Changeset 2574

Timestamp:

06/21/12 15:00:20 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-4105

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: sdmath unit test

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Unified behavior of scantable operation with scalar, 1-d array,
and 2-d array. Result of the operation (+,-,*,/) is returned as
new scantable. Returned scantable refers new table if sd.rcParamsinsitu?
is False while it refers the same table as input scantable if
sd.rcParamsinsitu? is True. For the later case, input scantable will
be modified. If sd.rcParamsscantable.storage? is 'disk', it means
that original scantable (on disk) will be modified so that those
functions must be used with care.

In task level (sdmath and sdscale), we take care to keep original table
unchanged so the users don't need to worry about that as long as they
are working on task level.

Location:

trunk/python

Files:

• asapmath.py (modified) (1 diff)
• scantable.py (modified) (1 diff)

trunk/python/asapmath.py

@@ -1022 +1022 @@
              Otherwise, the array operation is done in-sitsu.
     """
+    if insitu is None: insitu = rcParams['insitu']
     nrow = scan.nrow()
     s = None

trunk/python/scantable.py

@@ -3470 +3470 @@
     @asaplog_post_dec
     def __add__(self, other):
-        varlist = vars()
+        """
+        implicit on all axes and on Tsys
+        """
+        varlist = vars()
+        s = self.__op( other, "ADD" ) 
+        s._add_history("operator +", varlist)
+        return s
+
+    @asaplog_post_dec
+    def __sub__(self, other):
+        """
+        implicit on all axes and on Tsys
+        """
+        varlist = vars()
+        s = self.__op( other, "SUB" ) 
+        s._add_history("operator -", varlist)
+        return s
+
+    @asaplog_post_dec
+    def __mul__(self, other):
+        """
+        implicit on all axes and on Tsys
+        """
+        varlist = vars()
+        s = self.__op( other, "MUL" ) ;
+        s._add_history("operator *", varlist)
+        return s
+
+
+    @asaplog_post_dec
+    def __div__(self, other):
+        """
+        implicit on all axes and on Tsys
+        """
+        varlist = vars()
+        s = self.__op( other, "DIV" ) 
+        s._add_history("operator /", varlist)
+        return s
+
+    @asaplog_post_dec
+    def __op( self, other, mode ):
         s = None
         if isinstance(other, scantable):
-            s = scantable(self._math._binaryop(self, other, "ADD"))
+            s = scantable(self._math._binaryop(self, other, mode))
         elif isinstance(other, float):
-            s = scantable(self._math._unaryop(self, other, "ADD", False))
+            if other == 0.0:
+                raise ZeroDivisionError("Dividing by zero is not recommended")
+            s = scantable(self._math._unaryop(self, other, mode, 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 )
+                s = _array2dOp( self, other, mode, False )
             else:
-                s = scantable( self._math._arrayop( self.copy(), other, 
-                                                    "ADD", False ) )
+                s = scantable( self._math._arrayop( self, other, 
+                                                    mode, False ) )
         else:
             raise TypeError("Other input is not a scantable or float value")
-        s._add_history("operator +", varlist)
-        return s
-
-    @asaplog_post_dec
-    def __sub__(self, other):
-        """
-        implicit on all axes and on Tsys
-        """
-        varlist = vars()
-        s = None
-        if isinstance(other, scantable):
-            s = scantable(self._math._binaryop(self, other, "SUB"))
-        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")
-        s._add_history("operator -", varlist)
-        return s
-
-    @asaplog_post_dec
-    def __mul__(self, other):
-        """
-        implicit on all axes and on Tsys
-        """
-        varlist = vars()
-        s = None
-        if isinstance(other, scantable):
-            s = scantable(self._math._binaryop(self, other, "MUL"))
-        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")
-        s._add_history("operator *", varlist)
-        return s
-
-
-    @asaplog_post_dec
-    def __div__(self, other):
-        """
-        implicit on all axes and on Tsys
-        """
-        varlist = vars()
-        s = None
-        if isinstance(other, scantable):
-            s = scantable(self._math._binaryop(self, other, "DIV"))
-        elif isinstance(other, float):
-            if other == 0.0:
-                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")
-        s._add_history("operator /", varlist)
         return s