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

trunk/src/STFrequencies.h

@@ -32 +32 @@
 public:
   STFrequencies() {;}
-  explicit STFrequencies(casa::Table tab);
+  explicit STFrequencies(casacore::Table tab);
   explicit STFrequencies(const Scantable& parent);
 
@@ -46 +46 @@
    * @return an index into the frequency table
    */
-  casa::uInt addEntry( casa::Double refpix, casa::Double refval,
-                       casa::Double inc );
+  casacore::uInt addEntry( casacore::Double refpix, casacore::Double refval,
+                       casacore::Double inc );
 
   /**
@@ -56 +56 @@
    * @param id the identifier
    */
-  void getEntry( casa::Double& refpix, casa::Double& refval,
-                 casa::Double& inc, casa::uInt id );
+  void getEntry( casacore::Double& refpix, casacore::Double& refval,
+                 casacore::Double& inc, casacore::uInt id );
 
   /***
@@ -68 +68 @@
    * 17/09/2008 Takeshi Nakazato
    ***/
-  void setEntry( casa::Double refpix, casa::Double refval, 
-                 casa::Double inc, casa::uInt id ) ;
+  void setEntry( casacore::Double refpix, casacore::Double refval,
+                 casacore::Double inc, casacore::uInt id ) ;
 
 
@@ -75 +75 @@
 
   /**
-   * Retrieve  the frequency values as a casa::SpectralCoordinate
+   * Retrieve  the frequency values as a casacore::SpectralCoordinate
    * @param freqID
-   * @return casa::SpectralCoordinate
-   */
-  casa::SpectralCoordinate getSpectralCoordinate( casa::uInt freqID ) const;
-
-  /**
-  casa::SpectralCoordinate getSpectralCoordinate( const casa::MDirection& md,
-                                                  const casa::MPosition& mp,
-                                                  const casa::MEpoch& me,
-                                                  casa::Double restfreq,
-                                                  casa::uInt freqID
+   * @return casacore::SpectralCoordinate
+   */
+  casacore::SpectralCoordinate getSpectralCoordinate( casacore::uInt freqID ) const;
+
+  /**
+  casacore::SpectralCoordinate getSpectralCoordinate( const casacore::MDirection& md,
+                                                  const casacore::MPosition& mp,
+                                                  const casacore::MEpoch& me,
+                                                  casacore::Double restfreq,
+                                                  casacore::uInt freqID
                                                   ) const;
   **/
-  casa::SpectralCoordinate getSpectralCoordinate( const casa::MDirection& md,
-                                                  const casa::MPosition& mp,
-                                                  const casa::MEpoch& me,
-                                                  casa::Vector<casa::Double> restfreq,
-                                                  casa::uInt freqID
+  casacore::SpectralCoordinate getSpectralCoordinate( const casacore::MDirection& md,
+                                                  const casacore::MPosition& mp,
+                                                  const casacore::MEpoch& me,
+                                                  casacore::Vector<casacore::Double> restfreq,
+                                                  casacore::uInt freqID
                                                   ) const;
 
   /**
    * Return the unit of the frequency values
-   * @return casa::Unit
-   */
-  casa::Unit getUnit() const;
+   * @return casacore::Unit
+   */
+  casacore::Unit getUnit() const;
   std::string getUnitString() const;
 
   /**
    * Return the doppler type of the values
-   * @return casa::MDoppler::Types
-   */
-  casa::MDoppler::Types getDoppler() const;
+   * @return casacore::MDoppler::Types
+   */
+  casacore::MDoppler::Types getDoppler() const;
   std::string getDopplerString() const;
 
@@ -114 +114 @@
    * Return the frame type, e.g MFrequency::TOPO
    * @param base return the base frame or the user frame
-   * @return casa::MFrequency::Types
-   */
-  casa::MFrequency::Types getFrame(bool base=false) const;
+   * @return casacore::MFrequency::Types
+   */
+  casacore::MFrequency::Types getFrame(bool base=false) const;
 
   /**
@@ -131 +131 @@
   void setFrame(const std::string& frame, bool base=false);
   /**
-   * set the frequency frame from a casa::MFrequency::Types
-   * @param frame casa::MFrequency::Types
-   */
-  void setFrame(casa::MFrequency::Types frame, bool base=false);
+   * set the frequency frame from a casacore::MFrequency::Types
+   * @param frame casacore::MFrequency::Types
+   */
+  void setFrame(casacore::MFrequency::Types frame, bool base=false);
   void setUnit( const std::string & unit );
   void setDoppler( const std::string & doppler );
@@ -144 +144 @@
    * @li "RESAMPLE"
    */
-  void rescale(casa::Float factor, const std::string& mode);
+  void rescale(casacore::Float factor, const std::string& mode);
 
   /**
@@ -152 +152 @@
    * @return teh reference frequency
    */
-  float getRefFreq(casa::uInt id, casa::uInt channel);
+  float getRefFreq(casacore::uInt id, casacore::uInt channel);
 
   /**
@@ -159 +159 @@
     * @param id the coordinate id
     */
-  void shiftRefPix(int npix, casa::uInt id);
+  void shiftRefPix(int npix, casacore::uInt id);
   /**
    * Return this table or s specific row as a string representation
@@ -165 +165 @@
    * @return a string
    */
-  std::string print(int id=-1, casa::Bool strip=casa::False) const;
+  std::string print(int id=-1, casacore::Bool strip=casacore::False) const;
 
   std::vector<std::string> getInfo() const;
   void setInfo( const std::vector<std::string>& theinfo );
 
-  const casa::String& name() const { return name_; }
+  const casacore::String& name() const { return name_; }
 
   /**
@@ -185 +185 @@
    * @return boolean indicating match with any rows or not
    */
-  bool match( casa::Double refpix, casa::Double refval, casa::Double inc,
-              casa::Double freqTolInHz, casa::uInt &id);
+  bool match( casacore::Double refpix, casacore::Double refval, casacore::Double inc,
+              casacore::Double freqTolInHz, casacore::uInt &id);
 
 private:
 
   /**
-   * setup the the column structure of the casa::table
+   * setup the the column structure of the casacore::table
    */
   void setup();
@@ -198 +198 @@
    * @param sc
    * @param factor the bin factor
-   * @return casa::SpectralCoordinate
-   */
-  casa::SpectralCoordinate binCsys(const casa::SpectralCoordinate& sc, casa::Int factor);
+   * @return casacore::SpectralCoordinate
+   */
+  casacore::SpectralCoordinate binCsys(const casacore::SpectralCoordinate& sc, casacore::Int factor);
   /**
    * the actual resampling of the SpectralCoordinate as called by rescale
@@ -207 +207 @@
    * @return
    */
-  casa::SpectralCoordinate resampleCsys(const casa::SpectralCoordinate& sc, casa::Float width);
-
-  static const casa::String name_;
-  casa::ScalarColumn<casa::Double> refvalCol_, refpixCol_, incrCol_;
+  casacore::SpectralCoordinate resampleCsys(const casacore::SpectralCoordinate& sc, casacore::Float width);
+
+  static const casacore::String name_;
+  casacore::ScalarColumn<casacore::Double> refvalCol_, refpixCol_, incrCol_;
 };