Changeset 1232 for trunk/python/asapfitter.py

Timestamp:

09/01/06 13:14:11 (18 years ago)

Author:

mar637

Message:

Merge from Release2.1.0b tag

File:

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

trunk/python/asapfitter.py

@@ -100 +100 @@
 
         self.fitter.setexpression(self.fitfunc,n)
+        self.fitted = False
         return
 
@@ -142 +143 @@
                 self.fitter.estimate()
         try:
+            fxdpar = list(self.fitter.getfixedparameters())
+            if len(fxdpar) and fxdpar.count(0) == 0:
+                 raise RuntimeError,"No point fitting, if all parameters are fixed."
             converged = self.fitter.fit()
             if not converged:
@@ -155 +159 @@
         return
 
-    def store_fit(self):
-        """
-        Store the fit parameters in the scantable.
+    def store_fit(self, filename=None):
+        """
+        Save the fit parameters.
+        Parameters:
+            filename:    if specified save as an ASCII file, if None (default)
+                         store it in the scnatable
         """
         if self.fitted and self.data is not None:
@@ -169 +176 @@
             fit.setcomponents(self.components)
             fit.setframeinfo(self.data._getcoordinfo())
-            self.data._addfit(fit,self._fittedrow)
+            if filename is not None:
+                import os
+                filename = os.path.expandvars(os.path.expanduser(filename))
+                if os.path.exists(filename):
+                    raise IOError("File '%s' exists." % filename)
+                fit.save(filename)
+            else:
+                self.data._addfit(fit,self._fittedrow)
 
     #def set_parameters(self, params, fixed=None, component=None):
@@ -224 +238 @@
         Set the Parameters of a 'Gaussian' component, set with set_function.
         Parameters:
-            peak, centre, fhwm:  The gaussian parameters
+            peak, centre, fwhm:  The gaussian parameters
             peakfixed,
             centerfixed,
@@ -352 +366 @@
             for i in range(len(pars)):
                 fix = ""
-                if fixed[i]: fix = "(fixed)"
+                if len(fixed) and fixed[i]: fix = "(fixed)"
                 if errors :
                     out += '  p%d%s= %3.6f (%1.6f),' % (c,fix,pars[i], errors[i])