Changeset 1273

Timestamp:

09/13/06 12:09:43 (18 years ago)

Author:

mar637

Message:

Merge from Release2.1.1b tag

Location:

trunk

Files:

• python/asapfitter.py (modified) (6 diffs)
• test/mopra.py (modified) (1 diff)

trunk/python/asapfitter.py

@@ -493 +493 @@
         xlab = 'Abcissa'
         ylab = 'Ordinate'
-        from matplotlib.numerix import ma,logical_not,array
-        m = NUM.ones(len(self.x))
-
+        from matplotlib.numerix import ma,logical_not,logical_and,array
+        m = self.mask
         if self.data:
             tlab = self.data._getsourcename(self._fittedrow)
             xlab = self.data._getabcissalabel(self._fittedrow)
-            m = self.data._getmask(self._fittedrow)
+            m =  logical_and(self.mask,
+                             array(self.data._getmask(self._fittedrow)),
+                                   copy=False)
+                             
             ylab = self.data._get_ordinate_label()
 
@@ -505 +507 @@
         self._p.palette(0,colours)
         self._p.set_line(label='Spectrum')
-        y = ma.masked_array(self.y,mask=logical_not(array(m,copy=False)))
+        y = ma.masked_array(self.y,mask=logical_not(m))
         self._p.plot(self.x, y)
         if residual:
@@ -511 +513 @@
             self._p.set_line(label='Residual')
             y = ma.masked_array(self.get_residual(),
-                                  mask=logical_not(array(m,copy=False)))
+                                  mask=logical_not(m))
             self._p.plot(self.x, y)
         self._p.palette(2)
@@ -526 +528 @@
                     self._p.set_line(label=lab)
                     y = ma.masked_array(self.fitter.evaluate(c),
-                                          mask=logical_not(array(m,copy=False)))
+                                          mask=logical_not(m))
 
                     self._p.plot(self.x, y)
@@ -533 +535 @@
                     self._p.set_line(label="Total Fit")
                     y = ma.masked_array(self.fitter.getfit(),
-                                          mask=logical_not(array(m,copy=False)))
+                                          mask=logical_not(m))
                     self._p.plot(self.x, y)
         else:
@@ -539 +541 @@
             self._p.set_line(label='Fit')
             y = ma.masked_array(self.fitter.getfit(),
-                                  mask=logical_not(array(m,copy=False)))
+                                  mask=logical_not(m))
             self._p.plot(self.x, y)
         xlim=[min(self.x),max(self.x)]

trunk/test/mopra.py

@@ -23 +23 @@
 q.set_selection(selection)
 
+rcParams['plotter.gui'] = 0
 f = fitter()
 f.set_scan(q)
 f.set_function(gauss=2) # fit two gaussians
 f.fit()
+f.plot(filename='output/moprafit.png')
 fp = f.get_parameters()
 print "Mopra Test successful"