Changeset 2003 for trunk/src

Timestamp:

02/21/11 16:09:55 (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...

Introduced binary search in detecting SYSCAL and POINTING rows.

Location:

trunk/src

Files:

• MSFiller.cpp (modified) (6 diffs)
• MSFiller.h (modified) (2 diffs)

trunk/src/MSFiller.cpp

@@ -569 +569 @@
           MSSysCal caltabsel( caltab( caltab.col("ANTENNA_ID") == antenna_ && caltab.col("FEED_ID") == feedId && caltab.col("SPECTRAL_WINDOW_ID") == spwId ).sort("TIME") ) ;
           ROScalarMeasColumn<MEpoch> scTimeCol( caltabsel, "TIME" ) ;
-          Block<MEpoch> scTime( caltabsel.nrow() ) ;
+          Vector<MEpoch> scTime( caltabsel.nrow() ) ;
           for ( uInt irow = 0 ; irow < caltabsel.nrow() ; irow++ ) 
             scTime[irow] = scTimeCol( irow ) ;
@@ -1305 +1305 @@
 }
 
-void MSFiller::getSysCalTime( Block<MEpoch> &scTime, Vector<Double> &scInterval, Block<MEpoch> &tcol, Block<Double> &tstr, Block<Int> &tidx )
+void MSFiller::getSysCalTime( Vector<MEpoch> &scTime, Vector<Double> &scInterval, Block<MEpoch> &tcol, Block<Double> &tstr, Block<Int> &tidx )
 {
   double startSec = gettimeofday_sec() ;
@@ -1315 +1315 @@
   uInt idx = 0 ;
   const Double half = 0.5e0 ;
+  // execute  binary search
+  idx = binarySearch( scTime, tcol[0].get( "s" ).getValue() ) ;
+  if ( idx != 0 )
+    idx -= 1 ;
   for ( uInt i = 0 ; i < nrow ; i++ ) {
     Double t = tcol[i].get( "s" ).getValue() ;
@@ -1340 +1344 @@
   }
   double endSec = gettimeofday_sec() ;
-  os_ << "end MSFiller::getSysCalTime() endSec=" << endSec << " (" << endSec-startSec << "sec) scnrow = " << scnrow << "tcol.nelements() = " << tcol.nelements() << LogIO::POST ;
+  os_ << "end MSFiller::getSysCalTime() endSec=" << endSec << " (" << endSec-startSec << "sec) scnrow = " << scnrow << " tcol.nelements = " << tcol.nelements() << LogIO::POST ;
   return ;
 }
@@ -1410 +1414 @@
   ROArrayMeasColumn<MDirection> dmcol( tab, "DIRECTION" ) ;
   ROArrayColumn<Double> dcol( tab, "DIRECTION" ) ;
+  // binary search if idx == 0
+  if ( idx == 0 ) {
+    uInt nrowb = 75000 ;
+    if ( nrow > nblock ) {
+      uInt nblock = nrow / nrowb + 1 ;
+      for ( uInt iblock = 0 ; iblock < nblock ; iblock++ ) {
+        uInt high = min( nblock, nrow-iblock*nblock ) ;
+
+        if ( tcol( high-1 ).get( "s" ).getValue() < t ) {
+          idx = iblock * nblock ;
+          continue ;
+        }
+
+        Vector<MEpoch> tarr( high ) ;
+        for ( uInt irow = 0 ; irow < high ; irow++ ) {
+          tarr[irow] = tcol( iblock*nblock+irow ) ;
+        }
+
+        uInt bidx = binarySearch( tarr, t ) ;
+
+        idx = iblock * nblock + bidx ;
+        break ;
+      }
+    }
+    else {
+      Vector<MEpoch> tarr( nrow ) ;
+      for ( uInt irow = 0 ; irow < nrow ; irow++ ) {
+        tarr[irow] = tcol( irow ) ;
+      }
+      idx = binarySearch( tarr, t ) ;
+    }
+  }
   // ensure that tcol(idx) < t
   //os_ << "tcol(idx) = " << tcol(idx).get("s").getValue() << " t = " << t << " diff = " << tcol(idx).get("s").getValue()-t << endl ;
@@ -1486 +1522 @@
 }
 
+uInt MSFiller::binarySearch( Vector<MEpoch> &timeList, Double target ) 
+{
+  Int low = 0 ;
+  Int high = timeList.nelements() ;
+  uInt idx = 0 ;
+
+  while ( low <= high ) {
+    idx = (Int)( 0.5 * ( low + high ) ) ;
+    Double t = timeList[idx].get( "s" ).getValue() ;
+    if ( t < target ) 
+      low = idx + 1 ;
+    else if ( t > target )
+      high = idx - 1 ;
+    else 
+      return idx ;
+  }
+
+  idx = max( 0, min( low, high ) ) ;
+
+  return idx ;
+  
+}
+
 } ;
 

trunk/src/MSFiller.h

@@ -84 +84 @@
   // assume that tab is selected by ANTENNA_ID, FEED_ID, SPECTRAL_WINDOW_ID 
   // and sorted by TIME
-  void getSysCalTime( casa::Block<casa::MEpoch> &scTimeIn, casa::Vector<casa::Double> &scInterval, casa::Block<casa::MEpoch> &tcol, casa::Block<casa::Double> &scTimeOut, casa::Block<casa::Int> &tidx ) ;
+  void getSysCalTime( casa::Vector<casa::MEpoch> &scTimeIn, casa::Vector<casa::Double> &scInterval, casa::Block<casa::MEpoch> &tcol, casa::Block<casa::Double> &scTimeOut, casa::Block<casa::Int> &tidx ) ;
 
   // get tsys by time stamp
@@ -99 +99 @@
   // create key for TCAL table
   casa::String keyTcal( casa::Int feedid, casa::Int spwid, casa::String stime ) ; 
+
+  // binary search
+  casa::uInt binarySearch( casa::Vector<casa::MEpoch> &timeList, casa::Double target ) ; 
   
   casa::CountedPtr<Scantable> table_ ;