Changeset 2988 for trunk

Timestamp:

09/10/14 19:19:16 (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: added a private method, asapplotter._get_date_axis_setup()

Test Programs: invoke sdplot with plottype="azel" or asapplotter.plotazel

Put in Release Notes: No

Module(s): sdplot/asapplotter

Description: A minor reorganization of date formatting.

File:

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

trunk/python/asapplotter.py

@@ -1317 +1317 @@
             return start,end
 
-    def plotazel(self, scan=None, outfile=None):
-        """
-        plot azimuth and elevation versus time of a scantable
-        """
-        self._plotmode = "azel"
-        visible = rcParams['plotter.gui']
+    def _get_date_axis_setup(self, dates):
+        """
+        Returns proper axis title and formatters for a list of dates
+        Input
+            dates : a list of datetime objects returned by,
+                    e.g. scantable.get_time(asdatetime=True)
+        Output
+            a set of
+            * date axis title string
+            * formatter of date axis 
+            * major axis locator
+            * minor axis locator
+        """
         from matplotlib import pylab as PL
         from matplotlib.dates import DateFormatter
-        from pytz import timezone
         from matplotlib.dates import HourLocator, MinuteLocator,SecondLocator, DayLocator
-        from matplotlib.ticker import MultipleLocator
-        from numpy import array, pi, ma
-        if self._plotter and (PL.gcf() == self._plotter.figure):
-            # the current figure is ASAP plotter. Use mpl plotter
-            figids = PL.get_fignums()
-            PL.figure(max(figids[-1],1))
-
-        if not visible or not self._visible:
-            PL.ioff()
-            from matplotlib.backends.backend_agg import FigureCanvasAgg
-            PL.gcf().canvas.switch_backends(FigureCanvasAgg)
-        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')
-        PL.cla()
-        PL.ioff()
-        PL.clf()
-        # Adjust subplot margins
-        if not self._margins or len(self._margins) != 6:
-            self.set_margin(refresh=False)
-        lef, bot, rig, top, wsp, hsp = self._margins
-        PL.gcf().subplots_adjust(left=lef,bottom=bot,right=rig,top=top,
-                                 wspace=wsp,hspace=hsp)
-
         tdel = max(t) - min(t) # interval in day
-        ax = PL.subplot(2,1,1)
-        el = ma.masked_array(array(self._data.get_elevation())*180./pi, mask)
-        PL.ylabel('El [deg.]')
         dstr = dates[0].strftime('%Y/%m/%d')
         if tdel > 1.0: # >1day
@@ -1381 +1358 @@
             majloc = MinuteLocator()
             minloc = SecondLocator(30)
-
+        return (dstr, timefmt, majloc, minloc)
+
+    def plotazel(self, scan=None, outfile=None):
+        """
+        plot azimuth and elevation versus time of a scantable
+        """
+        self._plotmode = "azel"
+        visible = rcParams['plotter.gui']
+        from matplotlib import pylab as PL
+        from pytz import timezone
+        from matplotlib.ticker import MultipleLocator
+        from numpy import array, pi, ma
+        if self._plotter and (PL.gcf() == self._plotter.figure):
+            # the current figure is ASAP plotter. Use mpl plotter
+            figids = PL.get_fignums()
+            PL.figure(max(figids[-1],1))
+
+        if not visible or not self._visible:
+            PL.ioff()
+            from matplotlib.backends.backend_agg import FigureCanvasAgg
+            PL.gcf().canvas.switch_backends(FigureCanvasAgg)
+        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')
+        PL.cla()
+        PL.ioff()
+        PL.clf()
+        # Adjust subplot margins
+        if not self._margins or len(self._margins) != 6:
+            self.set_margin(refresh=False)
+        lef, bot, rig, top, wsp, hsp = self._margins
+        PL.gcf().subplots_adjust(left=lef,bottom=bot,right=rig,top=top,
+                                 wspace=wsp,hspace=hsp)
+
+        tdel = max(t) - min(t) # interval in day
+        ax = PL.subplot(2,1,1)
+        el = ma.masked_array(array(self._data.get_elevation())*180./pi, mask)
+        PL.ylabel('El [deg.]')
+        (dstr, timefmt, majloc, minloc) = self._get_date_axis_setup(dates)
+        
         PL.title(dstr)
         if tdel == 0.0: