Changeset 178

Timestamp:

01/07/05 11:19:31 (19 years ago)

Author:

kil064

Message:

remove 'hanning' functions and add 'smooth' functions

Location:

trunk/src

Files:

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

trunk/src/SDMathWrapper.cc

@@ -88 +88 @@
 }
 
-void SDMathWrapper::hanningInSitu(SDMemTableWrapper& in, bool doAll)
+
+void SDMathWrapper::smoothInSitu(SDMemTableWrapper& in, const std::string& kernel, float width, bool doAll)
 {
   SDMemTable* pIn = in.getPtr();
   SDMath sdm;
-  SDMemTable* pOut = sdm.hanning (*pIn, Bool(doAll));
+  SDMemTable* pOut = sdm.smooth(*pIn, String(kernel), Float(width), Bool(doAll));
   *pIn = *pOut;
    delete pOut;
 }
 
-SDMemTableWrapper SDMathWrapper::hanning (const SDMemTableWrapper& in, bool doAll)
+
+SDMemTableWrapper SDMathWrapper::smooth (const SDMemTableWrapper& in, const std::string& kernel, 
+                                         float width, bool doAll)
 {
   const CountedPtr<SDMemTable>& pIn = in.getCP();
   SDMath sdm;
-  return CountedPtr<SDMemTable>(sdm.hanning(*pIn, Bool(doAll)));
+  return CountedPtr<SDMemTable>(sdm.smooth(*pIn, String(kernel), Float(width), Bool(doAll)));
 }
 

trunk/src/SDMathWrapper.h

@@ -56 +56 @@
   SDMemTableWrapper add(const SDMemTableWrapper& in, float offset, bool all);
 
-// Hanning
-  void hanningInSitu (SDMemTableWrapper& in, bool doAll);
-  SDMemTableWrapper hanning(const SDMemTableWrapper& in, bool doAll);
+// Smooth
+  void smoothInSitu (SDMemTableWrapper& in, const std::string& kernel, float width, bool doAll);
+  SDMemTableWrapper smooth (const SDMemTableWrapper& in, const std::string& kernel, float width, bool doAll);
 
 // Bin up

trunk/src/python_SDMath.cc

@@ -72 +72 @@
       def("add_insitu", &SDMathWrapper::addInSitu);
 //
-      def("hanning", &SDMathWrapper::hanning);
-      def("hanning_insitu", &SDMathWrapper::hanningInSitu);
+      def("smooth", &SDMathWrapper::smooth);
+      def("smooth_insitu", &SDMathWrapper::smoothInSitu);
 //
       def("average", &SDMathWrapper::average);