Changeset 786 for branches/Release12

Timestamp:

12/08/05 09:51:43 (18 years ago)

Author:

mar637

Message:

added allaxes arg to poly_baseline

Location:

branches/Release12/python

Files:

• asapfitter.py (modified) (2 diffs)
• scantable.py (modified) (1 diff)

branches/Release12/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()

branches/Release12/python/scantable.py

@@ -1083 +1083 @@
         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)