plot particle data independently of the simgrid

The ParticleAnalyzer doesnt depend on the simgrid properties anymore. In case they arend dumped the simgrid=True option in the createHistrogram*d functions will be without any effect. fix #7
skuschel · Dec 25, 2014 · 7b98ed9 · 7b98ed9
1 parent 0fb9903
commit 7b98ed9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/postpic/analyzer/particles.py b/postpic/analyzer/particles.py
@@ -190,20 +190,21 @@ def __init__(self, dumpreader, *speciess):
         self._species = None  # trivial name if set
         self._compresslog = []
         self.simdimensions = dumpreader.simdimensions()
-        self.X.__func__.extent = dumpreader.extent('x')
-        self.X.__func__.gridpoints = dumpreader.gridpoints('x')
-        self.X_um.__func__.extent = dumpreader.extent('x') * 1e6
-        self.X_um.__func__.gridpoints = dumpreader.gridpoints('x')
-        if self.simdimensions > 1:
+        try:
+            self.X.__func__.extent = dumpreader.extent('x')
+            self.X.__func__.gridpoints = dumpreader.gridpoints('x')
+            self.X_um.__func__.extent = dumpreader.extent('x') * 1e6
+            self.X_um.__func__.gridpoints = dumpreader.gridpoints('x')
             self.Y.__func__.extent = dumpreader.extent('y')
             self.Y.__func__.gridpoints = dumpreader.gridpoints('y')
             self.Y_um.__func__.extent = dumpreader.extent('y') * 1e6
             self.Y_um.__func__.gridpoints = dumpreader.gridpoints('y')
-        if self.simdimensions > 2:
             self.Z.__func__.extent = dumpreader.extent('z')
             self.Z.__func__.gridpoints = dumpreader.gridpoints('z')
             self.Z_um.__func__.extent = dumpreader.extent('z') * 1e6
             self.Z_um.__func__.gridpoints = dumpreader.gridpoints('z')
+        except(KeyError):
+            pass
         self.angle_xy.__func__.extent = np.real([-np.pi, np.pi])
         self.angle_yz.__func__.extent = np.real([-np.pi, np.pi])
         self.angle_zx.__func__.extent = np.real([-np.pi, np.pi])

diff --git a/postpic/datareader/dummy.py b/postpic/datareader/dummy.py
@@ -114,7 +114,7 @@ def grid(self, axis):
                  2: [(-2, 10, 300), (-5, 5, 400)],
                  3: [(-2, 10, 100), (-5, 5, 80), (-4, 4, 60)]}
         if axid >= self.simdimensions():
-            raise IndexError('axis ' + str(axis) + ' not present.')
+            raise KeyError('axis ' + str(axis) + ' not present.')
         args = grids[self.simdimensions()][axid]
         ret = np.linspace(*args)
         return ret