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

trunk/src/Scantable.h

@@ -57 +57 @@
 
 /**
-  * This class contains and wraps a casa::Table, which is used to store
+  * This class contains and wraps a casacore::Table, which is used to store
   * all the information. This can be either a MemoryTable or a
   * disk based Table.
@@ -83 +83 @@
    * Default constructor
    */
-  explicit Scantable(casa::Table::TableType ttype = casa::Table::Memory);
+  explicit Scantable(casacore::Table::TableType ttype = casacore::Table::Memory);
 
   /**
@@ -90 +90 @@
    */
   explicit Scantable(const std::string& name, 
-                     casa::Table::TableType ttype = casa::Table::Memory);
+                     casacore::Table::TableType ttype = casacore::Table::Memory);
 
   /// @fixme this is only sensible for MemoryTables....
@@ -101 +101 @@
 
   /**
-   * get a const reference to the underlying casa::Table
-   * @return const \ref casa::Table reference
-   */
-  const casa::Table& table() const;
-
-  /**
-   * get a reference to the underlying casa::Table with the Selection
+   * get a const reference to the underlying casacore::Table
+   * @return const \ref casacore::Table reference
+   */
+  const casacore::Table& table() const;
+
+  /**
+   * get a reference to the underlying casacore::Table with the Selection
    * object applied if set
-   * @return casa::Table reference
-   */
-  casa::Table& table();
+   * @return casacore::Table reference
+   */
+  casacore::Table& table();
 
 
@@ -169 +169 @@
   int nscan() const;
 
-  casa::MEpoch::Types getTimeReference() const;
-
-
-  casa::MEpoch getEpoch(int whichrow) const;
+  casacore::MEpoch::Types getTimeReference() const;
+
+
+  casacore::MEpoch getEpoch(int whichrow) const;
 
   /**
    * Get global antenna position
-   * @return casa::MPosition
-   */
-  casa::MPosition getAntennaPosition() const;
-
-  /**
-   * the @ref casa::MDirection for a specific row
+   * @return casacore::MPosition
+   */
+  casacore::MPosition getAntennaPosition() const;
+
+  /**
+   * the @ref casacore::MDirection for a specific row
    * @param[in] whichrow the row number
-   * return casa::MDirection
-   */
-  casa::MDirection getDirection( int whichrow ) const;
+   * return casacore::MDirection
+   */
+  casacore::MDirection getDirection( int whichrow ) const;
 
   /**
@@ -249 +249 @@
    * param[in] rows    list of row numbers to be flagged
    */
-  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);
 
   /**
@@ -262 +262 @@
    * (CAS-1807 Wataru Kawasaki)
    */
-  void clip(const casa::Float uthres, const casa::Float dthres, bool clipoutside, bool unflag);
+  void clip(const casacore::Float uthres, const casacore::Float dthres, bool clipoutside, bool unflag);
 
   /**
@@ -268 +268 @@
    * about which channel is clipped.
    */
-  std::vector<bool> getClipMask(int whichrow, const casa::Float uthres, const casa::Float dthres, bool clipoutside, bool unflag);
-  void srchChannelsToClip(casa::uInt whichrow, const casa::Float uthres, const casa::Float dthres, bool clipoutside, bool unflag,
-                          casa::Vector<casa::uChar> flgs);
+  std::vector<bool> getClipMask(int whichrow, const casacore::Float uthres, const casacore::Float dthres, bool clipoutside, bool unflag);
+  void srchChannelsToClip(casacore::uInt whichrow, const casacore::Float uthres, const casacore::Float dthres, bool clipoutside, bool unflag,
+                          casacore::Vector<casacore::uChar> flgs);
 
   /**
@@ -347 +347 @@
 
   float getTsys(int whichrow) const
-    { return casa::Vector<casa::Float>(tsysCol_(whichrow))(0); }
+    { return casacore::Vector<casacore::Float>(tsysCol_(whichrow))(0); }
   std::vector<float> getTsysSpectrum(int whichrow) const ;
   
@@ -400 +400 @@
   //std::string getTime(int whichrow=-1, bool showdate=true) const;
   std::string getTime(int whichrow=-1, bool showdate=true, 
-                      casa::uInt prec=0) const;
+                      casacore::uInt prec=0) const;
   double getIntTime(int whichrow) const { return integrCol_(whichrow); }
 
@@ -445 +445 @@
   void shift(int npix);
 
-  casa::SpectralCoordinate getSpectralCoordinate(int whichrow) const;
+  casacore::SpectralCoordinate getSpectralCoordinate(int whichrow) const;
 
   void convertDirection(const std::string& newframe);
@@ -475 +475 @@
    * @return antenna name string
    */
-  casa::String getAntennaName() const;
+  casacore::String getAntennaName() const;
 
   /**
@@ -507 +507 @@
    * 30/07/2008 Takeshi Nakazato
    **/
-  void reshapeSpectrum( int nmin, int nmax ) throw( casa::AipsError );
+  void reshapeSpectrum( int nmin, int nmax ) throw( casacore::AipsError );
   void reshapeSpectrum( int nmin, int nmax, int irow ) ;
 
@@ -522 +522 @@
   void regridSpecChannel( double dnu, int nchan=-1 ) ;
 
-  bool isAllChannelsFlagged(casa::uInt whichrow);
+  bool isAllChannelsFlagged(casacore::uInt whichrow);
 
   std::vector<std::string> applyBaselineTable(const std::string& bltable, 
@@ -666 +666 @@
   static std::vector<bool> getMaskFromMaskList(const int nchan,
                                           const std::vector<int>& masklist);
-  static casa::Vector<casa::uInt> getMaskListFromMask(
+  static casacore::Vector<casacore::uInt> getMaskListFromMask(
                                            const std::vector<bool>& mask);
   static std::vector<int> splitToIntList(const std::string& str, 
@@ -677 +677 @@
 private:
 
-  casa::Matrix<casa::Float> getPolMatrix( casa::uInt whichrow ) const;
+  casacore::Matrix<casacore::Float> getPolMatrix( casacore::uInt whichrow ) const;
 
   /**
@@ -684 +684 @@
    * @return
    */
-  std::string formatSec(casa::Double x) const;
-
-  std::string formatTime(const casa::MEpoch& me, bool showdate)const;
-  std::string formatTime(const casa::MEpoch& me, bool showdate, 
-                         casa::uInt prec)const;
-
-  /**
-   *  Turns a casa::MDirection into a nicely formatted string
-   * @param md an casa::MDirection
+  std::string formatSec(casacore::Double x) const;
+
+  std::string formatTime(const casacore::MEpoch& me, bool showdate)const;
+  std::string formatTime(const casacore::MEpoch& me, bool showdate,
+                         casacore::uInt prec)const;
+
+  /**
+   *  Turns a casacore::MDirection into a nicely formatted string
+   * @param md an casacore::MDirection
    * @param prec output precision of direction
    * @return
    */
-  std::string formatDirection(const casa::MDirection& md, casa::Int prec=7) const;
+  std::string formatDirection(const casacore::MDirection& md, casacore::Int prec=7) const;
 
   /**
@@ -702 +702 @@
    * @return just the name
    */
-  static casa::String generateName();
+  static casacore::String generateName();
 
   /**
@@ -710 +710 @@
 
   /**
-   * Set up the main casa::Table
+   * Set up the main casacore::Table
    */
   void setupMainTable();
@@ -724 +724 @@
   int rowToScanIndex(int therow);
 
-  std::vector<uint> getNumbers(const casa::ScalarColumn<casa::uInt>& col) const;
+  std::vector<uint> getNumbers(const casacore::ScalarColumn<casacore::uInt>& col) const;
 
   /**
@@ -733 +733 @@
   std::size_t nValidMask(const std::vector<bool>& mask);
 
-  static const casa::uInt version_ = 4;
+  static const casacore::uInt version_ = 4;
 
   STSelector selector_;
 
-  casa::Table::TableType type_;
+  casacore::Table::TableType type_;
 
   // the actual data
-  casa::Table table_;
-  casa::Table originalTable_;
+  casacore::Table table_;
+  casacore::Table originalTable_;
 
   STTcal tcalTable_;
@@ -752 +752 @@
 
   // Cached Columns to avoid reconstructing them for each row get/put
-  casa::ScalarColumn<casa::Double> integrCol_;
-  casa::MDirection::ScalarColumn dirCol_;
-  casa::MEpoch::ScalarColumn timeCol_;
-  casa::ScalarColumn<casa::Float> azCol_;
-  casa::ScalarColumn<casa::Float> elCol_;
-  casa::ScalarColumn<casa::String> srcnCol_, fldnCol_;
-  casa::ScalarColumn<casa::uInt> scanCol_, beamCol_, ifCol_, polCol_, cycleCol_, flagrowCol_;
-  casa::ScalarColumn<casa::Int> rbeamCol_, srctCol_;
-  casa::ArrayColumn<casa::Float> specCol_, tsysCol_;
-  casa::ArrayColumn<casa::uChar> flagsCol_;
+  casacore::ScalarColumn<casacore::Double> integrCol_;
+  casacore::MDirection::ScalarColumn dirCol_;
+  casacore::MEpoch::ScalarColumn timeCol_;
+  casacore::ScalarColumn<casacore::Float> azCol_;
+  casacore::ScalarColumn<casacore::Float> elCol_;
+  casacore::ScalarColumn<casacore::String> srcnCol_, fldnCol_;
+  casacore::ScalarColumn<casacore::uInt> scanCol_, beamCol_, ifCol_, polCol_, cycleCol_, flagrowCol_;
+  casacore::ScalarColumn<casacore::Int> rbeamCol_, srctCol_;
+  casacore::ArrayColumn<casacore::Float> specCol_, tsysCol_;
+  casacore::ArrayColumn<casacore::uChar> flagsCol_;
 
   // id in frequencies table
-  casa::ScalarColumn<casa::uInt> mfreqidCol_;
+  casacore::ScalarColumn<casacore::uInt> mfreqidCol_;
   // id in tcal table
-  casa::ScalarColumn<casa::uInt> mtcalidCol_;
-
-  casa::ArrayColumn<casa::String> histitemCol_;
-  casa::ScalarColumn<casa::Int> mfitidCol_;
-  casa::ScalarColumn<casa::uInt> mweatheridCol_;
-
-  casa::ScalarColumn<casa::uInt> mfocusidCol_;
-
-  casa::ScalarColumn<casa::uInt> mmolidCol_;
+  casacore::ScalarColumn<casacore::uInt> mtcalidCol_;
+
+  casacore::ArrayColumn<casacore::String> histitemCol_;
+  casacore::ScalarColumn<casacore::Int> mfitidCol_;
+  casacore::ScalarColumn<casacore::uInt> mweatheridCol_;
+
+  casacore::ScalarColumn<casacore::uInt> mfocusidCol_;
+
+  casacore::ScalarColumn<casacore::uInt> mmolidCol_;
 
   static std::map<std::string, STPol::STPolFactory *> factories_;
@@ -789 +789 @@
    * 25/10/2009 Wataru Kawasaki
    */
-  template<class T, class T2> void attachAuxColumnDef(casa::ScalarColumn<T>&,
-                                                       const casa::String&,
+  template<class T, class T2> void attachAuxColumnDef(casacore::ScalarColumn<T>&,
+                                                       const casacore::String&,
                                                        const T2&);
-  template<class T, class T2> void attachAuxColumnDef(casa::ArrayColumn<T>&,
-                                                      const casa::String&,
-                                                      const casa::Array<T2>&);
+  template<class T, class T2> void attachAuxColumnDef(casacore::ArrayColumn<T>&,
+                                                      const casacore::String&,
+                                                      const casacore::Array<T2>&);
 
   double getNormalPolynomial(int n, double x);
@@ -950 +950 @@
                             bool& outTextFile, 
                             bool& csvFormat, 
-                            casa::String& coordInfo, 
+                            casacore::String& coordInfo,
                             bool& hasSameNchan, 
                             const std::string& progressInfo, 
                             bool& showProgress, 
                             int& minNRow, 
-                            casa::Vector<casa::Double>& timeSecCol);
+                            casacore::Vector<casacore::Double>& timeSecCol);
   void finaliseBaselining(const bool outBaselineTable, 
                           STBaselineTable* pbt, 
@@ -968 +968 @@
   std::string getMaskRangeList(const std::vector<bool>& mask, 
                                 int whichrow, 
-                                const casa::String& coordInfo, 
+                                const casacore::String& coordInfo,
                                 bool hasSameNchan,
                                 bool verbose=false);
@@ -976 +976 @@
   std::vector<bool> getCompositeChanMask(int whichrow, const std::vector<bool>& inMask);
   std::vector<bool> getCompositeChanMask(int whichrow, const std::vector<bool>& inMask, const std::vector<int>& edge, std::vector<int>& currEdge, STLineFinder& lineFinder);
-  void outputFittingResult(bool outLogger, bool outTextFile, bool csvFormat, const std::vector<bool>& chanMask, int whichrow, const casa::String& coordInfo, bool hasSameNchan, std::ofstream& ofs, const casa::String& funcName, const std::vector<int>& edge, const std::vector<float>& params, const int nClipped);
-  void outputFittingResult(bool outLogger, bool outTextFile, bool csvFormat, const std::vector<bool>& chanMask, int whichrow, const casa::String& coordInfo, bool hasSameNchan, std::ofstream& ofs, const casa::String& funcName, const std::vector<float>& params, const int nClipped);
+  void outputFittingResult(bool outLogger, bool outTextFile, bool csvFormat, const std::vector<bool>& chanMask, int whichrow, const casacore::String& coordInfo, bool hasSameNchan, std::ofstream& ofs, const casacore::String& funcName, const std::vector<int>& edge, const std::vector<float>& params, const int nClipped);
+  void outputFittingResult(bool outLogger, bool outTextFile, bool csvFormat, const std::vector<bool>& chanMask, int whichrow, const casacore::String& coordInfo, bool hasSameNchan, std::ofstream& ofs, const casacore::String& funcName, const std::vector<float>& params, const int nClipped);
   void parseProgressInfo(const std::string& progressInfo, bool& showProgress, int& minNRow);
   void showProgressOnTerminal(const int nProcessed, const int nTotal, const bool showProgress=true, const int nTotalThreshold=1000);
 
-  void applyChanFlag( casa::uInt whichrow, const std::vector<bool>& msk, casa::uChar flagval);
+  void applyChanFlag( casacore::uInt whichrow, const std::vector<bool>& msk, casacore::uChar flagval);
 
   double doCalculateModelSelectionCriteria(const std::string& valname, 
@@ -988 +988 @@
                                            const std::string& blfunc, 
                                            int order);
-  double doGetRms(const std::vector<bool>& mask, const casa::Vector<casa::Float>& spec);
+  double doGetRms(const std::vector<bool>& mask, const casacore::Vector<casacore::Float>& spec);
   std::string packFittingResults(const int irow, const std::vector<float>& params, const float rms);
   void parseBlInfo(const std::string& blInfo, int& whichrow, STBaselineFunc::FuncName& ftype, std::vector<int>& fpar, std::vector<bool>& mask, float& thresClip, int& nIterClip, bool& useLineFinder, float& thresLF, std::vector<int>& edgeLF, int& avgLF);