Changeset 151

Timestamp:

12/26/04 20:50:11 (19 years ago)

Author:

kil064

Message:

function 'add' and 'multiply' now take arg. doAll to
indicate whether operation to be applied to
all spectral or cursor seelctoin only

File:

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

trunk/src/SDMathWrapper.h

@@ -44 +44 @@
 namespace SDMathWrapper {
 
+// Quotient
+
   SDMemTableWrapper quotient(const SDMemTableWrapper& on,
                              const SDMemTableWrapper& off) {
@@ -50 +52 @@
   }
 
+// Multiply
+
+  void scaleInSitu(SDMemTableWrapper& in, casa::Float factor, casa::Bool all)
+  {
+    SDMemTable* sdmt = in.getPtr();
+    SDMath::multiplyInSitu(in.getPtr(),factor, all);
+  }
   SDMemTableWrapper scale(const SDMemTableWrapper& in,
-                             casa::Float factor) {
-    return SDMemTableWrapper(SDMath::multiply(in.getCP(),factor));
+                          casa::Float factor, casa::Bool all)
+  {
+    return SDMemTableWrapper(SDMath::multiply(in.getCP(), factor, all));
   }
 
-  void scaleInSitu(SDMemTableWrapper& in, casa::Float factor) {
+// Add
+
+  void addInSitu(SDMemTableWrapper& in, casa::Float offset, casa::Bool all)
+  {
     SDMemTable* sdmt = in.getPtr();
-    SDMath::multiplyInSitu(in.getPtr(),factor);
+    SDMath::addInSitu(in.getPtr(), offset, all);
+  }
+  SDMemTableWrapper add(const SDMemTableWrapper& in, casa::Float offset, casa::Bool all) 
+  {
+    return SDMemTableWrapper(SDMath::add(in.getCP(), offset, all));
   }
 
-  SDMemTableWrapper add(const SDMemTableWrapper& in,
-                        casa::Float offset) {
-    return SDMemTableWrapper(SDMath::add(in.getCP(), offset));
-  }
+// Hanning
 
   SDMemTableWrapper hanning(const SDMemTableWrapper& in) {
@@ -69 +83 @@
   }
 
+// Bin up
+
+  SDMemTableWrapper bin(const SDMemTableWrapper& in,
+                        int width) {
+    return SDMath::bin(in.getCP(), width);
+  }
+
+// Average in time
+
   SDMemTableWrapper average (boost::python::tuple tpl,
                              const std::vector<bool>& mask,
                              bool scanAv, const std::string& wt);
+
+// Average polarizations
 
   SDMemTableWrapper averagePol(const SDMemTableWrapper& in,
@@ -78 +103 @@
   }
 
-  SDMemTableWrapper bin(const SDMemTableWrapper& in,
-                        int width) {
-    return SDMath::bin(in.getCP(), width);
-  }
+// Statistics
 
   std::vector<float> statistic(const SDMemTableWrapper& in,
@@ -88 +110 @@
   }
 
-
 };