Changeset 318

Timestamp:

01/28/05 14:46:59 (19 years ago)

Author:

kil064

Message:

frequency alignment now takes interpolation methd argumenbt

Location:

trunk/src

Files:

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

trunk/src/SDMathWrapper.cc

@@ -249 +249 @@
 }
 
-void SDMathWrapper::frequencyAlignmentInSitu (SDMemTableWrapper& in, const std::string& refTime)
-{
-  SDMemTable* pIn = in.getPtr();
-  SDMath sdm;
-  SDMemTable* pOut = sdm.frequencyAlignment(*pIn, String(refTime));
+void SDMathWrapper::frequencyAlignmentInSitu (SDMemTableWrapper& in, const std::string& refTime,
+                                              const std::string& method)
+{
+  SDMemTable* pIn = in.getPtr();
+  SDMath sdm;
+  SDMemTable* pOut = sdm.frequencyAlignment(*pIn, String(refTime), String(method));
   *pIn = *pOut;
   delete pOut;
@@ -260 +261 @@
 
 SDMemTableWrapper SDMathWrapper::frequencyAlignment (const SDMemTableWrapper& in,
-                                                     const std::string& refTime)
-{
-  const CountedPtr<SDMemTable>& pIn = in.getCP();
-  SDMath sdm;
-  return CountedPtr<SDMemTable>(sdm.frequencyAlignment(*pIn, String(refTime)));
+                                                     const std::string& refTime,
+                                                     const std::string& method)
+{
+  const CountedPtr<SDMemTable>& pIn = in.getCP();
+  SDMath sdm;
+  return CountedPtr<SDMemTable>(sdm.frequencyAlignment(*pIn, String(refTime), String(method)));
 }
 

trunk/src/SDMathWrapper.h

@@ -89 +89 @@
 
 // Apply frequency alignment
-  void frequencyAlignmentInSitu (SDMemTableWrapper& in, const std::string& refTime);
-  SDMemTableWrapper frequencyAlignment(const SDMemTableWrapper& in, const std::string& refTime);
+  void frequencyAlignmentInSitu (SDMemTableWrapper& in, const std::string& refTime,
+                                 const std::string& method);
+  SDMemTableWrapper frequencyAlignment(const SDMemTableWrapper& in, const std::string& refTime,
+                                       const std::string& method);
 
 // Apply opacity correction