Changeset 2244 for trunk/src

Timestamp:

07/22/11 16:03:36 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Added maxRow = 1 in selection using TableExprNode when
finding at least one row is enough.

Minor bug fix on MSWriter.cpp

Location:

trunk/src

Files:

• MSWriter.cpp (modified) (8 diffs)
• Scantable.cpp (modified) (2 diffs)

trunk/src/MSWriter.cpp

@@ -1093 +1093 @@
     else {
 //       os_ << "NOT sorted at irow=" << irow << " ids[0]=" << ids[0] << LogIO::POST ;
-      t = stt( stt.col("ID") == ids[0] ) ;
+      t = stt( stt.col("ID") == ids[0], 1 ) ;
       Vector<Float> dummyC = tcalCol( 0 ) ;
-      tcal.resize( npol, dummyC.size() ) ;
+      tcal.resize( npol, dummyC.size(), True ) ;
       tcal.row( 0 ) = dummyC ;
     }
@@ -1105 +1105 @@
       else {
 //         os_ << "NOT sorted at irow=" << irow << " ids[1]=" << ids[1] << LogIO::POST ;
-        t = stt( stt.col("ID") == ids[1] ) ;
+        t = stt( stt.col("ID") == ids[1], 1 ) ;
         tcalCol.attach( t, "TCAL" ) ;
-        tcal.row( 1 ) = tcalCol( 1 ) ;
+        tcal.row( 1 ) = tcalCol( 0 ) ;
       }
     }
@@ -1114 +1114 @@
         tcal.row( 1 ) = tcalCol( ids[2] ) ;
       else {
-        t = stt( stt.col("ID") == ids[2] ) ;
+        t = stt( stt.col("ID") == ids[2], 1 ) ;
         tcalCol.attach( t, "TCAL" ) ;
         tcal.row( 1 ) = tcalCol( 0 ) ;
@@ -1121 +1121 @@
         tcal.row( 2 ) = tcalCol( ids[1] ) ;
       else {
-        t = stt( stt.col("ID") == ids[1] ) ;
+        t = stt( stt.col("ID") == ids[1], 1 ) ;
         tcalCol.attach( t, "TCAL" ) ;
         tcal.row( 2 ) = tcalCol( 0 ) ;
@@ -1130 +1130 @@
         tcal.row( 1 ) = tcalCol( ids[2] ) ;
       else {
-        t = stt( stt.col("ID") == ids[2] ) ;
+        t = stt( stt.col("ID") == ids[2], 1 ) ;
         tcalCol.attach( t, "TCAL" ) ;
         tcal.row( 1 ) = tcalCol( 0 ) ;
@@ -1137 +1137 @@
         tcal.row( 2 ) = tcalCol( ids[3] ) ;
       else {
-        t = stt( stt.col("ID") == ids[3] ) ;
+        t = stt( stt.col("ID") == ids[3], 1 ) ;
         tcalCol.attach( t, "TCAL" ) ;
         tcal.row( 2 ) = tcalCol( 0 ) ;
@@ -1144 +1144 @@
         tcal.row( 2 ) = tcalCol( ids[1] ) ;
       else {
-        t = stt( stt.col("ID") == ids[1] ) ;
+        t = stt( stt.col("ID") == ids[1], 1 ) ;
         tcalCol.attach( t, "TCAL" ) ;
         tcal.row( 3 ) = tcalCol( 0 ) ;
@@ -1324 +1324 @@
   if ( srcIdArr.size() != 0 ) {
     srcId = srcIdArr[0] ;
-    MSSource msSrcSel = msSrc( msSrc.col("SOURCE_ID") == srcId ) ;
+    MSSource msSrcSel = msSrc( msSrc.col("SOURCE_ID") == srcId, 1 ) ;
     ROMSSourceColumns msSrcCols( msSrcSel ) ;
     Vector<Double> srcDir = msSrcCols.direction()( 0 ) ;

trunk/src/Scantable.cpp

@@ -672 +672 @@
     // take the first SCANNO,POLNO,BEAMNO,CYCLENO as nbeam shouldn't
     // vary with these
-    Table t = table_(table_.col("IFNO") == ifno);
+    Table t = table_(table_.col("IFNO") == ifno, 1);
     if ( t.nrow() == 0 ) return 0;
     ROArrayColumn<Float> v(t, "SPECTRA");
@@ -1018 +1018 @@
   oss << setw(15) << "Rest Freqs:";
   for (int i=0; i<nid; i++) {
-      Table t = table_(table_.col("MOLECULE_ID") == i);
+    Table t = table_(table_.col("MOLECULE_ID") == i, 1);
       if (t.nrow() >  0) {
           Vector<Double> vec(moleculeTable_.getRestFrequency(i));