Changeset 626 for trunk

Timestamp:

05/05/05 12:30:37 (20 years ago)

Author:

mar637

Message:

fix for asap0019 from Release-1

Location:

trunk/python

Files:

• asapfitter.py (modified) (2 diffs)
• asapplotter.py (modified) (6 diffs)
• scantable.py (modified) (2 diffs)

trunk/python/asapfitter.py

@@ -132 +132 @@
             if len(ps) == 0:
                 self.fitter.estimate()
-        self.fitter.fit()
+        try:
+            self.fitter.fit()
+        except RuntimeError, msg:
+            print msg            
         self._fittedrow = row
         self.fitted = True
@@ -336 +339 @@
             xlab = self.data._getabcissalabel(self._fittedrow)
             m = self.data._getmask(self._fittedrow)
-            ylab = r'Flux'
-
-        colours = ["grey60","grey80","red","orange","purple","yellow","magenta", "cyan"]
+            ylab = self.data._get_ordinate_label()
+
+        colours = ["grey60","grey80","red","orange","purple","green","magenta", "cyan"]
         self._p.palette(1,colours)
         self._p.set_line(label='Spectrum')

trunk/python/asapplotter.py

@@ -80 +80 @@
                 self.set_cursor(refresh=False)
         if self._panelling == 't':
-            maxrows = 9
+            maxrows = 25
             if self._data[0].nrow() > maxrows:
                 if self._cursor["t"] is None or \
@@ -148 +148 @@
                 y = None
                 m = None
-                if not self._title:
+                if self._title is None:
                     tlab = scan._getsourcename(rowsel)                    
                 else:
-                    if len(self._title) == n:
+                    if len(self._title) >= n:
                         tlab = self._title[rowsel]
                     else:
@@ -169 +169 @@
                     ylab = self._ordinate
                 else:
-                    ylab = 'Flux ('+scan.get_fluxunit()+')'
+                    ylab = scan._get_ordinate_label()
                 m = scan._getmask(rowsel)
                 if self._lmap and len(self._lmap) > 0:
@@ -206 +206 @@
             if self._rows and self._cols:
                 n = min(n,self._rows*self._cols)
-                self._plotter.set_panel(rows=self._rows,cols=self._cols,
+                self._plotter.set_panels(rows=self._rows,cols=self._cols,
                                          nplots=n)
             else:
-                self._plotter.set_panel(rows=n,cols=0,nplots=n)
+                self._plotter.set_panels(rows=n,cols=0,nplots=n)
         else:
             self._plotter.set_panels()
+
         for scan in scans:
             self._plotter.palette(1)
@@ -255 +256 @@
                     ylab = self._ordinate
                 else:
-                    ylab = 'Flux ('+scan.get_fluxunit()+')'
+                    ylab = scan._get_ordinate_label()
                 m = scan._getmask(rowsel)
                 if self._lmap and len(self._lmap) > 0:
@@ -354 +355 @@
                     ylab = self._ordinate
                 else:
-                    ylab = 'Flux ('+scan.get_fluxunit()+')'
+                    ylab = scan._get_ordinate_label()
                 m = scan._getmask(rowsel)
                 if colmode == 's' or colmode == 't':

trunk/python/scantable.py

@@ -1066 +1066 @@
         if mask is None:
             from numarray import ones
-            mask = list(ones(scan.nchan()))
+            mask = list(ones(self.nchan()))
         from asap.asapfitter import fitter
         f = fitter()
@@ -1428 +1428 @@
             i = j        
         return segments
+    def _get_ordinate_label(self):
+        fu = "("+self.get_fluxunit()+")"
+        import re
+        lbl = "Intensity"
+        if re.match(".K.",fu):
+            lbl = "Brightness Temperature "+ fu
+        elif re.match(".Jy.",fu):
+            lbl = "Flux density "+ fu
+        return lbl
+