From afa093b47b796bbe928010c6711b9dd2bc89d7ee Mon Sep 17 00:00:00 2001 From: Remi Lehe Date: Fri, 12 Mar 2021 11:22:31 -0800 Subject: [PATCH] Add momentum p --- .../data_reader/h5py_reader/params_reader.py | 3 +++ .../data_reader/h5py_reader/particle_reader.py | 3 +++ .../data_reader/io_reader/params_reader.py | 3 +++ .../data_reader/io_reader/particle_reader.py | 5 ++++- openpmd_viewer/openpmd_timeseries/main.py | 9 ++++----- 5 files changed, 17 insertions(+), 6 deletions(-) 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..60b5784d 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 @@ -212,12 +212,15 @@ def simplify_record(record_comps): if 'momentum/x' in record_comps: record_comps.remove('momentum/x') record_comps.append('ux') + record_comps.append('px') if 'momentum/y' in record_comps: record_comps.remove('momentum/y') record_comps.append('uy') + record_comps.append('py') if 'momentum/z' in record_comps: record_comps.remove('momentum/z') record_comps.append('uz') + record_comps.append('pz') # Replace the name for 'weights' if 'weighting' in record_comps: diff --git a/openpmd_viewer/openpmd_timeseries/data_reader/h5py_reader/particle_reader.py b/openpmd_viewer/openpmd_timeseries/data_reader/h5py_reader/particle_reader.py index 82fddd20..dd9cada7 100644 --- a/openpmd_viewer/openpmd_timeseries/data_reader/h5py_reader/particle_reader.py +++ b/openpmd_viewer/openpmd_timeseries/data_reader/h5py_reader/particle_reader.py @@ -46,6 +46,9 @@ def read_species_data(filename, iteration, species, record_comp, extensions): 'ux': 'momentum/x', 'uy': 'momentum/y', 'uz': 'momentum/z', + 'px': 'momentum/x', + 'py': 'momentum/y', + 'pz': 'momentum/z', 'w': 'weighting'} if record_comp in dict_record_comp: opmd_record_comp = dict_record_comp[record_comp] 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 44488081..833bf85d 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 @@ -189,12 +189,15 @@ def simplify_record(record_comps): if 'momentum/x' in record_comps: record_comps.remove('momentum/x') record_comps.append('ux') + record_comps.append('px') if 'momentum/y' in record_comps: record_comps.remove('momentum/y') record_comps.append('uy') + record_comps.append('py') if 'momentum/z' in record_comps: record_comps.remove('momentum/z') record_comps.append('uz') + record_comps.append('pz') # Replace the name for 'weights' if 'weighting' in record_comps: diff --git a/openpmd_viewer/openpmd_timeseries/data_reader/io_reader/particle_reader.py b/openpmd_viewer/openpmd_timeseries/data_reader/io_reader/particle_reader.py index 0f14e866..35cdb455 100644 --- a/openpmd_viewer/openpmd_timeseries/data_reader/io_reader/particle_reader.py +++ b/openpmd_viewer/openpmd_timeseries/data_reader/io_reader/particle_reader.py @@ -46,8 +46,11 @@ def read_species_data(series, iteration, species_name, component_name, 'ux': ['momentum', 'x'], 'uy': ['momentum', 'y'], 'uz': ['momentum', 'z'], + 'px': ['momentum', 'x'], + 'py': ['momentum', 'y'], + 'pz': ['momentum', 'z'], 'w': ['weighting', None]} - + if component_name in dict_record_comp: ompd_record_name, ompd_record_comp_name = \ dict_record_comp[component_name] diff --git a/openpmd_viewer/openpmd_timeseries/main.py b/openpmd_viewer/openpmd_timeseries/main.py index 3de3d9a3..63078cfa 100644 --- a/openpmd_viewer/openpmd_timeseries/main.py +++ b/openpmd_viewer/openpmd_timeseries/main.py @@ -133,15 +133,14 @@ def get_particle(self, var_list=None, species=None, t=None, iteration=None, If two quantities are requested by the user, this plots a 2d histogram of these quantities. - In the case of momenta, the result is returned as: - - unitless momentum (i.e. gamma*beta) for particles with non-zero mass - - in kg.m.s^-1 for particles with zero mass - Parameters ---------- var_list : list of string, optional A list of the particle variables to extract. If var_list is not - provided, the available particle quantities are printed + provided, the available particle quantities are printed. + Note that `px`, `py`, `pz` represent the momentum in kg.m.s^-1, + while `ux`, `uy`, `uz` represent the unitless momentum + (i.e. gamma*beta). species: string A string indicating the name of the species