Changeset 2984 for trunk

Timestamp:

08/14/14 19:12:51 (10 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): sd.scantable

Description: a minor clean-up in do_pack_blinfo() and sub_baseline().

File:

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

trunk/python/scantable.py

@@ -231 +231 @@
             dinfo[key] = sval
 
-    blfunc = dinfo['blfunc']
     fspec_keys = {'poly': 'order', 'chebyshev': 'order', 'cspline': 'npiece', 'sinusoid': 'nwave'}
 
-    fspec_key = fspec_keys[blfunc]
+    fspec_key = fspec_keys[dinfo['blfunc']]
     if not blinfo.has_key(fspec_key):
         raise ValueError("'"+fspec_key+"' is missing in blinfo.")
@@ -274 +273 @@
         raise ValueError("all of 'thresh', 'edge' and 'chan_avg_limit' must be given to use linefinder.")
     
-    slblinfo = [dinfo['row'], blfunc, dinfo[fspec_key], dinfo['masklist'], \
+    slblinfo = [dinfo['row'], dinfo['blfunc'], dinfo[fspec_key], dinfo['masklist'], \
                 dinfo['clipthresh'], dinfo['clipniter'], \
                 dinfo['use_linefinder'], dinfo['thresh'], dinfo['edge'], dinfo['chan_avg_limit']]
@@ -3494 +3493 @@
             in_blinfo = pack_blinfo(blinfo=blinfo, maxirow=nrow)
 
-            print "in_blinfo=< "+ str(in_blinfo)+" >"
-
             sres = workscan._sub_baseline(in_blinfo,
                                           retfitres,