Changeset 244

Timestamp:

01/21/05 13:27:47 (19 years ago)

Author:

kil064

Message:

Add arg 'preserve' to quotient method to preserve continuum (or not)

Location:

trunk/src

Files:

• SDMath.cc (modified) (1 diff)
• SDMathWrapper.cc (modified) (1 diff)
• SDMathWrapper.h (modified) (1 diff)

trunk/src/SDMath.cc

@@ -422 +422 @@
      }
 
-// Compute quotient
-
-     MaskedArray<Float> tmp = (mOn-*pMOff);
-     Array<Float> out(tmp.getArray());
-     out /= *pMOff;
-     out *= tSysOffArr;
-
-//     MaskedArray<Float> tmp2 = (tSysOnArr * mOn / *pMOff) - tSysOffArr;
-
-
-// Fill container for this row
+// Get container
 
      SDContainer sc = on->getSDContainer(i);
-//
-     putDataInSDC(sc, out, tmp.getMask());
+
+// Compute and put quotient into container
+
+     if (preserveContinuum) {     
+        MaskedArray<Float> tmp = (tSysOffArr * mOn / *pMOff) - tSysOffArr;
+        putDataInSDC(sc, tmp.getArray(), tmp.getMask());
+     } else {
+        MaskedArray<Float> tmp = (tSysOffArr * mOn / *pMOff) - tSysOnArr;
+        putDataInSDC(sc, tmp.getArray(), tmp.getMask());
+     }
      sc.putTsys(tSysOffArr);
      sc.scanid = i;

trunk/src/SDMathWrapper.cc

@@ -39 +39 @@
 
 SDMemTableWrapper SDMathWrapper::quotient(const SDMemTableWrapper& on,
-                                          const SDMemTableWrapper& off)
+                                          const SDMemTableWrapper& off,
+                                          Bool preserveContinuum)
 {
     SDMath sdm;
-    return SDMemTableWrapper(sdm.quotient(on.getCP(), off.getCP()));
+    return SDMemTableWrapper(sdm.quotient(on.getCP(), off.getCP(), preserveContinuum));
 }
 

trunk/src/SDMathWrapper.h

@@ -45 +45 @@
 // Quotient
   SDMemTableWrapper quotient(const SDMemTableWrapper& on,
-                             const SDMemTableWrapper& off);
+                             const SDMemTableWrapper& off,
+                             casa::Bool preserveContinuum);
 
 // Simple binary operations