Changeset 1310

Timestamp:

12/14/06 11:21:48 (17 years ago)

Author:

mar637

Message:

merge from trunk, to get binary operator changes

Location:

branches/Release2.1.2

Files:

• python/scantable.py (modified) (5 diffs)
• src/STMath.cpp (modified) (4 diffs)
• src/STMath.h (modified) (1 diff)
• src/STMathWrapper.h (modified) (1 diff)
• src/python_STMath.cpp (modified) (1 diff)

branches/Release2.1.2/python/scantable.py

@@ -1413 +1413 @@
             return s
 
-    def scale(self, factor, tsys=True, insitu=None, ):
+    def scale(self, factor, tsys=True, insitu=None):
         """
         Return a scan where all spectra are scaled by the give 'factor'
@@ -1519 +1519 @@
         s = None
         if isinstance(other, scantable):
-            print "scantable + scantable NYI"
-            return
+            s = scantable(self._math._binaryop(self, other, "ADD"))
         elif isinstance(other, float):
             s = scantable(self._math._unaryop(self, other, "ADD", False))
@@ -1536 +1535 @@
         s = None
         if isinstance(other, scantable):
-            print "scantable - scantable NYI"
-            return
+            s = scantable(self._math._binaryop(self, other, "SUB"))
         elif isinstance(other, float):
             s = scantable(self._math._unaryop(self, other, "SUB", False))
@@ -1553 +1551 @@
         s = None
         if isinstance(other, scantable):
-            print "scantable * scantable NYI"
-            return
+            s = scantable(self._math._binaryop(self, other, "MUL"))
         elif isinstance(other, float):
             s = scantable(self._math._unaryop(self, other, "MUL", False))
@@ -1571 +1568 @@
         s = None
         if isinstance(other, scantable):
-            print "scantable / scantable NYI"
-            return
+            s = scantable(self._math._binaryop(self, other, "DIV"))
         elif isinstance(other, float):
             if other == 0.0:

branches/Release2.1.2/src/STMath.cpp

@@ -281 +281 @@
                                               bool tsys )
 {
-  // modes are "ADD" and "MUL"
   CountedPtr< Scantable > out = getScantable(in, false);
   Table& tab = out->table();
@@ -291 +290 @@
     specCol.get(i, spec);
     tsysCol.get(i, ts);
-    if (mode == "MUL") {
+    if (mode == "MUL" || mode == "DIV") {
+      if (mode == "DIV") val = 1.0/val;
       spec *= val;
       specCol.put(i, spec);
@@ -298 +298 @@
         tsysCol.put(i, ts);
       }
-    } else if ( mode == "ADD" ) {
+    } else if ( mode == "ADD"  || mode == "SUB") {
+      if (mode == "SUB") val *= -1.0;
       spec += val;
       specCol.put(i, spec);
@@ -309 +310 @@
   return out;
 }
+
+CountedPtr<Scantable> STMath::binaryOperate(const CountedPtr<Scantable>& left, 
+                                            const CountedPtr<Scantable>& right, 
+                                            const std::string& mode)
+{
+  bool insitu = insitu_;
+  if ( ! left->conformant(*right) ) {
+    throw(AipsError("'left' and 'right' scantables are not conformant."));
+  }
+  setInsitu(false);
+  CountedPtr< Scantable > out = getScantable(left, false);
+  setInsitu(insitu);
+  Table& tout = out->table();
+  Block<String> coln(5);
+  coln[0] = "SCANNO";  coln[1] = "CYCLENO";  coln[2] = "BEAMNO";
+  coln[3] = "IFNO";  coln[4] = "POLNO";
+  Table tmpl = tout.sort(coln);
+  Table tmpr = right->table().sort(coln);
+  ArrayColumn<Float> lspecCol(tmpl,"SPECTRA");
+  ROArrayColumn<Float> rspecCol(tmpr,"SPECTRA");
+  ArrayColumn<uChar> lflagCol(tmpl,"FLAGTRA");
+  ROArrayColumn<uChar> rflagCol(tmpr,"FLAGTRA");
+
+  for (uInt i=0; i<tout.nrow(); ++i) {
+    Vector<Float> lspecvec, rspecvec;
+    Vector<uChar> lflagvec, rflagvec;
+    lspecvec = lspecCol(i);    rspecvec = rspecCol(i);
+    lflagvec = lflagCol(i);    rflagvec = rflagCol(i);
+    MaskedArray<Float> mleft = maskedArray(lspecvec, lflagvec);
+    MaskedArray<Float> mright = maskedArray(rspecvec, rflagvec);
+    if (mode == "ADD") {
+      mleft += mright;
+    } else if ( mode == "SUB") {
+      mleft -= mright;
+    } else if ( mode == "MUL") {
+      mleft *= mright;
+    } else if ( mode == "DIV") {
+      mleft /= mright;
+    } else {
+      throw(AipsError("Illegal binary operator"));
+    }
+    lspecCol.put(i, mleft.getArray());
+  }
+  return out;
+}
+
+
 
 MaskedArray<Float> STMath::maskedArray( const Vector<Float>& s,

branches/Release2.1.2/src/STMath.h

@@ -119 +119 @@
                   const std::string& mode, bool tsys=false );
 
+  casa::CountedPtr<Scantable>
+    binaryOperate( const casa::CountedPtr<Scantable>& left, 
+                   const casa::CountedPtr<Scantable>& right, 
+                   const std::string& mode);
+
   casa::CountedPtr<Scantable> autoQuotient(const casa::CountedPtr<Scantable>& in,
                                            const std::string& mode = "NEAREST",

branches/Release2.1.2/src/STMathWrapper.h

@@ -72 +72 @@
                   const std::string& mode, bool tsys=false )
   { return ScantableWrapper(STMath::unaryOperate(in.getCP(), val, mode, tsys)); }
+
+  ScantableWrapper binaryOperate( const ScantableWrapper& left,
+                                  const ScantableWrapper& right,
+                                  const std::string& mode)
+  { return ScantableWrapper( STMath::binaryOperate( left.getCP(), right.getCP(),
+                                                    mode ) ); }
+
 
   ScantableWrapper autoQuotient( const ScantableWrapper& in,

branches/Release2.1.2/src/python_STMath.cpp

@@ -49 +49 @@
         .def("_averagebeams", &STMathWrapper::averageBeams)
         .def("_unaryop", &STMathWrapper::unaryOperate)
+        .def("_binaryop", &STMathWrapper::binaryOperate)
         .def("_auto_quotient", &STMathWrapper::autoQuotient)
         .def("_quotient", &STMathWrapper::quotient)