Changeset 1589 for trunk/python/asapfitter.py

Timestamp:

07/02/09 12:17:20 (15 years ago)

Author:

Malte Marquarding

Message:

Introduced print_log_dec(orator)

File:

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

trunk/python/asapfitter.py

@@ -1 +1 @@
 import _asap
 from asap import rcParams
-from asap import print_log
+from asap import print_log_dec
 from asap import _n_bools
 from asap import mask_and
@@ -76 +76 @@
         Set the function to be fit.
         Parameters:
-            poly:    use a polynomial of the order given with nonlinear least squares fit 
+            poly:    use a polynomial of the order given with nonlinear least squares fit
             lpoly:   use polynomial of the order given with linear least squares fit
             gauss:   fit the number of gaussian specified
@@ -90 +90 @@
             n = kwargs.get('poly')
             self.components = [n]
-            self.uselinear = False 
+            self.uselinear = False
         elif kwargs.has_key('lpoly'):
             self.fitfunc = 'poly'
@@ -101 +101 @@
             self.fitfuncs = [ 'gauss' for i in range(n) ]
             self.components = [ 3 for i in range(n) ]
-            self.uselinear = False 
+            self.uselinear = False
         else:
             msg = "Invalid function type."
@@ -114 +114 @@
         return
 
+    @print_log_dec
     def fit(self, row=0, estimate=False):
         """
@@ -150 +151 @@
                                                                       self.data.getbeam(i),
                                                                       self.data.getif(i),
-                                                                      self.data.getpol(i), 
+                                                                      self.data.getpol(i),
                                                                       self.data.getcycle(i))
                 asaplog.push(out,False)
@@ -175 +176 @@
         self._fittedrow = row
         self.fitted = True
-        print_log()
         return
 
@@ -204 +204 @@
                 self.data._addfit(fit,self._fittedrow)
 
-    #def set_parameters(self, params, fixed=None, component=None):
+    @print_log_dec
     def set_parameters(self,*args,**kwargs):
         """
@@ -247 +247 @@
         if fixed is not None:
             self.fitter.setfixedparameters(fixed)
-        print_log()
         return
 
@@ -461 +460 @@
         return self.fitter.getfit()
 
+    @print_log_dec
     def commit(self):
         """
@@ -482 +482 @@
         scan = self.data.copy()
         scan._setspectrum(self.fitter.getresidual())
-        print_log()
         return scan
 
+    @print_log_dec
     def plot(self, residual=False, components=None, plotparms=False, filename=None):
         """
@@ -520 +520 @@
                              array(self.data._getmask(self._fittedrow),
                                    copy=False))
-                             
+
             ylab = self.data._get_ordinate_label()
 
@@ -570 +570 @@
         if (not rcParams['plotter.gui']):
             self._p.save(filename)
-        print_log()
-
+
+    @print_log_dec
     def auto_fit(self, insitu=None, plot=False):
         """
@@ -598 +598 @@
                                                                    scan.getbeam(r),
                                                                    scan.getif(r),
-                                                                   scan.getpol(r), 
+                                                                   scan.getpol(r),
                                                                    scan.getcycle(r))
             asaplog.push(out, False)
@@ -616 +616 @@
             self._p.unmap()
             self._p = None
-        print_log()
         return scan
-