Changeset 1116 for trunk

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

Location:

trunk/python

Files:

• asapfitter.py (modified) (3 diffs)
• asapplotter.py (modified) (2 diffs)

trunk/python/asapfitter.py

@@ -492 +492 @@
         self._p.set_line(label='Spectrum')
         from matplotlib.numerix import ma,logical_not,array
-        y = ma.MA.MaskedArray(self.y,mask=logical_not(array(m,copy=0)),copy=0)
+        y = ma.masked_array(self.y,mask=logical_not(array(m,copy=False)))
         self._p.plot(self.x, y)
         if residual:
             self._p.palette(1)
             self._p.set_line(label='Residual')
-            y = ma.MA.MaskedArray(self.get_residual(),
-                                  mask=logical_not(array(m,copy=0)),copy=0)
+            y = ma.masked_array(self.get_residual(),
+                                  mask=logical_not(array(m,copy=False)))
             self._p.plot(self.x, y)
         self._p.palette(2)
@@ -512 +512 @@
                     lab = self.fitfuncs[c]+str(c)
                     self._p.set_line(label=lab)
-                    y = ma.MA.MaskedArray(self.fitter.evaluate(c),
-                                          mask=logical_not(array(m,copy=0)),
-                                          copy=0)
+                    y = ma.masked_array(self.fitter.evaluate(c),
+                                          mask=logical_not(array(m,copy=False)))
 
                     self._p.plot(self.x, y)
@@ -520 +519 @@
                     self._p.palette(2)
                     self._p.set_line(label="Total Fit")
-                    y = ma.MA.MaskedArray(self.fitter.getfit(),
-                                          mask=logical_not(array(m,copy=0)),
-                                          copy=0)
+                    y = ma.masked_array(self.fitter.getfit(),
+                                          mask=logical_not(array(m,copy=False)))
                     self._p.plot(self.x, y)
         else:
             self._p.palette(2)
             self._p.set_line(label='Fit')
-            y = ma.MA.MaskedArray(self.fitter.getfit(),
-                                  mask=logical_not(array(m,copy=0)),
-                                  copy=0)
+            y = ma.masked_array(self.fitter.getfit(),
+                                  mask=logical_not(array(m,copy=False)))
             self._p.plot(self.x, y)
         xlim=[min(self.x),max(self.x)]

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