Changeset 1017

Timestamp:

04/18/06 15:53:48 (18 years ago)

Author:

mar637

Message:

Fix for ticket #21 - get_parameters/set_parameters inconsistent. Reworked the interface to allow this.

File:

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

trunk/python/asapfitter.py

@@ -166 +166 @@
             self.data._addfit(fit,self._fittedrow)
 
-    def set_parameters(self, params, fixed=None, component=None):
+    #def set_parameters(self, params, fixed=None, component=None):
+    def set_parameters(self,*args,**kwargs):
         """
         Set the parameters to be fitted.
@@ -175 +176 @@
               component: in case of multiple gaussians, the index of the
                          component
-             """
+        """
+        component = None
+        fixed = None
+        params = None
+        
+        if len(args) and isinstance(args[0],dict):
+            kwargs = args[0]
+        if kwargs.has_key("fixed"): fixed = kwargs["fixed"]
+        if kwargs.has_key("params"): params = kwargs["params"]
+        if len(args) == 2 and isinstance(args[1], int):
+            component = args[1]
         if self.fitfunc is None:
             msg = "Please specify a fitting function first."
@@ -184 +195 @@
                 raise RuntimeError(msg)
         if self.fitfunc == "gauss" and component is not None:
-            if not self.fitted:
+            if not self.fitted and sum(self.fitter.getparameters()) == 0:
                 from numarray import zeros
                 pars = list(zeros(len(self.components)*3))
@@ -203 +214 @@
 
     def set_gauss_parameters(self, peak, centre, fhwm,
-                             peakfixed=False, centerfixed=False,
-                             fhwmfixed=False,
+                             peakfixed=0, centerfixed=0,
+                             fhwmfixed=0,
                              component=0):
         """
@@ -227 +238 @@
                 raise ValueError(msg)
         if 0 <= component < len(self.components):
-            self.set_parameters([peak, centre, fhwm],
-                                [peakfixed, centerfixed, fhwmfixed],
-                                component)
+            d = {'params':[peak, centre, fhwm],
+                 'fixed':[peakfixed, centerfixed, fhwmfixed]}
+            self.set_parameters(d, component)
         else:
             msg = "Please select a valid  component."
@@ -294 +305 @@
         if rcParams['verbose']:
             print fpars
-        return cpars, cfixed, fpars
+        return {'params':cpars, 'fixed':cfixed}
 
     def _format_pars(self, pars, fixed, area):
@@ -315 +326 @@
                 ounit = self.data.get_fluxunit()
             while i < len(pars):
-                out += '  %2d: peak = %3.3f %s , centre = %3.3f %s, FWHM = %3.3f %s\n      area = %3.3f %s %s\n' % (c,pars[i],ounit,pars[i+1],aunit,pars[i+2],aunit, area,ounit,aunit)
+                if area:
+                    out += '  %2d: peak = %3.3f %s , centre = %3.3f %s, FWHM = %3.3f %s\n      area = %3.3f %s %s\n' % (c,pars[i],ounit,pars[i+1],aunit,pars[i+2],aunit, area,ounit,aunit)
+                else:
+                    out += '  %2d: peak = %3.3f %s , centre = %3.3f %s, FWHM = %3.3f %s\n' % (c,pars[i],ounit,pars[i+1],aunit,pars[i+2],aunit,ounit,aunit)
                 c+=1
                 i+=3
@@ -327 +341 @@
         fixed = self.fitter.getfixedparameters()
         if rcParams['verbose']:
-            print self._format_pars(pars,fixed)
+            print self._format_pars(pars,fixed,None)
         return pars
 
@@ -422 +436 @@
         tlab = 'Spectrum'
         xlab = 'Abcissa'
-        m = ()
+        ylab = 'Ordinate'
+        m = None
         if self.data:
             tlab = self.data._getsourcename(self._fittedrow)