Changeset 2735 for trunk/src/STApplyCal.h

Timestamp:

01/17/13 18:54:24 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-4770

Ready for Test: Yes

Interface Changes: Yes/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...

• clean up log messages
• interface changes to be easier to call from Python layer
• added reset and completeReset method

File:

• trunk/src/STApplyCal.h (modified) (3 diffs)

trunk/src/STApplyCal.h

@@ -58 +58 @@
 
   // set interpolation method
-  void setInterpolation(STCalEnum::InterpolationAxis axis, STCalEnum::InterpolationType itype, casa::Int order=-1);
+  //void setInterpolation(STCalEnum::InterpolationAxis axis, STCalEnum::InterpolationType itype, casa::Int order=-1);
+  void setTimeInterpolation(STCalEnum::InterpolationType itype, casa::Int order=-1);
+  void setFrequencyInterpolation(STCalEnum::InterpolationType itype, casa::Int order=-1);
 
   // set IF (spw) mapping for Tsys transfer
@@ -69 +71 @@
   void save(const casa::String &name);
 
+  // reset all settings except target scantable
+  void reset();
+
+  // reset all settings
+  void completeReset();
+  
 private:
   // initialization
@@ -100 +108 @@
 
   // interpolation method
-  std::vector<STCalEnum::InterpolationType> interp_;
-  casa::Bool is2d_;
+  STCalEnum::InterpolationType iTime_;
+  STCalEnum::InterpolationType iFreq_;
   casa::Int order_;
   casa::CountedPtr<Interpolator1D<casa::Double, casa::Float> > interpolatorT_;