Changeset 86 for trunk

Timestamp:

11/12/04 12:05:49 (20 years ago)

Author:

mar637

Message:

renamed multiply to scale.

Location:

trunk/src

Files:

• SDMathWrapper.h (modified) (1 diff)
• python_SDMath.cc (modified) (3 diffs)

trunk/src/SDMathWrapper.h

@@ -48 +48 @@
 
   SDMemTableWrapper quotient(const SDMemTableWrapper& on,
-                             const SDMemTableWrapper& off) {
+                             const SDMemTableWrapper& off) {
     return SDMemTableWrapper(SDMath::quotient(on.getCP(),
-                                             off.getCP()));
+                                             off.getCP()));
   }
 
-  SDMemTableWrapper multiply(const SDMemTableWrapper& in,
-                             Float factor) {
-    return SDMemTableWrapper(SDMath::multiply(in.getCP(),factor));    
-  }
-  
-  SDMemTableWrapper hanning(const SDMemTableWrapper& in) {
-    return SDMemTableWrapper(SDMath::hanning(in.getCP()));    
+  SDMemTableWrapper scale(const SDMemTableWrapper& in,
+                             Float factor) {
+    return SDMemTableWrapper(SDMath::multiply(in.getCP(),factor));
   }
 
-  SDMemTableWrapper baseline(const SDMemTableWrapper& in, 
-                             const std::string& fitexpr,
-                             const std::vector<bool>& mask) {
+  SDMemTableWrapper hanning(const SDMemTableWrapper& in) {
+    return SDMemTableWrapper(SDMath::hanning(in.getCP()));
+  }
+
+  SDMemTableWrapper baseline(const SDMemTableWrapper& in,
+                             const std::string& fitexpr,
+                             const std::vector<bool>& mask) {
     return SDMath::baseline(in.getCP(), fitexpr, mask);
   }
 
-  SDMemTableWrapper averages(boost::python::tuple tpl, 
-                             const std::vector<bool>& mask);
+  SDMemTableWrapper averages(boost::python::tuple tpl,
+                             const std::vector<bool>& mask);
 
-  SDMemTableWrapper averagePol(const SDMemTableWrapper& in, 
-                               const std::vector<bool>& mask) {
+  SDMemTableWrapper averagePol(const SDMemTableWrapper& in,
+                               const std::vector<bool>& mask) {
     return SDMath::averagePol(in.getCP(), mask);
   }
 
-  SDMemTableWrapper bin(const SDMemTableWrapper& in, 
-                        int width) {
+  SDMemTableWrapper bin(const SDMemTableWrapper& in,
+                        int width) {
     return SDMath::bin(in.getCP(), width);
   }
 
-  float rms(const SDMemTableWrapper& in, 
-            const std::vector<bool>& mask) {
+  float rms(const SDMemTableWrapper& in,
+            const std::vector<bool>& mask) {
     return SDMath::rms(in.getCP(), mask);
   }

trunk/src/python_SDMath.cc

@@ -38 +38 @@
   namespace SDMathWrapper {
     SDMemTableWrapper SDMathWrapper::averages(boost::python::tuple tp,
-                                              const std::vector<bool>& mask) {
+                                              const std::vector<bool>& mask) {
       int n;
       n = extract<int>(tp.attr("__len__")());
       Block<CountedPtr<asap::SDMemTable> > b(n);
       for (int i=0;i< n;++i) {
-        SDMemTableWrapper sdmw = 
-          extract<SDMemTableWrapper>( tp.attr("__getitem__")(i) );
-        b[i] = sdmw.getCP();
+        SDMemTableWrapper sdmw =
+          extract<SDMemTableWrapper>( tp.attr("__getitem__")(i) );
+        b[i] = sdmw.getCP();
       }
       Vector<Bool> msk(mask);
       return SDMemTableWrapper(SDMath::averages(b,msk));
     };
-    
+
   } // namespace SDMathWrapper
 
@@ -57 +57 @@
       def("average", &SDMathWrapper::average);
       def("quotient", &SDMathWrapper::quotient);
-      def("multiply", &SDMathWrapper::multiply);
+      def("scale", &SDMathWrapper::scale);
       def("baseline", &SDMathWrapper::baseline);
       def("hanning", &SDMathWrapper::hanning);
@@ -65 +65 @@
       def("rms", &SDMathWrapper::rms);
     };
-    
+
   } // python
 } // asap