Changeset 794 for trunk/python

Timestamp:

12/09/05 14:50:59 (19 years ago)

Author:

mar637

Message:

update from Release12

Location:

trunk/python

Files:

• __init__.py (modified) (1 diff)
• asapfitter.py (modified) (2 diffs)
• asapplotter.py (modified) (7 diffs)
• scantable.py (modified) (9 diffs)

trunk/python/__init__.py

@@ -298 +298 @@
             get_time        - get the timestamps of the integrations
             get_sourcename  - get the source names of the scans
+            get_azimuth     - get the azimuth of the scans
+            get_elevation   - get the elevation of the scans
+            get_parangle    - get the parallactic angle of the scans
             get_unit        - get the currnt unit
             set_unit        - set the abcissa unit to be used from this

trunk/python/asapfitter.py

@@ -432 +432 @@
         print_log()
 
-    def auto_fit(self, insitu=None):
+    def auto_fit(self, insitu=None, allaxes=True):
         """
         Return a scan where the function is applied to all rows for
@@ -454 +454 @@
         rows = range(scan.nrow())
         from asap import asaplog
-        for i in range(scan.nbeam()):
-            scan.setbeam(i)
-            for j in range(scan.nif()):
-                scan.setif(j)
-                for k in range(scan.npol()):
-                    scan.setpol(k)
-                    asaplog.push("Fitting:")
-                    out = 'Beam[%d], IF[%d], Pol[%d]' % (i,j,k)
-                    asaplog.push(out)
-                    for iRow in rows:
-                        self.x = scan._getabcissa(iRow)
-                        self.y = scan._getspectrum(iRow)
-                        self.data = None
-                        self.fit()
-                        x = self.get_parameters()
-                        scan._setspectrum(self.fitter.getresidual(),iRow)
+        if allaxes:
+            for i in range(scan.nbeam()):
+                scan.setbeam(i)
+                for j in range(scan.nif()):
+                    scan.setif(j)
+                    for k in range(scan.npol()):
+                        scan.setpol(k)
+                        asaplog.push("Fitting:")
+                        out = 'Beam[%d], IF[%d], Pol[%d]' % (i,j,k)
+                        asaplog.push(out)
+                        for iRow in rows:
+                            self.x = scan._getabcissa(iRow)
+                            self.y = scan._getspectrum(iRow)
+                            self.data = None
+                            self.fit()
+                            x = self.get_parameters()
+                            scan._setspectrum(self.fitter.getresidual(),iRow)
+        else:
+            asaplog.push("Fitting:")
+            out = 'Beam[%d], IF[%d], Pol[%d]' % sel
+            asaplog.push(out)
+            for iRow in rows:
+                self.x = scan._getabcissa(iRow)
+                self.y = scan._getspectrum(iRow)
+                self.data = None
+                self.fit()
+                x = self.get_parameters()
+                scan._setspectrum(self.fitter.getresidual(),iRow)
+
         scan.set_cursor(sel[0],sel[1],sel[2])
         print_log()

trunk/python/asapplotter.py

@@ -148 +148 @@
         else:
             self._plotter.set_panels()
+        allxlim=[]
         rows = self._cursor["t"]
         rows = rows[:n]
@@ -228 +229 @@
                 if self._minmaxx is not None:
                     xlim = self._minmaxx
-                self._plotter.axes.set_xlim(xlim)
+                allxlim += xlim
+            allxlim.sort()
+            self._plotter.axes.set_xlim([allxlim[0],allxlim[-1]])
             self._plotter.set_axes('xlabel',xlab)
             self._plotter.set_axes('ylabel',ylab)
             self._plotter.set_axes('title',tlab)
+
         return
 
@@ -269 +273 @@
             colvals = eval(cdict2.get(colmode))
             rowsel = self._cursor["t"][0]
+            allxlim=[]
             for j in colvals:
                 polmode = "raw"
@@ -331 +336 @@
                 if self._minmaxx is not None:
                     xlim = self._minmaxx
-                self._plotter.axes.set_xlim(xlim)
-
+                allxlim += xlim
+            allxlim.sort()
+            self._plotter.axes.set_xlim([allxlim[0],allxlim[-1]])
             self._plotter.set_axes('xlabel',xlab)
             self._plotter.set_axes('ylabel',ylab)
@@ -377 +383 @@
             eval(cdict.get(self._panelling))
 
+            allxlim=[]
             colvals = eval(cdict2.get(colmode))
             for j in colvals:
@@ -404 +411 @@
                     eval(cdict.get(colmode))
                     i = savei
-                if self._panelling == "p":
-                    eval(cdict.get(self._panelling))
+                #if self._panelling == "p":
+                eval(cdict.get(self._panelling))
                 x = None
                 y = None
@@ -470 +477 @@
                 if self._minmaxx is not None:
                     xlim = self._minmaxx
-                self._plotter.axes.set_xlim(xlim)
+                allxlim += xlim
+            allxlim.sort()
+            self._plotter.axes.set_xlim([allxlim[0],allxlim[-1]])
 
             self._plotter.set_axes('xlabel',xlab)

trunk/python/scantable.py

@@ -226 +226 @@
                     raise IOError(msg)
         if rcParams['verbose']:
-            print info
+            try:
+                from IPython.genutils import page as pager
+            except ImportError:
+                from pydoc import pager
+            pager(info)
         else:
             return info
@@ -429 +433 @@
     def get_sourcename(self, row=-1):
         """
-        Get a list source anmes for the observations.
+        Get a list source names for the observations.
         Return a string for each integration in the scantable.
         Parameters:
@@ -442 +446 @@
             if  0 <= row < self.nrow():
                 return self._getsourcename(row)
+
+    def get_elevation(self, row=-1):
+        """
+        Get a list of elevations for the observations.
+        Return a float for each integration in the scantable.
+        Parameters:
+            row:    row no of integration. Default -1 return all rows
+        Example:
+            none
+        """
+        out = []
+        if row == -1:
+            return [self._getelevation(i) for i in range(self.nrow())]
+        else:
+            if  0 <= row < self.nrow():
+                return self._getelevation(row)
+
+    def get_azimuth(self, row=-1):
+        """
+        Get a list of azimuths for the observations.
+        Return a float for each integration in the scantable.
+        Parameters:
+            row:    row no of integration. Default -1 return all rows
+        Example:
+            none
+        """
+        out = []
+        if row == -1:
+            return [self._getazimuth(i) for i in range(self.nrow())]
+        else:
+            if  0 <= row < self.nrow():
+                return self._getazimuth(row)
+
+    def get_parangle(self, row=-1):
+        """
+        Get a list of parallactic angles for the observations.
+        Return a float for each integration in the scantable.
+        Parameters:
+            row:    row no of integration. Default -1 return all rows
+        Example:
+            none
+        """
+        out = []
+        if row == -1:
+            return [self._getparangle(i) for i in range(self.nrow())]
+        else:
+            if  0 <= row < self.nrow():
+                return self._getparangle(row)
 
     def set_unit(self, unit='channel'):
@@ -717 +769 @@
     def history(self):
         hist = list(self._gethistory())
-        print "-"*80
+        out = "-"*80
         for h in hist:
             if h.startswith("---"):
-                print h
+                out += "\n"+h
             else:
                 items = h.split("##")
@@ -726 +778 @@
                 func = items[1]
                 items = items[2:]
-                print date
-                print "Function: %s\n  Parameters:" % (func)
+                out += "\n"+date+"\n"
+                out += "Function: %s\n  Parameters:" % (func)
                 for i in items:
                     s = i.split("=")
-                    print "   %s = %s" % (s[0],s[1])
-                print "-"*80
+                    out += "\n   %s = %s" % (s[0],s[1])
+                out += "\n"+"-"*80
+        try:
+            from IPython.genutils import page as pager
+        except ImportError:
+            from pydoc import pager
+        pager(out)
         return
 
@@ -1055 +1112 @@
             return
 
-    def poly_baseline(self, mask=None, order=0, insitu=None):
+    def poly_baseline(self, mask=None, order=0, insitu=None, allaxes=None):
         """
         Return a scan which has been baselined (all rows) by a polynomial.
         Parameters:
-            scan:    a scantable
-            mask:    an optional mask
-            order:   the order of the polynomial (default is 0)
-            insitu:      if False a new scantable is returned.
-                         Otherwise, the scaling is done in-situ
-                         The default is taken from .asaprc (False)
+            scan:       a scantable
+            mask:       an optional mask
+            order:      the order of the polynomial (default is 0)
+            insitu:     if False a new scantable is returned.
+                        Otherwise, the scaling is done in-situ
+                        The default is taken from .asaprc (False)
+            allaxes:    If True (default) apply to all spectra. Otherwise
+                        apply only to the selected (beam/pol/if)spectra only
+                        The default is taken from .asaprc (True if none)
         Example:
             # return a scan baselined by a third order polynomial,
@@ -1070 +1130 @@
             bscan = scan.poly_baseline(order=3)
         """
+        if allaxes is None: allaxes = rcParams['scantable.allaxes']
         if insitu is None: insitu = rcParams['insitu']
         varlist = vars()
@@ -1079 +1140 @@
         f.set_scan(self, mask)
         f.set_function(poly=order)
-        sf = f.auto_fit(insitu)
+        sf = f.auto_fit(insitu,allaxes)
         if insitu:
             self._add_history("poly_baseline", varlist)
@@ -1291 +1352 @@
             refs = self.get_scan("*[_ewR]")
             if isinstance(srcs,scantable) and isinstance(refs,scantable):
+                from asap import asaplog
                 ns,nr = srcs.nrow(),refs.nrow()
+                msg = "Found %i Off and %i On scans" % (ns,nr)
+                asaplog.push(msg)
                 if nr > ns:
+                    asaplog("Found more Off integrations than On scans - dropping excess Offs.")
                     refs = refs.get_scan(range(ns))
                 print_log()