Changeset 1446 for branches/alma/src/Scantable.h

Timestamp:

11/12/08 17:04:01 (16 years ago)

Author:

TakTsutsumi

Message:

Merged recent updates (since 2007) from nrao-asap

File:

• branches/alma/src/Scantable.h (modified) (6 diffs)

branches/alma/src/Scantable.h

@@ -22 +22 @@
 #include <casa/Utilities/CountedPtr.h>
 
+#include <casa/Exceptions/Error.h>
+
 #include <coordinates/Coordinates/SpectralCoordinate.h>
 
@@ -29 +31 @@
 
 #include <measures/TableMeasures/ScalarMeasColumn.h>
+
+#include <casa/Arrays/Vector.h>
+#include <casa/Quanta/Quantum.h>
 
 #include "Logger.h"
@@ -167 +172 @@
 
         /**
-         * get the direction type as a string, e.g. "J2000"
+         * get the direction as a string
          * @param[in] whichrow the row number
          * return the direction string
@@ -277 +282 @@
   std::vector<uint> getScanNos() { return getNumbers(scanCol_); }
   int getScan(int whichrow) const { return scanCol_(whichrow); }
+
+  //TT addition
+  std::vector<uint> getMolNos() {return getNumbers(mmolidCol_); }
 
   /**
@@ -352 +360 @@
   std::vector<double> getRestFrequencies() const
     { return moleculeTable_.getRestFrequencies(); }
-
+  std::vector<double> getRestFrequency(int id) const
+    { return moleculeTable_.getRestFrequency(id); }
+
+  /**
   void setRestFrequencies(double rf, const std::string& name = "",
                           const std::string& = "Hz");
-  void setRestFrequencies(const std::string& name);
+  **/
+  // Modified by Takeshi Nakazato 05/09/2008
+  /***
+  void setRestFrequencies(vector<double> rf, const vector<std::string>& name = "",
+                          const std::string& = "Hz");
+  ***/
+  void setRestFrequencies(vector<double> rf,
+                          const vector<std::string>& name = vector<std::string>(1,""),
+                          const std::string& = "Hz");
+
+  //void setRestFrequencies(const std::string& name);
+  void setRestFrequencies(const vector<std::string>& name);
 
   void shift(int npix);
@@ -393 +415 @@
    * against the information found in GBT_GO table for
    * scan number orders to get correct pairs.
-   * @param[in] scan list
-   * @return status
+   * @param[in] scan list 
+   * @return status 
    */
   int checkScanInfo(const std::vector<int>& scanlist) const;
 
   /**
-   * Get the direction as a vector, for a specific row
+   * Get the direction as a vector, for a specific row  
    * @param[in] whichrow the row numbyyer
-   * @return the direction in a vector
+   * @return the direction in a vector 
    */
   std::vector<double> getDirectionVector(int whichrow) const;
 
+  /**
+   * Reshape spectrum
+   * @param[in] nmin, nmax minimum and maximum channel
+   * @param[in] irow       row number
+   * 
+   * 30/07/2008 Takeshi Nakazato  
+   **/
+  void reshapeSpectrum( int nmin, int nmax ) throw( casa::AipsError );
+  void reshapeSpectrum( int nmin, int nmax, int irow ) ;
+
+  /**
+   * Change channel number under fixed bandwidth
+   * @param[in] nchan, dnu new channel number and spectral resolution
+   * @param[in] irow       row number
+   *
+   * 27/08/2008 Takeshi Nakazato
+   **/
+  void regridChannel( int nchan, double dnu ) ;
+  void regridChannel( int nchan, double dnu, int irow ) ;
+ 
 private: