Changeset 2541 for trunk

Timestamp:

05/21/12 14:16:36 (13 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (related to CAS-3749)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: Interactive tests

Test I. run sdbaseline with blfunc='poly', verify=True and masklist=[]

on CASA,
or run scantable.auto_poly_baseline and scantable.poly_baseline
with plot=True and mask=None.
--> Verification plots should properly be loaded.

Test II.
(1) run asapfitter.plot, by for example

scan = asap.scantable(infile,False)
f=asap.fitter()
f.set_function(lpoly=2)
f.x = scan._getabcissa(0)
f.y = scan._getspectrum(0)
f.mask=(scan._getmask(0))
f.data=None
f.fit()
f.plot(residual=True)

(2) plot something with sdplot (on CASA) or asapplotter.plot
(3) run asapfitter.plot again

f.plot(residual=True)
--> (3) should work without an error

Put in Release Notes: No

Module(s):

Description:

[I] Fixed bugs which caused scantable.poly_baseline and
scantable.auto_poly_baseline crash when mask=None (default)
and plot=True.
[II] Fixed a bug which caused an error in asapfitter.plot when the
other plotting operation is invoked between multiple run of asapfitter.plot.

Location:

trunk/python

Files:

• asapfitter.py (modified) (1 diff)
• scantable.py (modified) (2 diffs)

trunk/python/asapfitter.py

@@ -544 +544 @@
         if not self.fitted:
             return
-        if not self._p or self._p.is_dead:
+        #if not self._p or self._p.is_dead:
+        if not (self._p and self._p._alive()):
             from asap.asapplotter import new_asaplot
             del self._p

trunk/python/scantable.py

@@ -2964 +2964 @@
                     f.x = workscan._getabcissa(r)
                     f.y = workscan._getspectrum(r)
-                    f.mask = mask_and(mask, workscan._getmask(r))    # (CAS-1434)
+                    if mask:
+                        f.mask = mask_and(mask, workscan._getmask(r))    # (CAS-1434)
+                    else: # mask=None
+                        f.mask = workscan._getmask(r)
+                    
                     f.data = None
                     f.fit()
-                    
+
                     f.plot(residual=True)
                     accept_fit = raw_input("Accept fit ( [y]/n ): ")
@@ -3109 +3113 @@
                 for r in rows:
                     idx = 2*workscan.getif(r)
-                    fl.find_lines(r, mask_and(mask, workscan._getmask(r)), 
-                                  edge[idx:idx+2])  # (CAS-1434)
+                    if mask:
+                        msk = mask_and(mask, workscan._getmask(r)) # (CAS-1434)
+                    else: # mask=None
+                        msk = workscan._getmask(r)
+                    fl.find_lines(r, msk, edge[idx:idx+2])  
 
                     f.x = workscan._getabcissa(r)