Changeset 2954 for trunk

Timestamp:

06/25/14 15:28:00 (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:

Module(s): sd

Description: add parameter (skip_flaggedrow) where they were missing in stmath._unaryop and stmath._arrayop called in scantable.op().

File:

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

trunk/python/scantable.py

@@ -952 +952 @@
 
         for i in rows:
+            print '@@@@@@@@'
+            print '['+str(i)+'/'+str(rows)+'] -- '+('RowFlagged' if self._getflagrow(i) else '')
+            print '@@@@@@@@'
+            #if self._getflagrow(i): continue
             refstr = ''
             statunit= ''
@@ -4789 +4793 @@
         self._math._setinsitu(insitu)
         varlist = vars()
-        s = scantable(self._math._unaryop(self, offset, "ADD", False))
+        s = scantable(self._math._unaryop(self, offset, "ADD", False, False))
         s._add_history("add", varlist)
         if insitu:
@@ -5043 +5047 @@
             if other == 0.0:
                 raise ZeroDivisionError("Dividing by zero is not recommended")
-            s = scantable(self._math._unaryop(self, other, mode, False))
+            s = scantable(self._math._unaryop(self, other, mode, False, False))
         elif isinstance(other, list) or isinstance(other, numpy.ndarray):
             if isinstance(other[0], list) \
@@ -5051 +5055 @@
             else:
                 s = scantable( self._math._arrayop( self, other, 
-                                                    mode, False ) )
+                                                    mode, False, False ) )
         else:
             raise TypeError("Other input is not a scantable or float value")