Changeset 69 for trunk

Timestamp:

07/19/04 11:35:39 (20 years ago)

Author:

mmarquar

Message:

Removedd class and replaces with namespace.

Location:

trunk/src

Files:

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

trunk/src/SDMathWrapper.h

@@ -42 +42 @@
 namespace atnf_sd {
 
-class SDMathWrapper {
-public:
+namespace SDMathWrapper {
   SDMemTableWrapper average(const SDMemTableWrapper& sdt) {
     return SDMemTableWrapper(SDMath::average(sdt.getCP()));
@@ -83 +82 @@
 
   float rms(const SDMemTableWrapper& in, 
-                        const std::vector<bool>& mask) {
+            const std::vector<bool>& mask) {
     return SDMath::rms(in.getCP(), mask);
   }

trunk/src/python_SDMath.cc

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