Changeset 2025 for trunk/src

Timestamp:

03/02/11 17:37:43 (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 on telescope name etc.

File:

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

trunk/src/MSFiller.cpp

@@ -119 +119 @@
   }
 
-  os_ << "Parsing MS options" << endl ;
-  os_ << "   getPt = " << getPt_ << endl ;
-  os_ << "   antenna = " << antenna_ << endl ;
-  os_ << "   antennaStr = " << antennaStr_ << LogIO::POST ;
-
   MeasurementSet *tmpMS = new MeasurementSet( filename, Table::Old ) ;
   //mstable_ = (*tmpMS)( tmpMS->col("ANTENNA1") == antenna_ 
@@ -133 +128 @@
     if ( id.size() > 0 )
       antenna_ = id[0] ;
-    os_ << "searched antenna_ = " << antenna_ << LogIO::POST ; 
-  }
+  }
+
+  os_ << "Parsing MS options" << endl ;
+  os_ << "   getPt = " << getPt_ << endl ;
+  os_ << "   antenna = " << antenna_ << endl ;
+  os_ << "   antennaStr = " << antennaStr_ << LogIO::POST ;
+
   mstable_ = MeasurementSet( (*tmpMS)( tmpMS->col("ANTENNA1") == antenna_ 
                                        && tmpMS->col("ANTENNA1") == tmpMS->col("ANTENNA2") ) ) ;
@@ -350 +350 @@
     if ( telescopeName == "" ) {
       tcolr = tpoolr->construct( obstab, "TELESCOPE_NAME" ) ;
-      sdh.observer = tcolr->asString( obsId ) ;
+      telescopeName = tcolr->asString( obsId ) ;
       tpoolr->destroy( tcolr ) ;
     }
@@ -1180 +1180 @@
   //os_ << "mWeatherSel.nrow() = " << mWeatherSel.nrow() << LogIO::POST ;
   if ( mWeatherSel.nrow() == 0 ) {
-    os_ << "No rows with ANTENNA_ID = " << antenna_ << ", Try -1..." << LogIO::POST ; 
+    os_ << "No rows with ANTENNA_ID = " << antenna_ << " in WEATHER table, Try -1..." << LogIO::POST ; 
     mWeatherSel = Table( MSWeather( mWeather( mWeather.col("ANTENNA_ID") == -1 ) ) ) ;
     if ( mWeatherSel.nrow() == 0 ) {
@@ -1273 +1273 @@
   if ( !isSysCal_ ) {
     // add dummy row
-    os_ << "No SysCal rows" << LogIO::POST ;
+    os_ << "No SYSCAL rows" << LogIO::POST ;
     table_->tcal().table().addRow(1,True) ;
     Vector<Float> defaultTcal( 1, 1.0 ) ;
@@ -1283 +1283 @@
   Table sctab = mstable_.sysCal() ;
   if ( sctab.nrow() == 0 ) {
-    os_ << "No SysCal rows" << LogIO::POST ;
+    os_ << "No SYSCAL rows" << LogIO::POST ;
     return ;
   } 
   Table sctabsel( sctab( sctab.col("ANTENNA_ID") == antenna_ ) ) ;
   if ( sctabsel.nrow() == 0 ) {
-    os_ << "No SysCal rows" << LogIO::POST ;
+    os_ << "No SYSCAL rows" << LogIO::POST ;
     return ;
   }