Changeset 888

Timestamp:

03/08/06 13:15:06 (18 years ago)

Author:

mar637

Message:

Fixed all nXYZ() functions, to get row 0 NOT the number 0

File:

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

trunk/src/Scantable.cpp

@@ -407 +407 @@
   } else {
     // take the first POLNO,IFNO,CYCLENO as nbeam shouldn't vary with these
-    Table tab = table_(table_.col("SCANNO") == scanno
-                       && table_.col("POLNO") == 0
-                       && table_.col("IFNO") == 0
-                       && table_.col("CYCLENO") == 0 );
-    ROTableVector<uInt> v(tab, "BEAMNO");
+    Table t = table_(table_.col("SCANNO") == scanno);
+    ROTableRow row(t);
+    const TableRecord& rec = row.get(0);
+    Table subt = t( t.col("IFNO") == Int(rec.asuInt("IFNO"))
+                    && t.col("POLNO") == Int(rec.asuInt("POLNO"))
+                    && t.col("CYCLENO") == Int(rec.asuInt("CYCLENO")) );
+    ROTableVector<uInt> v(subt, "BEAMNO");
     return int(v.nelements());
   }
@@ -425 +427 @@
   } else {
     // take the first POLNO,BEAMNO,CYCLENO as nbeam shouldn't vary with these
-    Table tab = table_(table_.col("SCANNO") == scanno
-                       && table_.col("POLNO") == 0
-                       && table_.col("BEAMNO") == 0
-                       && table_.col("CYCLENO") == 0 );
-    ROTableVector<uInt> v(tab, "IFNO");
+    Table t = table_(table_.col("SCANNO") == scanno);
+    ROTableRow row(t);
+    const TableRecord& rec = row.get(0);
+    Table subt = t( t.col("BEAMNO") == Int(rec.asuInt("BEAMNO"))
+                    && t.col("POLNO") == Int(rec.asuInt("POLNO"))
+                    && t.col("CYCLENO") == Int(rec.asuInt("CYCLENO")) );
+    if ( subt.nrow() == 0 ) return 0;
+    ROTableVector<uInt> v(subt, "IFNO");
     return int(v.nelements());
   }
@@ -443 +448 @@
   } else {
     // take the first POLNO,IFNO,CYCLENO as nbeam shouldn't vary with these
-    Table tab = table_(table_.col("SCANNO") == scanno
-                       && table_.col("IFNO") == 0
-                       && table_.col("BEAMNO") == 0
-                       && table_.col("CYCLENO") == 0 );
-    ROTableVector<uInt> v(tab, "POLNO");
+    Table t = table_(table_.col("SCANNO") == scanno);
+    ROTableRow row(t);
+    const TableRecord& rec = row.get(0);
+    Table subt = t( t.col("BEAMNO") == Int(rec.asuInt("BEAMNO"))
+                    && t.col("IFNO") == Int(rec.asuInt("IFNO"))
+                    && t.col("CYCLENO") == Int(rec.asuInt("CYCLENO")) );
+    if ( subt.nrow() == 0 ) return 0;
+    ROTableVector<uInt> v(subt, "POLNO");
     return int(v.nelements());
   }
@@ -466 +474 @@
     return n;
   } else {
-    // take the first POLNO,IFNO,CYCLENO as nbeam shouldn't vary with these
-    Table tab = table_(table_.col("SCANNO") == scanno
-                       && table_.col("BEAMNO") == 0
-                       && table_.col("IFNO") == 0
-                       && table_.col("POLNO") == 0 );
-    return int(tab.nrow());
+    Table t = table_(table_.col("SCANNO") == scanno);
+    ROTableRow row(t);
+    const TableRecord& rec = row.get(0);
+    Table subt = t( t.col("BEAMNO") == Int(rec.asuInt("BEAMNO"))
+                    && t.col("POLNO") == Int(rec.asuInt("POLNO"))
+                    && t.col("IFNO") == Int(rec.asuInt("IFNO")) );
+    if ( subt.nrow() == 0 ) return 0;
+    return int(subt.nrow());
   }
   return 0;
@@ -490 +500 @@
   } else {
     // 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
-                       && table_.col("POLNO") == 0
-                       && table_.col("CYCLENO") == 0 );
-    ROArrayColumn<Float> v(tab, "SPECTRA");
+    Table t = table_(table_.col("IFNO") == ifno);
+    if ( t.nrow() == 0 ) return 0;
+    ROArrayColumn<Float> v(t, "SPECTRA");
     return v(0).nelements();
   }