Changeset 1061 for trunk/python/asapfitter.py

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.

File:

• trunk/python/asapfitter.py (modified) (3 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