Changeset 1039

Timestamp:

04/27/06 13:58:48 (18 years ago)

Author:

mar637

Message:

minor fix to printing of areas by component. The sum of all areas was printed instead of the area of the individual components.

File:

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

trunk/python/asapfitter.py

@@ -291 +291 @@
         pars = list(self.fitter.getparameters())
         fixed = list(self.fitter.getfixedparameters())
+        area = []
         if component is not None:
             if self.fitfunc == "gauss":
@@ -296 +297 @@
                 cpars = pars[i:i+3]
                 cfixed = fixed[i:i+3]
+                a = self.get_area(component)
+                area = [a for i in range(3)]
             else:
                 cpars = pars
@@ -302 +305 @@
             cpars = pars
             cfixed = fixed
-        fpars = self._format_pars(cpars, cfixed, self.get_area(component))
+            if self.fitfunc == "gauss":
+                for c in range(len(self.components)):
+                  a = self.get_area(c)
+                  area += [a for i in range(3)]
+
+        fpars = self._format_pars(cpars, cfixed, area)
         if rcParams['verbose']:
             print fpars
@@ -326 +334 @@
                 ounit = self.data.get_fluxunit()
             while i < len(pars):
-                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)
+                if len(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[i],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)