Changeset 2952 for trunk/python

Timestamp:

06/24/14 19:59:46 (11 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: Yes CAS-6598

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: add a parameter for some functions

Test Programs: test_sdscale

Put in Release Notes:

Module(s): sd

Description: add a parameter 'skip_flaggedrow' for STMath::unaryOperate(), STMath::arrayOperate(), STMath::arrayOperateChannel(), STMath::arrayOperateRow() and their python interfaces if exist. the default value of 'skip_flaggedrow' is false so default behaviour of these functions will not change.

Location:

trunk/python

Files:

• asapmath.py (modified) (4 diffs)
• scantable.py (modified) (3 diffs)

trunk/python/asapmath.py

@@ -1025 +1025 @@
 
 @asaplog_post_dec
-def _array2dOp( scan, value, mode="ADD", tsys=False, insitu=None):
+def _array2dOp( scan, value, mode="ADD", tsys=False, insitu=None, skip_flaggedrow=False):
     """
     This function is workaround on the basic operation of scantable
@@ -1036 +1036 @@
     insitu:  if False, a new scantable is returned.
              Otherwise, the array operation is done in-sitsu.
+    skip_flaggedrow: skip operation for row-flagged spectra.
     """
     if insitu is None: insitu = rcParams['insitu']
@@ -1044 +1045 @@
     stm._setinsitu(insitu)
     if len( value ) == 1:
-        s = scantable( stm._arrayop( scan, value[0], mode, tsys ) )
+        s = scantable( stm._arrayop( scan, value[0], mode, tsys, skip_flaggedrow ) )
     elif len( value ) != nrow:
         raise ValueError( 'len(value) must be 1 or conform to scan.nrow()' )
@@ -1062 +1063 @@
             s.set_selection( sel )
             if len( value[irow] ) == 1:
-                stm._unaryop( s, value[irow][0], mode, tsys )
+                stm._unaryop( s, value[irow][0], mode, tsys, skip_flaggedrow )
             else:
                 #stm._arrayop( s, value[irow], mode, tsys, 'channel' )
-                stm._arrayop( s, value[irow], mode, tsys )
+                stm._arrayop( s, value[irow], mode, tsys, skip_flaggedrow )
         s.set_selection(basesel)
     return s

trunk/python/scantable.py

@@ -4797 +4797 @@
 
     @asaplog_post_dec
-    def scale(self, factor, tsys=True, insitu=None):
+    def scale(self, factor, tsys=True, insitu=None, skip_flaggedrow=False):
         """\
 
@@ -4813 +4813 @@
                          as well as the data
 
+            skip_flaggedrow: if True, scaling is NOT executed for
+                             row-flagged spectra. default is False.
         """
         if insitu is None: insitu = rcParams['insitu']
@@ -4823 +4825 @@
                                                          numpy.ndarray):
                 from asapmath import _array2dOp
-                s = _array2dOp( self, factor, "MUL", tsys, insitu )
+                s = _array2dOp( self, factor, "MUL", tsys, insitu, skip_flaggedrow )
             else:
                 s = scantable( self._math._arrayop( self, factor, 
-                                                    "MUL", tsys ) )
+                                                    "MUL", tsys, skip_flaggedrow ) )
         else:
-            s = scantable(self._math._unaryop(self, factor, "MUL", tsys))
+            s = scantable(self._math._unaryop(self, factor, "MUL", tsys, skip_flaggedrow))
         s._add_history("scale", varlist)
         if insitu: