Changes in trunk/python/asapfitter.py [2153:2451]

File:

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

trunk/python/asapfitter.py

@@ -151 +151 @@
                 self.x = self.data._getabcissa(row)
                 self.y = self.data._getspectrum(row)
-                self.mask = mask_and(self.mask, self.data._getmask(row))
+                #self.mask = mask_and(self.mask, self.data._getmask(row))
+                if len(self.x) == len(self.mask):
+                    self.mask = mask_and(self.mask, self.data._getmask(row))
+                else:
+                    asaplog.push('lengths of data and mask are not the same. preset mask will be ignored')
+                    asaplog.post('WARN','asapfit.fit')
+                    self.mask=self.data._getmask(row)
                 asaplog.push("Fitting:")
                 i = row
@@ -538 +544 @@
             return
         if not self._p or self._p.is_dead:
-            #if rcParams['plotter.gui']:
-            #    from asap.asaplotgui import asaplotgui as asaplot
-            #else:
-            #    from asap.asaplot import asaplot
-            #self._p = asaplot()
             from asap.asapplotter import new_asaplot
+            del self._p
             self._p = new_asaplot(rcParams['plotter.gui'])
         self._p.hold()
@@ -659 +661 @@
             self.x = scan._getabcissa(r)
             self.y = scan._getspectrum(r)
-            self.mask = mask_and(self.mask, scan._getmask(r))
+            #self.mask = mask_and(self.mask, scan._getmask(r))
+            if len(self.x) == len(self.mask):
+                self.mask = mask_and(self.mask, self.data._getmask(row))
+            else:
+                asaplog.push('lengths of data and mask are not the same. preset mask will be ignored')
+                asaplog.post('WARN','asapfit.fit')
+                self.mask=self.data._getmask(row)
             self.data = None
             self.fit()