Changeset 2269

Timestamp:

08/11/11 12:19:57 (13 years ago)

Author:

Malte Marquarding

Message:

DO NOT change ORDER of arguments in functions. This WILL BREAK old code

File:

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

trunk/python/scantable.py

@@ -2173 +2173 @@
 
     @asaplog_post_dec
-    def smooth(self, kernel="hanning", width=5.0, order=2, plot=False, insitu=None):
+    def smooth(self, kernel="hanning", width=5.0, order=2, plot=False, 
+               insitu=None):
         """\
         Smooth the spectrum by the specified kernel (conserving flux).
@@ -2291 +2292 @@
 
     @asaplog_post_dec
-    def sinusoid_baseline(self, insitu=None, mask=None, applyfft=None, fftmethod=None, fftthresh=None,
-                          addwn=None, rejwn=None, clipthresh=None, clipniter=None, plot=None,
-                          getresidual=None, showprogress=None, minnrow=None, outlog=None, blfile=None):
+    def sinusoid_baseline(self, insitu=None, mask=None, applyfft=None, 
+                          fftmethod=None, fftthresh=None,
+                          addwn=None, rejwn=None, clipthresh=None,
+                          clipniter=None, plot=None,
+                          getresidual=None, showprogress=None, 
+                          minnrow=None, outlog=None, blfile=None):
         """\
         Return a scan which has been baselined (all rows) with sinusoidal functions.
@@ -2682 +2686 @@
 
             #CURRENTLY, PLOT=true UNAVAILABLE UNTIL cubic spline fitting is implemented as a fitter method.
-            workscan._auto_cspline_baseline(mask, npiece, clipthresh, clipniter, normalise_edge_param(edge), threshold, chan_avg_limit, getresidual, pack_progress_params(showprogress, minnrow), outlog, blfile)
+            workscan._auto_cspline_baseline(mask, npiece, clipthresh, 
+                                            clipniter, 
+                                            normalise_edge_param(edge), 
+                                            threshold, 
+                                            chan_avg_limit, getresidual, 
+                                            pack_progress_params(showprogress, 
+                                                                 minnrow), 
+                                            outlog, blfile)
             workscan._add_history("auto_cspline_baseline", varlist)
             
@@ -2694 +2705 @@
 
     @asaplog_post_dec
-    def poly_baseline(self, insitu=None, mask=None, order=None, plot=None, getresidual=None,
-                      showprogress=None, minnrow=None, outlog=None, blfile=None):
+    def poly_baseline(self, mask=None, order=None, insitu=None, plot=None, 
+                      getresidual=None, showprogress=None, minnrow=None, 
+                      outlog=None, blfile=None):
         """\
         Return a scan which has been baselined (all rows) by a polynomial.
@@ -2728 +2740 @@
             varlist = vars()
         
-            if insitu is None: insitu = rcParams["insitu"]
+            if insitu is None: 
+                insitu = rcParams["insitu"]
             if insitu:
                 workscan = self
@@ -2734 +2747 @@
                 workscan = self.copy()
 
-            if mask         is None: mask         = [True for i in xrange(workscan.nchan())]
+            if mask         is None: mask         = [True for i in \
+                                                       xrange(workscan.nchan())]
             if order        is None: order        = 0
             if plot         is None: plot         = False
@@ -2744 +2758 @@
 
             if plot:
-                outblfile = (blfile != "") and os.path.exists(os.path.expanduser(os.path.expandvars(blfile)))
-                if outblfile: blf = open(blfile, "a")
+                outblfile = (blfile != "") and \
+                    os.path.exists(os.path.expanduser(os.path.expandvars(blfile)))
+                if outblfile: 
+                    blf = open(blfile, "a")
                 
                 f = fitter()
@@ -2769 +2785 @@
                     masklist = workscan.get_masklist(f.mask, row=r, silent=True)
                     #workscan._append_blinfo(blpars, masklist, f.mask)
-                    workscan._setspectrum((f.fitter.getresidual() if getresidual else f.fitter.getfit()), r)
+                    workscan._setspectrum((f.fitter.getresidual() 
+                                           if getresidual else f.fitter.getfit()), r)
                     
                     if outblfile:
                         rms = workscan.get_rms(f.mask, r)
-                        dataout = workscan.format_blparams_row(blpars["params"], blpars["fixed"], rms, str(masklist), r, True)
+                        dataout = \
+                            workscan.format_blparams_row(blpars["params"], 
+                                                         blpars["fixed"], 
+                                                         rms, str(masklist), 
+                                                         r, True)
                         blf.write(dataout)
 
@@ -2781 +2802 @@
                 if outblfile: blf.close()
             else:
-                workscan._poly_baseline(mask, order, getresidual, pack_progress_params(showprogress, minnrow), outlog, blfile)
+                workscan._poly_baseline(mask, order, getresidual, 
+                                        pack_progress_params(showprogress, 
+                                                             minnrow), 
+                                        outlog, blfile)
             
             workscan._add_history("poly_baseline", varlist)
@@ -2794 +2818 @@
 
     @asaplog_post_dec
-    def auto_poly_baseline(self, insitu=None, mask=None, order=None, edge=None, threshold=None, chan_avg_limit=None,
-                           plot=None, getresidual=None, showprogress=None, minnrow=None, outlog=None, blfile=None):
+    def auto_poly_baseline(self, mask=None, order=None, edge=None, 
+                           threshold=None, chan_avg_limit=None,
+                           plot=None, insitu=None,
+                           getresidual=None, showprogress=None, 
+                           minnrow=None, outlog=None, blfile=None):
         """\
         Return a scan which has been baselined (all rows) by a polynomial.
@@ -2849 +2876 @@
             varlist = vars()
 
-            if insitu is None: insitu = rcParams['insitu']
+            if insitu is None: 
+                insitu = rcParams['insitu']
             if insitu:
                 workscan = self
@@ -2870 +2898 @@
 
             if plot:
-                outblfile = (blfile != "") and os.path.exists(os.path.expanduser(os.path.expandvars(blfile)))
+                outblfile = (blfile != "") and \
+                    os.path.exists(os.path.expanduser(os.path.expandvars(blfile)))
                 if outblfile: blf = open(blfile, "a")
                 
                 from asap.asaplinefind import linefinder
                 fl = linefinder()
-                fl.set_options(threshold=threshold,avg_limit=chan_avg_limit)
+                fl.set_options(threshold=threshold, avg_limit=chan_avg_limit)
                 fl.set_scan(workscan)
                 
@@ -2886 +2915 @@
                 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)
+                    fl.find_lines(r, mask_and(mask, workscan._getmask(r)), 
+                                  edge[idx:idx+2])  # (CAS-1434)
 
                     f.x = workscan._getabcissa(r)
@@ -2903 +2933 @@
                     masklist = workscan.get_masklist(f.mask, row=r, silent=True)
                     #workscan._append_blinfo(blpars, masklist, f.mask)
-                    workscan._setspectrum((f.fitter.getresidual() if getresidual else f.fitter.getfit()), r)
+                    workscan._setspectrum((f.fitter.getresidual() \
+                                               if getresidual else f.fitter.getfit()), r)
 
                     if outblfile:
                         rms = workscan.get_rms(f.mask, r)
-                        dataout = workscan.format_blparams_row(blpars["params"], blpars["fixed"], rms, str(masklist), r, True)
+                        dataout = \
+                            workscan.format_blparams_row(blpars["params"], 
+                                                         blpars["fixed"], 
+                                                         rms, str(masklist), 
+                                                         r, True)
                         blf.write(dataout)
                     
@@ -2915 +2950 @@
                 if outblfile: blf.close()
             else:
-                workscan._auto_poly_baseline(mask, order, edge, threshold, chan_avg_limit, getresidual, pack_progress_params(showprogress, minnrow), outlog, blfile)
+                workscan._auto_poly_baseline(mask, order, edge, threshold, 
+                                             chan_avg_limit, getresidual, 
+                                             pack_progress_params(showprogress,
+                                                                  minnrow), 
+                                             outlog, blfile)
 
             workscan._add_history("auto_poly_baseline", varlist)