Changeset 2541 for trunk/python/scantable.py
- Timestamp:
- 05/21/12 14:16:36 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/python/scantable.py
r2535 r2541 2964 2964 f.x = workscan._getabcissa(r) 2965 2965 f.y = workscan._getspectrum(r) 2966 f.mask = mask_and(mask, workscan._getmask(r)) # (CAS-1434) 2966 if mask: 2967 f.mask = mask_and(mask, workscan._getmask(r)) # (CAS-1434) 2968 else: # mask=None 2969 f.mask = workscan._getmask(r) 2970 2967 2971 f.data = None 2968 2972 f.fit() 2969 2973 2970 2974 f.plot(residual=True) 2971 2975 accept_fit = raw_input("Accept fit ( [y]/n ): ") … … 3109 3113 for r in rows: 3110 3114 idx = 2*workscan.getif(r) 3111 fl.find_lines(r, mask_and(mask, workscan._getmask(r)), 3112 edge[idx:idx+2]) # (CAS-1434) 3115 if mask: 3116 msk = mask_and(mask, workscan._getmask(r)) # (CAS-1434) 3117 else: # mask=None 3118 msk = workscan._getmask(r) 3119 fl.find_lines(r, msk, edge[idx:idx+2]) 3113 3120 3114 3121 f.x = workscan._getabcissa(r)
Note: See TracChangeset
for help on using the changeset viewer.