Changeset 3106 for trunk/src/STApplyCal.h

Timestamp:

10/04/16 18:20:50 (8 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes/No?

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...

Check-in asap modifications from Jim regarding casacore namespace conversion.

File:

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

trunk/src/STApplyCal.h

@@ -48 +48 @@
 public:
   STApplyCal();
-  STApplyCal(casa::CountedPtr<Scantable> target);
+  STApplyCal(casacore::CountedPtr<Scantable> target);
 
   ~STApplyCal();
 
   // set data
-  void setTarget(casa::CountedPtr<Scantable> target);
-  void setTarget(const casa::String &name);
+  void setTarget(casacore::CountedPtr<Scantable> target);
+  void setTarget(const casacore::String &name);
 
   // push new caltable 
@@ -61 +61 @@
 
   // set interpolation method
-  //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);
+  //void setInterpolation(STCalEnum::InterpolationAxis axis, STCalEnum::InterpolationType itype, casacore::Int order=-1);
+  void setTimeInterpolation(STCalEnum::InterpolationType itype, casacore::Int order=-1);
+  void setFrequencyInterpolation(STCalEnum::InterpolationType itype, casacore::Int order=-1);
 
   // set IF (spw) mapping for Tsys transfer
-  void setTsysTransfer(casa::uInt from, casa::Vector<casa::uInt> to);
+  void setTsysTransfer(casacore::uInt from, casacore::Vector<casacore::uInt> to);
 
   // apply tables
-  void apply(casa::Bool insitu=false, casa::Bool filltsys=true);
+  void apply(casacore::Bool insitu=false, casacore::Bool filltsys=true);
 
   // split target data and store it to disk
-  void save(const casa::String &name);
+  void save(const casacore::String &name);
 
   // reset all settings except target scantable
@@ -88 +88 @@
 
   // single loop element in apply()
-  void doapply(casa::uInt beamno, casa::uInt ifno, casa::uInt polno, 
-               casa::Vector<casa::uInt> &rows,
-               casa::Vector<casa::uInt> &skylist,
-               casa::Bool filltsys=true);
+  void doapply(casacore::uInt beamno, casacore::uInt ifno, casacore::uInt polno, 
+               casacore::Vector<casacore::uInt> &rows,
+               casacore::Vector<casacore::uInt> &skylist,
+               casacore::Bool filltsys=true);
 
   // get frequency information from FREQUENCIES subtable
-  casa::Vector<casa::Double> getBaseFrequency(casa::uInt whichrow);
+  casacore::Vector<casacore::Double> getBaseFrequency(casacore::uInt whichrow);
 
   // search spwmap_ to get IFNO for Tsys
-  casa::uInt getIFForTsys(casa::uInt to);
+  casacore::uInt getIFForTsys(casacore::uInt to);
 
   // target data
-  casa::CountedPtr<Scantable> target_;
+  casacore::CountedPtr<Scantable> target_;
 
   // working data
-  casa::CountedPtr<Scantable> work_;
+  casacore::CountedPtr<Scantable> work_;
 
   // calibrator
-  casa::CountedPtr<Calibrator> calibrator_;
+  casacore::CountedPtr<Calibrator> calibrator_;
 
   // interpolation method
   STCalEnum::InterpolationType iTime_;
   STCalEnum::InterpolationType iFreq_;
-  casa::Int order_;
-  casa::CountedPtr<Interpolator1D<casa::Double, casa::Float> > interpolatorT_;
-  casa::CountedPtr<Interpolator1D<casa::Double, casa::Float> > interpolatorF_;
-  casa::CountedPtr<Interpolator1D<casa::Double, casa::Float> > interpolatorS_;
+  casacore::Int order_;
+  casacore::CountedPtr<Interpolator1D<casacore::Double, casacore::Float> > interpolatorT_;
+  casacore::CountedPtr<Interpolator1D<casacore::Double, casacore::Float> > interpolatorF_;
+  casacore::CountedPtr<Interpolator1D<casacore::Double, casacore::Float> > interpolatorS_;
 
   // IF (spw) mapping for Tsys transfer
-  map<casa::uInt, casa::Vector<casa::uInt> > spwmap_;
+  map<casacore::uInt, casacore::Vector<casacore::uInt> > spwmap_;
 
   // list of apply tables
@@ -125 +125 @@
   // calibration type
   STCalEnum::CalType caltype_;
-  casa::Bool doTsys_;
+  casacore::Bool doTsys_;
 
   // selector
@@ -131 +131 @@
 
   // logger
-  casa::LogIO os_;
+  casacore::LogIO os_;
 };