Changeset 541

Timestamp:

03/08/05 15:29:17 (19 years ago)

Author:

mar637

Message:

• enabled plotting of circular pols.
• major bug fix on recursive plot calls.

File:

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

trunk/python/asapplotter.py

@@ -31 +31 @@
                        self._idict,self._pdict,
                        self._sdict]
-        self._panels = 's'
+        self._panels = rcParams['plotter.panelling']
         self._stacking = rcParams['plotter.stacking']
         self._rows = None
@@ -73 +73 @@
                     self._data = list(args)
                     # reset cursor
-                    self.set_cursor()
+                    self.set_cursor(refresh=False)
             else:
                 self._data = list(args)
-                self.set_cursor()
+                self.set_cursor(refresh=False)
         if self._panels == 't':
-            if self._data[0].nrow() > 49:
-                print "Scan to be plotted contains more than 25 rows.\n \
-                Can't plot that many panels..."
-                return
+            maxrows = 9
+            if self._data[0].nrow() > maxrows:
+                print "Scan to be plotted contains more than %d rows.\n" \
+                      "Selecting first %d rows..." % (maxrows,maxrows)
+                self._cursor["t"] = range(maxrows)
             self._plot_time(self._data[0], self._stacking)
         elif self._panels == 's':
@@ -155 +156 @@
                 elif polmode == "stokes2":
                     y = scan._getstokesspectrum(rowsel,True)
+                elif polmode == "circular":
+                    y = scan._stokestopolspectrum(rowsel,False,-1)
                 else:
                     y = scan._getspectrum(rowsel)
@@ -170 +173 @@
                         elif polmode == "stokes2":
                             llab = scan._getpolarizationlabel(0,1,1)
+                        elif polmode == "circular":
+                            llab = scan._getpolarizationlabel(0,0,0)
                         else:
                             llab = scan._getpolarizationlabel(1,0,0)
@@ -207 +212 @@
             else:
                 self._plotter.set_panels(rows=n,cols=0,nplots=n)
-        self._plotter.palette(1)
         for scan in scans:
+            self._plotter.palette(1)
             if n > 1:
                 self._plotter.subplot(scans.index(scan))
@@ -243 +248 @@
                 elif polmode == "stokes2":
                     y = scan._getstokesspectrum(rowsel,True)
+                elif polmode == "circular":
+                    y = scan._stokestopolspectrum(rowsel,False,-1)
                 else:
                     y = scan._getspectrum(rowsel)
@@ -258 +265 @@
                         elif polmode == "stokes2":
                             llab = scan._getpolarizationlabel(0,1,1)
+                        elif polmode == "circular":
+                            llab = scan._getpolarizationlabel(0,0,0)
                         else:
                             llab = scan._getpolarizationlabel(1,0,0)
@@ -296 +305 @@
             else:
                 self._plotter.set_panels(rows=n,cols=0,nplots=n)
-        self._plotter.palette(1)
         panels = self._cursor[self._panels]        
         for i in panels:
+            self._plotter.palette(1)
             polmode = "raw"
             ii = self._cursor[self._panels].index(i)
@@ -343 +352 @@
                 elif polmode == "stokes2":
                     y = scan._getstokesspectrum(rowsel,True)
+                elif polmode == "circular":
+                    y = scan._stokestopolspectrum(rowsel,False,-1)
                 else:
                     y = scan._getspectrum(rowsel)
@@ -370 +381 @@
                             elif polmode == "stokes2":
                                 llab = scan._getpolarizationlabel(0,1,1)
+                            elif polmode == "circular":
+                                llab = scan._getpolarizationlabel(0,0,0)
                             else:
                                 llab = scan._getpolarizationlabel(1,0,0)
@@ -379 +392 @@
                     elif polmode == "stokes2":
                         tlab = scan._getpolarizationlabel(0,1,1)
+                    elif polmode == "circular":
+                        tlab = scan._getpolarizationlabel(0,0,0)
                     else:
                         tlab = scan._getpolarizationlabel(1,0,0)
@@ -525 +540 @@
         return
     
-    def set_cursor(self, row=None,beam=None,IF=None,pol=None):
+    def set_cursor(self, row=None,beam=None,IF=None,pol=None, refresh=True):
         """
         Specify a 'cursor' for plotting selected spectra. Time (rows),
@@ -539 +554 @@
                     ["I", "Q", "U", "V"] or
                     ["I", "Plinear", "Pangle", "V"] or
-                    ["XX", "YY", "Real(XY)", "Imag(XY)"]
-                    Circular polarisation are not handled yet.
+                    ["XX", "YY", "Real(XY)", "Imag(XY)"] or
+                    ["RR", "LL"]
         Example:
             plotter.set_mode('pol','time')
@@ -589 +604 @@
         dstokes2 = {"I":0,"Plinear":1,"Pangle":2,"V":3}
         draw = {"XX":0, "YY":1,"Real(XY)":2, "Imag(XY)":3}
-        dcirc = { "RR":0,"LL":1,"RL":2,"LR":3}
+        dcirc = { "RR":0,"LL":1}#,"Real(RL)":2,"Image(RL)":3}
         
         if pol is None:
@@ -612 +627 @@
                     elif dcirc.has_key(i):
                         pols.append(dcirc.get(i))
-                        polmode.append("cricular")
+                        polmode.append("circular")
                     else:
                         "Pol type '%s' not valid" %i
@@ -624 +639 @@
             self._cursor["p"] = pols
             self._polmode = polmode
-        if self._data: self.plot()
+        if self._data and refresh: self.plot()