Changeset 3008 for trunk

Timestamp:

10/17/14 23:23:35 (10 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: CAS-6594

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: test_sdmath

Put in Release Notes: No

Module(s): sd, unit test

Description: changed skip_flagrow to True in scantable.op(), also changed the default skip_flagrow value to True in STMath::unaryOperate() and arrayOperate().

Location:

trunk

Files:

• python/scantable.py (modified) (1 diff)
• src/STMathWrapper.h (modified) (2 diffs)

trunk/python/scantable.py

@@ -5053 +5053 @@
             if other == 0.0:
                 raise ZeroDivisionError("Dividing by zero is not recommended")
-            s = scantable(self._math._unaryop(self, other, mode, False, False))
+            s = scantable(self._math._unaryop(self, other, mode, False, True))
         elif isinstance(other, list) or isinstance(other, numpy.ndarray):
             if isinstance(other[0], list) \
                     or isinstance(other[0], numpy.ndarray):
                 from asapmath import _array2dOp
-                s = _array2dOp( self, other, mode, False )
+                s = _array2dOp(self, other, mode, False)
             else:
-                s = scantable( self._math._arrayop( self, other, 
-                                                    mode, False, False ) )
+                s = scantable(self._math._arrayop(self, other, mode, False, True))
         else:
             raise TypeError("Other input is not a scantable or float value")

trunk/src/STMathWrapper.h

@@ -71 +71 @@
     unaryOperate( const ScantableWrapper& in, float val,
                   const std::string& mode, bool tsys=false,
-                  bool skip_flaggedrow=false )
+                  bool skip_flaggedrow=true )
   { return ScantableWrapper(STMath::unaryOperate(in.getCP(), val, mode, tsys, skip_flaggedrow)); }
 
@@ -78 +78 @@
                                  const std::string& mode,
                                  bool tsys=false,
-                                 bool skip_flaggedrow=false )
+                                 bool skip_flaggedrow=true )
   { return ScantableWrapper(STMath::arrayOperateChannel(in.getCP(), val, mode, tsys, skip_flaggedrow)); }