Changeset 145

Timestamp:

12/25/04 00:28:13 (19 years ago)

Author:

kil064

Message:

cahneg inertface so that function 'averages' and 'average' are combined
into one called 'average'

Location:

trunk/src

Files:

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

trunk/src/SDMathWrapper.h

@@ -43 +43 @@
 
 namespace SDMathWrapper {
-  SDMemTableWrapper average(const SDMemTableWrapper& sdt) {
-    return SDMemTableWrapper(SDMath::average(sdt.getCP()));
-  }
 
   SDMemTableWrapper quotient(const SDMemTableWrapper& on,
@@ -57 +54 @@
     return SDMemTableWrapper(SDMath::multiply(in.getCP(),factor));
   }
+
   void scaleInSitu(SDMemTableWrapper& in, casa::Float factor) {
     SDMemTable* sdmt = in.getPtr();
@@ -71 +69 @@
   }
 
-  SDMemTableWrapper averages(boost::python::tuple tpl,
-                             const std::vector<bool>& mask);
+  SDMemTableWrapper average (boost::python::tuple tpl,
+                             const std::vector<bool>& mask,
+                             bool scanAv, const std::string& wt);
 
   SDMemTableWrapper averagePol(const SDMemTableWrapper& in,

trunk/src/python_SDMath.cc

@@ -42 +42 @@
 namespace asap {
   namespace SDMathWrapper {
-    SDMemTableWrapper SDMathWrapper::averages(boost::python::tuple tp,
-                                              const std::vector<bool>& mask) {
+    SDMemTableWrapper SDMathWrapper::average(boost::python::tuple tp,
+                                             const std::vector<bool>& mask,
+                                             bool scanAv,
+                                             const std::string& weightStr) {
       int n;
       n = extract<int>(tp.attr("__len__")());
@@ -53 +55 @@
       }
       Vector<Bool> msk(mask);
-      return SDMemTableWrapper(SDMath::averages(b,msk));
+      return SDMemTableWrapper(SDMath::average(b,msk,scanAv,weightStr));
     };
-
   } // namespace SDMathWrapper
 
   namespace python {
     void python_SDMath() {
-      def("average", &SDMathWrapper::average);
       def("quotient", &SDMathWrapper::quotient);
       def("scale", &SDMathWrapper::scale);
@@ -66 +66 @@
       def("add", &SDMathWrapper::add);
       def("hanning", &SDMathWrapper::hanning);
-      def("averages", &SDMathWrapper::averages);
+      def("average", &SDMathWrapper::average);
       def("averagepol", &SDMathWrapper::averagePol);
       def("bin", &SDMathWrapper::bin);