Changeset 1391 for trunk/python/asapfitter.py

Timestamp:

07/30/07 11:59:36 (17 years ago)

Author:

Malte Marquarding

Message:

merge from alma branch to get alma/GBT support. Commented out fluxUnit changes as they are using a chnaged interface to PKSreader/writer. Also commented out progress meter related code.

File:

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

trunk/python/asapfitter.py

@@ -25 +25 @@
         self._p = None
         self._selection = None
+        self.uselinear = False
 
     def set_data(self, xdat, ydat, mask=None):
@@ -74 +75 @@
         Set the function to be fit.
         Parameters:
-            poly:    use a polynomial of the order given
+            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
         Example:
             fitter.set_function(gauss=2) # will fit two gaussians
-            fitter.set_function(poly=3)  # will fit a 3rd order polynomial
+            fitter.set_function(poly=3)  # will fit a 3rd order polynomial via nonlinear method
+            fitter.set_function(lpoly=3)  # will fit a 3rd order polynomial via linear method
         """
         #default poly order 0
@@ -86 +89 @@
             n = kwargs.get('poly')
             self.components = [n]
+            self.uselinear = False 
+        elif kwargs.has_key('lpoly'):
+            self.fitfunc = 'poly'
+            n = kwargs.get('lpoly')
+            self.components = [n]
+            self.uselinear = True
         elif kwargs.has_key('gauss'):
             n = kwargs.get('gauss')
@@ -91 +100 @@
             self.fitfuncs = [ 'gauss' for i in range(n) ]
             self.components = [ 3 for i in range(n) ]
+            self.uselinear = False 
         else:
             msg = "Invalid function type."
@@ -146 +156 @@
             if len(fxdpar) and fxdpar.count(0) == 0:
                  raise RuntimeError,"No point fitting, if all parameters are fixed."
-            converged = self.fitter.fit()
+            if self.uselinear:
+                converged = self.fitter.lfit()
+            else:
+                converged = self.fitter.fit()
             if not converged:
                 raise RuntimeError,"Fit didn't converge."
@@ -501 +514 @@
                              array(self.data._getmask(self._fittedrow),
                                    copy=False))
-            
+                             
             ylab = self.data._get_ordinate_label()