Changeset 1087 for trunk/python

Timestamp:

07/27/06 14:39:36 (18 years ago)

Author:

mar637

Message:

use MA instead of homemade masking; This probably breaks old (woody) versions of mpl

File:

• trunk/python/asapplotter.py (modified) (2 diffs)

trunk/python/asapplotter.py

@@ -455 +455 @@
                         m = logical_and(m, self._usermask)
                 x = scan._getabcissa(r)
+                from matplotlib.numerix import ma,logical_not,array
+                y = ma.MA.MaskedArray(y,mask=logical_not(array(m,copy=0)),copy=0)
                 if self._minmaxx is not None:
                     s,e = self._slice_indeces(x)
                     x = x[s:e]
                     y = y[s:e]
-                    m = m[s:e]
                 if len(x) > 2048 and rcParams['plotter.decimate']:
                     fac = len(x)/2048
                     x = x[::fac]
-                    m = m[::fac]
                     y = y[::fac]
                 llbl = self._get_label(scan, r, self._stacking, self._lmap)
@@ -476 +476 @@
                 plotit = self._plotter.plot
                 if self._hist: plotit = self._plotter.hist
-                plotit(x,y,m)
+                plotit(x,y)
                 xlim= self._minmaxx or [min(x),max(x)]
                 allxlim += xlim
-                ylim= self._minmaxy or [min(y),max(y)]
+                ylim= self._minmaxy or [ma.MA.minimum(y),ma.MA.maximum(y)]
                 allylim += ylim
                 stackcount += 1