Changeset 2991 for trunk

Timestamp:

09/12/14 21:31:17 (10 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-6704)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: renamed private method asapplotter._plottp2 asapplotter._plottp_in_time

Test Programs:

Put in Release Notes: No

Module(s): asapplotter

Description: renamed the name of a private method, asapplotter._plottp2, asapplotter._plottp_in_time. An improvements to error handling.

File:

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

trunk/python/asapplotter.py

@@ -1686 +1686 @@
             self._plottp(self._data)
         else:
-            self._plottp2(self._data,colorby)
+            self._plottp_in_time(self._data,colorby)
         if self._minmaxy is not None:
             self._plotter.set_limits(ylim=self._minmaxy)
@@ -1694 +1694 @@
         return
 
-    def _plottp2(self,scan,colorby):
+    def _plottp_in_time(self,scan,colorby):
         """
         private method for plotting total power data in time
+        Parameters:
+            scan    : input scantable instance
+            colorby : change color by either
+                      'type'(source type)|'scan'|'if'|'pol'|'beam'
         """
         from numpy import ma, array, arange, logical_not
@@ -1712 +1716 @@
         #ylab = self._ordinate and self._ordinate[panelcount] \
         #       or scan._get_ordinate_label()
-        tmplab = 'row number' if colorby=='' else 'Time (UTC)'  
-        xlab = self._abcissa or tmplab
+        xlab = self._abcissa or 'Time (UTC)'
         ylab = self._ordinate or scan._get_ordinate_label()
         self._plotter.set_axes('xlabel',xlab)
@@ -1728 +1731 @@
         validtypes=['type','scan','if','pol', 'beam']
         stype = None
+        col_msg = "Invalid choice of 'colorby' (choices: %s)" % str(validtypes)
         if (colorby in validtypes):
             stype = colorby[0]
         elif len(colorby) > 0:
-            msg = "Invalid choice of 'colorby' (choices: %s)" % str(validtypes)
-            raise ValueError(msg)
+            raise ValueError(col_msg)
         if not stype:
-            selIds = [""] # cheating
-            sellab = "all points"
+            raise ValueError(col_msg)
         elif stype == 't':
             selIds = range(15)
@@ -1748 +1750 @@
         for idx in selIds:
             sel = selector() + basesel
-            if stype:
-                bid = getattr(basesel,'get_'+colorby+"s")()
-                if (len(bid) > 0) and (not idx in bid):
-                    # base selection doesn't contain idx
-                    # Note summation of selector is logical sum if 
-                    continue
-                getattr(sel, selFunc)([idx])
+            bid = getattr(basesel,'get_'+colorby+"s")()
+            if (len(bid) > 0) and (not idx in bid):
+                # base selection doesn't contain idx
+                # Note summation of selector is logical sum if 
+                continue
+            getattr(sel, selFunc)([idx])
             if not sel.is_empty():
                 try:
@@ -1771 +1772 @@
             y = ma.masked_array(y,mask=logical_not(array(m,copy=False)))
             # try to handle spectral data somewhat...
-            l,m = y.shape
+            try:
+                l,m = y.shape
+            except ValueError, e:
+                raise ValueError(str(e)+" This error usually occurs when you select multiple spws with different number of channels. Try selecting single channels and retry.")
             if m > 1:
                 y=y.mean(axis=1)
@@ -1781 +1785 @@
             #self._plotter.set_line(label=llbl)
             self._plotter.set_line(label=(sellab+str(idx)))
-            if stype:
-                from matplotlib.dates import date2num
-                from pytz import timezone
-                dates = self._data.get_time(asdatetime=True)
-                alldates += list(dates)
-                x = date2num(dates)
-                tz = timezone('UTC')
-                self._plotter.axes.plot_date(x,y,'-',tz=tz)
-            else:
-                x = arange(len(y))
-                self._plotter.plot(x,y)
+            from matplotlib.dates import date2num
+            from pytz import timezone
+            dates = self._data.get_time(asdatetime=True)
+            alldates += list(dates)
+            x = date2num(dates)
+            tz = timezone('UTC')
+            self._plotter.axes.plot_date(x,y,'-',tz=tz)
+
         # legend and axis formatting
-        if stype:
-            (dstr, timefmt, majloc, minloc) = self._get_date_axis_setup(alldates)
-            ax = self.gca()
-            ax.xaxis.set_major_formatter(timefmt)
-            ax.xaxis.set_major_locator(majloc)
-            ax.xaxis.set_minor_locator(minloc)
-            self._plotter.legend(self._legendloc)
-        else: self._plotter.legend(None)
+        (dstr, timefmt, majloc, minloc) = self._get_date_axis_setup(alldates)
+        ax = self.gca()
+        ax.xaxis.set_major_formatter(timefmt)
+        ax.xaxis.set_major_locator(majloc)
+        ax.xaxis.set_minor_locator(minloc)
+        self._plotter.legend(self._legendloc)
 
     def _plottp(self,scan):