Changeset 2775 for trunk/src

Timestamp:

02/28/13 18:58:29 (12 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...

Bug fix on indexing of WEATHER_ID when more than one weather station
is included in input MS.

File:

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

trunk/src/MSFiller.cpp

@@ -272 +272 @@
       dataColumnName = "FLOAT_DATA" ;
     getpt = False ;
-    isWeather = False ;
+    isWeather_ = False ;
     isSysCal = False ;
     isTcal = False ;
@@ -532 +532 @@
     // WEATHER_ID
     uInt wid = 0 ;
-    if ( isWeather ) 
+    if ( isWeather_ ) 
       wid = getWeatherId() ;
 
@@ -685 +685 @@
     initConvert() ;
   }
-  void setWeatherTime( const Vector<Double> &t, const Vector<Double> &it )
-  {
-    isWeather = True ;
-    weatherTime = t ;
-    weatherInterval = it ;
+  void setWeatherTime( const Vector<Double> &t, const Vector<Double> &it, 
+                       const Vector<uInt> &idx )
+  {
+    isWeather_ = True ;
+    weatherTime_ = t ;
+    weatherInterval_ = it ;
+    weatherIndex_ = idx;
   }
   void setSysCalRecord( const Record &r )
@@ -1153 +1155 @@
   {
     // if only one row, return 0
-    if ( weatherTime.nelements() == 1 )
+    if ( weatherTime_.nelements() == 1 )
       return 0 ;
 
@@ -1159 +1161 @@
     //       if this is bottleneck, frequency of binary search must be reduced
     Double t = currentTime.get( "s" ).getValue() ;
-    uInt idx = min( binarySearch( weatherTime, t ), weatherTime.nelements()-1 ) ;
-    if ( weatherTime[idx] < t ) {
-      if ( idx != weatherTime.nelements()-1 ) {
-        if ( weatherTime[idx+1] - t < 0.5 * weatherInterval[idx+1] )
+    uInt idx = min( binarySearch( weatherTime_, t ), weatherTime_.nelements()-1 ) ;
+    if ( weatherTime_[idx] < t ) {
+      if ( idx != weatherTime_.nelements()-1 ) {
+        if ( weatherTime_[idx+1] - t < 0.5 * weatherInterval_[idx+1] )
           idx++ ;
       }
     }
-    else if ( weatherTime[idx] > t ) {
+    else if ( weatherTime_[idx] > t ) {
       if ( idx != 0 ) {
-        if ( weatherTime[idx] - t > 0.5 * weatherInterval[idx] )
+        if ( weatherTime_[idx] - t > 0.5 * weatherInterval_[idx] )
           idx-- ;
       }
     }
-    return idx ;
+    return weatherIndex_[idx] ;
   }
   void processSysCal( Int &spwId )
@@ -1305 +1307 @@
   Cube<Double> pointingDirection;
   MDirection::Types dirType;
-  Bool isWeather;
-  Vector<Double> weatherTime;
-  Vector<Double> weatherInterval;
+  Bool isWeather_;
+  Vector<Double> weatherTime_;
+  Vector<Double> weatherInterval_;
+  Vector<uInt> weatherIndex_;
   Bool isSysCal;
   Bool isTcal;
@@ -1804 +1807 @@
     }
     if ( isWeather_ )
-      myVisitor.setWeatherTime( mwTime_, mwInterval_ ) ;
+      myVisitor.setWeatherTime( mwTime_, mwInterval_, mwIndex_ ) ;
     if ( isSysCal_ ) 
       myVisitor.setSysCalRecord( tcalrec_ ) ;
@@ -2008 +2011 @@
   }
   //os_ << "mwTime[0] = " << mwTime_[0] << " mwInterval[0] = " << mwInterval_[0] << LogIO::POST ; 
+  //os_ << "mwIndex_=" << mwIndex_ << LogIO::POST;
   //double endSec = mathutil::gettimeofday_sec() ;
   //os_ << "end MSFiller::fillWeather() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;