Changeset 1230 for tags/Release2.1.0b/python/asapfitter.py

Timestamp:

09/01/06 10:45:58 (18 years ago)

Author:

mar637

Message:

small fix to _format_pars to test for length. Ticket #44 - fit can be saved as ASCII via fitter.store_fit.

File:

• tags/Release2.1.0b/python/asapfitter.py (modified) (3 diffs)

tags/Release2.1.0b/python/asapfitter.py

@@ -156 +156 @@
         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:
@@ -170 +173 @@
             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):
@@ -353 +363 @@
             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])