Changeset 2246 for trunk/src

Timestamp:

07/25/11 14:41:23 (13 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...

More improvement

Location:

trunk/src

Files:

• MSFiller.cpp (modified) (17 diffs)
• MSFiller.h (modified) (3 diffs)

trunk/src/MSFiller.cpp

@@ -260 +260 @@
   delete sharedQDArrCol ;
   MPosition mp( MVPosition( antpos ), MPosition::ITRF ) ;
+  Vector<Double> pt ;
+  ROArrayColumn<Double> pdcol ;
+  Vector<Double> defaultScanrate( 2, 0.0 ) ;
   if ( getPt_ ) {
     pointtab = MSPointing( pointtab( pointtab.col("ANTENNA_ID")==antenna_ ).sort("TIME") ) ;
-  }
-  ROScalarColumn<Double> ptcol( pointtab, "TIME" ) ;
-  ROArrayColumn<Double> pdcol( pointtab, "DIRECTION" ) ; 
+    ROScalarColumn<Double> ptcol( pointtab, "TIME" ) ;
+    ptcol.getColumn( pt ) ;
+    TableRecord trec = ptcol.keywordSet() ;
+    String tUnit = trec.asArrayString( "QuantumUnits" ).data()[0] ;
+    if ( tUnit == "d" )
+      pt *= 86400.0 ;
+    pdcol.attach( pointtab, "DIRECTION" ) ; 
+  }
   String stationName = asString( "STATION", antenna_, anttab, tpoolr ) ;
   String antennaName = asString( "NAME", antenna_, anttab, tpoolr ) ;
@@ -497 +505 @@
             for ( uInt irow = 0 ; irow < caltabsel.nrow() ; irow++ ) 
               scTime[irow] = scTimeCol( irow ) ;
-            ROScalarColumn<Double> *scIntervalCol = new ROScalarColumn<Double>( caltabsel, "INTERVAL" ) ;
-            scInterval = scIntervalCol->getColumn() ;
-            delete scIntervalCol ;
+            ROScalarColumn<Double> scIntervalCol( caltabsel, "INTERVAL" ) ;
+            scIntervalCol.getColumn( scInterval ) ;
             if ( colTsys_ != "NONE" )
               scTsysCol.attach( caltabsel, colTsys_ ) ;
@@ -566 +573 @@
               for ( Int irow = 0 ; irow < nrow ; irow++ ) 
                 mTimeB[irow] = (*mTimeCol)( irow ) ;
-//               ROTableColumn *mIntervalCol = tpoolr->construct( t5, "INTERVAL" ) ;
-//               ROTableColumn *mFlagRowCol = tpoolr->construct( t5, "FLAG_ROW" ) ;
               Block<Int> sysCalIdx( nrow, -1 ) ;
               if ( isSysCal_ ) {
@@ -606 +611 @@
 
                 // FLAGROW
-//                 *flrRF = (uInt)mFlagRowCol->asBool( irow ) ;
                 *flrRF = (uInt)asBool( "FLAG_ROW", irow, t5, tpoolr ) ;
 
@@ -619 +623 @@
 
                 // INTERVAL
-//                 *intervalRF = (Double)(mIntervalCol->asdouble( irow )) ;
                 *intervalRF = asDouble( "INTERVAL", irow, t5, tpoolr ) ;
 
@@ -648 +651 @@
                 Vector<Double> dir ;
                 Vector<Double> azel ;
-                Vector<Double> scanrate ;
+                Vector<Double> scanrate = defaultScanrate ;
                 String refString ;
                 if ( getPt_ )
-                  //diridx = getDirection( diridx, dir, azel, scanrate, pointtab, mTimeB[irow], mp ) ;
-                  diridx = getDirection( diridx, dir, azel, scanrate, ptcol, pdcol, mTimeB[irow], mp ) ;
+                  diridx = getDirection( diridx, dir, azel, scanrate, pt, pdcol, mTimeB[irow], mp ) ;
                 else
                   getSourceDirection( dir, azel, scanrate, mTimeB[irow], mp, delayDir ) ;
@@ -1404 +1406 @@
                              Vector<Double> &srate, 
                              String &ref, 
-                             ROScalarColumn<Double> &tcol, 
+                             Vector<Double> &tcol, 
                              ROArrayColumn<Double> &dcol, 
                              Double t ) 
@@ -1414 +1416 @@
   // assume that cols is sorted by TIME
   Bool doInterp = False ;
-  uInt nrow = tcol.nrow() ;
+  //uInt nrow = tcol.nrow() ;
+  uInt nrow = dcol.nrow() ;
   if ( nrow == 0 ) 
     return 0 ;
-  TableRecord trec = tcol.keywordSet() ;
-  String tUnit = trec.asArrayString( "QuantumUnits" ).data()[0] ;
-  Double factor = 1.0 ;
-  if ( tUnit == "d" )
-    factor = 86400.0 ;
-  // binary search if idx == 0
   if ( idx == 0 ) {
     uInt nrowb = 1000 ;
@@ -1430 +1427 @@
         uInt high = min( nrowb, nrow-iblock*nrowb ) ;
 
-        if ( tcol( high-1 ) * factor < t ) {
+        if ( tcol( high-1 ) < t ) {
           idx = iblock * nrowb ;
           continue ;
         }
 
-        RefRows refrows( iblock*nrowb, iblock*nrowb+high, 1 ) ;
-        Vector<Double> tarr = tcol.getColumnCells( refrows ) ;
-        if ( tUnit == "d" )
-          tarr *= factor ;
+        Slice slice( iblock*nrowb, nrowb ) ;
+        Vector<Double> tarr = tcol( slice ) ;
 
         uInt bidx = binarySearch( tarr, t ) ;
@@ -1447 +1442 @@
     }
     else {
-      Vector<Double> tarr = tcol.getColumn() ;
-      if ( tUnit == "d" )
-        tarr *= factor ;
-      idx = binarySearch( tarr, t ) ;
+      idx = binarySearch( tcol, t ) ;
     }
   }
@@ -1459 +1451 @@
   //time0 = gettimeofday_sec() ;
   //os_ << "start getDirection 2nd stage startSec=" << time0 << LogIO::POST ;
-  while( tcol( idx ) * factor > t && idx > 0 )
+  //while( tcol( idx ) * factor > t && idx > 0 )
+  while( tcol[idx] > t && idx > 0 )
     idx-- ;
   //os_ << "idx = " << idx << LogIO::POST ;
@@ -1465 +1458 @@
   // index search
   for ( uInt i = idx ; i < nrow ; i++ ) {
-    //Double tref = tcol( i ).get( "s" ).getValue() ;
-    Double tref = tcol( i ) * factor ;
+    Double tref = tcol[i] ;
     if ( tref == t ) {
       idx = i ;
@@ -1496 +1488 @@
   //os_ << "ip = " << ip << LogIO::POST ;
   //ref = dmcol(idx)(ip).getRefString() ;
-  trec = dcol.keywordSet() ;
+  TableRecord trec = dcol.keywordSet() ;
   Record rec = trec.asRecord( "MEASINFO" ) ;
   ref = rec.asString( "Ref" ) ;
@@ -1503 +1495 @@
     //os_ << "do interpolation" << LogIO::POST ;
     //os_ << "dcol(idx).shape() = " << dcol(idx).shape() << LogIO::POST ;
-//     Double tref0 = tcol(idx).get("s").getValue() ;
-//     Double tref1 = tcol(idx+1).get("s").getValue() ;
-    Double tref0 = tcol(idx) * factor ;
-    Double tref1 = tcol(idx+1) * factor ;
+    Double tref0 = tcol[idx] ;
+    Double tref1 = tcol[idx+1] ;
     Matrix<Double> mdir0 = dcol( idx ) ;
     Matrix<Double> mdir1 = dcol( idx+1 ) ;
@@ -1687 +1677 @@
                              Vector<Double> &azel,
                              Vector<Double> &srate,
-                             ROScalarColumn<Double> &ptcol,
+                             Vector<Double> &ptcol,
                              ROArrayColumn<Double> &pdcol,
                              MEpoch &t,
@@ -1732 +1722 @@
   //double startSec = gettimeofday_sec() ;
   //os_ << "start MSFiller::getSourceDirection() startSec=" << startSec << LogIO::POST ; 
-  Vector<Double> defaultScanrate( 2, 0.0 ) ;
   Vector<Double> defaultDir = srcdir[0].getAngle( "rad" ).getValue() ;
   if ( srcdir.nelements() > 1 ) 
-    defaultScanrate = srcdir[1].getAngle( "rad" ).getValue() ;
+    srate = srcdir[1].getAngle( "rad" ).getValue() ;
   String ref = srcdir[0].getRefString() ;
   MDirection::Types dirType ;
@@ -1746 +1735 @@
   else 
     dir = defaultDir ;
-  if ( ref != "AZELGEO" ) {
-    MDirection::Convert toazel( dirType, MDirection::Ref( MDirection::AZELGEO, mf ) ) ;
-    azel = toazel( defaultDir ).getAngle("rad").getValue() ;
-  }
-  else 
-    azel = defaultDir ;
-  srate = defaultScanrate ;
+  MDirection::Convert toazel( dirType, MDirection::Ref( MDirection::AZELGEO, mf ) ) ;
+  azel = toazel( defaultDir ).getAngle("rad").getValue() ;
   //double endSec = gettimeofday_sec() ;
   //os_ << "end MSFiller::getSourceDirection() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;

trunk/src/MSFiller.h

@@ -30 +30 @@
 #include <casa/Containers/Record.h>
 #include <casa/Containers/Block.h>
-
-//#include <tables/Tables/TableColumn.h>
 
 #include <ms/MeasurementSets/MeasurementSet.h>
@@ -94 +92 @@
                            casa::Vector<casa::Double> &srate, 
                            casa::String &ref, 
-                           casa::ROScalarColumn<casa::Double> &ptcol, 
+                           casa::Vector<casa::Double> &ptcol, 
                            casa::ROArrayColumn<casa::Double> &pdcol, 
                            casa::Double t ) ;
@@ -101 +99 @@
                            casa::Vector<casa::Double> &azel, 
                            casa::Vector<casa::Double> &srate, 
-                           casa::ROScalarColumn<casa::Double> &ptcol, 
+                           casa::Vector<casa::Double> &ptcol, 
                            casa::ROArrayColumn<casa::Double> &pdcol,
                            casa::MEpoch &t, casa::MPosition &antpos ) ;