Changeset 2727 for trunk/src/STApplyCal.cpp

Timestamp:

01/11/13 18:48:37 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-4770, CAS-4774

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Updated STApplyCal to be able to specify interpolation method.
The method can be specified in time and frequency axes independently.
Possible options are nearest, linear (default), (natural) cubic spline,
and polynomial with arbitrary order.

File:

• trunk/src/STApplyCal.cpp (modified) (4 diffs)

trunk/src/STApplyCal.cpp

@@ -34 +34 @@
 #include "PSAlmaCalibrator.h"
 #include "NearestInterpolator1D.h"
+#include "BufferedLinearInterpolator1D.h"
+#include "PolynomialInterpolator1D.h"
+#include "CubicSplineInterpolator1D.h"
 #include <atnf/PKSIO/SrcType.h>
 
@@ -62 +65 @@
   doTsys_ = False;
   interp_.resize((int)STCalEnum::NumAxis);
+  // default is linear interpolation
+  for (unsigned int i = 0; i < interp_.size(); i++) {
+    interp_[i] = STCalEnum::LinearInterpolation;
+  }
 }
 
@@ -125 +132 @@
 
   // interpolator
-  interpolatorS_ = new NearestInterpolator1D();
-  interpolatorT_ = new NearestInterpolator1D();
-  interpolatorF_ = new NearestInterpolator1D();
+  initInterpolator();
 
   // select data
@@ -450 +455 @@
 }
 
-}
+void STApplyCal::initInterpolator()
+{
+  int ta = (int)STCalEnum::TimeAxis;
+  int fa = (int)STCalEnum::FrequencyAxis;
+  int order = (order_ > 0) ? order_ : 1;
+  switch (interp_[ta]) {
+  case STCalEnum::NearestInterpolation:
+    {
+      os_ << "use NearestInterpolator in time axis" << LogIO::POST;
+      interpolatorS_ = new NearestInterpolator1D();
+      interpolatorT_ = new NearestInterpolator1D();
+      break;
+    }
+  case STCalEnum::LinearInterpolation:
+    {
+      os_ << "use BufferedLinearInterpolator in time axis" << LogIO::POST;
+      interpolatorS_ = new BufferedLinearInterpolator1D();
+      interpolatorT_ = new BufferedLinearInterpolator1D();
+      break;      
+    }
+  case STCalEnum::CubicSplineInterpolation:
+    {
+      os_ << "use CubicSplineInterpolator in time axis" << LogIO::POST;
+      interpolatorS_ = new CubicSplineInterpolator1D();
+      interpolatorT_ = new CubicSplineInterpolator1D();
+      break;
+    }
+  case STCalEnum::PolynomialInterpolation:
+    {
+      os_ << "use PolynomialInterpolator in time axis" << LogIO::POST;
+      if (order == 0) {
+        interpolatorS_ = new NearestInterpolator1D();
+        interpolatorT_ = new NearestInterpolator1D();
+      }
+      else {
+        interpolatorS_ = new PolynomialInterpolator1D();
+        interpolatorT_ = new PolynomialInterpolator1D();
+        interpolatorS_->setOrder(order);
+        interpolatorT_->setOrder(order);
+      }
+      break;
+    }
+  default:
+    {
+      os_ << "use BufferedLinearInterpolator in time axis" << LogIO::POST;
+      interpolatorS_ = new BufferedLinearInterpolator1D();
+      interpolatorT_ = new BufferedLinearInterpolator1D();
+      break;      
+    }
+  }
+   
+  switch (interp_[fa]) {
+  case STCalEnum::NearestInterpolation:
+    {
+      os_ << "use NearestInterpolator in frequency axis" << LogIO::POST;
+      interpolatorF_ = new NearestInterpolator1D();
+      break;
+    }
+  case STCalEnum::LinearInterpolation:
+    {
+      os_ << "use BufferedLinearInterpolator in frequency axis" << LogIO::POST;
+      interpolatorF_ = new BufferedLinearInterpolator1D();
+      break;      
+    }
+  case STCalEnum::CubicSplineInterpolation:
+    {
+      os_ << "use CubicSplineInterpolator in frequency axis" << LogIO::POST;
+      interpolatorF_ = new CubicSplineInterpolator1D();
+      break;
+    }
+  case STCalEnum::PolynomialInterpolation:
+    {
+      os_ << "use PolynomialInterpolator in frequency axis" << LogIO::POST;
+      if (order == 0) {
+        interpolatorF_ = new NearestInterpolator1D();
+      }
+      else {
+        interpolatorF_ = new PolynomialInterpolator1D();
+        interpolatorF_->setOrder(order);
+      }
+      break;
+    }
+  default:
+    {
+      os_ << "use LinearInterpolator in frequency axis" << LogIO::POST;
+      interpolatorF_ = new BufferedLinearInterpolator1D();
+      break;      
+    }
+  }
+}
+}