Changeset 716 for trunk/src/SDMathWrapper.cc

Timestamp:

11/17/05 14:37:33 (19 years ago)

Author:

mar637

Message:

added frequency switching; implemented use of SDLog

File:

• trunk/src/SDMathWrapper.cc (modified) (25 diffs)

trunk/src/SDMathWrapper.cc

@@ -30 +30 @@
 //#---------------------------------------------------------------------------
 
-
 #include "SDMathWrapper.h"
-#include "SDMath.h"
-
 
 using namespace asap;
 using namespace casa;
+
 
 SDMemTableWrapper SDMathWrapper::quotient(const SDMemTableWrapper& on,
@@ -42 +40 @@
                                           Bool preserveContinuum)
 {
-    SDMath sdm;
+    
     Bool doTSys = True;
-    return SDMemTableWrapper(sdm.binaryOperate(on.getCP(), off.getCP(), 
-                             String("QUOTIENT"), preserveContinuum, doTSys));
+    return SDMemTableWrapper(sdmath.binaryOperate(on.getCP(), off.getCP(), 
+                                                  String("QUOTIENT"), 
+                                                  preserveContinuum, doTSys));
 }
 
@@ -51 +50 @@
 SDMemTableWrapper SDMathWrapper::binaryOperate(const SDMemTableWrapper& left,
                                                const SDMemTableWrapper& right,
-                                               const std::string& op, bool doTSys)
-{
-    SDMath sdm;
-    return SDMemTableWrapper(sdm.binaryOperate(left.getCP(), right.getCP(), 
-                                               String(op), False, Bool(doTSys)));
-}
-
-
-void SDMathWrapper::scaleInSitu(SDMemTableWrapper& in, float factor, bool doAll, bool doTSys)
+                                               const std::string& op, 
+                                               bool doTSys)
+{
+    
+    return SDMemTableWrapper(sdmath.binaryOperate(left.getCP(), right.getCP(), 
+                                                  String(op), False, 
+                                                  Bool(doTSys)));
+}
+
+
+void SDMathWrapper::scaleInSitu(SDMemTableWrapper& in, float factor, 
+                                bool doAll, bool doTSys)
 {
   SDMemTable* pIn = in.getPtr();
   const uInt what = 0;
-//
-  SDMath sdm;
-  SDMemTable* pOut = sdm.unaryOperate (*pIn, Float(factor), 
+  
+  SDMemTable* pOut = sdmath.unaryOperate (*pIn, Float(factor), 
                                         Bool(doAll), what, Bool(doTSys));
   *pIn = *pOut;
@@ -76 +77 @@
   const CountedPtr<SDMemTable>& pIn = in.getCP();
   const uInt what = 0;
-  SDMath sdm;
-  return CountedPtr<SDMemTable>(sdm.unaryOperate(*pIn, Float(factor), Bool(doAll), 
+  
+  return CountedPtr<SDMemTable>(sdmath.unaryOperate(*pIn, Float(factor), Bool(doAll), 
                                                  what, Bool (doTSys)));
 }
@@ -86 +87 @@
   SDMemTable* pIn = in.getPtr();
   const uInt what = 1;
-//
-  SDMath sdm;
+  
   Bool doTSys = False;
-  SDMemTable* pOut = sdm.unaryOperate (*pIn, Float(offset), 
+  SDMemTable* pOut = sdmath.unaryOperate (*pIn, Float(offset), 
                                         Bool(doAll), what, doTSys);
   *pIn = *pOut;
@@ -100 +100 @@
   const CountedPtr<SDMemTable>& pIn = in.getCP();
   const uInt what = 1;
-  SDMath sdm;
+  
   Bool doTSys = False;
-  return CountedPtr<SDMemTable>(sdm.unaryOperate(*pIn, Float(offset),
+  return CountedPtr<SDMemTable>(sdmath.unaryOperate(*pIn, Float(offset),
                                                   Bool(doAll), what, doTSys));
 }
@@ -112 +112 @@
 {
   SDMemTable* pIn = in.getPtr();
-  SDMath sdm;
-  SDMemTable* pOut = sdm.smooth(*pIn, String(kernel), 
+  
+  SDMemTable* pOut = sdmath.smooth(*pIn, String(kernel), 
                                 Float(width), Bool(doAll));
   *pIn = *pOut;
@@ -125 +125 @@
 {
   const CountedPtr<SDMemTable>& pIn = in.getCP();
-  SDMath sdm;
-  return CountedPtr<SDMemTable>(sdm.smooth(*pIn, String(kernel), 
+  
+  return CountedPtr<SDMemTable>(sdmath.smooth(*pIn, String(kernel), 
                                            Float(width), Bool(doAll)));
 }
@@ -135 +135 @@
 {
   SDMemTable* pIn = in.getPtr();
-  SDMath sdm;
-  SDMemTable* pOut = sdm.bin (*pIn, Int(width));
+  
+  SDMemTable* pOut = sdmath.bin (*pIn, Int(width));
   *pIn = *pOut;
    delete pOut;
@@ -145 +145 @@
 {
   const CountedPtr<SDMemTable>& pIn = in.getCP();
-  SDMath sdm;
-  return CountedPtr<SDMemTable>(sdm.bin(*pIn, Int(width)));
+  
+  return CountedPtr<SDMemTable>(sdmath.bin(*pIn, Int(width)));
 }
 
@@ -153 +153 @@
 {
   SDMemTable* pIn = in.getPtr();
-  SDMath sdm;
-  SDMemTable* pOut = sdm.resample(*pIn, String(method), Float(width));
+  
+  SDMemTable* pOut = sdmath.resample(*pIn, String(method), Float(width));
   *pIn = *pOut;
    delete pOut;
@@ -163 +163 @@
 {
   const CountedPtr<SDMemTable>& pIn = in.getCP();
-  SDMath sdm;
-  return CountedPtr<SDMemTable>(sdm.resample(*pIn, String(method), Float(width)));
+  
+  return CountedPtr<SDMemTable>(sdmath.resample(*pIn, String(method), Float(width)));
 }
 
@@ -173 +173 @@
 {
   SDMemTable* pIn = in.getPtr();
-  SDMath sdm;
+  
   Vector<Bool> tMask(mask);
-  SDMemTable* pOut = sdm.averagePol (*pIn, tMask, String(weightStr));
+  SDMemTable* pOut = sdmath.averagePol (*pIn, tMask, String(weightStr));
   *pIn = *pOut;
    delete pOut;
@@ -185 +185 @@
 {
   const CountedPtr<SDMemTable>& pIn = in.getCP();
-  SDMath sdm;
+  
   Vector<Bool> tMask(mask);
-  return CountedPtr<SDMemTable>(sdm.averagePol(*pIn, tMask, String(weightStr)));
+  return CountedPtr<SDMemTable>(sdmath.averagePol(*pIn, tMask, String(weightStr)));
 }
 
@@ -195 +195 @@
                                             const std::string& which, int row) 
 {
-  SDMath sdm;
+  
   Vector<Bool> tMask(mask);
-  return sdm.statistic(in.getCP(), tMask, String(which), Int(row));
+  return sdmath.statistic(in.getCP(), tMask, String(which), Int(row));
 }
 
@@ -205 +205 @@
 {
   SDMemTable* pIn = in.getPtr();
-  SDMath sdm;
-  SDMemTable* pOut = sdm.convertFlux (*pIn, Float(D), Float(eta), Float(JyPerK), Bool(doAll));
+  
+  SDMemTable* pOut = sdmath.convertFlux (*pIn, Float(D), Float(eta), Float(JyPerK), Bool(doAll));
   *pIn = *pOut;
   delete pOut;
@@ -216 +216 @@
 {
   const CountedPtr<SDMemTable>& pIn = in.getCP();
-  SDMath sdm;
-  return CountedPtr<SDMemTable>(sdm.convertFlux(*pIn, Float(D), Float(eta), Float(JyPerK), Bool(doAll)));
+  
+  return CountedPtr<SDMemTable>(sdmath.convertFlux(*pIn, Float(D), Float(eta), Float(JyPerK), Bool(doAll)));
 }
 
@@ -228 +228 @@
   SDMemTable* pIn = in.getPtr();
   Vector<Float> tCoeffs(coeffs);
-  SDMath sdm;
-  SDMemTable* pOut = sdm.gainElevation(*pIn, tCoeffs, String(fileName), 
+  
+  SDMemTable* pOut = sdmath.gainElevation(*pIn, tCoeffs, String(fileName), 
                                        String(method), Bool(doAll));
   *pIn = *pOut;
@@ -243 +243 @@
   const CountedPtr<SDMemTable>& pIn = in.getCP();
   Vector<Float> tCoeffs(coeffs);
-  SDMath sdm;
-  return CountedPtr<SDMemTable>(sdm.gainElevation(*pIn, tCoeffs, String(fileName), 
+  
+  return CountedPtr<SDMemTable>(sdmath.gainElevation(*pIn, tCoeffs, String(fileName), 
                                                   String(method), Bool(doAll)));
 }
@@ -252 +252 @@
 {
   SDMemTable* pIn = in.getPtr();
-  SDMath sdm;
-  SDMemTable* pOut = sdm.frequencyAlignment(*pIn, String(refTime), String(method),
+  
+  SDMemTable* pOut = sdmath.frequencyAlignment(*pIn, String(refTime), String(method),
                                             Bool(perFreqID));
   *pIn = *pOut;
@@ -266 +266 @@
 {
   const CountedPtr<SDMemTable>& pIn = in.getCP();
-  SDMath sdm;
-  return CountedPtr<SDMemTable>(sdm.frequencyAlignment(*pIn, String(refTime), 
+  
+  return CountedPtr<SDMemTable>(sdmath.frequencyAlignment(*pIn, String(refTime), 
                                                        String(method), Bool(perFreqID)));
 }
@@ -274 +274 @@
 {
   SDMemTable* pIn = in.getPtr();
-  SDMath sdm;
-  sdm.rotateXYPhase(*pIn, Float(angle), Bool(doAll));
+  
+  sdmath.rotateXYPhase(*pIn, Float(angle), Bool(doAll));
 }
 
@@ -282 +282 @@
 {
   SDMemTable* pIn = in.getPtr();
-  SDMath sdm;
-  sdm.rotateLinPolPhase(*pIn, Float(angle), Bool(doAll));
+  
+  sdmath.rotateLinPolPhase(*pIn, Float(angle), Bool(doAll));
 }
 
@@ -292 +292 @@
 {
   SDMemTable* pIn = in.getPtr();
-  SDMath sdm;
-  SDMemTable* pOut = sdm.opacity(*pIn, Float(tau), Bool(doAll));
-  *pIn = *pOut;
-  delete pOut;
-}
-
+  
+  SDMemTable* pOut = sdmath.opacity(*pIn, Float(tau), Bool(doAll));
+  *pIn = *pOut;
+  delete pOut;
+}
 
 SDMemTableWrapper SDMathWrapper::opacity(const SDMemTableWrapper& in, 
@@ -303 +302 @@
 {
   const CountedPtr<SDMemTable>& pIn = in.getCP();
+  
+  return CountedPtr<SDMemTable>(sdmath.opacity(*pIn, Float(tau), Bool(doAll)));
+}
+
+void SDMathWrapper::frequencySwitchInSitu(SDMemTableWrapper& in)
+{
+  SDMemTable* pIn = in.getPtr();
   SDMath sdm;
-  return CountedPtr<SDMemTable>(sdm.opacity(*pIn, Float(tau), Bool(doAll)));
-}
-
+  SDMemTable* pOut = sdm.frequencySwitch(*pIn);
+  *pIn = *pOut;
+  delete pOut;
+}
+
+SDMemTableWrapper SDMathWrapper::frequencySwitch(const SDMemTableWrapper& in)
+{
+  const CountedPtr<SDMemTable>& pIn = in.getCP();
+  SDMath sdm;
+  return CountedPtr<SDMemTable>(sdm.frequencySwitch(*pIn));
+}