Changeset 2704 for trunk

Timestamp:

12/20/12 14:38:59 (12 years ago)

Author:

Kana Sugimoto

Message:

New Development: No (a bug fix)

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

invoke asapplotter.plotazel (sdplot with plottype="azel") and
asapplotter.plotpointing (sdplot with plottype="pointing")
before invoking asapplotter.plot (sdplot with plottype="spectra") or
asapplotter.plottp (sdplot with plottype="totalpower") after loading
casapy/asap.

Put in Release Notes: No

Module(s): asapplotter and sdplot

Description:

Fixed a bug which caused azel and pointing plot fail when the plot
commands are invoked before running spectral or totalpower plot at
least once after loading casapy/asap.

File:

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

trunk/python/asapplotter.py

@@ -60 +60 @@
         self._legendloc = None
         ### scantable plot settings
+        self._plotmode = "spectra"
         self._panelling = None
         self._stacking = None
@@ -961 +962 @@
             are consistent e.g. all 'channel' or all 'velocity' etc.
         """
+        self._plotmode = "spectra"
         if not self._data and not scan:
             msg = "Input is not a scantable"
@@ -1304 +1306 @@
         plot azimuth and elevation versus time of a scantable
         """
+        self._plotmode = "azel"
         visible = rcParams['plotter.gui']
         from matplotlib import pylab as PL
@@ -1311 +1314 @@
         from matplotlib.ticker import MultipleLocator
         from numpy import array, pi
-        if PL.gcf() == self._plotter.figure:
+        if self._plotter and (PL.gcf() == self._plotter.figure):
             # the current figure is ASAP plotter. Use mpl plotter
             figids = PL.get_fignums()
-            if figids[-1] > 0:
-                PL.figure(figids[-1])
-            else:
-                PL.figure(1)
+            PL.figure(max(figids[-1],1))
+
         if not visible or not self._visible:
             PL.ioff()
@@ -1423 +1424 @@
                          ''(no projection [deg])|'coord'(not implemented)
         """
+        self._plotmode = "pointing"
         from numpy import array, pi
         from asap import scantable
@@ -1544 +1546 @@
         from matplotlib import pylab as PL
         from numpy import array, pi
-        if PL.gcf() == self._plotter.figure:
+        if self._plotter and (PL.gcf() == self._plotter.figure):
             # the current figure is ASAP plotter. Use mpl plotter
             figids = PL.get_fignums()
-            if figids[-1] > 0:
-                PL.figure(figids[-1])
-            else:
-                PL.figure(1)
+            PL.figure(max(figids[-1],1))
+
         if not visible or not self._visible:
             PL.ioff()
@@ -1588 +1588 @@
     @asaplog_post_dec
     def plottp(self, scan=None):
+        self._plotmode = "totalpower"
         from asap import scantable
         if not self._data and not scan:
@@ -1775 +1776 @@
         spectra which belong to a grid.
         """
+        self._plotmode = "grid"
         from asap import scantable
         from numpy import array, ma, cos