Changeset 1214

Timestamp:

08/30/06 10:56:19 (18 years ago)

Author:

mar637

Message:

fix to spelling fhwm; fix to mask creation in plot

File:

• tags/Release2.1.0b/python/asapfitter.py (modified) (5 diffs)

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

@@ -217 +217 @@
         return
 
-    def set_gauss_parameters(self, peak, centre, fhwm,
+    def set_gauss_parameters(self, peak, centre, fwhm,
                              peakfixed=0, centerfixed=0,
-                             fhwmfixed=0,
+                             fwhmfixed=0,
                              component=0):
         """
@@ -227 +227 @@
             peakfixed,
             centerfixed,
-            fhwmfixed:           Optional parameters to indicate if
+            fwhmfixed:           Optional parameters to indicate if
                                  the paramters should be held fixed during
                                  the fitting process. The default is to keep
@@ -242 +242 @@
                 raise ValueError(msg)
         if 0 <= component < len(self.components):
-            d = {'params':[peak, centre, fhwm],
-                 'fixed':[peakfixed, centerfixed, fhwmfixed]}
+            d = {'params':[peak, centre, fwhm],
+                 'fixed':[peakfixed, centerfixed, fwhmfixed]}
             self.set_parameters(d, component)
         else:
@@ -479 +479 @@
         xlab = 'Abcissa'
         ylab = 'Ordinate'
-        m = None
+        from matplotlib.numerix import ma,logical_not,array
+        m = NUM.ones(len(self.x))
+
         if self.data:
             tlab = self.data._getsourcename(self._fittedrow)
@@ -489 +491 @@
         self._p.palette(0,colours)
         self._p.set_line(label='Spectrum')
-        from matplotlib.numerix import ma,logical_not,array
         y = ma.masked_array(self.y,mask=logical_not(array(m,copy=False)))
         self._p.plot(self.x, y)