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

trunk/src/ScantableWrapper.h

@@ -45 +45 @@
   {
     GILHandler scopedRelease;
-    casa::Table::TableType tp = casa::Table::Memory;
-    if ( type == 1 ) tp = casa::Table::Plain;
+    casacore::Table::TableType tp = casacore::Table::Memory;
+    if ( type == 1 ) tp = casacore::Table::Plain;
     table_ = new Scantable(name, tp);
   }
@@ -53 +53 @@
   {
     GILHandler scopedRelease;
-    casa::Table::TableType tp = casa::Table::Memory;
-    if ( type == 1) tp = casa::Table::Plain;
+    casacore::Table::TableType tp = casacore::Table::Memory;
+    if ( type == 1) tp = casacore::Table::Plain;
     table_= new Scantable(tp);
   }
 
-  explicit ScantableWrapper(casa::CountedPtr<Scantable> cp) : table_(cp) {;}
+  explicit ScantableWrapper(casacore::CountedPtr<Scantable> cp) : table_(cp) {;}
 
   ScantableWrapper(const ScantableWrapper& mt) :
@@ -105 +105 @@
   //  { return table_->getTime(whichrow); }
   std::string getTime(int whichrow=0, int prec = 0) const
-    { return table_->getTime(whichrow, true, casa::uInt(prec)); }
+    { return table_->getTime(whichrow, true, casacore::uInt(prec)); }
 
   double getIntTime(int whichrow=0) const
@@ -134 +134 @@
     { table_->flag(whichrow, msk, unflag); }
 
-  void flagRow(const std::vector<casa::uInt>& rows=std::vector<casa::uInt>(), bool unflag=false)
+  void flagRow(const std::vector<casacore::uInt>& rows=std::vector<casacore::uInt>(), bool unflag=false)
     { table_->flagRow(rows, unflag); }
 
@@ -140 +140 @@
     { return table_->getFlagRow(whichrow); }
 
-  void clip(const casa::Float uthres, const casa::Float dthres, bool clipoutside=true, bool unflag=false)
+  void clip(const casacore::Float uthres, const casacore::Float dthres, bool clipoutside=true, bool unflag=false)
     { table_->clip(uthres, dthres, clipoutside, unflag); }
 
-  std::vector<bool> getClipMask(int whichrow, const casa::Float uthres, const casa::Float dthres, bool clipoutside, bool unflag) const
+  std::vector<bool> getClipMask(int whichrow, const casacore::Float uthres, const casacore::Float dthres, bool clipoutside, bool unflag) const
     { return table_->getClipMask(whichrow, uthres, dthres, clipoutside, unflag); }
 
@@ -236 +236 @@
     { table_->setDirectionRefString(refstr); }
 
-  casa::CountedPtr<Scantable> getCP() const {return table_;}
+  casacore::CountedPtr<Scantable> getCP() const {return table_;}
   Scantable* getPtr() {return &(*table_);}
 
@@ -343 +343 @@
 
   bool isAllChannelsFlagged(int whichrow=0) const
-  { return table_->isAllChannelsFlagged(casa::uInt(whichrow)); }
+  { return table_->isAllChannelsFlagged(casacore::uInt(whichrow)); }
 
   std::vector<float> execFFT(int whichrow, const std::vector<bool>& mask, bool getRealImag=false, bool getAmplitudeOnly=false)
@@ -362 +362 @@
 
 private:
-  casa::CountedPtr<Scantable> table_;
+  casacore::CountedPtr<Scantable> table_;
 };