Changeset 1230 for tags/Release2.1.0b/python/asapfit.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/asapfit.py (modified) (2 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