Changeset 2145 for branches

Timestamp:

04/18/11 13:01:09 (14 years ago)

Author:

Takeshi Nakazato

Message:

merge bug fix in trunk (r2143,r2144).

Location:

branches/casa-prerelease/pre-asap

Files:

• . (modified) (1 prop)
• Makefile (modified) (1 prop)
• SConstruct (modified) (1 prop)
• apps (modified) (1 prop)
• external-alma (modified) (1 prop)
• external-alma/atnf/pks/pks_maths.cc (modified) (1 prop)
• getsvnrev.sh (modified) (1 prop)
• python (modified) (1 prop)
• python/flagtoolbar.py (modified) (1 prop)
• python/scantable.py (modified) (4 diffs)
• src (modified) (1 prop)
• src/SConscript (modified) (1 prop)
• src/STMath.cpp (modified) (6 diffs)

branches/casa-prerelease/pre-asap/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")

branches/casa-prerelease/pre-asap/src/STMath.cpp

@@ -492 +492 @@
   ArrayColumn<Float> specCol(tab,"SPECTRA");
   ArrayColumn<Float> tsysCol(tab,"TSYS");
+  if (mode=="DIV") val = 1.0/val ;
+  else if (mode=="SUB") val *= -1.0 ;
   for (uInt i=0; i<tab.nrow(); ++i) {
     Vector<Float> spec;
@@ -498 +500 @@
     tsysCol.get(i, ts);
     if (mode == "MUL" || mode == "DIV") {
-      if (mode == "DIV") val = 1.0/val;
+      //if (mode == "DIV") val = 1.0/val;
       spec *= val;
       specCol.put(i, spec);
@@ -506 +508 @@
       }
     } else if ( mode == "ADD"  || mode == "SUB") {
-      if (mode == "SUB") val *= -1.0;
+      //if (mode == "SUB") val *= -1.0;
       spec += val;
       specCol.put(i, spec);
@@ -587 +589 @@
   ArrayColumn<Float> specCol(tab,"SPECTRA");
   ArrayColumn<Float> tsysCol(tab,"TSYS");
+  if (mode == "DIV") fact = (float)1.0 / fact;
+  else if (mode == "SUB") fact *= (float)-1.0 ;
   for (uInt i=0; i<tab.nrow(); ++i) {
     Vector<Float> spec;
@@ -593 +597 @@
     tsysCol.get(i, ts);
     if (mode == "MUL" || mode == "DIV") {
-      if (mode == "DIV") fact = (float)1.0 / fact;
+      //if (mode == "DIV") fact = (float)1.0 / fact;
       spec *= fact;
       specCol.put(i, spec);
@@ -601 +605 @@
       }
     } else if ( mode == "ADD"  || mode == "SUB") {
-      if (mode == "SUB") fact *= (float)-1.0 ;
+      //if (mode == "SUB") fact *= (float)-1.0 ;
       spec += fact;
       specCol.put(i, spec);