Changeset 317

Timestamp:

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

Author:

kil064

Message:

add interpolatiun method argument to function 'frequencyAlign'

Location:

trunk/src

Files:

• SDMath.cc (modified) (9 diffs)
• SDMath.h (modified) (3 diffs)

trunk/src/SDMath.cc

@@ -108 +108 @@
 
 
-SDMemTable* SDMath::frequencyAlignment (const SDMemTable& in, const String& refTime) const
+SDMemTable* SDMath::frequencyAlignment (const SDMemTable& in, const String& refTime, const String& method) const
 {
 
@@ -128 +128 @@
 // Do it
 
-   return frequencyAlign (in, freqSystem, refTime);
+   return frequencyAlign (in, freqSystem, refTime, method);
 }
 
@@ -635 +635 @@
    } 
 
-
 // Interpolation method
 
-  Int interpMethod = 0;
-  convertInterpString(interpMethod, methodStr);
+  InterpolateArray1D<Double,Float>::InterpolationMethod interp;
+  convertInterpString(interp, methodStr);
+  Int interpMethod(interp);
 
 // Make output table
@@ -1253 +1253 @@
 SDMemTable* SDMath::frequencyAlign (const SDMemTable& in,
                                    MFrequency::Types freqSystem,
-                                   const String& refTime) const
+                                   const String& refTime, const String& methodStr) const
 {
 // Get Header
@@ -1312 +1312 @@
                               freqSystem, refPos, refEpoch);
 
+// Interpolation method
+
+   InterpolateArray1D<Double,Float>::InterpolationMethod interp;
+   convertInterpString(interp, methodStr);
+
 // New output Table
 
@@ -1319 +1324 @@
 
    const IPosition polChanAxes(2, asap::PolAxis, asap::ChanAxis);
-   FrequencyAligner<Float>::Method method = FrequencyAligner<Float>::LINEAR;
+
    Bool extrapolate=False;
    Bool useCachedAbcissa = False;
@@ -1376 +1381 @@
         while (!itValuesVec.pastEnd()) {     
            ok = a[faIdx]->align (yOut, maskOut, itValuesVec.vector(),
-                                  itMaskVec.vector(), epoch, useCachedAbcissa,
-                                  method, extrapolate); 
+                                 itMaskVec.vector(), epoch, useCachedAbcissa,
+                                 interp, extrapolate); 
            itValuesVec.vector() = yOut;
            itMaskVec.vector() = maskOut;
@@ -1631 +1636 @@
 }
 
-void SDMath::convertInterpString(Int& type, const String& interp) const
+
+void SDMath::convertInterpString(casa::InterpolateArray1D<Double,Float>::InterpolationMethod& type,  
+                                 const casa::String& interp) const
 {
   String tStr(interp);
   tStr.upcase();
   if (tStr.contains(String("NEAR"))) {
-     type = InterpolateArray1D<Float,Float>::nearestNeighbour;
+     type = InterpolateArray1D<Double,Float>::nearestNeighbour;
   } else if (tStr.contains(String("LIN"))) {
-     type = InterpolateArray1D<Float,Float>::linear;
+     type = InterpolateArray1D<Double,Float>::linear;
   } else if (tStr.contains(String("CUB"))) {
-     type = InterpolateArray1D<Float,Float>::cubic;
+     type = InterpolateArray1D<Double,Float>::cubic;
   } else if (tStr.contains(String("SPL"))) {
-     type = InterpolateArray1D<Float,Float>::spline;
+     type = InterpolateArray1D<Double,Float>::spline;
   } else {
     throw(AipsError("Unrecognized interpolation type"));
@@ -1698 +1705 @@
 // Interpolate (and extrapolate) with desired method
 
-   Int method = 0;
+   InterpolateArray1D<Double,Float>::InterpolationMethod method;
    convertInterpString(method, methodStr);
+   Int intMethod(method);
 //
    Vector<Float> yOut;
    Vector<Bool> maskOut;
    InterpolateArray1D<Float,Float>::interpolate(yOut, maskOut, xOut, 
-                                                xIn, yIn, maskIn, method,
+                                                xIn, yIn, maskIn, intMethod,
                                                 True, True);
 // Apply 

trunk/src/SDMath.h

@@ -106 +106 @@
 
 // Frequency Alignment
-   SDMemTable* frequencyAlignment (const SDMemTable& in, const casa::String& refTime) const;
+   SDMemTable* frequencyAlignment (const SDMemTable& in, const casa::String& refTime,
+                                   const casa::String& method) const;
 
 // Opacity correction
@@ -165 +166 @@
 
 // Convert interpolation type string
-   void convertInterpString(casa::Int& type, const casa::String& interp) const;
+//   void convertInterpString(casa::Int& type, const casa::String& interp) const;
+   void convertInterpString(casa::InterpolateArray1D<casa::Double,casa::Float>::InterpolationMethod& method,  
+                             const casa::String& interp) const;
 
 // Correct data from an ascii Table
@@ -206 +209 @@
    SDMemTable* frequencyAlign (const SDMemTable& in,
                               casa::MFrequency::Types system,
-                              const casa::String& timeRef) const;
+                              const casa::String& timeRef,
+                              const casa::String& method) const;
 
 // Convert time String to Epoch