Changeset 1995 for trunk/python

Timestamp:

02/16/11 21:06:10 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-2775)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: plot spectra with FLAGROW=1

Put in Release Notes: No

Module(s): asapplotter, sdplot

Description:

Proper handling of FLAGROW values in sdplot/asapplotter.
Also, proper handling of plotrange for totally flagged spectra.

File:

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

trunk/python/asapplotter.py

@@ -85 +85 @@
             #from asap.casatoolbar import CustomFlagToolbarTkAgg
             #return CustomFlagToolbarTkAgg(self)
-        else: return None
+        return None
 
     @asaplog_post_dec
@@ -949 +949 @@
                 else:
                     y = scan._getspectrum(r)
-                m = scan._getmask(r)
-                from numpy import logical_not, logical_and
-                if self._maskselection and len(self._usermask) == len(m):
-                    if d[self._stacking](r) in self._maskselection[self._stacking]:
-                        m = logical_and(m, self._usermask)
+                # flag application
+                mr = scan._getflagrow(r)
                 from numpy import ma, array
+                if mr:
+                    y = ma.masked_array(y,mask=mr)
+                else:
+                    m = scan._getmask(r)
+                    from numpy import logical_not, logical_and
+                    if self._maskselection and len(self._usermask) == len(m):
+                        if d[self._stacking](r) in self._maskselection[self._stacking]:
+                            m = logical_and(m, self._usermask)
+                    y = ma.masked_array(y,mask=logical_not(array(m,copy=False)))
+
                 x = array(scan._getabcissa(r))
                 if self._offset:
                     x += self._offset
-                y = ma.masked_array(y,mask=logical_not(array(m,copy=False)))
                 if self._minmaxx is not None:
                     s,e = self._slice_indeces(x)
@@ -978 +984 @@
                 plotit = self._plotter.plot
                 if self._hist: plotit = self._plotter.hist
-                if len(x) > 0:
+                if len(x) > 0 and not mr:
                     plotit(x,y)
                     xlim= self._minmaxx or [min(x),max(x)]