Changeset 2021 for trunk/src/MSFiller.cpp

Timestamp:

03/02/11 13:00:54 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2718

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...

Bug fix related to ALMA data.

1. bug fix when NUM_LINES is 0 in SOURCE subtable
2. support variable number of polarization data (e.g. including WVR data)
3. bug fix on WEATHER_ID numbering in MSFiller

File:

• trunk/src/MSFiller.cpp (modified) (21 diffs)

trunk/src/MSFiller.cpp

@@ -44 +44 @@
 #include <measures/TableMeasures/ArrayQuantColumn.h>
 
+#include <ms/MeasurementSets/MSAntennaIndex.h>
+
 #include <atnf/PKSIO/SrcType.h>
 
@@ -67 +69 @@
     tablename_( "" ),
     antenna_( -1 ),
+    antennaStr_(""),
     getPt_( False ),
     isFloatData_( False ),
@@ -107 +110 @@
       }
       else {
-        antenna_ = atoi( msrec.asString( "antenna" ).c_str() ) ;
+        //antenna_ = atoi( msrec.asString( "antenna" ).c_str() ) ;
+        antennaStr_ = msrec.asString( "antenna" ) ;
       }
     }
@@ -116 +120 @@
 
   os_ << "Parsing MS options" << endl ;
+  rec.print(cout) ;
   os_ << "   getPt = " << getPt_ << endl ;
-  os_ << "   antenna = " << antenna_ << LogIO::POST ;
+  os_ << "   antenna = " << antenna_ << endl ;
+  os_ << "   antennaStr = " << antennaStr_ << LogIO::POST ;
 
   MeasurementSet *tmpMS = new MeasurementSet( filename, Table::Old ) ;
@@ -123 +129 @@
   //                     && tmpMS->col("ANTENNA1") == tmpMS->col("ANTENNA2") ) ;
   tablename_ = tmpMS->tableName() ;
+  if ( antenna_ == -1 && antennaStr_.size() > 0 ) {
+    MSAntennaIndex msAntIdx( tmpMS->antenna() ) ;
+    Vector<Int> id = msAntIdx.matchAntennaName( antennaStr_ ) ;
+    if ( id.size() > 0 )
+      antenna_ = id[0] ;
+    os_ << "searched antenna_ = " << antenna_ << LogIO::POST ; 
+  }
   mstable_ = MeasurementSet( (*tmpMS)( tmpMS->col("ANTENNA1") == antenna_ 
                                        && tmpMS->col("ANTENNA1") == tmpMS->col("ANTENNA2") ) ) ;
@@ -274 +287 @@
   String telescopeName = "" ;
 
-  //double time1 = gettimeofday_sec() ;
-  //os_ << "end fill init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+//   double time1 = gettimeofday_sec() ;
+//   os_ << "end fill init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
 
   // row based 
@@ -314 +327 @@
   TableIterator iter0( mstable_, "OBSERVATION_ID" ) ;
   while( !iter0.pastEnd() ) {
-    //time0 = gettimeofday_sec() ;
-    //os_ << "start 0th iteration: " << time0 << LogIO::POST ;
+//     time0 = gettimeofday_sec() ;
+//     os_ << "start 0th iteration: " << time0 << LogIO::POST ;
     Table t0 = iter0.table() ;
     tcolr = tpoolr->construct( t0, "OBSERVATION_ID" ) ;
@@ -342 +355 @@
     }
     Int nbeam = 0 ;
-    //time1 = gettimeofday_sec() ;
-    //os_ << "end 0th iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+//     time1 = gettimeofday_sec() ;
+//     os_ << "end 0th iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
     //
     // ITERATION: FEED1
@@ -349 +362 @@
     TableIterator iter1( t0, "FEED1" ) ;
     while( !iter1.pastEnd() ) {
-      //time0 = gettimeofday_sec() ;
-      //os_ << "start 1st iteration: " << time0 << LogIO::POST ;
+//       time0 = gettimeofday_sec() ;
+//       os_ << "start 1st iteration: " << time0 << LogIO::POST ;
       Table t1 = iter1.table() ;
       // assume FEED1 == FEED2
@@ -366 +379 @@
       *uintRF = 0 ;
 
-      //time1 = gettimeofday_sec() ;
-      //os_ << "end 1st iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+//       time1 = gettimeofday_sec() ;
+//       os_ << "end 1st iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
       // 
       // ITERATION: FIELD_ID 
@@ -373 +386 @@
       TableIterator iter2( t1, "FIELD_ID" ) ;
       while( !iter2.pastEnd() ) {
-        //time0 = gettimeofday_sec() ;
-        //os_ << "start 2nd iteration: " << time0 << LogIO::POST ;
+//         time0 = gettimeofday_sec() ;
+//         os_ << "start 2nd iteration: " << time0 << LogIO::POST ;
         Table t2 = iter2.table() ;
         tcolr = tpoolr->construct( t2, "FIELD_ID" ) ;
@@ -399 +412 @@
 
 
-        //time1 = gettimeofday_sec() ;
-        //os_ << "end 2nd iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+//         time1 = gettimeofday_sec() ;
+//         os_ << "end 2nd iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
         // 
         // ITERATION: DATA_DESC_ID
@@ -406 +419 @@
         TableIterator iter3( t2, "DATA_DESC_ID" ) ;
         while( !iter3.pastEnd() ) {
-          //time0 = gettimeofday_sec() ;
-          //os_ << "start 3rd iteration: " << time0 << LogIO::POST ;
+//           time0 = gettimeofday_sec() ;
+//           os_ << "start 3rd iteration: " << time0 << LogIO::POST ;
           Table t3 = iter3.table() ;
           tcolr = tpoolr->construct( t3, "DATA_DESC_ID" ) ;
@@ -432 +445 @@
           Vector<Int> corrtype = (*roArrICol)( polId ) ;
           delete roArrICol ;
-          //os_ << "npol = " << npol << LogIO::POST ;
-          //os_ << "corrtype = " << corrtype << LogIO::POST ;
+//           os_ << "npol = " << npol << LogIO::POST ;
+//           os_ << "corrtype = " << corrtype << LogIO::POST ;
           sdh.npol = max( sdh.npol, npol ) ;
           if ( sdh.poltype == "" ) sdh.poltype = getPolType( corrtype[0] ) ;
@@ -469 +482 @@
 
           //os_ << "srcDir = " << srcDir << LogIO::POST ;
-          Array<Double> sysVels ;
-          Double sysVel = 0.0 ;
-          if ( srctabSel.tableDesc().isColumn( "SYSVEL" ) ) {
-            roArrDCol = new ROArrayColumn<Double>( srctabSel, "SYSVEL" ) ;
-            sysVels = (*roArrDCol)( 0 ) ;
-            delete roArrDCol ;
-          }
-          if ( !sysVels.empty() ) {
-            //os_ << "sysVels.shape() = " << sysVels.shape() << LogIO::POST ;
-            // NB: assume all SYSVEL values are the same
-            sysVel = sysVels( IPosition(1,0) ) ;
-          }
-
-          // SRCVELOCITY
-          RecordFieldPtr<Double> doubleRF( trec, "SRCVELOCITY" ) ;
-          *doubleRF = sysVel ;
-
-          //delete tmpArrCol ;
-          //os_ << "sysVel = " << sysVel << LogIO::POST ;
           ROScalarMeasColumn<MDirection> *tmpMeasCol = new ROScalarMeasColumn<MDirection>( srctabSel, "DIRECTION" ) ;
           MDirection md = (*tmpMeasCol)( 0 ) ;
           delete tmpMeasCol ;
+
           // for MOLECULES subtable
           tcolr = tpoolr->construct( srctabSel, "NUM_LINES" ) ;
           Int numLines = tcolr->asInt( 0 ) ;
           tpoolr->destroy( tcolr ) ;
-          //os_ << "numLines = " << numLines << LogIO::POST ;
+//           os_ << "numLines = " << numLines << LogIO::POST ;
+
           Vector<Double> restFreqs( numLines, 0.0 ) ;
           Vector<String> transitionName( numLines, "" ) ;
+          Vector<Double> sysVels ;
+          Double sysVel = 0.0 ;
           if ( numLines != 0 ) {
             if ( srctabSel.tableDesc().isColumn( "REST_FREQUENCY" ) ) {
@@ -514 +512 @@
               //os_ << "transitionNameCol.nrow() = " << transitionCol.nrow() << LogIO::POST ;
             }
+            if ( srctabSel.tableDesc().isColumn( "SYSVEL" ) ) {
+              roArrDCol = new ROArrayColumn<Double>( srctabSel, "SYSVEL" ) ;
+              sysVels = (*roArrDCol)( 0 ) ;
+              delete roArrDCol ;
+            }
+            if ( !sysVels.empty() ) {
+              //os_ << "sysVels.shape() = " << sysVels.shape() << LogIO::POST ;
+              // NB: assume all SYSVEL values are the same
+              sysVel = sysVels( IPosition(1,0) ) ;
+            }
           }
+
+          // SRCVELOCITY
+          RecordFieldPtr<Double> doubleRF( trec, "SRCVELOCITY" ) ;
+          *doubleRF = sysVel ;
+
+//           os_ << "sysVel = " << sysVel << LogIO::POST ;
+
           uInt molId = table_->molecules().addEntry( restFreqs, transitionName, transitionName ) ;
 
@@ -612 +627 @@
             scTsysCol.attach( caltabsel, colTsys_ ) ;
           }
-          //time1 = gettimeofday_sec() ;
-          //os_ << "end 3rd iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+//           time1 = gettimeofday_sec() ;
+//           os_ << "end 3rd iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
           //
           // ITERATION: SCAN_NUMBER
@@ -619 +634 @@
           TableIterator iter4( t3, "SCAN_NUMBER" ) ;
           while( !iter4.pastEnd() ) {
-            //time0 = gettimeofday_sec() ;
-            //os_ << "start 4th iteration: " << time0 << LogIO::POST ;
+//             time0 = gettimeofday_sec() ;
+//             os_ << "start 4th iteration: " << time0 << LogIO::POST ;
             Table t4 = iter4.table() ;
             tcolr = tpoolr->construct( t4, "SCAN_NUMBER" ) ;
@@ -630 +645 @@
             *uintRF = scanNum - 1 ;
 
-            //time1 = gettimeofday_sec() ;
-            //os_ << "end 4th iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+//             time1 = gettimeofday_sec() ;
+//             os_ << "end 4th iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
             // 
             // ITERATION: STATE_ID
@@ -1242 +1257 @@
     os_ << "No SysCal rows" << LogIO::POST ;
     table_->tcal().table().addRow(1,True) ;
+    Vector<Float> defaultTcal( 1, 1.0 ) ;
+    ArrayColumn<Float> tcalCol( table_->tcal().table(), "TCAL" ) ;
+    tcalCol.put( 0, defaultTcal ) ;
     return ;
   }
@@ -1344 +1362 @@
     //os_ << "tStart = " << tStart << " dtEnd = " << tEnd-tStart << " dwtime = " << wtime-tStart << LogIO::POST ;
     if ( wtime >= tStart && wtime <= tEnd )
+      wid = i-1 ;
+    else 
       wid = i ;
   }