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

Timestamp:

06/09/10 19:03:06 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-2211)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: ASAP 3.0.0 interface changes

Test Programs:

Put in Release Notes: Yes

Module(s): all the CASA sd tools and tasks are affected.

Description: Merged ATNF-ASAP 3.0.0 developments to CASA (alma) branch.

Note you also need to update casa/code/atnf.

Location:

branches/alma

Files:

• . (modified) (2 props)
• src/Scantable.h (modified) (11 diffs)

branches/alma/src/Scantable.h

@@ -22 +22 @@
 #include <casa/Utilities/CountedPtr.h>
 
-#include <casa/Exceptions/Error.h>
-
-#include <coordinates/Coordinates/SpectralCoordinate.h>
-
 #include <tables/Tables/Table.h>
 #include <tables/Tables/ArrayColumn.h>
@@ -32 +28 @@
 #include <measures/TableMeasures/ScalarMeasColumn.h>
 
+#include <coordinates/Coordinates/SpectralCoordinate.h>
+
 #include <casa/Arrays/Vector.h>
 #include <casa/Quanta/Quantum.h>
+
+#include <casa/Exceptions/Error.h>
 
 #include "Logger.h"
@@ -173 +173 @@
    */
   casa::MDirection getDirection( int whichrow ) const;
-  
+
   /**
    * get the direction type as a string, e.g. "J2000"
@@ -191 +191 @@
    * @return a string describing the direction reference
    */
-  std::string getDirectionRefString() const;    
+  std::string getDirectionRefString() const;
 
   /**
@@ -298 +298 @@
 
   int getBeam(int whichrow) const;
-  std::vector<uint> getBeamNos() { return getNumbers(beamCol_); }
+  std::vector<uint> getBeamNos() const { return getNumbers(beamCol_); }
 
   int getIF(int whichrow) const;
-  std::vector<uint> getIFNos() { return getNumbers(ifCol_); }
+  std::vector<uint> getIFNos() const { return getNumbers(ifCol_); }
 
   int getPol(int whichrow) const;
-  std::vector<uint> getPolNos() { return getNumbers(polCol_); }
-
-  std::vector<uint> getScanNos() { return getNumbers(scanCol_); }
+  std::vector<uint> getPolNos() const { return getNumbers(polCol_); }
+
+  std::vector<uint> getScanNos() const { return getNumbers(scanCol_); }
   int getScan(int whichrow) const { return scanCol_(whichrow); }
 
@@ -335 +335 @@
     { return azCol_(whichrow); }
   float getParAngle(int whichrow) const
-    { return paraCol_(whichrow); }
+    { return focus().getParAngle(mfocusidCol_(whichrow)); }
   int getTcalId(int whichrow) const
     { return mtcalidCol_(whichrow); }
@@ -384 +384 @@
 
   std::vector<double> getAbcissa(int whichrow) const;
+
+  std::vector<float> getWeather(int whichrow) const;
 
   std::string getAbcissaLabel(int whichrow) const;
@@ -408 +410 @@
 
   void shift(int npix);
+
+  casa::SpectralCoordinate getSpectralCoordinate(int whichrow) const;
 
   void convertDirection(const std::string& newframe);
@@ -443 +447 @@
    * 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;
+
+  /**
+   * Set a flag indicating whether the data was parallactified
+   * @param[in] flag true or false
+   */
+  void parallactify(bool flag)
+    { focus().setParallactify(flag); }
 
   /**
@@ -523 +534 @@
   int rowToScanIndex(int therow);
 
-  std::vector<uint> getNumbers(casa::ScalarColumn<casa::uInt>& col);
-
-  static const casa::uInt version_ = 2;
+  std::vector<uint> getNumbers(const casa::ScalarColumn<casa::uInt>& col) const;
+
+  static const casa::uInt version_ = 3;
 
   STSelector selector_;
@@ -549 +560 @@
   casa::ScalarColumn<casa::Float> azCol_;
   casa::ScalarColumn<casa::Float> elCol_;
-  casa::ScalarColumn<casa::Float> paraCol_;
   casa::ScalarColumn<casa::String> srcnCol_, fldnCol_;
   casa::ScalarColumn<casa::uInt> scanCol_, beamCol_, ifCol_, polCol_, cycleCol_, flagrowCol_;