Changeset 2017 for trunk/src

Timestamp:

02/28/11 18:51:18 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2718

Ready for Test: Yes/No

Interface Changes: Yes/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...

Defined gettimeofday_sec() as private method of the class.

Location:

trunk/src

Files:

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

trunk/src/MSFiller.cpp

@@ -20 +20 @@
 #include <tables/Tables/ScalarColumn.h>
 #include <tables/Tables/ArrayColumn.h>
-#include <tables/Tables/RefRows.h>
 #include <tables/Tables/TableParse.h>
-#include <tables/Tables/RefRows.h>
 #include <tables/Tables/TableRow.h>
 
@@ -54 +52 @@
 #include <sys/time.h>
 
-double gettimeofday_sec()
+using namespace casa ;
+using namespace std ;
+
+namespace asap {
+double MSFiller::gettimeofday_sec()
 {
   struct timeval tv ;
@@ -61 +63 @@
 }
 
-using namespace casa ;
-using namespace std ;
-
-namespace asap {
 MSFiller::MSFiller( casa::CountedPtr<Scantable> stable )
   : table_( stable ),
@@ -715 +713 @@
               ROTableColumn *mIntervalCol = tpoolr->construct( t5, "INTERVAL" ) ;
               ROTableColumn *mFlagRowCol = tpoolr->construct( t5, "FLAG_ROW" ) ;
-              Block<Double> sysCalTime( nrow, -1.0 ) ;
               Block<Int> sysCalIdx( nrow, -1 ) ;
               if ( isSysCal_ ) {
-                getSysCalTime( scTime, scInterval, mTimeB, sysCalTime, sysCalIdx ) ;
+                getSysCalTime( scTime, scInterval, mTimeB, sysCalIdx ) ;
               }
               delete mTimeCol ;
@@ -1354 +1351 @@
 }
 
-void MSFiller::getSysCalTime( Vector<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<Int> &tidx )
 {
 //   double startSec = gettimeofday_sec() ;
@@ -1362 +1359 @@
     return ;
 
-  uInt nrow = tstr.nelements() ;
+  uInt nrow = tidx.nelements() ;
   if ( scTime.nelements() == 0 ) 
     return ;
@@ -1374 +1371 @@
   for ( uInt i = 0 ; i < nrow ; i++ ) {
     Double t = tcol[i].get( "s" ).getValue() ;
+    Double tsc = scTime[0].get( "s" ).getValue() ;
+    if ( t < tsc ) {
+      tidx[i] = 0 ;
+      continue ;
+    }
     for ( uInt j = idx ; j < scnrow-1 ; j++ ) {
       Double tsc1 = scTime[j].get( "s" ).getValue() ;
@@ -1380 +1382 @@
       Double dt2 = scInterval[j+1] ;
       if ( t > tsc1-half*dt1 && t <= tsc2-half*dt2 ) {
-        tstr[i] = tsc1 ;
         tidx[i] = j ;
         idx = j ;
@@ -1386 +1387 @@
       }
     }
-    if ( tstr[i] == -1.0 ) {
+    if ( tidx[i] == -1 ) {
       Double tsc = scTime[scnrow-1].get( "s" ).getValue() ;
       Double dt = scInterval[scnrow-1] ;
-      if ( t <= tsc+0.5*dt ) {
-        tstr[i] = tsc ;
-        tidx[i] = scnrow-1 ;
-      }
+//       if ( t <= tsc+0.5*dt ) {
+//         tidx[i] = scnrow-1 ;
+//       }
+      tidx[i] = scnrow-1 ;
     }
   }

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::Vector<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::Int> &tidx ) ;
 
   // get TCAL_ID 
@@ -97 +97 @@
   // binary search
   casa::uInt binarySearch( casa::Vector<casa::MEpoch> &timeList, casa::Double target ) ; 
+
+  // tool for HPC
+  double gettimeofday_sec() ;
   
   casa::CountedPtr<Scantable> table_ ;