Changeset 2409 for trunk/python


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/python/asapfitter.py

    r2408 r2409  
    157157                    asaplog.push('lengths of data and mask are not the same. preset mask will be ignored')
    158158                    asaplog.post('WARN','asapfit.fit')
    159                     self.mask=_n_bools(len(self.x), True)
     159                    self.mask=self.data._getmask(row)
    160160                asaplog.push("Fitting:")
    161161                i = row
     
    665665            self.x = scan._getabcissa(r)
    666666            self.y = scan._getspectrum(r)
     667            #self.mask = mask_and(self.mask, scan._getmask(r))
    667668            if len(self.x) == len(self.mask):
    668669                self.mask = mask_and(self.mask, self.data._getmask(row))
     
    670671                asaplog.push('lengths of data and mask are not the same. preset mask will be ignored')
    671672                asaplog.post('WARN','asapfit.fit')
    672                 self.mask=_n_bools(len(self.x), True)
    673             #self.mask = mask_and(self.mask, scan._getmask(r))
     673                self.mask=self.data._getmask(row)
    674674            self.data = None
    675675            self.fit()
Note: See TracChangeset for help on using the changeset viewer.