Changeset 2409 for trunk

Timestamp:

02/17/12 13:50:58 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-3606

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: do sdfit with data having multi-IF

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Default value of channel mask is changed to correct one.

File:

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

trunk/python/asapfitter.py

@@ -157 +157 @@
                     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=self.data._getmask(row)
                 asaplog.push("Fitting:")
                 i = row
@@ -665 +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))
@@ -670 +671 @@
                 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.mask=self.data._getmask(row)
             self.data = None
             self.fit()