Changeset 845 for trunk/src/Scantable.cpp

Timestamp:

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

Author:

mar637

Message:

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

File:

• trunk/src/Scantable.cpp (modified) (5 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