Changeset 974

Timestamp:

04/03/06 16:38:28 (18 years ago)

Author:

mar637

Message:

Completed Ticket #7 - storing of fits.

File:

• trunk/python/asapfit.py (modified) (2 diffs)

trunk/python/asapfit.py

@@ -1 @@
-from _asap import sdfit
+from _asap import fitentry
 from asap import rcParams
 
-class asapfit(sdfit):
+class asapfit(fitentry):
 
-    def __init__(self, other):
-        sdfit.__init__(self,other)
+    def __init__(self, other=None):
+        if isinstance(other, fitentry):
+            fitentry.__init__(self,other)
+        else:
+            fitentry.__init__(self)
 
     def __str__(self):
-        if self.__len__() == 0:
-            return "No fits"
         out = ""
-        for i in range(self.__len__()):
-            out += "Fit No %d:" % (i)
-            pars = self.getparameters(i)
-            mask = self.getfixedparameters(i)
-            funcs = self.getfunctions(i)
-            comps = self.getcomponents(i)
-            finfo = self.getframeinfo(i)
-            pos=0
-            k = 0
-            for f in funcs:
-                out += "\n Type:         "
-                out += f
-                s = pos
-                pos += comps[k]
-                ps = pars[s:pos]
-                out += "\n  Parameters:  "
-                out += self._format_pars(pars[s:pos],f, finfo[0])
-                out += "\n  Fixed Parms: "
-                out += str(mask[s:pos])
-                out += "\n  Frame:       "
-                out += str(finfo)
-                out += "\n"
+        out += "Fit:"
+        pars = self.getparameters()
+        mask = self.getfixedparameters()
+        funcs = self.getfunctions()
+        comps = self.getcomponents()
+        finfo = self.getframeinfo()
+        pos=0
+        k = 0
+        for f in funcs:
+            out += "\n Type:         "
+            out += f
+            s = pos
+            pos += comps[k]
+            ps = pars[s:pos]
+            out += "\n  Parameters:  "
+            out += self._format_pars(pars[s:pos],f, finfo[0])
+            out += "\n  Fixed Parms: "
+            out += str(mask[s:pos])
+            out += "\n  Frame:       "
+            out += str(finfo)
             out += "\n"
+        out += "\n"
         return out
 
     def as_dict(self):
         out = []
-        for i in range(self.__len__()):
-            pars = self.getparameters(i)
-            mask = self.getfixedparameters(i)
-            funcs = self.getfunctions(i)
-            comps = self.getcomponents(i)
-            pos=0
-            k=0
-            comp = []
-            for f in funcs:
-                s = pos
-                pos += comps[k]
-                ps = pars[s:pos]
-                d = {'function' : f,
-                     'parameters' : pars[s:pos],
-                     'fixed' : mask[s:pos],
-                     'frame' : self.getframeinfo(i)
-                     }
-                comp.append(d)
-            out.append(comp)
+        pars = self.getparameters()
+        mask = self.getfixedparameters()
+        funcs = self.getfunctions()
+        comps = self.getcomponents()
+        pos=0
+        k=0
+        comp = []
+        for f in funcs:
+            s = pos
+            pos += comps[k]
+            ps = pars[s:pos]
+            d = {'function' : f,
+                  'parameters' : pars[s:pos],
+                  'fixed' : mask[s:pos],
+                  'frame' : self.getframeinfo()
+                  }
+            comp.append(d)
+        out.append(comp)
         return out
-
 
     def _format_pars(self, pars, ftype, unit):
@@ -70 +68 @@
         elif ftype == 'gauss':
             out += 'peak = %3.3f , centre = %3.3f %s, FWHM = %3.3f %s' % (pars[0],pars[1],unit,pars[2],unit)
-
         return out