From 4e46b601b1808baa005384b03586097926691e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81ngel=20Ferran=20Pousa?= Date: Fri, 1 Sep 2023 12:27:16 +0200 Subject: [PATCH] Simplify records of radial position and momentum --- .../data_reader/h5py_reader/params_reader.py | 7 +++++++ .../data_reader/io_reader/params_reader.py | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/openpmd_viewer/openpmd_timeseries/data_reader/h5py_reader/params_reader.py b/openpmd_viewer/openpmd_timeseries/data_reader/h5py_reader/params_reader.py index ffdcfdbf..196d1a4d 100644 --- a/openpmd_viewer/openpmd_timeseries/data_reader/h5py_reader/params_reader.py +++ b/openpmd_viewer/openpmd_timeseries/data_reader/h5py_reader/params_reader.py @@ -207,6 +207,10 @@ def simplify_record(record_comps): record_comps.remove('position/z') record_comps.remove('positionOffset/z') record_comps.append('z') + if ('position/r' in record_comps) and ('positionOffset/r' in record_comps): + record_comps.remove('position/r') + record_comps.remove('positionOffset/r') + record_comps.append('r') # Replace the names of the momenta if 'momentum/x' in record_comps: @@ -218,6 +222,9 @@ def simplify_record(record_comps): if 'momentum/z' in record_comps: record_comps.remove('momentum/z') record_comps.append('uz') + if 'momentum/r' in record_comps: + record_comps.remove('momentum/r') + record_comps.append('ur') # Replace the name for 'weights' if 'weighting' in record_comps: diff --git a/openpmd_viewer/openpmd_timeseries/data_reader/io_reader/params_reader.py b/openpmd_viewer/openpmd_timeseries/data_reader/io_reader/params_reader.py index d80f7b32..81ac248e 100644 --- a/openpmd_viewer/openpmd_timeseries/data_reader/io_reader/params_reader.py +++ b/openpmd_viewer/openpmd_timeseries/data_reader/io_reader/params_reader.py @@ -184,6 +184,10 @@ def simplify_record(record_comps): record_comps.remove('position/z') record_comps.remove('positionOffset/z') record_comps.append('z') + if ('position/r' in record_comps) and ('positionOffset/r' in record_comps): + record_comps.remove('position/r') + record_comps.remove('positionOffset/r') + record_comps.append('r') # Replace the names of the momenta if 'momentum/x' in record_comps: @@ -195,6 +199,9 @@ def simplify_record(record_comps): if 'momentum/z' in record_comps: record_comps.remove('momentum/z') record_comps.append('uz') + if 'momentum/r' in record_comps: + record_comps.remove('momentum/r') + record_comps.append('ur') # Replace the name for 'weights' if 'weighting' in record_comps: