Changeset 1061 for trunk

Timestamp:

06/08/06 13:59:51 (18 years ago)

Author:

mar637

Message:

Added feature Ticket #42; The user can now plot the fits adn reject them.

Location:

trunk/python

Files:

• asapfitter.py (modified) (3 diffs)
• scantable.py (modified) (6 diffs)

trunk/python/asapfitter.py

@@ -322 +322 @@
                 fix = ""
                 if fixed[i]: fix = "(fixed)"
-                out += '  p%d%s= %3.3f,' % (c,fix,pars[i])
+                out += '  p%d%s= %3.6f,' % (c,fix,pars[i])
                 c+=1
             out = out[:-1]  # remove trailing ','
@@ -491 +491 @@
         print_log()
 
-    def auto_fit(self, insitu=None):
+    def auto_fit(self, insitu=None, plot=False):
         """
         Return a scan where the function is applied to all rows for
@@ -521 +521 @@
             self.fit()
             x = self.get_parameters()
+            if plot:
+                self.plot(residual=True)
+                x = raw_input("Accept fit ([y]/n): ")
+                if x.upper() == 'N':
+                    continue
             scan._setspectrum(self.fitter.getresidual(), r)
+        if plot:
+            self._p.unmap()
+            self._p = None
         print_log()
         return scan

trunk/python/scantable.py

@@ -1033 +1033 @@
 
 
-    def poly_baseline(self, mask=None, order=0, insitu=None):
+    def poly_baseline(self, mask=None, order=0, plot=False, insitu=None):
         """
         Return a scan which has been baselined (all rows) by a polynomial.
@@ -1040 +1040 @@
             mask:       an optional mask
             order:      the order of the polynomial (default is 0)
+            plot:       plot the fit and the residual. In this each
+                        indivual fit has to be approved, by typing 'y'
+                        or 'n'
             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,
@@ -1060 +1060 @@
         f.set_scan(self, mask)
         f.set_function(poly=order)
-        s = f.auto_fit(insitu)
+        s = f.auto_fit(insitu, plot=plot)
         s._add_history("poly_baseline", varlist)
         print_log()
@@ -1067 +1067 @@
 
     def auto_poly_baseline(self, mask=[], edge=(0,0), order=0,
-                           threshold=3, insitu=None):
+                           threshold=3, plot=False, insitu=None):
         """
         Return a scan which has been baselined (all rows) by a polynomial.
@@ -1086 +1086 @@
                         keep it large as only strong lines affect the
                         baseline solution.
+            plot:       plot the fit and the residual. In this each
+                        indivual fit has to be approved, by typing 'y'
+                        or 'n'
             insitu:     if False a new scantable is returned.
                         Otherwise, the scaling is done in-situ
@@ -1155 +1158 @@
             f.fit()
             x = f.get_parameters()
+            if plot:
+                f.plot(residual=True)
+                x = raw_input("Accept fit ( [y]/n ): ")
+                if x.upper() == 'N':
+                    continue
             workscan._setspectrum(f.fitter.getresidual(), r)
-        workscan._add_history("poly_baseline", varlist)
+        if plot:
+            f._p.unmap()
+            f._p = None
+        workscan._add_history("auto_poly_baseline", varlist)
         if insitu:
             self._assign(workscan)