Changeset 2153 for trunk/python

Timestamp:

04/25/11 18:41:34 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No (a bug fix)

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs:

Put in Release Notes: No

Module(s): asapfitter, sdfit

Description: proper handling of rowflag in plotting.

File:

• trunk/python/asapfitter.py (modified) (7 diffs)

trunk/python/asapfitter.py

@@ -30 +30 @@
         """
         Set the absissa and ordinate for the fit. Also set the mask
-        indicationg valid points.
+        indicating valid points.
         This can be used for data vectors retrieved from a scantable.
         For scantable fitting use 'fitter.set_scan(scan, mask)'.
@@ -557 +557 @@
             tlab = self.data._getsourcename(self._fittedrow)
             xlab = self.data._getabcissalabel(self._fittedrow)
-            m =  logical_and(self.mask,
-                             array(self.data._getmask(self._fittedrow),
-                                   copy=False))
+            if self.data._getflagrow(self._fittedrow):
+                m = [False]
+            else:
+                m =  logical_and(self.mask,
+                                 array(self.data._getmask(self._fittedrow),
+                                       copy=False))
 
             ylab = self.data._get_ordinate_label()
@@ -567 +570 @@
         for i in range(len(m)):
             nomask = nomask and m[i]
+        if len(m) == 1:
+            m = m[0]
+            invm = (not m)
+        else:
+            invm = logical_not(m)
         label0='Masked Region'
         label1='Spectrum'
@@ -578 +586 @@
         self._p.palette(0,colours)
         self._p.set_line(label=label0)
-        y = ma.masked_array(self.y,mask=logical_not(m))
+        y = ma.masked_array(self.y,mask=invm)
         self._p.plot(self.x, y)
         if residual:
@@ -584 +592 @@
             self._p.set_line(label='Residual')
             y = ma.masked_array(self.get_residual(),
-                                  mask=logical_not(m))
+                                  mask=invm)
             self._p.plot(self.x, y)
         self._p.palette(2)
@@ -598 +606 @@
                     lab = self.fitfuncs[c]+str(c)
                     self._p.set_line(label=lab)
-                    y = ma.masked_array(self.fitter.evaluate(c),
-                                          mask=logical_not(m))
+                    y = ma.masked_array(self.fitter.evaluate(c), mask=invm)
 
                     self._p.plot(self.x, y)
@@ -606 +613 @@
                     self._p.set_line(label="Total Fit")
                     y = ma.masked_array(self.fitter.getfit(),
-                                          mask=logical_not(m))
+                                          mask=invm)
                     self._p.plot(self.x, y)
         else:
             self._p.palette(2)
             self._p.set_line(label='Fit')
-            y = ma.masked_array(self.fitter.getfit(),
-                                  mask=logical_not(m))
+            y = ma.masked_array(self.fitter.getfit(),mask=invm)
             self._p.plot(self.x, y)
         xlim=[min(self.x),max(self.x)]