Changeset 876 for trunk/python/asapfitter.py

Timestamp:

03/06/06 11:51:04 (18 years ago)

Author:

mar637

Message:

move to asap2 container

File:

• trunk/python/asapfitter.py (modified) (3 diffs)

trunk/python/asapfitter.py

@@ -130 +130 @@
                 from asap import asaplog
                 asaplog.push("Fitting:")
-                self.selection = self.data.get_cursor()
+                out = "Scan[%d] Beam[%d] IF[%d] Pol[%d] Cycle[%d]" (self.data.getscan(i),self.data.getbeam(i),self.data.getif(i),self.data.getpol(i), self.data.getcycle(i))
+                asaplog.push(out)
         self.fitter.setdata(self.x, self.y, self.mask)
         if self.fitfunc == 'gauss':
@@ -432 +433 @@
         print_log()
 
-    def auto_fit(self, insitu=None, allaxes=True):
+    def auto_fit(self, insitu=None):
         """
         Return a scan where the function is applied to all rows for
@@ -451 +452 @@
         else:
             scan = self.data
-        sel = scan.get_cursor()
         rows = range(scan.nrow())
         from asap import asaplog
-        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("Fitting:")
+        for r in rows:
+            out = "Scan[%d] Beam[%d] IF[%d] Pol[%d] Cycle[%d]" %        (self.data.getscan(r),self.data.getbeam(r),self.data.getif(r),self.data.getpol(r), self.data.getcycle(r))
             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])
+            self.x = scan._getabcissa(r)
+            self.y = scan._getspectrum(r)
+            self.data = None
+            self.fit()
+            x = self.get_parameters()
+            scan._setspectrum(self.fitter.getresidual(),iRow)
         print_log()
-        if not insitu:
-            return scan
+        return scan
+