Changeset 1116 for trunk/python/asapplotter.py

Timestamp:

08/04/06 16:27:27 (18 years ago)

Author:

mar637

Message:

fixed up import of MaskedArray? to make it usable with numpy and numarray

File:

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

trunk/python/asapplotter.py

@@ -519 +519 @@
                         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)
+                from matplotlib.numerix import ma, logical_not, array
+                y = ma.masked_array(y,mask=logical_not(array(m,copy=False)))
                 if self._minmaxx is not None:
                     s,e = self._slice_indeces(x)
@@ -543 +543 @@
                 xlim= self._minmaxx or [min(x),max(x)]
                 allxlim += xlim
-                ylim= self._minmaxy or [ma.MA.minimum(y),ma.MA.maximum(y)]
+                ylim= self._minmaxy or [ma.minimum(y),ma.maximum(y)]
                 allylim += ylim
                 stackcount += 1