Changeset 1111 for trunk/src/Scantable.h

Timestamp:

08/04/06 12:06:38 (18 years ago)

Author:

mar637

Message:

add getNumbers utility function, which is now called by all function which retrieve numbers from the Scantable

File:

• trunk/src/Scantable.h (modified) (3 diffs)

trunk/src/Scantable.h

@@ -250 +250 @@
   std::string getPolType() const;
 
+
+  /**
+   * Get the number of integartion cycles
+   * @param scanno the scan number to get the number of rows for.
+   * If scanno<0 the number is retrieved from the header.
+   * @return the number of rows (for the specified scanno)
+   */
+  int nrow(int scanno=-1) const;
+
+  int getBeam(int whichrow) const;
+  std::vector<uint> getBeamNos() { return getNumbers(beamCol_); }
+
+  int getIF(int whichrow) const;
+  std::vector<uint> getIFNos() { return getNumbers(ifCol_); }
+
+  int getPol(int whichrow) const;
+  std::vector<uint> getPolNos() { return getNumbers(polCol_); }
+
+  std::vector<uint> getScanNos() { return getNumbers(scanCol_); }
+  int getScan(int whichrow) const { return scanCol_(whichrow); }
+
   /**
    * Get the number of channels in the data or a specific IF. This currently
@@ -258 +279 @@
    */
   int nchan(int ifno=-1) const;
-
-  /**
-   * Get the number of integartion cycles
-   * @param scanno the scan number to get the number of rows for.
-   * If scanno<0 the number is retrieved from the header.
-   * @return the number of rows (for the specified scanno)
-   */
-  int nrow(int scanno=-1) const;
+  int getChannels(int whichrow) const;
 
   int ncycle(int scanno=-1) const;
-
-  int getBeam(int whichrow) const;
-  int getIF(int whichrow) const;
-  int getPol(int whichrow) const;
   int getCycle(int whichrow) const { return cycleCol_(whichrow); }
-  int getScan(int whichrow) const { return scanCol_(whichrow); }
-  int getChannels(int whichrow) const;
 
   double getInterval(int whichrow) const
@@ -402 +410 @@
    */
   int rowToScanIndex(int therow);
+
+  std::vector<uint> getNumbers(casa::ScalarColumn<casa::uInt>& col);
 
   static const casa::uInt version_ = 2;