Changeset 2144 for trunk

Timestamp:

04/18/11 12:57:09 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: sdmath unit test (coming soon)

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Bug fix on 2D array operation with scantable.

File:

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

trunk/python/scantable.py

@@ -3184 +3184 @@
         elif isinstance(other, float):
             s = scantable(self._math._unaryop(self, other, "ADD", False))
+        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.copy(), other, "ADD", False )
+            else:
+                s = scantable( self._math._arrayop( self.copy(), other, "ADD", False ) )
         else:
             raise TypeError("Other input is not a scantable or float value")
@@ -3200 +3206 @@
         elif isinstance(other, float):
             s = scantable(self._math._unaryop(self, other, "SUB", False))
+        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.copy(), other, "SUB", False )
+            else:
+                s = scantable( self._math._arrayop( self.copy(), other, "SUB", False ) )
         else:
             raise TypeError("Other input is not a scantable or float value")
@@ -3216 +3228 @@
         elif isinstance(other, float):
             s = scantable(self._math._unaryop(self, other, "MUL", False))
+        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.copy(), other, "MUL", False )
+            else:
+                s = scantable( self._math._arrayop( self.copy(), other, "MUL", False ) )
         else:
             raise TypeError("Other input is not a scantable or float value")
@@ -3235 +3253 @@
                 raise ZeroDivisionError("Dividing by zero is not recommended")
             s = scantable(self._math._unaryop(self, other, "DIV", False))
+        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.copy(), other, "DIV", False )
+            else:
+                s = scantable( self._math._arrayop( self.copy(), other, "DIV", False ) )
         else:
             raise TypeError("Other input is not a scantable or float value")