Changeset 1814 for branches

Timestamp:

08/02/10 14:18:05 (14 years ago)

Author:

Malte Marquarding

Message:

Use casa::String instead as it is derived from std::string but also provides extra features

Location:

branches/newfiller/src

Files:

• Scantable.cpp (modified) (1 diff)
• Scantable.h (modified) (6 diffs)

branches/newfiller/src/Scantable.cpp

@@ -1246 +1246 @@
 }
 
-std::string Scantable::getAntennaName() const
+String Scantable::getAntennaName() const
 {
   String out;

branches/newfiller/src/Scantable.h

@@ -237 +237 @@
 
   /**
-   * Get flagRow info at the specified row. If true, the whole data 
+   * Get flagRow info at the specified row. If true, the whole data
    * at the row should be flagged.
    */
@@ -250 +250 @@
 
   /**
-   * Return a list of booleans with the size of nchan for a specified row, to get info 
+   * Return a list of booleans with the size of nchan for a specified row, to get info
    * 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, 
+  void srchChannelsToClip(casa::uInt whichrow, const casa::Float uthres, const casa::Float dthres, bool clipoutside, bool unflag,
                           casa::Vector<casa::uChar> flgs);
 
@@ -441 +441 @@
    * @return antenna name string
    */
-  std::string getAntennaName() const;
+  casa::String getAntennaName() const;
 
   /**
@@ -470 +470 @@
    * @param[in] nmin, nmax minimum and maximum channel
    * @param[in] irow       row number
-   * 
-   * 30/07/2008 Takeshi Nakazato  
+   *
+   * 30/07/2008 Takeshi Nakazato
    **/
   void reshapeSpectrum( int nmin, int nmax ) throw( casa::AipsError );
@@ -486 +486 @@
   void regridChannel( int nchan, double dnu, int irow ) ;
 
- 
+
 private:
 
@@ -583 +583 @@
 
   /**
-   * Add an auxiliary column to the main table and attach it to a 
+   * Add an auxiliary column to the main table and attach it to a
    * cached column. Use for adding new columns that the original asap2
-   * tables do not have. 
+   * tables do not have.
    * @param[in] col      reference to the cached column to be attached
    * @param[in] colName  column name in asap table