Changeset 2408 for trunk/python
- Timestamp:
- 02/16/12 16:41:32 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/python/asapfitter.py
r2153 r2408 151 151 self.x = self.data._getabcissa(row) 152 152 self.y = self.data._getspectrum(row) 153 self.mask = mask_and(self.mask, self.data._getmask(row)) 153 #self.mask = mask_and(self.mask, self.data._getmask(row)) 154 if len(self.x) == len(self.mask): 155 self.mask = mask_and(self.mask, self.data._getmask(row)) 156 else: 157 asaplog.push('lengths of data and mask are not the same. preset mask will be ignored') 158 asaplog.post('WARN','asapfit.fit') 159 self.mask=_n_bools(len(self.x), True) 154 160 asaplog.push("Fitting:") 155 161 i = row … … 659 665 self.x = scan._getabcissa(r) 660 666 self.y = scan._getspectrum(r) 661 self.mask = mask_and(self.mask, scan._getmask(r)) 667 if len(self.x) == len(self.mask): 668 self.mask = mask_and(self.mask, self.data._getmask(row)) 669 else: 670 asaplog.push('lengths of data and mask are not the same. preset mask will be ignored') 671 asaplog.post('WARN','asapfit.fit') 672 self.mask=_n_bools(len(self.x), True) 673 #self.mask = mask_and(self.mask, scan._getmask(r)) 662 674 self.data = None 663 675 self.fit()
Note:
See TracChangeset
for help on using the changeset viewer.