Changeset 3106 for trunk/src/STCalibration.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/STCalibration.h (modified) (2 diffs)

trunk/src/STCalibration.h

@@ -35 +35 @@
 class STCalibration {
 public:
-  STCalibration(casa::CountedPtr<Scantable> &s, const casa::String target_column);
+  STCalibration(casacore::CountedPtr<Scantable> &s, const casacore::String target_column);
 
   void calibrate();
@@ -41 +41 @@
   virtual ~STCalibration() {;}
 
-  void save(casa::String name) {applytable_->save(name);}
+  void save(casacore::String name) {applytable_->save(name);}
   //const STApplyTable &applytable() {return *applytable_;}
-  const casa::CountedPtr<STApplyTable> applytable() {return applytable_;}
+  const casacore::CountedPtr<STApplyTable> applytable() {return applytable_;}
 
-  void setOption(casa::Record &rec) {options_ = rec;}
+  void setOption(casacore::Record &rec) {options_ = rec;}
 
 protected:
   virtual void setupSelector(const STSelector &sel) = 0;
   virtual void fillCalTable();
-  virtual void appenddata(casa::uInt scanno, casa::uInt cycleno, 
-                          casa::uInt beamno, casa::uInt ifno, casa::uInt polno, 
-                          casa::uInt freqid, casa::Double time, casa::Float elevation, 
-                          const casa::Vector<casa::Float> &any_data,
-                          const casa::Vector<casa::uChar> &channel_flag) = 0;
+  virtual void appenddata(casacore::uInt scanno, casacore::uInt cycleno, 
+                          casacore::uInt beamno, casacore::uInt ifno, casacore::uInt polno, 
+                          casacore::uInt freqid, casacore::Double time, casacore::Float elevation, 
+                          const casacore::Vector<casacore::Float> &any_data,
+                          const casacore::Vector<casacore::uChar> &channel_flag) = 0;
 
   STSelector sel_;
-  casa::CountedPtr<Scantable> scantable_;
-  casa::CountedPtr<STApplyTable> applytable_; 
-  casa::LogIO os_;
-  casa::Record options_;
-  const casa::String target_column_;
+  casacore::CountedPtr<Scantable> scantable_;
+  casacore::CountedPtr<STApplyTable> applytable_; 
+  casacore::LogIO os_;
+  casacore::Record options_;
+  const casacore::String target_column_;
 };