Changeset 1230

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.

Location:

tags/Release2.1.0b/python

Files:

• asapfit.py (modified) (2 diffs)
• asapfitter.py (modified) (3 diffs)

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

@@ -55 +55 @@
                   }
             comp.append(d)
+            k+=1
         out.append(comp)
         return out
+
+    def save(self, filename):
+        f = file(filename, 'w')
+        parstr = ""
+        for i in xrange(self.getcomponents()[0]):
+            pname = "P%d"% (i)
+            parstr += "%-12s " % (pname)
+        header = "#%-12s %s\n" % ("Function", parstr)
+        f.write(header)
+        i = 0
+        funcs=self.getfunctions()
+        pars=self.getparameters()
+        for c in self.getcomponents():
+            line = " %-12s " % (funcs[i])
+            for j in xrange(c):
+                line += "%3.8f " % (pars[i*c+j])
+            i+=1
+            f.write(line+"\n")
+        f.close()
 
     def _format_pars(self, pars, ftype, unit):
@@ -63 +83 @@
             i = 0
             for p in pars:
-                out += ' p%d = %3.3f %s,' % (i,p,unit)
+                out += ' p%d = %3.6f %s,' % (i,p,unit)
                 i+=1
             out = out[1:-1]
         elif ftype == 'gauss':
-            out += 'peak = %3.3f , centre = %3.3f %s, FWHM = %3.3f %s' % (pars[0],pars[1],unit,pars[2],unit)
+            out += 'peak = %3.6f , centre = %3.6f %s, FWHM = %3.6f %s' % (pars[0],pars[1],unit,pars[2],unit)
         return out

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])