Changeset 2408 for trunk

Timestamp:

02/16/12 16:41:32 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS3606

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: sdfit unit test

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

In asapfitter.(auto_)fit, preset mask is ignored if length of mask is
not the same as that of number of spectral channel.

File:

• trunk/python/asapfitter.py (modified) (2 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=_n_bools(len(self.x), True)
                 asaplog.push("Fitting:")
                 i = row
@@ -659 +665 @@
             self.x = scan._getabcissa(r)
             self.y = scan._getspectrum(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=_n_bools(len(self.x), True)
+            #self.mask = mask_and(self.mask, scan._getmask(r))
             self.data = None
             self.fit()