Changeset 1655 for branches/alma

Timestamp:

11/05/09 21:40:21 (14 years ago)

Author:

WataruKawasaki

Message:

New Development: Yes

JIRA Issue: Yes (CAS-1433)

Ready to Release: Yes

Interface Changes: Yes

What Interface Changed: A new functionality flag_row() added

Test Programs:

Put in Release Notes: No

Module(s): sdflag

Description: Added a new functionality flag_row() to

enable row_based flagging/unflagging.

File:

• branches/alma/python/scantable.py (modified) (7 diffs)

branches/alma/python/scantable.py

@@ -825 +825 @@
         self._add_history("flag", varlist)
 
+    def flag_row(self, rows=[], unflag=False):
+        """
+        Flag the selected data in row-based manner.
+        Parameters:
+            rows:   list of row numbers to be flagged. Default is no row (must be explicitly specified to execute row-based flagging).
+            unflag: if True, unflag the data.
+        """
+        varlist = vars()
+        try:
+            self._flag_row(rows, unflag)
+        except RuntimeError, msg:
+            if rcParams['verbose']:
+                print_log()
+                asaplog.push(msg.message)
+                print_log('ERROR')
+                return
+            else: raise
+        self._add_history("flag_row", varlist)
+        
+        
     def lag_flag(self, frequency, width=0.0, unit="GHz", insitu=None):
         """
@@ -1578 +1598 @@
                 f.set_function(poly=order)
 
-            rows = range(self.nrow())
+            rows = range(workscan.nrow())
             if len(rows) > 0:
                 self.blpars = []
@@ -1584 +1604 @@
             for r in rows:
                 # take into account flagtra info (CAS-1434)
-                flagtra = self._getmask(r)
+                flagtra = workscan._getmask(r)
                 actualmask = mask[:]
                 if len(actualmask) == 0:
@@ -1594 +1614 @@
                         for i in range(0, len(actualmask)):
                             actualmask[i] = actualmask[i] and flagtra[i]
-                f.set_scan(self, actualmask)
-                f.x = self._getabcissa(r)
-                f.y = self._getspectrum(r)
+                f.set_scan(workscan, actualmask)
+                f.x = workscan._getabcissa(r)
+                f.y = workscan._getspectrum(r)
                 f.data = None
                 f.fit()
-                fpar = f.get_parameters()
                 if plot:
                     f.plot(residual=True)
@@ -1607 +1626 @@
                         continue
                 workscan._setspectrum(f.fitter.getresidual(), r)
-                self.blpars.append(fpar)
+                self.blpars.append(f.get_parameters())
+
             if plot:
                 f._p.unmap()
                 f._p = None
-            #f.set_scan(self, mask)
-            #s = f.auto_fit(insitu, plot=plot)
-            ## Save parameters of baseline fits as a class attribute.
-            ## NOTICE: It does not reflect changes in scantable!
-            #self.blpars = f.blpars
             workscan._add_history("poly_baseline", varlist)
             print_log()
@@ -1759 +1774 @@
             asaplog.push(msg, False)
 
-            fpar = f.get_parameters()
             if plot:
                 f.plot(residual=True)
@@ -1767 +1781 @@
                     self.masklists.append(None)
                     continue
+
             workscan._setspectrum(f.fitter.getresidual(), r)
-            self.blpars.append(fpar)
+            self.blpars.append(f.get_parameters())
             self.masklists.append(masklist)
         if plot: