Changeset 2953 for trunk/python

Timestamp:

06/24/14 20:51:58 (11 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-6595)

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs:

Put in Release Notes: Yes

Module(s): sdplot, asapplotter

Description: Proper handling of flagged data in plottp, plotazel, and plotpointing2

File:

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

trunk/python/asapplotter.py

@@ -1328 +1328 @@
         from matplotlib.dates import HourLocator, MinuteLocator,SecondLocator, DayLocator
         from matplotlib.ticker import MultipleLocator
-        from numpy import array, pi
+        from numpy import array, pi, ma
         if self._plotter and (PL.gcf() == self._plotter.figure):
             # the current figure is ASAP plotter. Use mpl plotter
@@ -1340 +1340 @@
         self._data = scan
         dates = self._data.get_time(asdatetime=True)
+        # for flag handling
+        mask = [ self._data._is_all_chan_flagged(i) for i in range(self._data.nrow())]
         t = PL.date2num(dates)
         tz = timezone('UTC')
@@ -1354 +1356 @@
         tdel = max(t) - min(t)
         ax = PL.subplot(2,1,1)
-        el = array(self._data.get_elevation())*180./pi
+        el = ma.masked_array(array(self._data.get_elevation())*180./pi, mask)
         PL.ylabel('El [deg.]')
         dstr = dates[0].strftime('%Y/%m/%d')
@@ -1392 +1394 @@
 
         # Az plot
-        az = array(self._data.get_azimuth())*180./pi
+        az = ma.masked_array(array(self._data.get_azimuth())*180./pi, mask)
         if min(az) < 0:
             for irow in range(len(az)):
@@ -1440 +1442 @@
         """
         self._plotmode = "pointing"
-        from numpy import array, pi
+        from numpy import array, pi, ma
         from asap import scantable
         # check for scantable
@@ -1519 +1521 @@
             # getting data to plot
             dir = array(self._data.get_directionval()).transpose()
+            # for flag handling
+            mask = [ self._data._is_all_chan_flagged(i) for i in range(self._data.nrow())]
             ra = dir[0]*180./pi
-            dec = dir[1]*180./pi
+            dec = ma.masked_array(dir[1]*180./pi, mask)
             # actual plot
             self._plotter.set_line(label=(sellab+str(idx)))
@@ -1679 +1683 @@
         if m > 1:
             y=y.mean(axis=1)
+        # flag handling
+        m = [ scan._is_all_chan_flagged(i) for i in range(scan.nrow()) ]
+        y = ma.masked_array(y,mask=m)
         plotit = self._plotter.plot
         llbl = self._get_label(scan, r, self._stacking, None)