Changeset 716 for trunk/src/SDMathWrapper.h

Timestamp:

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

Author:

mar637

Message:

added frequency switching; implemented use of SDLog

File:

• trunk/src/SDMathWrapper.h (modified) (5 diffs)

trunk/src/SDMathWrapper.h

@@ -38 +38 @@
 
 #include "SDMemTableWrapper.h"
+#include "SDMath.h"
 
 namespace asap {
@@ -43 +44 @@
 namespace SDMathWrapper {
 
-// Quotient
+
+  static SDMath sdmath;
+  // Quotient
   SDMemTableWrapper quotient(const SDMemTableWrapper& on,
                              const SDMemTableWrapper& off,
                              casa::Bool preserveContinuum);
 
-// Simple binary operations
-  SDMemTableWrapper binaryOperate (const SDMemTableWrapper& left,
-                                   const SDMemTableWrapper& right,
-                                   const std::string& op, bool doTSys);
-
-// Multiply
-  void scaleInSitu(SDMemTableWrapper& in, float factor, bool doAll, bool doTSys);
-  SDMemTableWrapper scale(const SDMemTableWrapper& in, float factor, bool all, bool doTSys);
-
-// Add
+  // Simple binary operations
+  SDMemTableWrapper binaryOperate(const SDMemTableWrapper& left,
+                                  const SDMemTableWrapper& right,
+                                  const std::string& op, bool doTSys);
+  
+  // Multiply
+  void scaleInSitu(SDMemTableWrapper& in, float factor, bool doAll, 
+                   bool doTSys);
+  SDMemTableWrapper scale(const SDMemTableWrapper& in, float factor, 
+                          bool all, bool doTSys);
+  
+  // Add
   void addInSitu(SDMemTableWrapper& in, float offset, bool doAall);
   SDMemTableWrapper add(const SDMemTableWrapper& in, float offset, bool all);
@@ -72 +77 @@
 
 // Resample 
-  void resampleInSitu(SDMemTableWrapper& in, const std::string& method, float width);
-  SDMemTableWrapper resample(const SDMemTableWrapper& in, const std::string& method, 
+  void resampleInSitu(SDMemTableWrapper& in, const std::string& method, 
+                      float width);
+  SDMemTableWrapper resample(const SDMemTableWrapper& in, 
+                             const std::string& method, 
                              float width);
 
 // Convert brightness between Jy and K
-  void convertFluxInSitu(SDMemTableWrapper& in, float D, float eta, float JyPerK, bool doAll);
-  SDMemTableWrapper convertFlux(const SDMemTableWrapper& in, float D, float eta, float JyPerK, bool doAll);
+  void convertFluxInSitu(SDMemTableWrapper& in, float D, float eta, 
+                         float JyPerK, bool doAll);
+  SDMemTableWrapper convertFlux(const SDMemTableWrapper& in, float D, 
+                                float eta, float JyPerK, bool doAll);
 
 // Apply gain elevation correction
@@ -101 +110 @@
 
 // Apply opacity correction
-  void opacityInSitu (SDMemTableWrapper& in, float tau, bool doAll);
-  SDMemTableWrapper opacity (const SDMemTableWrapper& in, float tau, bool doAll);
+  void opacityInSitu(SDMemTableWrapper& in, float tau, bool doAll);
+  SDMemTableWrapper opacity(const SDMemTableWrapper& in, float tau, 
+                            bool doAll);
 
 // Average in time
@@ -116 +126 @@
                                const std::string& weightStr);
 
-// Statistics
+  // Frequency Switching
+  void SDMathWrapper::frequencySwitchInSitu(SDMemTableWrapper& in);
+
+  SDMemTableWrapper 
+  SDMathWrapper::frequencySwitch(const SDMemTableWrapper& in);
+
+  // Statistics
   std::vector<float> statistic(const SDMemTableWrapper& in,
                                const std::vector<bool>& mask, 
                                const std::string& which, int row);
+
 };