Changeset 2004 for trunk

Timestamp:

02/22/11 20:24:33 (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...

The MSFiller is called instead of PKSFiller when input data is MS.
I have tested all task regressions as well as sdsave unit test and passed.

A few modification was needed for STMath::dototalpower() and
STWriter::write().

Location:

trunk

Files:

• python/scantable.py (modified) (4 diffs)
• src/MSFiller.cpp (modified) (54 diffs)
• src/MSFiller.h (modified) (1 diff)
• src/STMath.cpp (modified) (1 diff)
• src/STWriter.cpp (modified) (2 diffs)

trunk/python/scantable.py

@@ -10 +10 @@
 from asap.env import is_casapy
 from asap._asap import Scantable
-from asap._asap import filler
+from asap._asap import filler, msfiller
 from asap.parameters import rcParams
 from asap.logging import asaplog, asaplog_post_dec
@@ -232 +232 @@
         if format2 == 'ASAP':
             self._save(name)
+##         elif format2 == 'MS2':
+##             msopt = {'ms': {'overwrite': overwrite } }
+##             from asap._asap import mswriter
+##             writer = mswriter( self )
+##             writer.write( name, msopt ) 
         else:
             from asap._asap import stwriter as stw
@@ -2687 +2692 @@
     def _check_ifs(self):
         #nchans = [self.nchan(i) for i in range(self.nif(-1))]
-        #nchans = filter(lambda t: t > 0, nchans)
         nchans = [self.nchan(i) for i in self.getifnos()]
+        nchans = filter(lambda t: t > 0, nchans)
         return (sum(nchans)/len(nchans) == nchans[0])
 
@@ -2708 +2713 @@
         for name in fullnames:
             tbl = Scantable(stype)
-            r = filler(tbl)
-            rx = rcParams['scantable.reference']
-            r.setreferenceexpr(rx)
+            if is_ms( name ):
+                r = msfiller( tbl )
+            else:
+                r = filler( tbl )
+                rx = rcParams['scantable.reference']
+                r.setreferenceexpr(rx)
+            #r = filler(tbl)
+            #rx = rcParams['scantable.reference']
+            #r.setreferenceexpr(rx)
             msg = "Importing %s..." % (name)
             asaplog.push(msg, False)

trunk/src/MSFiller.cpp

@@ -94 +94 @@
 {
   os_.origin( LogOrigin( "MSFiller", "open()", WHERE ) ) ;
-  double startSec = gettimeofday_sec() ;
-  os_ << "start MSFiller::open() startsec=" << startSec << LogIO::POST ;
+//   double startSec = gettimeofday_sec() ;
+//   os_ << "start MSFiller::open() startsec=" << startSec << LogIO::POST ;
   //os_ << "   filename = " << filename << endl ;
 
@@ -137 +137 @@
   isData_ = mstable_.tableDesc().isColumn( "DATA" ) ;
 
-  double endSec = gettimeofday_sec() ;
-  os_ << "end MSFiller::open() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
+//   double endSec = gettimeofday_sec() ;
+//   os_ << "end MSFiller::open() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
   return true ;
 }
@@ -145 +145 @@
 {
   os_.origin( LogOrigin( "MSFiller", "fill()", WHERE ) ) ;
-  double startSec = gettimeofday_sec() ;
-  os_ << "start MSFiller::fill() startSec=" << startSec << LogIO::POST ;
-
-  double time0 = gettimeofday_sec() ;
-  os_ << "start init fill: " << time0 << LogIO::POST ;
+//   double startSec = gettimeofday_sec() ;
+//   os_ << "start MSFiller::fill() startSec=" << startSec << LogIO::POST ;
+
+//   double time0 = gettimeofday_sec() ;
+//   os_ << "start init fill: " << time0 << LogIO::POST ;
 
   // Initialize header
@@ -175 +175 @@
   const TableRecord msrec = mstable_.keywordSet() ;
   isDoppler_ = msrec.isDefined( "DOPPLER" ) ;
+  if ( isDoppler_ )
+    if ( mstable_.doppler().nrow() == 0 ) 
+      isDoppler_ = False ;
   isFlagCmd_ = msrec.isDefined( "FLAG_CMD" ) ;
+  if ( isFlagCmd_ )
+    if ( mstable_.flagCmd().nrow() == 0 ) 
+      isFlagCmd_ = False ;
   isFreqOffset_ = msrec.isDefined( "FREQ_OFFSET" ) ;
+  if ( isFreqOffset_ )
+    if ( mstable_.freqOffset().nrow() == 0 ) 
+      isFreqOffset_ = False ;
   isHistory_ = msrec.isDefined( "HISTORY" ) ;
+  if ( isHistory_ )
+    if ( mstable_.history().nrow() == 0 ) 
+      isHistory_ = False ;
   isProcessor_ = msrec.isDefined( "PROCESSOR" ) ;
+  if ( isProcessor_ )
+    if ( mstable_.processor().nrow() == 0 ) 
+      isProcessor_ = False ;
   isSysCal_ = msrec.isDefined( "SYSCAL" ) ;
+  if ( isSysCal_ )
+    if ( mstable_.sysCal().nrow() == 0 ) 
+      isSysCal_ = False ;
   isWeather_ = msrec.isDefined( "WEATHER" ) ;
-  
+  if ( isWeather_ )
+    if ( mstable_.weather().nrow() == 0 ) 
+      isWeather_ = False ;
+
   // Access to MS subtables
   MSField fieldtab = mstable_.field() ;
@@ -198 +219 @@
       colTsys_ = "TSYS" ;
   }
-  //colTcal_ = "TCAL" ;
-  //colTsys_ = "TSYS" ;
+//   colTcal_ = "TCAL" ;
+//   colTsys_ = "TSYS" ;
   MSPointing pointtab = mstable_.pointing() ;
   if ( mstable_.weather().nrow() == 0 ) 
@@ -216 +237 @@
 
   // SUBTABLES: WEATHER
-  if ( isWeather_ )
-    fillWeather() ;
+  fillWeather() ;
 
   // SUBTABLES: FOCUS
@@ -223 +243 @@
 
   // SUBTABLES: TCAL
-  if ( isSysCal_ )
-    fillTcal( tpoolr ) ;
+  fillTcal( tpoolr ) ;
 
   // SUBTABLES: FIT
@@ -257 +276 @@
   String telescopeName = "" ;
 
-  double time1 = gettimeofday_sec() ;
-  os_ << "end fill init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+  //double time1 = gettimeofday_sec() ;
+  //os_ << "end fill init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
 
   // row based 
@@ -297 +316 @@
   TableIterator iter0( mstable_, "OBSERVATION_ID" ) ;
   while( !iter0.pastEnd() ) {
-    time0 = gettimeofday_sec() ;
-    os_ << "start 0th iteration: " << time0 << LogIO::POST ;
+    //time0 = gettimeofday_sec() ;
+    //os_ << "start 0th iteration: " << time0 << LogIO::POST ;
     Table t0 = iter0.table() ;
     tcolr = tpoolr->construct( t0, "OBSERVATION_ID" ) ;
@@ -325 +344 @@
     }
     Int nbeam = 0 ;
-    time1 = gettimeofday_sec() ;
-    os_ << "end 0th iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+    //time1 = gettimeofday_sec() ;
+    //os_ << "end 0th iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
     //
     // ITERATION: FEED1
@@ -332 +351 @@
     TableIterator iter1( t0, "FEED1" ) ;
     while( !iter1.pastEnd() ) {
-      time0 = gettimeofday_sec() ;
-      os_ << "start 1st iteration: " << time0 << LogIO::POST ;
+      //time0 = gettimeofday_sec() ;
+      //os_ << "start 1st iteration: " << time0 << LogIO::POST ;
       Table t1 = iter1.table() ;
       // assume FEED1 == FEED2
@@ -349 +368 @@
       *uintRF = 0 ;
 
-      time1 = gettimeofday_sec() ;
-      os_ << "end 1st iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+      //time1 = gettimeofday_sec() ;
+      //os_ << "end 1st iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
       // 
       // ITERATION: FIELD_ID 
@@ -356 +375 @@
       TableIterator iter2( t1, "FIELD_ID" ) ;
       while( !iter2.pastEnd() ) {
-        time0 = gettimeofday_sec() ;
-        os_ << "start 2nd iteration: " << time0 << LogIO::POST ;
+        //time0 = gettimeofday_sec() ;
+        //os_ << "start 2nd iteration: " << time0 << LogIO::POST ;
         Table t2 = iter2.table() ;
         tcolr = tpoolr->construct( t2, "FIELD_ID" ) ;
@@ -368 +387 @@
         String fieldName = tcolr->asString( fieldId ) + "__" + String::toString(fieldId) ;
         tpoolr->destroy( tcolr ) ;
+        ROArrayMeasColumn<MDirection> *delayDirCol = new ROArrayMeasColumn<MDirection>( fieldtab, "DELAY_DIR" ) ;
+        Vector<MDirection> delayDir = (*delayDirCol)( fieldId ) ;
+        delete delayDirCol ;
+        Vector<Double> defaultScanrate( 2, 0.0 ) ;
+        Vector<Double> defaultDir = delayDir[0].getAngle( "rad" ).getValue() ;
+        if ( delayDir.nelements() > 1 ) 
+          defaultScanrate = delayDir[1].getAngle( "rad" ).getValue() ;
+          
 
         // FIELDNAME
@@ -374 +401 @@
 
 
-        time1 = gettimeofday_sec() ;
-        os_ << "end 2nd iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+        //time1 = gettimeofday_sec() ;
+        //os_ << "end 2nd iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
         // 
         // ITERATION: DATA_DESC_ID
@@ -381 +408 @@
         TableIterator iter3( t2, "DATA_DESC_ID" ) ;
         while( !iter3.pastEnd() ) {
-          time0 = gettimeofday_sec() ;
-          os_ << "start 3rd iteration: " << time0 << LogIO::POST ;
+          //time0 = gettimeofday_sec() ;
+          //os_ << "start 3rd iteration: " << time0 << LogIO::POST ;
           Table t3 = iter3.table() ;
           tcolr = tpoolr->construct( t3, "DATA_DESC_ID" ) ;
@@ -393 +420 @@
           Int spwId = tcolr->asInt( ddId ) ;
           tpoolr->destroy( tcolr ) ;
+          // TODO: This must be updated if writer will be replaced from STWriter to MSWriter
+          sdh.nif = max( sdh.nif, spwId ) ;
 
           // IFNO
@@ -410 +439 @@
           if ( sdh.poltype == "" ) sdh.poltype = getPolType( corrtype[0] ) ;
           // source information
-          MSSource srctabSel( srctab( srctab.col("SOURCE_ID") == srcId && srctab.col("SPECTRAL_WINDOW_ID") == spwId ) ) ;
-          os_ << "srcId = " << srcId << " spwId = " << spwId << " nrow = " << srctabSel.nrow() << LogIO::POST ; 
+          //os_ << "srcId = " << srcId << ", spwId = " << spwId << LogIO::POST ;
+          MSSource srctabSel = srctab( srctab.col("SOURCE_ID") == srcId && srctab.col("SPECTRAL_WINDOW_ID") == spwId ) ;
+          if ( srctabSel.nrow() == 0 ) {
+            srctabSel = srctab( srctab.col("SOURCE_ID") == srcId && srctab.col("SPECTRAL_WINDOW_ID") == -1 ) ;
+          }
           tcolr = tpoolr->construct( srctabSel, "NAME" ) ;
           String srcName = tcolr->asString( 0 ) ;
@@ -479 +511 @@
             //os_ << "restFreqs = " << restFreqs << LogIO::POST ;
             if ( srctabSel.tableDesc().isColumn( "TRANSITION" ) ) {
-              tcolr = tpoolr->construct( srctabSel, "TRANSITION" ) ;
-              transitionName = tcolr->asString( 0 ) ;
-              tpoolr->destroy( tcolr ) ;
-              //os_ << "transitionNameCol.nrow() = " << transitionNameCol.nrow() << LogIO::POST ;
+              ROArrayColumn<String> transitionCol( srctabSel, "TRANSITION" ) ;
+              if ( transitionCol.isDefined( 0 ) )
+                transitionName = transitionCol( 0 ) ;
+              //os_ << "transitionNameCol.nrow() = " << transitionCol.nrow() << LogIO::POST ;
             }
           }
@@ -567 +599 @@
 
           // for TSYS and TCAL
-          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" ) ;
-          Vector<MEpoch> scTime( caltabsel.nrow() ) ;
-          for ( uInt irow = 0 ; irow < caltabsel.nrow() ; irow++ ) 
-            scTime[irow] = scTimeCol( irow ) ;
-          ROScalarColumn<Double> *scIntervalCol = new ROScalarColumn<Double>( caltabsel, "INTERVAL" ) ;
-          Vector<Double> scInterval = scIntervalCol->getColumn() ;
-          delete scIntervalCol ;
-          ROArrayColumn<Float> scTsysCol( caltabsel, "TSYS" ) ;
-          time1 = gettimeofday_sec() ;
-          os_ << "end 3rd iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+          Vector<MEpoch> scTime ;
+          Vector<Double> scInterval ;
+          ROArrayColumn<Float> scTsysCol ;
+          MSSysCal caltabsel ;
+          if ( isSysCal_ ) {
+            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" ) ;
+            scTime.resize( caltabsel.nrow() ) ;
+            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 ;
+            scTsysCol.attach( caltabsel, colTsys_ ) ;
+          }
+          //time1 = gettimeofday_sec() ;
+          //os_ << "end 3rd iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
           //
           // ITERATION: SCAN_NUMBER
@@ -583 +621 @@
           TableIterator iter4( t3, "SCAN_NUMBER" ) ;
           while( !iter4.pastEnd() ) {
-            time0 = gettimeofday_sec() ;
-            os_ << "start 4th iteration: " << time0 << LogIO::POST ;
+            //time0 = gettimeofday_sec() ;
+            //os_ << "start 4th iteration: " << time0 << LogIO::POST ;
             Table t4 = iter4.table() ;
             tcolr = tpoolr->construct( t4, "SCAN_NUMBER" ) ;
@@ -594 +632 @@
             *uintRF = scanNum - 1 ;
 
-            uInt cycle = 0 ;
-            time1 = gettimeofday_sec() ;
-            os_ << "end 4th iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+            //time1 = gettimeofday_sec() ;
+            //os_ << "end 4th iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
             // 
             // ITERATION: STATE_ID
@@ -602 +639 @@
             TableIterator iter5( t4, "STATE_ID" ) ; 
             while( !iter5.pastEnd() ) {
-              time0 = gettimeofday_sec() ;
-              os_ << "start 5th iteration: " << time0 << LogIO::POST ;
+              //time0 = gettimeofday_sec() ;
+              //os_ << "start 5th iteration: " << time0 << LogIO::POST ;
               Table t5 = iter5.table() ;
               tcolr = tpoolr->construct( t5, "STATE_ID" ) ;
@@ -614 +651 @@
 
               Int nrow = t5.nrow() ;
-              time1 = gettimeofday_sec() ;
-              os_ << "end 5th iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+              //time1 = gettimeofday_sec() ;
+              //os_ << "end 5th iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+
+              uInt cycle = 0 ;
 
               Cube<Float> spArr ;
@@ -632 +671 @@
               else if ( isData_ ) {
                 spArr.resize( npol, nchan, nrow ) ;
+                flArr.resize( npol, nchan, nrow ) ;
                 ROArrayColumn<Bool> mFlagCol( t5, "FLAG" ) ;
                 ROArrayColumn<Complex> mDataCol( t5, "DATA" ) ;
@@ -638 +678 @@
                   Matrix<Complex> sp = mDataCol( irow ) ;
                   Matrix<Bool> fl = mFlagCol( irow ) ;
+                  Matrix<Float> spxy = spArr.xyPlane( irow ) ;
+                  Matrix<Bool> flxy = flArr.xyPlane( irow ) ;
                   for ( Int ipol = 0 ; ipol < npol ; ipol++ ) {
                     if ( corrtype[ipol] == Stokes::XY || corrtype[ipol] == Stokes::YX 
                          || corrtype[ipol] == Stokes::RL || corrtype[ipol] == Stokes::LR ) {
                       if ( !crossOK ) {
-                        spArr( Slicer(Slice(ipol,1),Slice(0,nchan),Slice(irow,1)) ) = real( sp.row( ipol ) ) ;
-                        flArr( Slicer(Slice(ipol,1),Slice(0,nchan),Slice(irow,1)) ) = fl.row( ipol ) ;
+                        spxy.row( ipol ) = real( sp.row( ipol ) ) ;
+                        flxy.row( ipol ) = fl.row( ipol ) ;
                         if ( corrtype[ipol] == Stokes::XY || corrtype[ipol] == Stokes::RL ) {
-                          spArr( Slicer(Slice(ipol+1,1),Slice(0,nchan),Slice(irow,1)) ) = imag( sp.row( ipol ) ) ;
-                          flArr( Slicer(Slice(ipol+1,1),Slice(0,nchan),Slice(irow,1)) ) = fl.row( ipol ) ;
+                          spxy.row( ipol+1 ) = imag( sp.row( ipol ) ) ;
+                          flxy.row( ipol+1 ) = fl.row( ipol ) ;
                         }                        
                         else {
-                          spArr( Slicer(Slice(ipol+1,1),Slice(0,nchan),Slice(irow,1)) ) = imag( conj( sp.row( ipol ) ) ) ;
-                          flArr( Slicer(Slice(ipol+1,1),Slice(0,nchan),Slice(irow,1)) ) = fl.row( ipol ) ;
+                          spxy.row( ipol+1 ) = imag( conj( sp.row( ipol ) ) ) ;
+                          flxy.row( ipol+1 ) = fl.row( ipol ) ;
                         }
+                        crossOK = True ;
                       }
                     }
                     else {
-                      spArr( Slicer(Slice(ipol,1),Slice(0,nchan),Slice(irow,1)) ) = real( sp.row( ipol ) ) ; 
-                      flArr( Slicer(Slice(ipol,1),Slice(0,nchan),Slice(irow,1)) ) = fl.row( ipol ) ; 
+                      spxy.row( ipol ) = real( sp.row( ipol ) ) ;
+                      flxy.row( ipol ) = fl.row( ipol ) ;
                     }
                   }
@@ -672 +715 @@
               ROTableColumn *mIntervalCol = tpoolr->construct( t5, "INTERVAL" ) ;
               ROTableColumn *mFlagRowCol = tpoolr->construct( t5, "FLAG_ROW" ) ;
-              //Vector<Double> sysCalTime( nrow, -1.0 ) ;
               Block<Double> sysCalTime( nrow, -1.0 ) ;
               Block<Int> sysCalIdx( nrow, -1 ) ;
               if ( isSysCal_ ) {
-                //getSysCalTime( caltabsel, mTimeB, sysCalTime, sysCalIdx ) ;
                 getSysCalTime( scTime, scInterval, mTimeB, sysCalTime, sysCalIdx ) ;
               }
               delete mTimeCol ;
               Matrix<Float> defaulttsys( npol, 1, 1.0 ) ;
-              //uInt calidx = 0 ;
               Int srcType = getSrcType( stateId, tpoolr ) ;
-              Vector<Double> defaultScanrate( 2, 0.0 ) ;
               uInt diridx = 0 ;
               MDirection::Types dirType ;
@@ -720 +759 @@
 
                 // SPECTRA, FLAG
-                //Matrix<Float> sp = mFloatDataCol( irow ) ;
-                //Matrix<Bool> flb = mFlagCol( irow ) ;
                 Matrix<Float> sp = spArr.xyPlane( irow ) ;
                 Matrix<Bool> flb = flArr.xyPlane( irow ) ;
@@ -728 +765 @@
 
                 // TIME
-                *timeRF = mTimeB[irow].get("s").getValue() ;
+                *timeRF = mTimeB[irow].get("d").getValue() ;
 
                 // INTERVAL
@@ -735 +772 @@
                 // TSYS
                 Matrix<Float> tsys ;
-                //calidx = getTsys( calidx, tsys, caltabsel, sysCalTime[irow] ) ;
-//                 calidx = getTsys( calidx, tsys, scTsysCol, scTime, sysCalTime[irow] ) ;
-//                 if ( tsys.nelements() == 0 ) 
-//                   tsys = defaulttsys ;
                 if ( sysCalIdx[irow] != -1 )
                   tsys = scTsysCol( irow ) ;
@@ -745 +778 @@
 
                 // TCAL_ID
-                Block<uInt> tcalids = getTcalId( feedId, spwId, sysCalTime[irow] ) ;
-                if ( tcalids.size() == 0 ) {
-                  tcalids.resize( npol ) ;
-                  tcalids = 0 ;
+                Block<uInt> tcalids( npol, 0 ) ;
+                if ( sysCalIdx[irow] != -1 ) {
+                  tcalids = getTcalId( feedId, spwId, scTime[sysCalIdx[irow]] ) ;
                 }
 
@@ -798 +830 @@
                 else {
                   String ref = md.getRefString() ;
-                  Vector<Double> defaultDir = srcDir ;
+                  //Vector<Double> defaultDir = srcDir ;
                   MDirection::getType( dirType, "J2000" ) ;
                   if ( ref != "J2000" ) {
@@ -829 +861 @@
                   row.put( stab.nrow()-1 ) ;
                 }
+
+                cycle++ ;
               }
-              //delete mTimeCol ;
               tpoolr->destroy( mIntervalCol ) ;
               tpoolr->destroy( mFlagRowCol ) ;
 
-              time1 = gettimeofday_sec() ;
-              os_ << "end 5th iteration: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+              //time1 = gettimeofday_sec() ;
+              //os_ << "end 5th iteration: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
 
               iter5.next() ;
@@ -865 +898 @@
 
   // Table Keywords
-  sdh.nif = ifmap.size() ;
+  // TODO: This must be updated if writer will be replaced from STWriter to MSWriter
+//   sdh.nif = ifmap.size() ;
+  sdh.nif++ ;
   if ( ( telescopeName == "" ) || ( antennaName == telescopeName ) ) {
     sdh.antennaname = antennaName ;
@@ -910 +945 @@
     stab.rwKeywordSet().define( "GBT_GO", goTabName ) ;
   }
-  double endSec = gettimeofday_sec() ;
-  os_ << "end MSFiller::fill() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
+//   double endSec = gettimeofday_sec() ;
+//   os_ << "end MSFiller::fill() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
 }
 
@@ -924 +959 @@
 Int MSFiller::getSrcType( Int stateId, boost::object_pool<ROTableColumn> *tpool ) 
 {
-  double startSec = gettimeofday_sec() ;
-  os_ << "start MSFiller::getSrcType() startSec=" << startSec << LogIO::POST ;
+//   double startSec = gettimeofday_sec() ;
+//   os_ << "start MSFiller::getSrcType() startSec=" << startSec << LogIO::POST ;
 
   MSState statetab = mstable_.state() ;
@@ -1031 +1066 @@
     
   //os_ << "srcType = " << srcType << LogIO::POST ;
-  double endSec = gettimeofday_sec() ;
-  os_ << "end MSFiller::getSrcType() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
+//   double endSec = gettimeofday_sec() ;
+//   os_ << "end MSFiller::getSrcType() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
   return srcType ;
 }
@@ -1039 +1074 @@
 Block<uInt> MSFiller::getPolNo( Int corrType ) 
 {
-  double startSec = gettimeofday_sec() ;
-  os_ << "start MSFiller::getPolNo() startSec=" << startSec << LogIO::POST ;
+//   double startSec = gettimeofday_sec() ;
+//   os_ << "start MSFiller::getPolNo() startSec=" << startSec << LogIO::POST ;
   Block<uInt> polno( 1 ) ;
 
@@ -1070 +1105 @@
   }
   //os_ << "polno = " << polno << LogIO::POST ;
-  double endSec = gettimeofday_sec() ;
-  os_ << "end MSFiller::getPolNo() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
+//   double endSec = gettimeofday_sec() ;
+//   os_ << "end MSFiller::getPolNo() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
   
   return polno ;
@@ -1078 +1113 @@
 String MSFiller::getPolType( Int corrType ) 
 {
-  double startSec = gettimeofday_sec() ;
-  os_ << "start MSFiller::getPolType() startSec=" << startSec << LogIO::POST ;
+//   double startSec = gettimeofday_sec() ;
+//   os_ << "start MSFiller::getPolType() startSec=" << startSec << LogIO::POST ;
   String poltype = "" ;
 
@@ -1091 +1126 @@
     poltype = "linpol" ;
 
-  double endSec = gettimeofday_sec() ;
-  os_ << "end MSFiller::getPolType() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
+//   double endSec = gettimeofday_sec() ;
+//   os_ << "end MSFiller::getPolType() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
   return poltype ;
 }
@@ -1098 +1133 @@
 void MSFiller::fillWeather()
 {
-  double startSec = gettimeofday_sec() ;
-  os_ << "start MSFiller::fillWeather() startSec=" << startSec << LogIO::POST ;
+//   double startSec = gettimeofday_sec() ;
+//   os_ << "start MSFiller::fillWeather() startSec=" << startSec << LogIO::POST ;
+
+  if ( !isWeather_ ) {
+    // add dummy row
+    table_->weather().table().addRow(1,True) ;
+    return ;
+  }
+
   Table mWeather = mstable_.weather()  ;
   //Table mWeatherSel = mWeather( mWeather.col("ANTENNA_ID") == antenna_ ).sort("TIME") ;
@@ -1174 +1216 @@
     mwInterval_ *= 86400.0 ; 
   //os_ << "mwTime[0] = " << mwTime_[0] << " mwInterval[0] = " << mwInterval_[0] << LogIO::POST ; 
-  double endSec = gettimeofday_sec() ;
-  os_ << "end MSFiller::fillWeather() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
+//   double endSec = gettimeofday_sec() ;
+//   os_ << "end MSFiller::fillWeather() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
 }
 
 void MSFiller::fillFocus()
 {
-  double startSec = gettimeofday_sec() ;
-  os_ << "start MSFiller::fillFocus() startSec=" << startSec << LogIO::POST ;
+//   double startSec = gettimeofday_sec() ;
+//   os_ << "start MSFiller::fillFocus() startSec=" << startSec << LogIO::POST ;
   // tentative
   Table tab = table_->focus().table() ;
@@ -1187 +1229 @@
   ScalarColumn<uInt> idCol( tab, "ID" ) ;
   idCol.put( 0, 0 ) ;
-  double endSec = gettimeofday_sec() ;
-  os_ << "end MSFiller::fillFocus() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
+//   double endSec = gettimeofday_sec() ;
+//   os_ << "end MSFiller::fillFocus() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
 }
 
 void MSFiller::fillTcal( boost::object_pool<ROTableColumn> *tpoolr )
 {
-  double startSec = gettimeofday_sec() ;
-  os_ << "start MSFiller::fillTcal() startSec=" << startSec << LogIO::POST ;
+//   double startSec = gettimeofday_sec() ;
+//   os_ << "start MSFiller::fillTcal() startSec=" << startSec << LogIO::POST ;
+
+  if ( !isSysCal_ ) {
+    // add dummy row
+    os_ << "No SysCal rows" << LogIO::POST ;
+    table_->tcal().table().addRow(1,True) ;
+    return ;
+  }
 
   Table sctab = mstable_.sysCal() ;
@@ -1264 +1313 @@
 
   //tcalrec_.print( std::cout ) ;
-  double endSec = gettimeofday_sec() ;
-  os_ << "end MSFiller::fillTcal() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
+//   double endSec = gettimeofday_sec() ;
+//   os_ << "end MSFiller::fillTcal() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
 }
 
 uInt MSFiller::getWeatherId( uInt idx, Double wtime ) 
 {
-  double startSec = gettimeofday_sec() ;
-  os_ << "start MSFiller::getWeatherId() startSec=" << startSec << LogIO::POST ;
+//   double startSec = gettimeofday_sec() ;
+//   os_ << "start MSFiller::getWeatherId() startSec=" << startSec << LogIO::POST ;
   uInt nrow = mwTime_.size() ;
   if ( nrow == 0 ) 
@@ -1300 +1349 @@
   //os_ << LogIO::WARN << "Couldn't find correct WEATHER_ID for time " << wtime << LogIO::POST ;
 
-  double endSec = gettimeofday_sec() ;
-  os_ << "end MSFiller::getWeatherId() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
+//   double endSec = gettimeofday_sec() ;
+//   os_ << "end MSFiller::getWeatherId() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
   return wid ;
 }
@@ -1307 +1356 @@
 void MSFiller::getSysCalTime( Vector<MEpoch> &scTime, Vector<Double> &scInterval, Block<MEpoch> &tcol, Block<Double> &tstr, Block<Int> &tidx )
 {
-  double startSec = gettimeofday_sec() ;
-  os_ << "start MSFiller::getSysCalTime() startSec=" << startSec << LogIO::POST ;
+//   double startSec = gettimeofday_sec() ;
+//   os_ << "start MSFiller::getSysCalTime() startSec=" << startSec << LogIO::POST ;
+
+  if ( !isSysCal_ )
+    return ;
+
   uInt nrow = tstr.nelements() ;
   if ( scTime.nelements() == 0 ) 
@@ -1321 +1374 @@
   for ( uInt i = 0 ; i < nrow ; i++ ) {
     Double t = tcol[i].get( "s" ).getValue() ;
-    os_ << "getSysCalTime()  irow = " << i << " idx = " << idx << LogIO::POST ;
     for ( uInt j = idx ; j < scnrow-1 ; j++ ) {
       Double tsc1 = scTime[j].get( "s" ).getValue() ;
@@ -1343 +1395 @@
     }
   }
-  double endSec = gettimeofday_sec() ;
-  os_ << "end MSFiller::getSysCalTime() endSec=" << endSec << " (" << endSec-startSec << "sec) scnrow = " << scnrow << " tcol.nelements = " << tcol.nelements() << LogIO::POST ;
+//   double endSec = gettimeofday_sec() ;
+//   os_ << "end MSFiller::getSysCalTime() endSec=" << endSec << " (" << endSec-startSec << "sec) scnrow = " << scnrow << " tcol.nelements = " << tcol.nelements() << LogIO::POST ;
   return ;
 }
 
-// uInt MSFiller::getTsys( uInt idx, Matrix<Float> &tsys, ROArrayColumn<Float> &mTsysCol, Block<MEpoch> &scTimeCol, Double t )
-// {
+Block<uInt> MSFiller::getTcalId( Int fid, Int spwid, MEpoch &t ) 
+{
 //   double startSec = gettimeofday_sec() ;
-//   os_ << "start MSFiller::getTsys() startSec=" << startSec << LogIO::POST ;
-//   uInt nrow = mTsysCol.nrow() ; 
-//   if ( nrow == 0 ) {
-//     os_ << "No SysCal rows" << LogIO::POST ;
-//     tsys.resize( IPosition(0) ) ;
-//     return 0 ;
-//   }
-//   for ( uInt i = idx ; i < nrow ; i++ ) {
-//     Double tref = scTimeCol[i].get("s").getValue() ;
-//     if ( t == tref ) {
-//       tsys.reference( mTsysCol( i ) ) ;
-//       idx = i ;
-//       break ;
-//     }
-//   }
-//   //os_ << "MSFiller::getTsys() idx = " << idx << " tsys = " << tsys << LogIO::POST ;
-//   double endSec = gettimeofday_sec() ;
-//   os_ << "end MSFiller::getTsys() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
-//   return idx ;
-// }
-
-Block<uInt> MSFiller::getTcalId( Int fid, Int spwid, Double t ) 
-{
-  double startSec = gettimeofday_sec() ;
-  os_ << "start MSFiller::getTcalId() startSec=" << startSec << LogIO::POST ;
-  if ( table_->tcal().table().nrow() == 0 ) {
+//   os_ << "start MSFiller::getTcalId() startSec=" << startSec << LogIO::POST ;
+  //if ( table_->tcal().table().nrow() == 0 ) {
+  if ( !isSysCal_ ) {
     os_ << "No TCAL rows" << LogIO::POST ;
     Block<uInt> tcalids( 0 ) ;
     return  tcalids ;
   }    
-  String sctime = MVTime( Quantum<Double>(t,"s") ).string(MVTime::YMD) ;
+  //String sctime = MVTime( Quantum<Double>(t,"s") ).string(MVTime::YMD) ;
+  String sctime = MVTime( t.getValue() ).string(MVTime::YMD) ;
   String key = keyTcal( fid, spwid, sctime ) ;
   if ( !tcalrec_.isDefined( key ) ) {
@@ -1396 +1426 @@
     tcalids[ipol] = ids[0] + ipol - 1 ;
 
-  double endSec = gettimeofday_sec() ;
-  os_ << "end MSFiller::getTcalId() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
+//   double endSec = gettimeofday_sec() ;
+//   os_ << "end MSFiller::getTcalId() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
   return tcalids ;
 }
@@ -1403 +1433 @@
 uInt MSFiller::getDirection( uInt idx, Vector<Double> &dir, Vector<Double> &srate, String &ref, MSPointing &tab, Double t ) 
 {
-  double startSec = gettimeofday_sec() ;
-  os_ << "start MSFiller::getDirection() startSec=" << startSec << LogIO::POST ;
+//   double startSec = gettimeofday_sec() ;
+//   os_ << "start MSFiller::getDirection() startSec=" << startSec << LogIO::POST ;
   // assume that cols is sorted by TIME
   Bool doInterp = False ;
@@ -1417 +1447 @@
   if ( idx == 0 ) {
     uInt nrowb = 75000 ;
-    if ( nrow > nblock ) {
+    if ( nrow > nrowb ) {
       uInt nblock = nrow / nrowb + 1 ;
       for ( uInt iblock = 0 ; iblock < nblock ; iblock++ ) {
-        uInt high = min( nblock, nrow-iblock*nblock ) ;
+        uInt high = min( nrowb, nrow-iblock*nrowb ) ;
 
         if ( tcol( high-1 ).get( "s" ).getValue() < t ) {
-          idx = iblock * nblock ;
+          idx = iblock * nrowb ;
           continue ;
         }
@@ -1429 +1459 @@
         Vector<MEpoch> tarr( high ) ;
         for ( uInt irow = 0 ; irow < high ; irow++ ) {
-          tarr[irow] = tcol( iblock*nblock+irow ) ;
+          tarr[irow] = tcol( iblock*nrowb+irow ) ;
         }
 
         uInt bidx = binarySearch( tarr, t ) ;
 
-        idx = iblock * nblock + bidx ;
+        idx = iblock * nrowb + bidx ;
         break ;
       }
@@ -1510 +1540 @@
   }
 
-  double endSec = gettimeofday_sec() ;
-  os_ << "end MSFiller::getDirection() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
+//   double endSec = gettimeofday_sec() ;
+//   os_ << "end MSFiller::getDirection() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
   return idx ;
 }

trunk/src/MSFiller.h

@@ -86 +86 @@
   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
-  // assume that tab is selected by ANTENNA_ID, FEED_ID, SPECTRAL_WINDOW_ID 
-  // and sorted by TIME
-//   casa::uInt getTsys( casa::uInt idx, casa::Matrix<casa::Float> &tsys, casa::ROArrayColumn<casa::Float> &tsysCol, casa::Block<casa::MEpoch> &scTime, casa::Double t ) ;
-
   // get TCAL_ID 
-  casa::Block<casa::uInt> getTcalId( casa::Int feedId, casa::Int spwId, casa::Double t ) ;
+  casa::Block<casa::uInt> getTcalId( casa::Int feedId, casa::Int spwId, casa::MEpoch &t ) ;
 
   // get direction for DIRECTION, AZIMUTH, and ELEVATION columns

trunk/src/STMath.cpp

@@ -1047 +1047 @@
       if ( tcal <= 0.0 ) {
         caloff->tcal().getEntry(tcalt, tcalout, tcalId);
-        if (polno<=3) {
-          tcalUsed = tcalout[polno];
-        }
+//         if (polno<=3) {
+//           tcalUsed = tcalout[polno];
+//         }
+//         else {
+//           tcalUsed = tcalout[0];
+//         }
+        if ( tcalout.size() == 1 )
+          tcalUsed = tcalout[0] ;
+        else if ( tcalout.size() == nchan ) 
+          tcalUsed = mean(tcalout) ;
         else {
-          tcalUsed = tcalout[0];
+          uInt ipol = polno ;
+          if ( ipol > 3 ) ipol = 0 ;
+          tcalUsed = tcalout[ipol] ;
         }
       }

trunk/src/STWriter.cpp

@@ -228 +228 @@
           inst->molecules().getEntry(pksrec.restFreq,stmp0,stmp1,
                                    rec.asuInt("MOLECULE_ID"));
-          inst->tcal().getEntry(pksrec.tcalTime, pksrec.tcal,
-                              rec.asuInt("TCAL_ID"));
+//           inst->tcal().getEntry(pksrec.tcalTime, pksrec.tcal,
+//                               rec.asuInt("TCAL_ID"));
           inst->weather().getEntry(pksrec.temperature, pksrec.pressure,
                                  pksrec.humidity, pksrec.windSpeed,
@@ -240 +240 @@
           // dummy data
           uInt npol = pksrec.spectra.ncolumn();
+
+          // TCAL
+          inst->tcal().getEntry( pksrec.tcalTime, pksrec.tcal,
+                                 rec.asuInt("TCAL_ID") ) ;
+          if ( pksrec.tcal.nelements() == 1 ) {
+            ROScalarColumn<uInt> uintCol( itable, "TCAL_ID" ) ;
+            Vector<uInt> tcalids = uintCol.getColumn() ;
+            pksrec.tcal.resize( npol ) ;
+            Vector<Float> dummyA ;
+            String dummyS ;
+            for ( uInt ipol = 0 ; ipol < npol ; ipol++ ) {
+              inst->tcal().getEntry( dummyS, dummyA, tcalids[ipol] ) ;
+              pksrec.tcal[ipol] = dummyA[0] ;
+            }
+          }
+          else if ( pksrec.tcal.nelements() == nchan ) {
+            ROScalarColumn<uInt> uintCol( itable, "TCAL_ID" ) ;
+            Vector<uInt> tcalids = uintCol.getColumn() ;
+            pksrec.tcal.resize( npol ) ;
+            Vector<Float> dummyA ;
+            String dummyS ;
+            for ( uInt ipol = 0 ; ipol < npol ; ipol++ ) {
+              inst->tcal().getEntry( dummyS, dummyA, tcalids[ipol] ) ;
+              pksrec.tcal[ipol] = mean( dummyA ) ;
+            }
+          }
+          //LogIO os ;
+          //os << "npol = " << npol << " pksrec.tcal = " << pksrec.tcal << LogIO::POST ;
 
           pksrec.mjd       = rec.asDouble("TIME");