use charge and mass information in particle analyzer if dumped

skuschel · Dec 7, 2014 · ac58217 · ac58217
1 parent f4ee6c2
commit ac58217
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/postpic/_const.py b/postpic/_const.py
@@ -28,7 +28,9 @@
                        'PY': 4, 'Py': 4, 'py': 4, 4: 4,
                        'PZ': 5, 'Pz': 5, 'pz': 5, 9: 9,
                        'weight': 9, 'w': 9, 10: 10,
-                       'id': 10, 'ID': 10})
+                       'id': 10, 'ID': 10,
+                       'mass': 11, 'm': 11, 'Mass': 11,
+                       'charge': 12, 'c': 12, 'Charge': 12, 'q': 12})
 
 # Some static functions
 

diff --git a/postpic/analyzer/particles.py b/postpic/analyzer/particles.py
@@ -37,9 +37,12 @@ class _SingleSpeciesAnalyzer(object):
     def __init__(self, dumpreader, species):
         self.species = species
         self._dumpreader = dumpreader
-        self._idfy = identifyspecies(species)
-        self._mass = self._idfy['mass']  # SI
-        self._charge = self._idfy['charge']  # SI
+        self._mass = dumpreader.getSpecies(species, 'mass')
+        self._charge = dumpreader.getSpecies(species, 'charge')
+        if self._mass is None or self._charge is None:
+            self._idfy = identifyspecies(species)
+            self._mass = self._idfy['mass']  # SI
+            self._charge = self._idfy['charge']  # SI
         self.compresslog = []
         self._compressboollist = None
         self._cache = {}