Changeset 845 for trunk

Timestamp:

02/23/06 11:25:32 (18 years ago)

Author:

mar637

Message:

changed getSDHeader -> getHeader
changed nrow interface
added ncycle()

Location:

trunk/src

Files:

• Scantable.cpp (modified) (5 diffs)
• Scantable.h (modified) (7 diffs)

trunk/src/Scantable.cpp

@@ -244 +244 @@
 }
 
-void Scantable::putSDHeader(const SDHeader& sdh)
+void Scantable::setHeader(const SDHeader& sdh)
 {
   table_.rwKeywordSet().define("nIF", sdh.nif);
@@ -264 +264 @@
 }
 
-SDHeader Scantable::getSDHeader() const
+SDHeader Scantable::getHeader() const
 {
   SDHeader sdh;
@@ -286 +286 @@
 }
 
+bool Scantable::conformant( const Scantable& other )
+{
+  return this->getHeader().conformant(other.getHeader());
+}
+
+
 int Scantable::rowToScanIndex( int therow )
 {
@@ -433 +439 @@
 }
 
-int Scantable::nrow( int scanno ) const
+int Scantable::ncycle( int scanno ) const
 {
   if ( scanno < 0 ) {
@@ -457 +463 @@
 
 
-int Scantable::nchan( int scanno, int ifno ) const
-{
-  if ( scanno < 0 || ifno < 0 ) {
+int Scantable::nrow( int scanno ) const
+{
+  return int(table_.nrow());
+}
+
+int Scantable::nchan( int ifno ) const
+{
+  if ( ifno < 0 ) {
     Int n;
     table_.keywordSet().get("nChan",n);
     return int(n);
   } else {
-    // take the first POLNO,IFNO,CYCLENO as nbeam shouldn't vary with these
-    Table tab = table_(table_.col("SCANNO") == scanno
+    // take the first SCANNO,POLNO,BEAMNO,CYCLENO as nbeam shouldn't vary with these
+    Table tab = table_(table_.col("SCANNO") == 0
                        && table_.col("IFNO") == ifno
                        && table_.col("BEAMNO") == 0

trunk/src/Scantable.h

@@ -85 +85 @@
   /**
    * get a const reference to the underlying casa::Table
-   * @return const casa::Table reference
+   * @return consantcasa::Table reference
    */
   const casa::Table& table() const;
@@ -96 +96 @@
   casa::Table& table();
 
+
+  /**
+   * Get a handle to the selection object
+   * @return constant STSelector reference
+   */
+  const STSelector& getSelection() const { return selector_; }
+
+  /**
+   * Set the data to be a subset as defined by the STSelector
+   * @param selection a STSelector object
+   */
   void setSelection(const STSelector& selection);
+
+  /**
+   * unset the selection of the data
+   */
   void unsetSelection();
   /**
@@ -102 +117 @@
    * @param[in] sdh an SDHeader object
    */
-  void putSDHeader( const SDHeader& sdh );
+  void setHeader( const SDHeader& sdh );
 
   /**
@@ -108 +123 @@
    * @return an SDHeader object
    */
-  SDHeader getSDHeader( ) const;
-
-
+  SDHeader getHeader( ) const;
   /**
    * Checks if the "other" Scantable is conformant with this,
@@ -123 +136 @@
    * @return number of scans in the table
    */
-  int nScan() const;
+  int nscan() const;
 
   //casa::MDirection::Types getDirectionReference() const;
@@ -130 +143 @@
   /**
    * Get global antenna position
+   * @return casa::MPosition
+   */
+  casa::MPosition getAntennaPosition() const;
+
+  /**
+   *  Return the Flux unit of the data, e.g. "Jy" or "K"
+   * @return string
+   */
+  std::string getFluxUnit() const;
+
+  /**
+   * Set the Flux unit of the data
+   * @param unit a string representing the unit, e.g "Jy" or "K"
+   */
+  void setFluxUnit( const std::string& unit );
+
+  /**
+   *
+   * @param instrument a string representing an insturment. see xxx
+   */
+  void setInstrument( const std::string& instrument );
+
+  /**
+   * (Re)calculate the azimuth and elevationnfor all rows
+   */
+  void calculateAZEL();
+
+  /**
+   * "hard" flag the data, this flags everything selected in setSelection()
+   */
+  void flag();
+
+
+  /**
+   * Get the number of beams in the data or a specific scan
+   * @param scanno the scan number to get the number of beams for.
+   * If scanno<0 the number is retrieved from the header.
+   * @return an integer number
+   */
+  int nbeam(int scanno=-1) const;
+  /**
+   * Get the number of IFs in the data or a specific scan
+   * @param scanno the scan number to get the number of IFs for.
+   * If scanno<0 the number is retrieved from the header.
+   * @return an integer number
+   */
+  int nif(int scanno=-1) const;
+  /**
+   * Get the number of polarizations in the data or a specific scan
+   * @param scanno the scan number to get the number of polarizations for.
+   * If scanno<0 the number is retrieved from the header.
+   * @return an integer number
+   */
+  int npol(int scanno=-1) const;
+
+  /**
+   * Get the number of channels in the data or a specific IF. This currently
+   * varies only with IF number
+   * @param ifno the IF number to get the number of channels for.
+   * If ifno<0 the number is retrieved from the header.
+   * @return an integer number
+   */
+  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
    */
-  casa::MPosition getAntennaPosition() const;
-
-  /**
-   *
-   * @return
-   */
-
-  std::string getFluxUnit() const;
-
-  /**
-   *
-   * @param unit
-   */
-  void setFluxUnit( const std::string& unit );
-
-  /**
-   *
-   * @param instrument
-   */
-  void setInstrument( const std::string& instrument );
-
-  void calculateAZEL();
-
-  /**
-   * "hard" flags
-   * @param[in] whichrow
-   */
-  void flag();
-
-  int nbeam(int scanno=-1) const;
-  int nif(int scanno=-1) const;
-  int npol(int scanno=-1) const;
-  int nchan(int scanno=-1, int ifno=-1) const;
-
   int nrow(int scanno=-1) const;
 
-  double getInterval(int whichrow=0) const;
-
-  float getTsys(int whichrow=0) const;
+  int ncycle(int scanno=-1) const;
+
+  double getInterval(int scanno=0) const;
+
+  float getTsys(int scanno=0) const;
 
   std::vector<bool> getMask(int whichrow=0) const;
@@ -181 +230 @@
                                    int polidx=-1) const;
 
+  /**
+   * Write the Scantable to disk
+   * @param filename the output file name
+   */
   void makePersistent(const std::string& filename);
-
-
-  void select(const STSelector& sel);
-
-  const STSelector& selection() const { return selector_; }
 
   std::vector<std::string> getHistory() const;