Changeset 837

Timestamp:

02/20/06 14:44:25 (18 years ago)

Author:

mar637

Message:

Reworked nchan and nrow.

File:

• trunk/src/Scantable.cpp (modified) (9 diffs)

trunk/src/Scantable.cpp

@@ -188 +188 @@
 }
 
-void asap::Scantable::setupHistoryTable( )
+void Scantable::setupHistoryTable( )
 {
   TableDesc tdh("", "1", TableDesc::Scratch);
@@ -293 +293 @@
 }
 
-int Scantable::nScan() const {
+int Scantable::nscan() const {
   int n = 0;
   int previous = -1; int current = 0;
@@ -379 +379 @@
 }
 
-int asap::Scantable::nbeam( int scanno ) const
+int Scantable::nbeam( int scanno ) const
 {
   if ( scanno < 0 ) {
@@ -397 +397 @@
 }
 
-int asap::Scantable::nif( int scanno ) const
+int Scantable::nif( int scanno ) const
 {
   if ( scanno < 0 ) {
@@ -415 +415 @@
 }
 
-int asap::Scantable::npol( int scanno ) const
+int Scantable::npol( int scanno ) const
 {
   if ( scanno < 0 ) {
@@ -433 +433 @@
 }
 
-int asap::Scantable::nrow( int scanno ) const
+int Scantable::nrow( int scanno ) const
 {
   if ( scanno < 0 ) {
-    return int(table_.nrow());
+    Block<String> cols(2);
+    cols[0] = "SCANNO";
+    cols[1] = "CYCLENO";
+    TableIterator it(table_, cols);
+    int n = 0;
+    while ( !it.pastEnd() ) {
+      ++n;
+    }
+    return n;
   } else {
     // take the first POLNO,IFNO,CYCLENO as nbeam shouldn't vary with these
@@ -449 +457 @@
 
 
-int asap::Scantable::nchan( int scanno, int ifno ) const
-{
-  if ( scanno < 0 && ifno < 0 ) {
+int Scantable::nchan( int scanno, int ifno ) const
+{
+  if ( scanno < 0 || ifno < 0 ) {
     Int n;
     table_.keywordSet().get("nChan",n);
@@ -463 +471 @@
                        && table_.col("CYCLENO") == 0 );
     ROArrayColumn<Float> v(tab, "SPECTRA");
-    cout << v.shape(0) << endl;
-    return 0;
+    return v(0).nelements();
   }
   return 0;
@@ -614 +621 @@
 }
 
-std::string asap::Scantable::summary( bool verbose )
+std::string Scantable::summary( bool verbose )
 {
   // Format header info