Changeset 2240 for branches

Timestamp:

07/22/11 12:26:10 (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...

Merge changes for speed up of MSFiller.
Revisions to be merged are r2217, r2219, r2221-2224, r2226, r2228,
r2231-2232, r2234, and r2237-2239.

Location:

branches/parallel

Files:

• . (modified) (1 prop)
• Makefile (modified) (1 prop)
• SConstruct (modified) (1 prop)
• apps (modified) (1 prop)
• external-alma (modified) (1 prop)
• external-alma/atnf/pks/pks_maths.cc (modified) (1 prop)
• getsvnrev.sh (modified) (1 prop)
• python (modified) (1 prop)
• python/flagtoolbar.py (modified) (1 prop)
• src (modified) (1 prop)
• src/MSFiller.cpp (modified) (51 diffs)
• src/MSFiller.h (modified) (3 diffs)
• src/SConscript (modified) (1 prop)

branches/parallel/src/MSFiller.cpp

@@ -95 +95 @@
 {
   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 ;
 
@@ -147 +147 @@
   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 ;
 }
@@ -155 +155 @@
 {
   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
   STHeader sdh ;  
-  sdh.nchan = 0 ;
-  sdh.npol = 0 ;
-  sdh.nif = 0 ;
-  sdh.nbeam = 0 ;
-  sdh.observer = "" ;
-  sdh.project = "" ;
-  sdh.obstype = "" ;
-  sdh.antennaname = "" ;
-  sdh.antennaposition.resize( 0 ) ;
-  sdh.equinox = 0.0 ;
-  sdh.freqref = "" ;
-  sdh.reffreq = -1.0 ;
-  sdh.bandwidth = 0.0 ;
-  sdh.utc = 0.0 ;
-  sdh.fluxunit = "" ;
-  sdh.epoch = "" ;
-  sdh.poltype = "" ;
+  initHeader( sdh ) ;
  
   // check if optional table exists
@@ -249 +233 @@
 
   // SUBTABLES: FREQUENCIES
-  table_->frequencies().setFrame( "LSRK" ) ;
-  table_->frequencies().setFrame( "LSRK", True ) ;
+  //string freqFrame = getFrame() ;
+  string freqFrame = "LSRK" ;
+  table_->frequencies().setFrame( freqFrame ) ;
+  table_->frequencies().setFrame( freqFrame, True ) ;
 
   // SUBTABLES: WEATHER
@@ -266 +252 @@
   // SUBTABLES: HISTORY
   //fillHistory() ;
-
-  // shared pointers
-  ROTableColumn *tcolr ;
 
   // MAIN 
@@ -278 +261 @@
   MPosition mp( MVPosition( antpos ), MPosition::ITRF ) ;
   if ( getPt_ ) {
-    //pointtab = pointtab( pointtab.col("ANTENNA_ID")==antenna_ ).sort("TIME") ;
     pointtab = MSPointing( pointtab( pointtab.col("ANTENNA_ID")==antenna_ ).sort("TIME") ) ;
   }
-  tcolr = tpoolr->construct( anttab, "STATION" ) ;
-  String stationName = tcolr->asString( antenna_ ) ;
-  tpoolr->destroy( tcolr ) ;
-  tcolr = tpoolr->construct( anttab, "NAME" ) ;
-  String antennaName = tcolr->asString( antenna_ ) ;
-  tpoolr->destroy( tcolr ) ;
+  ROScalarColumn<Double> ptcol( pointtab, "TIME" ) ;
+  ROArrayColumn<Double> pdcol( pointtab, "DIRECTION" ) ; 
+  String stationName = asString( "STATION", antenna_, anttab, tpoolr ) ;
+  String antennaName = asString( "NAME", antenna_, anttab, tpoolr ) ;
   sdh.antennaposition.resize( 3 ) ;
   for ( int i = 0 ; i < 3 ; i++ )
@@ -292 +272 @@
   String telescopeName = "" ;
 
-//   double time1 = gettimeofday_sec() ;
-//   os_ << "end fill init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+  //double time1 = gettimeofday_sec() ;
+  //os_ << "end init fill: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
 
   // row based 
@@ -313 +293 @@
   RecordFieldPtr<uInt> widRF( trec, "WEATHER_ID" ) ;
   RecordFieldPtr<uInt> polnoRF( trec, "POLNO" ) ;
-
+  RecordFieldPtr<Int> refbRF( trec, "REFBEAMNO" ) ;
+  RecordFieldPtr<Int> fitidRF( trec, "FIT_ID" ) ;
+  RecordFieldPtr<Float> tauRF( trec, "OPACITY" ) ;
+  RecordFieldPtr<uInt> beamRF( trec, "BEAMNO" ) ;
+  RecordFieldPtr<uInt> focusidRF( trec, "FOCUS_ID" ) ;
+  RecordFieldPtr<uInt> ifnoRF( trec, "IFNO" ) ;
+  RecordFieldPtr<uInt> molidRF( trec, "MOLECULE_ID" ) ;
+  RecordFieldPtr<uInt> freqidRF( trec, "FREQ_ID" ) ;
+  RecordFieldPtr<uInt> scanRF( trec, "SCANNO" ) ;
+  RecordFieldPtr<Int> srctypeRF( trec, "SRCTYPE" ) ;
+  RecordFieldPtr<String> srcnameRF( trec, "SRCNAME" ) ;
+  RecordFieldPtr<String> fieldnameRF( trec, "FIELDNAME" ) ;
+  RecordFieldPtr< Array<Double> > srcpmRF( trec, "SRCPROPERMOTION" ) ;
+  RecordFieldPtr< Array<Double> > srcdirRF( trec, "SRCDIRECTION" ) ;
+  RecordFieldPtr<Double> sysvelRF( trec, "SRCVELOCITY" ) ;
 
   // REFBEAMNO
-  RecordFieldPtr<Int> intRF( trec, "REFBEAMNO" ) ;
-  *intRF = 0 ;
+  *refbRF = -1 ;
 
   // FIT_ID
-  intRF.attachToRecord( trec, "FIT_ID" ) ;
-  *intRF = -1 ;
+  *fitidRF = -1 ;
 
   // OPACITY
-  RecordFieldPtr<Float> floatRF( trec, "OPACITY" ) ;
-  *floatRF = 0.0 ;
+  *tauRF = 0.0 ;
 
   //
@@ -332 +323 @@
   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" ) ;
-    Int obsId = tcolr->asInt( 0 ) ;
-    tpoolr->destroy( tcolr ) ;
+    Int obsId = asInt( "OBSERVATION_ID", 0, t0, tpoolr ) ;
     if ( sdh.observer == "" ) {
-      tcolr = tpoolr->construct( obstab, "OBSERVER" ) ;
-      sdh.observer = tcolr->asString( obsId ) ;
-      tpoolr->destroy( tcolr ) ;
+      sdh.observer = asString( "OBSERVER", obsId, obstab, tpoolr ) ;
     }
     if ( sdh.project == "" ) {
-      tcolr = tpoolr->construct( obstab, "PROJECT" ) ;
-      sdh.observer = tcolr->asString( obsId ) ;
-      tpoolr->destroy( tcolr ) ;
+      sdh.project = asString( "PROJECT", obsId, obstab, tpoolr ) ;
     }
     ROArrayMeasColumn<MEpoch> *tmpMeasCol = new ROArrayMeasColumn<MEpoch>( obstab, "TIME_RANGE" ) ;
@@ -355 +340 @@
     }
     if ( telescopeName == "" ) {
-      tcolr = tpoolr->construct( obstab, "TELESCOPE_NAME" ) ;
-      telescopeName = tcolr->asString( obsId ) ;
-      tpoolr->destroy( tcolr ) ;
+      telescopeName = asString( "TELESCOPE_NAME", obsId, obstab, tpoolr ) ;
     }
     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
@@ -367 +350 @@
     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
-      tcolr = tpoolr->construct( t1, "FEED1" ) ;
-      Int feedId = tcolr->asInt( 0 ) ;
-      tpoolr->destroy( tcolr ) ;
+      Int feedId = asInt( "FEED1", 0, t1, tpoolr ) ;
       nbeam++ ;
 
       // BEAMNO
-      RecordFieldPtr<uInt> uintRF( trec, "BEAMNO" ) ;
-      *uintRF = feedId ;
+      *beamRF = feedId ;
 
       // FOCUS_ID
-      uintRF.attachToRecord( trec, "FOCUS_ID" ) ;
-      *uintRF = 0 ;
-
-//       time1 = gettimeofday_sec() ;
-//       os_ << "end 1st iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+      *focusidRF = 0 ;
+
+      //time1 = gettimeofday_sec() ;
+      //os_ << "end 1st iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
       // 
       // ITERATION: FIELD_ID 
@@ -391 +370 @@
       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" ) ;
-        Int fieldId = tcolr->asInt( 0 ) ;
-        tpoolr->destroy( tcolr ) ;
-        tcolr = tpoolr->construct( fieldtab, "SOURCE_ID" ) ;
-        Int srcId = tcolr->asInt( fieldId ) ;
-        tpoolr->destroy( tcolr ) ;
-        tcolr = tpoolr->construct( fieldtab, "NAME" ) ;
-        String fieldName = tcolr->asString( fieldId ) + "__" + String::toString(fieldId) ;
-        tpoolr->destroy( tcolr ) ;
+        Int fieldId = asInt( "FIELD_ID", 0, t2, tpoolr ) ;
+        Int srcId = asInt( "SOURCE_ID", fieldId, fieldtab, tpoolr ) ;
+        String fieldName = asString( "NAME", fieldId, fieldtab, tpoolr ) ;
+        fieldName += "__" + String::toString(fieldId) ;
         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() ;
-          
+        delete delayDirCol ;          
 
         // FIELDNAME
-        RecordFieldPtr<String> strRF( trec, "FIELDNAME" ) ;
-        *strRF = fieldName ;
-
-
-//         time1 = gettimeofday_sec() ;
-//         os_ << "end 2nd iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+        *fieldnameRF = fieldName ;
+
+
+        //time1 = gettimeofday_sec() ;
+        //os_ << "end 2nd iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
         // 
         // ITERATION: DATA_DESC_ID
@@ -424 +392 @@
         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" ) ;
-          Int ddId = tcolr->asInt( 0 ) ;
-          tpoolr->destroy( tcolr ) ;
-          tcolr = tpoolr->construct( ddtab, "POLARIZATION_ID" ) ;
-          Int polId = tcolr->asInt( ddId ) ;
-          tpoolr->destroy( tcolr ) ;
-          tcolr = tpoolr->construct( ddtab, "SPECTRAL_WINDOW_ID" ) ;
-          Int spwId = tcolr->asInt( ddId ) ;
-          tpoolr->destroy( tcolr ) ;
+          Int ddId = asInt( "DATA_DESC_ID", 0, t3, tpoolr ) ;
+          Int polId = asInt( "POLARIZATION_ID", ddId, ddtab, tpoolr ) ;
+          Int spwId = asInt( "SPECTRAL_WINDOW_ID", ddId, ddtab, tpoolr ) ;
 
           // IFNO
-          uintRF.attachToRecord( trec, "IFNO" ) ;
-          *uintRF = (uInt)spwId ;
+          *ifnoRF = (uInt)spwId ;
 
           // polarization information
-          tcolr = tpoolr->construct( poltab, "NUM_CORR" ) ;
-          Int npol = tcolr->asInt( polId ) ;
-          tpoolr->destroy( tcolr ) ;
+          Int npol = asInt( "NUM_CORR", polId, poltab, tpoolr ) ;
           ROArrayColumn<Int> *roArrICol = new ROArrayColumn<Int>( poltab, "CORR_TYPE" ) ;
           Vector<Int> corrtype = (*roArrICol)( polId ) ;
           delete roArrICol ;
-//           os_ << "npol = " << npol << LogIO::POST ;
-//           os_ << "corrtype = " << corrtype << LogIO::POST ;
-          // source information
-//           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 ) ;
-          }
           String srcName( "" ) ;
           Vector<Double> srcPM( 2, 0.0 ) ;
           Vector<Double> srcDir( 2, 0.0 ) ;
           MDirection md ;
-          Int numLines = 0 ;
-          ROArrayColumn<Double> *roArrDCol = 0 ;
-          if ( srctabSel.nrow() > 0 ) {
-            // source name
-            tcolr = tpoolr->construct( srctabSel, "NAME" ) ;
-            srcName = tcolr->asString( 0 ) ;
-            tpoolr->destroy( tcolr ) ;
-
-            // source proper motion
-            roArrDCol = new ROArrayColumn<Double>( srctabSel, "PROPER_MOTION" ) ;
-            srcPM = (*roArrDCol)( 0 ) ;
-            delete roArrDCol ;
-            
-            // source direction
-            roArrDCol = new ROArrayColumn<Double>( srctabSel, "DIRECTION" ) ;
-            srcDir = (*roArrDCol)( 0 ) ;
-            delete roArrDCol ;
-
-            // source direction as MDirection object
-            ROScalarMeasColumn<MDirection> *tmpMeasCol = new ROScalarMeasColumn<MDirection>( srctabSel, "DIRECTION" ) ;
-            md = (*tmpMeasCol)( 0 ) ;
-            delete tmpMeasCol ;
-
-            // number of lines
-            tcolr = tpoolr->construct( srctabSel, "NUM_LINES" ) ;
-            numLines = tcolr->asInt( 0 ) ;
-            tpoolr->destroy( tcolr ) ;
-
-          }
-          else {
-            md = MDirection( Quantum<Double>(0.0,Unit("rad")), Quantum<Double>(0.0,Unit("rad")) ) ;
-          }
+          Vector<Double> restFreqs ;
+          Vector<String> transitionName ;
+          Vector<Double> sysVels ;
+//           os_ << "npol = " << npol << LogIO::POST ;
+//           os_ << "corrtype = " << corrtype << LogIO::POST ;
+
+          // source and molecular transition
+          sourceInfo( srcId, spwId, srcName, md, srcPM, restFreqs, transitionName, sysVels, tpoolr ) ;
+//           os_ << "srcId = " << srcId << ", spwId = " << spwId << LogIO::POST ;
 
           // SRCNAME
-          strRF.attachToRecord( trec, "SRCNAME" ) ;
-          *strRF = srcName ;
+          *srcnameRF = srcName ;
 
 //           os_ << "srcName = " << srcName << LogIO::POST ;
 
           // SRCPROPERMOTION
-          RecordFieldPtr< Array<Double> > darrRF( trec, "SRCPROPERMOTION" ) ;
-          *darrRF = srcPM ;
+          *srcpmRF = srcPM ;
 
           //os_ << "srcPM = " << srcPM << LogIO::POST ;
 
           // SRCDIRECTION
-          darrRF.attachToRecord( trec, "SRCDIRECTION" ) ;
-          *darrRF = srcDir ;
+          *srcdirRF = md.getAngle().getValue( "rad" ) ;
 
           //os_ << "srcDir = " << srcDir << LogIO::POST ;
 
-          // for MOLECULES subtable
-//           os_ << "numLines = " << numLines << LogIO::POST ;
-
-          Vector<Double> restFreqs( numLines, 0.0 ) ;
-          Vector<String> transitionName( numLines, "" ) ;
-          Vector<Double> sysVels ;
+          // SRCVELOCITY
           Double sysVel = 0.0 ;
-          if ( numLines != 0 ) {
-            if ( srctabSel.tableDesc().isColumn( "REST_FREQUENCY" ) ) {
-              sharedQDArrCol = new ROArrayQuantColumn<Double>( srctabSel, "REST_FREQUENCY" ) ;
-              Array< Quantum<Double> > qRestFreqs = (*sharedQDArrCol)( 0 ) ;
-              delete sharedQDArrCol ;
-              for ( int i = 0 ; i < numLines ; i++ ) {
-                restFreqs[i] = qRestFreqs( IPosition( 1, i ) ).getValue( "Hz" ) ;
-              }
-            }
-//             os_ << "restFreqs = " << restFreqs << LogIO::POST ;
-            if ( srctabSel.tableDesc().isColumn( "TRANSITION" ) ) {
-              ROArrayColumn<String> transitionCol( srctabSel, "TRANSITION" ) ;
-              if ( transitionCol.isDefined( 0 ) )
-                transitionName = transitionCol( 0 ) ;
-              //os_ << "transitionNameCol.nrow() = " << transitionCol.nrow() << LogIO::POST ;
-            }
-            if ( srctabSel.tableDesc().isColumn( "SYSVEL" ) ) {
-              roArrDCol = new ROArrayColumn<Double>( srctabSel, "SYSVEL" ) ;
-              sysVels = (*roArrDCol)( 0 ) ;
-              delete roArrDCol ;
-            }
-            if ( !sysVels.empty() ) {
-              //os_ << "sysVels.shape() = " << sysVels.shape() << LogIO::POST ;
-              // NB: assume all SYSVEL values are the same
-              sysVel = sysVels( IPosition(1,0) ) ;
-            }
-          }
-
-          // SRCVELOCITY
-          RecordFieldPtr<Double> doubleRF( trec, "SRCVELOCITY" ) ;
-          *doubleRF = sysVel ;
+          if ( !sysVels.empty() ) 
+            sysVel = sysVels[0] ;
+          *sysvelRF = sysVel ;
 
 //           os_ << "sysVel = " << sysVel << LogIO::POST ;
@@ -555 +447 @@
 
           // MOLECULE_ID
-          uintRF.attachToRecord( trec, "MOLECULE_ID" ) ;
-          *uintRF = molId ;
+          *molidRF = molId ;
 
           // spectral setup
-          MeasFrame mf( me, mp, md ) ;
-          tcolr = tpoolr->construct( spwtab, "MEAS_FREQ_REF" ) ;
-          MFrequency::Types freqRef = MFrequency::castType((uInt)(tcolr->asInt(spwId))) ;
-          tpoolr->destroy( tcolr ) ;
-          tcolr = tpoolr->construct( spwtab, "NUM_CHAN" ) ;
-          Int nchan = tcolr->asInt( spwId ) ;
+          uInt freqId ;
+          Int nchan = asInt( "NUM_CHAN", spwId, spwtab, tpoolr ) ;
           Bool iswvr = False ;
           if ( nchan == 4 ) iswvr = True ;
-          tpoolr->destroy( tcolr ) ;
-          Bool even = False ;
-          if ( (nchan/2)*2 == nchan ) even = True ;
           sdh.nchan = max( sdh.nchan, nchan ) ;
-          ROScalarQuantColumn<Double> *tmpQuantCol = new ROScalarQuantColumn<Double>( spwtab, "TOTAL_BANDWIDTH" ) ;
-          Double totbw = (*tmpQuantCol)( spwId ).getValue( "Hz" ) ;
-          delete tmpQuantCol ;
-          sdh.bandwidth = max( sdh.bandwidth, totbw ) ;
-          if ( sdh.freqref == "" ) 
-            //sdh.freqref = MFrequency::showType( freqRef ) ;
-            sdh.freqref = "LSRK" ;
-          if ( sdh.reffreq == -1.0 ) {
-            tmpQuantCol = new ROScalarQuantColumn<Double>( spwtab, "REF_FREQUENCY" ) ;
-            Quantum<Double> qreffreq = (*tmpQuantCol)( spwId ) ;
-            delete tmpQuantCol ;
-            if ( freqRef == MFrequency::LSRK ) {
-              sdh.reffreq = qreffreq.getValue("Hz") ;
-            }
-            else {
-              MFrequency::Convert tolsr( freqRef, MFrequency::Ref( MFrequency::LSRK, mf ) ) ;
-              sdh.reffreq = tolsr( qreffreq ).get("Hz").getValue() ; 
-            }
-          }
-          Int refchan = nchan / 2 ;
-          IPosition refip( 1, refchan ) ;
-          Double refpix = 0.5*(nchan-1) ;
-          Double refval = 0.0 ;
-          sharedQDArrCol = new ROArrayQuantColumn<Double>( spwtab, "CHAN_WIDTH" ) ;
-          Double increment = (*sharedQDArrCol)( spwId )( refip ).getValue( "Hz" ) ;
-          delete sharedQDArrCol ;
-//           os_ << "nchan = " << nchan << " refchan = " << refchan << "(even=" << even << ") refpix = " << refpix << LogIO::POST ;
-          sharedQDArrCol = new ROArrayQuantColumn<Double>( spwtab, "CHAN_FREQ" ) ;
-          Vector< Quantum<Double> > chanFreqs = (*sharedQDArrCol)( spwId ) ;
-          delete sharedQDArrCol ;
-          if ( freqRef == MFrequency::LSRK ) {
-            if ( even ) {
-              IPosition refip0( 1, refchan-1 ) ;
-              Double refval0 = chanFreqs(refip0).getValue("Hz") ;
-              Double refval1 = chanFreqs(refip).getValue("Hz") ;
-              refval = 0.5 * ( refval0 + refval1 ) ;
-            }
-            else {
-              refval = chanFreqs(refip).getValue("Hz") ;
-            }
-          }
-          else {
-            MFrequency::Convert tolsr( freqRef, MFrequency::Ref( MFrequency::LSRK, mf ) ) ;
-            if ( even ) {
-              IPosition refip0( 1, refchan-1 ) ;
-              Double refval0 = chanFreqs(refip0).getValue("Hz") ;
-              Double refval1 = chanFreqs(refip).getValue("Hz") ;
-              refval = 0.5 * ( refval0 + refval1 ) ;
-              refval = tolsr( refval ).get("Hz").getValue() ;
-            }
-            else {
-              refval = tolsr( chanFreqs(refip) ).get("Hz").getValue() ;
-            }
-          }
-          uInt freqId = table_->frequencies().addEntry( refpix, refval, increment ) ;
-          if ( ifmap.find( spwId ) == ifmap.end() ) {
+          map<Int,uInt>::iterator iter = ifmap.find( spwId ) ;
+          if ( iter == ifmap.end() ) {
+            ROScalarMeasColumn<MEpoch> *tmpMeasCol = new ROScalarMeasColumn<MEpoch>( t3, "TIME" ) ;
+            me = (*tmpMeasCol)( 0 ) ;
+            delete tmpMeasCol ;
+            Double refpix ;
+            Double refval ;
+            Double increment ;
+            spectralSetup( spwId, 
+                           me,
+                           mp, 
+                           md,
+                           refpix,
+                           refval,
+                           increment,
+                           nchan,
+                           sdh.freqref,
+                           sdh.reffreq,
+                           sdh.bandwidth,
+                           tpoolr ) ;
+            freqId = table_->frequencies().addEntry( refpix, refval, increment ) ;
             ifmap.insert( pair<Int, uInt>(spwId,freqId) ) ;
             //os_ << "added to ifmap: (" << spwId << "," << freqId << ")" << LogIO::POST ;
           }
+          else {
+            freqId = iter->second ;
+          }
 
           // FREQ_ID
-          uintRF.attachToRecord( trec, "FREQ_ID" ) ;
-          *uintRF = freqId ;
+          *freqidRF = freqId ;
 
           // for TSYS and TCAL
@@ -656 +507 @@
           if ( !iswvr && sdh.poltype == "" ) sdh.poltype = getPolType( corrtype[0] ) ;
 
-//           time1 = gettimeofday_sec() ;
-//           os_ << "end 3rd iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+          //time1 = gettimeofday_sec() ;
+          //os_ << "end 3rd iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
           //
           // ITERATION: SCAN_NUMBER
@@ -663 +514 @@
           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" ) ;
-            Int scanNum = tcolr->asInt( 0 ) ;
-            tpoolr->destroy( tcolr ) ;
+            Int scanNum = asInt( "SCAN_NUMBER", 0, t4, tpoolr ) ;
 
             // SCANNO
-            uintRF.attachToRecord( trec, "SCANNO" ) ;
-            *uintRF = scanNum - 1 ;
-
-//             time1 = gettimeofday_sec() ;
-//             os_ << "end 4th iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+            *scanRF = scanNum - 1 ;
+
+            //time1 = gettimeofday_sec() ;
+            //os_ << "end 4th iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
             // 
             // ITERATION: STATE_ID
@@ -681 +529 @@
             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" ) ;
-              Int stateId = tcolr->asInt( 0 ) ;
-              tpoolr->destroy( tcolr ) ;
-              tcolr = tpoolr->construct( stattab, "OBS_MODE" ) ;
-              String obstype = tcolr->asString( stateId ) ;
-              tpoolr->destroy( tcolr ) ;
+              Int stateId = asInt( "STATE_ID", 0, t5, tpoolr ) ;
+              String obstype = asString( "OBS_MODE", 0, stattab, tpoolr ) ;
               if ( sdh.obstype == "" ) sdh.obstype = obstype ;
 
               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 ;
@@ -700 +544 @@
               Cube<Float> spArr ;
               Cube<Bool> flArr ;
-              if ( isFloatData_ ) {
-                ROArrayColumn<Bool> mFlagCol( t5, "FLAG" ) ;
-                ROArrayColumn<Float> mFloatDataCol( t5, "FLOAT_DATA" ) ;
-                spArr = mFloatDataCol.getColumn() ;
-                flArr = mFlagCol.getColumn() ;
-                if ( sdh.fluxunit == "" ) {
-                  const TableRecord &dataColKeys = mFloatDataCol.keywordSet() ;
-                  if ( dataColKeys.isDefined( "UNIT" ) )
-                    sdh.fluxunit = dataColKeys.asString( "UNIT" ) ;
-                } 
+              reshapeSpectraAndFlagtra( spArr, 
+                                        flArr, 
+                                        t5, 
+                                        npol, 
+                                        nchan, 
+                                        nrow,
+                                        corrtype ) ;
+              if ( sdh.fluxunit == "" ) {
+                String colName = "FLOAT_DATA" ;
+                if ( isData_ ) colName = "DATA" ;
+                ROTableColumn dataCol( t5, colName ) ;
+                const TableRecord &dataColKeys = dataCol.keywordSet() ;
+                if ( dataColKeys.isDefined( "UNIT" ) )
+                  sdh.fluxunit = dataColKeys.asString( "UNIT" ) ;
+                else if ( dataColKeys.isDefined( "QuantumUnits" ) )
+                  sdh.fluxunit = dataColKeys.asString( "QuantumUnits" ) ;
               }
-              else if ( isData_ ) {
-                spArr.resize( npol, nchan, nrow ) ;
-                flArr.resize( npol, nchan, nrow ) ;
-                ROArrayColumn<Bool> mFlagCol( t5, "FLAG" ) ;
-                ROArrayColumn<Complex> mDataCol( t5, "DATA" ) ;
-                for ( Int irow = 0 ; irow < nrow ; irow++ ) {
-                  Bool crossOK = False ;
-                  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 ) {
-                        spxy.row( ipol ) = real( sp.row( ipol ) ) ;
-                        flxy.row( ipol ) = fl.row( ipol ) ;
-                        if ( corrtype[ipol] == Stokes::XY || corrtype[ipol] == Stokes::RL ) {
-                          spxy.row( ipol+1 ) = imag( sp.row( ipol ) ) ;
-                          flxy.row( ipol+1 ) = fl.row( ipol ) ;
-                        }                        
-                        else {
-                          spxy.row( ipol+1 ) = imag( conj( sp.row( ipol ) ) ) ;
-                          flxy.row( ipol+1 ) = fl.row( ipol ) ;
-                        }
-                        crossOK = True ;
-                      }
-                    }
-                    else {
-                      spxy.row( ipol ) = real( sp.row( ipol ) ) ;
-                      flxy.row( ipol ) = fl.row( ipol ) ;
-                    }
-                  }
-                }
-                if ( sdh.fluxunit == "" ) {
-                  const TableRecord &dataColKeys = mDataCol.keywordSet() ;
-                  if ( dataColKeys.isDefined( "UNIT" ) )
-                    sdh.fluxunit = dataColKeys.asString( "UNIT" ) ;
-                } 
-              }
+
               ROScalarMeasColumn<MEpoch> *mTimeCol = new ROScalarMeasColumn<MEpoch>( t5, "TIME" ) ;
               Block<MEpoch> mTimeB( nrow ) ;
               for ( Int irow = 0 ; irow < nrow ; irow++ ) 
                 mTimeB[irow] = (*mTimeCol)( irow ) ;
-              ROTableColumn *mIntervalCol = tpoolr->construct( t5, "INTERVAL" ) ;
-              ROTableColumn *mFlagRowCol = tpoolr->construct( t5, "FLAG_ROW" ) ;
+//               ROTableColumn *mIntervalCol = tpoolr->construct( t5, "INTERVAL" ) ;
+//               ROTableColumn *mFlagRowCol = tpoolr->construct( t5, "FLAG_ROW" ) ;
               Block<Int> sysCalIdx( nrow, -1 ) ;
               if ( isSysCal_ ) {
@@ -765 +576 @@
               Int srcType = getSrcType( stateId, tpoolr ) ;
               uInt diridx = 0 ;
-              MDirection::Types dirType ;
               uInt wid = 0 ;
               Int pidx = 0 ;
@@ -789 +599 @@
               
               // SRCTYPE
-              intRF.attachToRecord( trec, "SRCTYPE" ) ;
-              *intRF = srcType ;
+              *srctypeRF = srcType ;
 
               for ( Int irow = 0 ; irow < nrow ; irow++ ) {
@@ -797 +606 @@
 
                 // FLAGROW
-                *flrRF = (uInt)mFlagRowCol->asBool( irow ) ;
+//                 *flrRF = (uInt)mFlagRowCol->asBool( irow ) ;
+                *flrRF = (uInt)asBool( "FLAG_ROW", irow, t5, tpoolr ) ;
 
                 // SPECTRA, FLAG
@@ -809 +619 @@
 
                 // INTERVAL
-                *intervalRF = (Double)(mIntervalCol->asdouble( irow )) ;
+//                 *intervalRF = (Double)(mIntervalCol->asdouble( irow )) ;
+                *intervalRF = asDouble( "INTERVAL", irow, t5, tpoolr ) ;
 
                 // TSYS
@@ -825 +636 @@
 
                 // WEATHER_ID
-                if ( isWeather_ )
+                if ( isWeather_ ) {
                   wid = getWeatherId( wid, mTimeB[irow].get("s").getValue() ) ;
-                *widRF = wid ;
-                  
-
-                // DIRECTION, AZEL, SCANRATE
-                if ( getPt_ ) {
-                  Vector<Double> dir ;
-                  Vector<Double> scanrate ;
-                  String refString ;
-                  diridx = getDirection( diridx, dir, scanrate, refString, pointtab, mTimeB[irow].get("s").getValue() ) ;
-                  MDirection::getType( dirType, refString ) ;
-                  mf.resetEpoch( mTimeB[irow] ) ;
-                  mf.resetDirection( MDirection( MVDirection(dir), dirType ) ) ;
-                  if ( refString == "J2000" ) {
-                    *dirRF = dir ;
-                    MDirection::Convert toazel( dirType, MDirection::Ref( MDirection::AZEL, mf ) ) ;
-                    Vector<Double> azel = toazel( dir ).getAngle("rad").getValue() ;
-                    *azRF = (Float)azel(0) ;
-                    *elRF = (Float)azel(1) ;
-                  }
-                  else if ( refString(0,4) == "AZEL" ) {
-                    *azRF = (Float)dir(0) ;
-                    *elRF = (Float)dir(1) ;
-                    MDirection::Convert toj2000( dirType, MDirection::Ref( MDirection::J2000, mf ) ) ;
-                    Vector<Double> newdir = toj2000( dir ).getAngle("rad").getValue() ;
-                    *dirRF = newdir ;
-                  }
-                  else {
-                    MDirection::Convert toazel( dirType, MDirection::Ref( MDirection::AZEL, mf ) ) ;
-                    Vector<Double> azel = toazel( dir ).getAngle("rad").getValue() ;
-                    MDirection::Convert toj2000( dirType, MDirection::Ref( MDirection::J2000, mf ) ) ;
-                    Vector<Double> newdir = toj2000( dir ).getAngle("rad").getValue() ;
-                    *dirRF = newdir ;
-                    *azRF = (Float)azel(0) ;
-                    *elRF = (Float)azel(1) ;
-                  }
-                  if ( scanrate.size() != 0 ) {
-                    *scrRF = scanrate ;
-                  }
-                  else {
-                    *scrRF = defaultScanrate ;
-                  }
+                  *widRF = mwIndex_[wid] ;
                 }
                 else {
-                  String ref = md.getRefString() ;
-                  //Vector<Double> defaultDir = srcDir ;
-                  MDirection::getType( dirType, "J2000" ) ;
-                  if ( ref != "J2000" ) {
-                    ROScalarMeasColumn<MEpoch> tmCol( pointtab, "TIME" ) ;
-                    mf.resetEpoch( tmCol( 0 ) ) ;
-                    MDirection::Convert toj2000( dirType, MDirection::Ref( MDirection::J2000, mf ) ) ;
-                    defaultDir = toj2000( defaultDir ).getAngle("rad").getValue() ;
-                  }
-                  mf.resetEpoch( mTimeB[irow] ) ;
-                  MDirection::Convert toazel( dirType, MDirection::Ref( MDirection::AZEL, mf ) ) ;
-                  Vector<Double> azel = toazel( defaultDir ).getAngle("rad").getValue() ;
-                  *azRF = (Float)azel(0) ;
-                  *elRF = (Float)azel(1) ;
-                  *dirRF = defaultDir ;
-                  *scrRF = defaultScanrate ;
+                  *widRF = wid ;
                 }
+                  
+
+                // DIRECTION, AZEL, SCANRATE
+                Vector<Double> dir ;
+                Vector<Double> azel ;
+                Vector<Double> scanrate ;
+                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 ) ;
+                else
+                  getSourceDirection( dir, azel, scanrate, mTimeB[irow], mp, delayDir ) ;
+                *dirRF = dir ;
+                *azRF = azel[0] ;
+                *elRF = azel[1] ;
+                *scrRF = scanrate ;
 
                 // Polarization dependent things
@@ -893 +665 @@
                   *polnoRF = polnos[ipol] ;
 
-                  //*spRF = sp.row( ipol ) ;
-                  //*ucarrRF = fl.row( ipol ) ;
-                  //*tsysRF = tsys.row( ipol ) ;
                   spRF.define( sp.row( ipol ) ) ;
                   ucarrRF.define( fl.row( ipol ) ) ;
@@ -908 +677 @@
                 cycle++ ;
               }
-              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() ;
             }
-
-
             iter4.next() ;
           }
-
-
           iter3.next() ;
         }
-
-              
         iter2.next() ;
       }
-
-
       iter1.next() ;
     }
@@ -974 +733 @@
     sdh.freqref = "SOURCE";
   }
+
+  if ( sdh.fluxunit == "" || sdh.fluxunit == "CNTS" )
+    sdh.fluxunit = "K" ;
   table_->setHeader( sdh ) ;
 
@@ -1006 +768 @@
   }
 
-//   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 ;
 }
 
@@ -1020 +782 @@
 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() ;
-  ROTableColumn *sharedCol ;
-  sharedCol = tpool->construct( statetab, "OBS_MODE" ) ;
-  String obsMode = sharedCol->asString( stateId ) ;
-  tpool->destroy( sharedCol ) ;
-  sharedCol = tpool->construct( statetab, "SIG" ) ;
-  Bool sig = sharedCol->asBool( stateId ) ;
-  tpool->destroy( sharedCol ) ;
-  sharedCol = tpool->construct( statetab, "REF" ) ;
-  Bool ref = sharedCol->asBool( stateId ) ;
-  tpool->destroy( sharedCol ) ;
-  sharedCol = tpool->construct( statetab, "CAL" ) ;
-  Double cal = (Double)(sharedCol->asdouble( stateId )) ;
-  tpool->destroy( sharedCol ) ;
+  String obsMode = asString( "OBS_MODE", stateId, statetab, tpool ) ;
+  Bool sig = asBool( "SIG", stateId, statetab, tpool ) ;
+  Bool ref = asBool( "REF", stateId, statetab, tpool ) ;
+  Double cal = asDouble( "CAL", stateId, statetab, tpool ) ;
   //os_ << "OBS_MODE = " << obsMode << LogIO::POST ;
 
@@ -1182 +935 @@
     
   //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 ;
 }
@@ -1190 +943 @@
 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 ) ;
 
@@ -1221 +974 @@
   }
   //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 ;
@@ -1229 +982 @@
 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 = "" ;
 
@@ -1242 +995 @@
     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 ;
 }
@@ -1249 +1002 @@
 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_ ) {
@@ -1278 +1031 @@
   wtab.addRow( wnrow ) ;
 
+  Bool stationInfoExists = mWeatherSel.tableDesc().isColumn( "NS_WX_STATION_ID" ) ;
+  Int stationId = -1 ;
+  if ( stationInfoExists ) {
+    // determine which station is closer
+    ROScalarColumn<Int> stationCol( mWeatherSel, "NS_WX_STATION_ID" ) ;
+    ROArrayColumn<Double> stationPosCol( mWeatherSel, "NS_WX_STATION_POSITION" ) ;
+    Vector<Int> stationIds = stationCol.getColumn() ;
+    Vector<Int> stationIdList( 0 ) ;
+    Matrix<Double> stationPosList( 0, 3, 0.0 ) ;
+    uInt numStation = 0 ;
+    for ( uInt i = 0 ; i < stationIds.size() ; i++ ) {
+      if ( !anyEQ( stationIdList, stationIds[i] ) ) {
+        numStation++ ;
+        stationIdList.resize( numStation, True ) ;
+        stationIdList[numStation-1] = stationIds[i] ;
+        stationPosList.resize( numStation, 3, True ) ;
+        stationPosList.row( numStation-1 ) = stationPosCol( i ) ;
+      }
+    }
+    //os_ << "staionIdList = " << stationIdList << endl ;
+    Table mAntenna = mstable_.antenna() ;
+    ROArrayColumn<Double> antposCol( mAntenna, "POSITION" ) ;
+    Vector<Double> antpos = antposCol( antenna_ ) ;
+    Double minDiff = -1.0 ;
+    for ( uInt i = 0 ; i < stationIdList.size() ; i++ ) {
+      Double diff = sum( square( antpos - stationPosList.row( i ) ) ) ;
+      if ( minDiff < 0.0 || minDiff > diff ) {
+        minDiff = diff ;
+        stationId = stationIdList[i] ;
+      }
+    }
+  }
+  //os_ << "stationId = " << stationId << endl ;
+  
   ScalarColumn<Float> *fCol ;
   ROScalarColumn<Float> *sharedFloatCol ;
@@ -1322 +1109 @@
   ROScalarColumn<Double> tCol( mWeatherSel, "TIME" ) ;
   String tUnit = tqCol.getUnits() ;
-  mwTime_ = tCol.getColumn() ;
+  Vector<Double> mwTime = tCol.getColumn() ;
   if ( tUnit == "d" ) 
-    mwTime_ *= 86400.0 ;
+    mwTime *= 86400.0 ;
   tqCol.attach( mWeatherSel, "INTERVAL" ) ;
   tCol.attach( mWeatherSel, "INTERVAL" ) ;
   String iUnit = tqCol.getUnits() ;
-  mwInterval_ = tCol.getColumn() ;
+  Vector<Double> mwInterval = tCol.getColumn() ;
   if ( iUnit == "d" ) 
-    mwInterval_ *= 86400.0 ; 
+    mwInterval *= 86400.0 ; 
+
+  if ( stationId > 0 ) {
+    ROScalarColumn<Int> stationCol( mWeatherSel, "NS_WX_STATION_ID" ) ;
+    Vector<Int> stationVec = stationCol.getColumn() ;
+    uInt wsnrow = ntrue( stationVec == stationId ) ;
+    mwTime_.resize( wsnrow ) ;
+    mwInterval_.resize( wsnrow ) ;
+    mwIndex_.resize( wsnrow ) ;
+    uInt wsidx = 0 ;
+    for ( uInt irow = 0 ; irow < wnrow ; irow++ ) {
+      if ( stationId == stationVec[irow] ) {
+        mwTime_[wsidx] = mwTime[irow] ;
+        mwInterval_[wsidx] = mwInterval[irow] ;
+        mwIndex_[wsidx] = irow ;
+        wsidx++ ;
+      }
+    }
+  }
+  else {
+    mwTime_ = mwTime ;
+    mwInterval_ = mwInterval ;
+    mwIndex_.resize( mwTime_.size() ) ;
+    indgen( mwIndex_ ) ;
+  }
   //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() ;
-  tab.addRow( 1 ) ;
-  ScalarColumn<uInt> idCol( tab, "ID" ) ;
-  idCol.put( 0, 0 ) ;
-//   double endSec = gettimeofday_sec() ;
-//   os_ << "end MSFiller::fillFocus() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
+  table_->focus().addEntry( 0.0, 0.0, 0.0, 0.0 ) ;
+  //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_ ) {
@@ -1407 +1215 @@
   Table tab = table_->tcal().table() ;
   ArrayColumn<Float> tcalCol( tab, "TCAL" ) ;
-  ROTableColumn *sharedCol ;
   uInt oldnr = 0 ;
   uInt newnr = 0 ;
@@ -1418 +1225 @@
   while( !iter0.pastEnd() ) {
     Table t0 = iter0.table() ;
-    sharedCol = tpoolr->construct( t0, "FEED_ID" ) ;
-    Int feedId = sharedCol->asInt( 0 ) ;
-    tpoolr->destroy( sharedCol ) ;
+    Int feedId = asInt( "FEED_ID", 0, t0, tpoolr ) ;
     TableIterator iter1( t0, "SPECTRAL_WINDOW_ID" ) ;
     while( !iter1.pastEnd() ) {
       Table t1 = iter1.table() ;
-      sharedCol = tpoolr->construct( t1, "SPECTRAL_WINDOW_ID" ) ;
-      Int spwId = sharedCol->asInt( 0 ) ;
-      tpoolr->destroy( sharedCol ) ;
+      Int spwId = asInt( "SPECTRAL_WINDOW_ID", 0, t1, tpoolr ) ;
       tmpTcalCol = new ROArrayColumn<Float>( t1, colTcal_ ) ;
       ROScalarQuantColumn<Double> scTimeCol( t1, "TIME" ) ;
@@ -1460 +1263 @@
 
   //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 < 2 ) 
     return 0 ;
   uInt wid = nrow ;
+  if ( idx == 0 ) {
+    wid = 0 ;
+    Double tStart = mwTime_[wid]-0.5*mwInterval_[wid] ;
+    if ( wtime < tStart )
+      return wid ;
+  }
   for ( uInt i = idx ; i < nrow-1 ; i++ ) {
     Double tStart = mwTime_[i]-0.5*mwInterval_[i] ;
@@ -1498 +1307 @@
   //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 ;
 }
@@ -1505 +1314 @@
 void MSFiller::getSysCalTime( Vector<MEpoch> &scTime, Vector<Double> &scInterval, Block<MEpoch> &tcol, 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_ )
@@ -1552 +1361 @@
     }
   }
-//   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 ;
 }
@@ -1559 +1368 @@
 Block<uInt> MSFiller::getTcalId( Int fid, Int spwid, MEpoch &t ) 
 {
-//   double startSec = gettimeofday_sec() ;
-//   os_ << "start MSFiller::getTcalId() startSec=" << startSec << LogIO::POST ;
+  //double startSec = gettimeofday_sec() ;
+  //os_ << "start MSFiller::getTcalId() startSec=" << startSec << LogIO::POST ;
   //if ( table_->tcal().table().nrow() == 0 ) {
   if ( !isSysCal_ ) {
@@ -1583 +1392 @@
     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 ;
 }
 
-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 ;
+uInt MSFiller::getDirection( uInt idx, 
+                             Vector<Double> &dir, 
+                             Vector<Double> &srate, 
+                             String &ref, 
+                             ROScalarColumn<Double> &tcol, 
+                             ROArrayColumn<Double> &dcol, 
+                             Double t ) 
+{
+  //double startSec = gettimeofday_sec() ;
+  //os_ << "start MSFiller::getDirection1() startSec=" << startSec << LogIO::POST ;
+  //double time0 = gettimeofday_sec() ;
+  //os_ << "start getDirection 1st stage startSec=" << time0 << LogIO::POST ;
   // assume that cols is sorted by TIME
   Bool doInterp = False ;
-  //uInt nrow = cols.nrow() ;
-  uInt nrow = tab.nrow() ;
+  uInt nrow = tcol.nrow() ;
   if ( nrow == 0 ) 
     return 0 ;
-  ROScalarMeasColumn<MEpoch> tcol( tab, "TIME" ) ;
-  ROArrayMeasColumn<MDirection> dmcol( tab, "DIRECTION" ) ;
-  ROArrayColumn<Double> dcol( tab, "DIRECTION" ) ;
+  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 = 75000 ;
+    uInt nrowb = 1000 ;
     if ( nrow > nrowb ) {
       uInt nblock = nrow / nrowb + 1 ;
@@ -1609 +1427 @@
         uInt high = min( nrowb, nrow-iblock*nrowb ) ;
 
-        if ( tcol( high-1 ).get( "s" ).getValue() < t ) {
+        if ( tcol( high-1 ) * factor < t ) {
           idx = iblock * nrowb ;
           continue ;
         }
 
-        Vector<MEpoch> tarr( high ) ;
-        for ( uInt irow = 0 ; irow < high ; irow++ ) {
-          tarr[irow] = tcol( iblock*nrowb+irow ) ;
-        }
+        RefRows refrows( iblock*nrowb, iblock*nrowb+high, 1 ) ;
+        Vector<Double> tarr = tcol.getColumnCells( refrows ) ;
+        if ( tUnit == "d" )
+          tarr *= factor ;
 
         uInt bidx = binarySearch( tarr, t ) ;
@@ -1626 +1444 @@
     }
     else {
-      Vector<MEpoch> tarr( nrow ) ;
-      for ( uInt irow = 0 ; irow < nrow ; irow++ ) {
-        tarr[irow] = tcol( irow ) ;
-      }
+      Vector<Double> tarr = tcol.getColumn() ;
+      if ( tUnit == "d" )
+        tarr *= factor ;
       idx = binarySearch( tarr, t ) ;
     }
   }
+  //double time1 = gettimeofday_sec() ;
+  //os_ << "end getDirection 1st stage endSec=" << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
   // ensure that tcol(idx) < t
   //os_ << "tcol(idx) = " << tcol(idx).get("s").getValue() << " t = " << t << " diff = " << tcol(idx).get("s").getValue()-t << endl ;
-  while ( tcol(idx).get("s").getValue() > t && idx > 0 ) 
+  //time0 = gettimeofday_sec() ;
+  //os_ << "start getDirection 2nd stage startSec=" << time0 << LogIO::POST ;
+  while( tcol( idx ) * factor > t && idx > 0 )
     idx-- ;
   //os_ << "idx = " << idx << LogIO::POST ;
@@ -1641 +1462 @@
   // index search
   for ( uInt i = idx ; i < nrow ; i++ ) {
-    Double tref = tcol( i ).get( "s" ).getValue() ;
+    //Double tref = tcol( i ).get( "s" ).getValue() ;
+    Double tref = tcol( i ) * factor ;
     if ( tref == t ) {
       idx = i ;
@@ -1660 +1482 @@
     }
   }
+  //time1 = gettimeofday_sec() ;
+  //os_ << "end getDirection 2nd stage endSec=" << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
   //os_ << "searched idx = " << idx << LogIO::POST ;
 
+  //time0 = gettimeofday_sec() ;
+  //os_ << "start getDirection 3rd stage startSec=" << time0 << LogIO::POST ;
   //os_ << "dmcol(idx).shape() = " << dmcol(idx).shape() << LogIO::POST ;
-  IPosition ip( dmcol(idx).shape().nelements(), 0 ) ;
+  //IPosition ip( dmcol(idx).shape().nelements(), 0 ) ;
+  IPosition ip( dcol(idx).shape().nelements(), 0 ) ;
   //os_ << "ip = " << ip << LogIO::POST ;
-  ref = dmcol(idx)(ip).getRefString() ;
+  //ref = dmcol(idx)(ip).getRefString() ;
+  trec = dcol.keywordSet() ;
+  Record rec = trec.asRecord( "MEASINFO" ) ;
+  ref = rec.asString( "Ref" ) ;
   //os_ << "ref = " << ref << LogIO::POST ;
   if ( doInterp ) {
     //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).get("s").getValue() ;
+//     Double tref1 = tcol(idx+1).get("s").getValue() ;
+    Double tref0 = tcol(idx) * factor ;
+    Double tref1 = tcol(idx+1) * factor ;
     Matrix<Double> mdir0 = dcol( idx ) ;
     Matrix<Double> mdir1 = dcol( idx+1 ) ;
@@ -1697 +1529 @@
   }
 
-//   double endSec = gettimeofday_sec() ;
-//   os_ << "end MSFiller::getDirection() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
+  //time1 = gettimeofday_sec() ;
+  //os_ << "end getDirection 3rd stage endSec=" << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+  //double endSec = gettimeofday_sec() ;
+  //os_ << "end MSFiller::getDirection1() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
   return idx ;
 }
@@ -1722 +1556 @@
     else if ( t > target )
       high = idx - 1 ;
-    else 
+    else {
       return idx ;
+    }
   }
 
@@ -1729 +1564 @@
 
   return idx ;
+}
+
+uInt MSFiller::binarySearch( Vector<Double> &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] ;
+    if ( t < target ) 
+      low = idx + 1 ;
+    else if ( t > target )
+      high = idx - 1 ;
+    else {
+      return idx ;
+    }
+  }
+
+  idx = max( 0, min( low, high ) ) ;
+
+  return idx ;
+}
+
+string MSFiller::getFrame()
+{
+  MFrequency::Types frame = MFrequency::DEFAULT ;
+  ROTableColumn numChanCol( mstable_.spectralWindow(), "NUM_CHAN" ) ;
+  ROTableColumn measFreqRefCol( mstable_.spectralWindow(), "MEAS_FREQ_REF" ) ;
+  uInt nrow = numChanCol.nrow() ;
+  Vector<Int> measFreqRef( nrow, MFrequency::DEFAULT ) ;
+  uInt nref = 0 ;
+  for ( uInt irow = 0 ; irow < nrow ; irow++ ) {
+    if ( numChanCol.asInt( irow ) != 4 ) { // exclude WVR
+      measFreqRef[nref] = measFreqRefCol.asInt( irow ) ;
+      nref++ ;
+    }
+  }
+  if ( nref > 0 )
+    frame = (MFrequency::Types)measFreqRef[0] ;
+
+  return MFrequency::showType( frame ) ;
+}
+
+void MSFiller::reshapeSpectraAndFlagtra( Cube<Float> &sp,
+                                         Cube<Bool> &fl,
+                                         Table &tab,
+                                         Int &npol,
+                                         Int &nchan,
+                                         Int &nrow,
+                                         Vector<Int> &corrtype )
+{
+  //double startSec = gettimeofday_sec() ;
+  //os_ << "start MSFiller::reshapeSpectraAndFlagtra() startSec=" << startSec << LogIO::POST ;  
+  if ( isFloatData_ ) {
+    ROArrayColumn<Bool> mFlagCol( tab, "FLAG" ) ;
+    ROArrayColumn<Float> mFloatDataCol( tab, "FLOAT_DATA" ) ;
+    sp = mFloatDataCol.getColumn() ;
+    fl = mFlagCol.getColumn() ;
+  }
+  else if ( isData_ ) {
+    sp.resize( npol, nchan, nrow ) ;
+    fl.resize( npol, nchan, nrow ) ;
+    ROArrayColumn<Bool> mFlagCol( tab, "FLAG" ) ;
+    ROArrayColumn<Complex> mDataCol( tab, "DATA" ) ;
+    if ( npol < 3 ) {
+//       Cube<Complex> tmp = mDataCol.getColumn() ;
+//       Float *sp_p = sp.data() ;
+//       Complex *tmp_p = tmp.data() ;
+//       for ( uInt i = 0 ; i < sp.nelements() ; i++ )
+//         sp_p[i] = tmp_p[i].real() ;
+      Cube<Float> tmp = ComplexToReal( mDataCol.getColumn() ) ;
+      IPosition start( 3, 0, 0, 0 ) ;
+      IPosition end( 3, 2*npol-1, nchan-1, nrow-1 ) ;
+      IPosition inc( 3, 2, 1, 1 ) ;
+      sp = tmp( start, end, inc ) ;
+      fl = mFlagCol.getColumn() ;
+    }
+    else {
+      for ( Int irow = 0 ; irow < nrow ; irow++ ) {
+        Bool crossOK = False ;
+        Matrix<Complex> mSp = mDataCol( irow ) ;
+        Matrix<Bool> mFl = mFlagCol( irow ) ;
+        Matrix<Float> spxy = sp.xyPlane( irow ) ;
+        Matrix<Bool> flxy = fl.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 ) {
+              Vector<Float> tmp = ComplexToReal( mSp.row( ipol ) ) ;
+              IPosition start( 1, 0 ) ;
+              IPosition end( 1, 2*nchan-1 ) ;
+              IPosition inc( 1, 2 ) ;
+              spxy.row( ipol ) = tmp( start, end, inc ) ;
+              flxy.row( ipol ) = mFl.row( ipol ) ;
+              start = IPosition( 1, 1 ) ;
+              spxy.row( ipol+1 ) = tmp( start, end, inc ) ;
+              flxy.row( ipol+1 ) = mFl.row( ipol ) ;
+              if ( corrtype[ipol] == Stokes::YX || corrtype[ipol] == Stokes::LR ) {
+                spxy.row( ipol+1 ) = spxy.row( ipol+1 ) * (Float)-1.0 ;
+              }
+              crossOK = True ;
+            }
+          }
+          else {
+            Vector<Float> tmp = ComplexToReal( mSp.row( ipol ) ) ;
+            IPosition start( 1, 0 ) ;
+            IPosition end( 1, 2*nchan-1 ) ;
+            IPosition inc( 1, 2 ) ;
+            spxy.row( ipol ) = tmp( start, end, inc ) ;
+            flxy.row( ipol ) = mFl.row( ipol ) ;
+          }
+        }
+      }
+    }
+  }
+  //double endSec = gettimeofday_sec() ;
+  //os_ << "end MSFiller::reshapeSpectraAndFlagtra() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
+}
+
+uInt MSFiller::getDirection( uInt idx,
+                             Vector<Double> &dir,
+                             Vector<Double> &azel,
+                             Vector<Double> &srate,
+                             ROScalarColumn<Double> &ptcol,
+                             ROArrayColumn<Double> &pdcol,
+                             MEpoch &t,
+                             MPosition &antpos )
+{
+  //double startSec = gettimeofday_sec() ;
+  //os_ << "start MSFiller::getDirection2() startSec=" << startSec << LogIO::POST ;  
+  String refString ;
+  MDirection::Types dirType ;
+  uInt diridx = getDirection( idx, dir, srate, refString, ptcol, pdcol, t.get("s").getValue() ) ;
+  MDirection::getType( dirType, refString ) ;
+  MeasFrame mf( t, antpos ) ;
+  if ( refString == "J2000" ) {
+    MDirection::Convert toazel( dirType, MDirection::Ref( MDirection::AZEL, mf ) ) ;
+    azel = toazel( dir ).getAngle("rad").getValue() ;
+  }
+  else if ( refString(0,4) == "AZEL" ) {
+    azel = dir.copy() ;
+    MDirection::Convert toj2000( dirType, MDirection::Ref( MDirection::J2000, mf ) ) ;
+    dir = toj2000( dir ).getAngle("rad").getValue() ;
+  }
+  else {
+    MDirection::Convert toazel( dirType, MDirection::Ref( MDirection::AZEL, mf ) ) ;
+    azel = toazel( dir ).getAngle("rad").getValue() ;
+    MDirection::Convert toj2000( dirType, MDirection::Ref( MDirection::J2000, mf ) ) ;
+    dir = toj2000( dir ).getAngle("rad").getValue() ;
+  }
+  if ( srate.size() == 0 ) {
+    srate.resize( 2 ) ;
+    srate = 0.0 ;
+  }
+  //double endSec = gettimeofday_sec() ;
+  //os_ << "end MSFiller::getDirection2() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
+  return diridx ;
+}
+
+void MSFiller::getSourceDirection( Vector<Double> &dir, 
+                                   Vector<Double> &azel, 
+                                   Vector<Double> &srate, 
+                                   MEpoch &t, 
+                                   MPosition &antpos, 
+                                   Vector<MDirection> &srcdir ) 
+{
+  //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() ;
+  String ref = srcdir[0].getRefString() ;
+  MDirection::Types dirType ;
+  MDirection::getType( dirType, ref ) ;
+  MeasFrame mf( t, antpos ) ;
+  if ( ref != "J2000" ) {
+    MDirection::Convert toj2000( dirType, MDirection::Ref( MDirection::J2000, mf ) ) ;
+    dir = toj2000( defaultDir ).getAngle("rad").getValue() ;
+  }
+  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 ;
+  //double endSec = gettimeofday_sec() ;
+  //os_ << "end MSFiller::getSourceDirection() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
+}
+
+void MSFiller::initHeader( STHeader &header )
+{
+  header.nchan = 0 ;
+  header.npol = 0 ;
+  header.nif = 0 ;
+  header.nbeam = 0 ;
+  header.observer = "" ;
+  header.project = "" ;
+  header.obstype = "" ;
+  header.antennaname = "" ;
+  header.antennaposition.resize( 0 ) ;
+  header.equinox = 0.0 ;
+  header.freqref = "" ;
+  header.reffreq = -1.0 ;
+  header.bandwidth = 0.0 ;
+  header.utc = 0.0 ;
+  header.fluxunit = "" ;
+  header.epoch = "" ;
+  header.poltype = "" ;
+}
+
+String MSFiller::asString( String name,
+                           uInt idx,
+                           Table tab,
+                           boost::object_pool<ROTableColumn> *pool )
+{
+  ROTableColumn *col = pool->construct( tab, name ) ;
+  String v = col->asString( idx ) ;
+  pool->destroy( col ) ;
+  return v ;
+}
+
+Bool MSFiller::asBool( String name,
+                         uInt idx,
+                         Table &tab,
+                         boost::object_pool<ROTableColumn> *pool )
+{
+  ROTableColumn *col = pool->construct( tab, name ) ;
+  Bool v = col->asBool( idx ) ;
+  pool->destroy( col ) ;
+  return v ;
+}
+
+uInt MSFiller::asuInt( String name,
+                         uInt idx,
+                         Table &tab,
+                         boost::object_pool<ROTableColumn> *pool )
+{
+  ROTableColumn *col = pool->construct( tab, name ) ;
+  uInt v = col->asuInt( idx ) ;
+  pool->destroy( col ) ;
+  return v ;
+}
+
+Int MSFiller::asInt( String name,
+                        uInt idx,
+                        Table &tab,
+                        boost::object_pool<ROTableColumn> *pool )
+{
+  ROTableColumn *col = pool->construct( tab, name ) ;
+  Int v = col->asInt( idx ) ;
+  pool->destroy( col ) ;
+  return v ;
+}
+
+Float MSFiller::asFloat( String name,
+                          uInt idx,
+                          Table &tab,
+                          boost::object_pool<ROTableColumn> *pool )
+{
+  ROTableColumn *col = pool->construct( tab, name ) ;
+  Float v = col->asfloat( idx ) ;
+  pool->destroy( col ) ;
+  return v ;
+}
+
+Double MSFiller::asDouble( String name,
+                           uInt idx,
+                           Table &tab,
+                           boost::object_pool<ROTableColumn> *pool )
+{
+  ROTableColumn *col = pool->construct( tab, name ) ;
+  Double v = col->asdouble( idx ) ;
+  pool->destroy( col ) ;
+  return v ;
+}
+
+void MSFiller::sourceInfo( Int sourceId,
+                           Int spwId,
+                           String &name, 
+                           MDirection &direction,
+                           Vector<casa::Double> &properMotion,
+                           Vector<casa::Double> &restFreqs,
+                           Vector<casa::String> &transitions,
+                           Vector<casa::Double> &sysVels,
+                           boost::object_pool<ROTableColumn> *tpoolr ) 
+{
+  //double startSec = gettimeofday_sec() ;
+  //os_ << "start MSFiller::sourceInfo() startSec=" << startSec << LogIO::POST ; 
+
+  MSSource srctab = mstable_.source() ;
+  MSSource srctabSel = srctab( srctab.col("SOURCE_ID") == sourceId && srctab.col("SPECTRAL_WINDOW_ID") == spwId ) ;
+  if ( srctabSel.nrow() == 0 ) {
+    srctabSel = srctab( srctab.col("SOURCE_ID") == sourceId && srctab.col("SPECTRAL_WINDOW_ID") == -1 ) ;
+  }
+  Int numLines = 0 ;
+  if ( srctabSel.nrow() > 0 ) {
+    // source name
+    name = asString( "NAME", 0, srctabSel, tpoolr ) ;
+    
+    // source proper motion
+    ROArrayColumn<Double> roArrDCol( srctabSel, "PROPER_MOTION" ) ;
+    properMotion = roArrDCol( 0 ) ;
+    
+    // source direction as MDirection object
+    ROScalarMeasColumn<MDirection> tmpMeasCol( srctabSel, "DIRECTION" ) ;
+    direction = tmpMeasCol( 0 ) ;
+    
+    // number of lines
+    numLines = asInt( "NUM_LINES", 0, srctabSel, tpoolr ) ;
+  }
+  else {
+    name = "" ;
+    properMotion = Vector<Double>( 2, 0.0 ) ;
+    direction = MDirection( Quantum<Double>(0.0,Unit("rad")), Quantum<Double>(0.0,Unit("rad")) ) ;
+  }
+
+  restFreqs.resize( numLines ) ;
+  transitions.resize( numLines ) ;
+  sysVels.resize( numLines ) ;
+  if ( numLines > 0 ) {
+    if ( srctabSel.tableDesc().isColumn( "REST_FREQUENCY" ) ) {
+      ROArrayQuantColumn<Double> quantArrCol( srctabSel, "REST_FREQUENCY" ) ;
+      Array< Quantum<Double> > qRestFreqs = quantArrCol( 0 ) ;
+      for ( int i = 0 ; i < numLines ; i++ ) {
+        restFreqs[i] = qRestFreqs( IPosition( 1, i ) ).getValue( "Hz" ) ;
+      }
+    }
+    //os_ << "restFreqs = " << restFreqs << LogIO::POST ;
+    if ( srctabSel.tableDesc().isColumn( "TRANSITION" ) ) {
+      ROArrayColumn<String> transitionCol( srctabSel, "TRANSITION" ) ;
+      if ( transitionCol.isDefined( 0 ) )
+        transitions = transitionCol( 0 ) ;
+      //os_ << "transitionNameCol.nrow() = " << transitionCol.nrow() << LogIO::POST ;
+    }
+    if ( srctabSel.tableDesc().isColumn( "SYSVEL" ) ) {
+      ROArrayColumn<Double> roArrDCol( srctabSel, "SYSVEL" ) ;
+      sysVels = roArrDCol( 0 ) ;
+    }
+  }
   
+  //double endSec = gettimeofday_sec() ;
+  //os_ << "end MSFiller::sourceInfo() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
+}
+
+void MSFiller::spectralSetup( Int spwId,
+                              MEpoch &me,
+                              MPosition &mp,
+                              MDirection &md,
+                              Double &refpix,
+                              Double &refval,
+                              Double &increment,
+                              Int &nchan,
+                              String &freqref,
+                              Double &reffreq,
+                              Double &bandwidth,
+                              boost::object_pool<ROTableColumn> *tpoolr ) 
+{
+  //double startSec = gettimeofday_sec() ;
+  //os_ << "start MSFiller::spectralSetup() startSec=" << startSec << LogIO::POST ; 
+
+  MSSpectralWindow spwtab = mstable_.spectralWindow() ;
+  MeasFrame mf( me, mp, md ) ;
+  MFrequency::Types freqRef = MFrequency::castType( (uInt)asInt( "MEAS_FREQ_REF", spwId, spwtab, tpoolr ) ) ;
+  Bool even = False ;
+  if ( (nchan/2)*2 == nchan ) even = True ;
+  ROScalarQuantColumn<Double> tmpQuantCol( spwtab, "TOTAL_BANDWIDTH" ) ;
+  Double totbw = tmpQuantCol( spwId ).getValue( "Hz" ) ;
+  if ( nchan != 4 )
+    bandwidth = max( bandwidth, totbw ) ;
+  if ( freqref == "" && nchan != 4) 
+    //sdh.freqref = MFrequency::showType( freqRef ) ;
+    freqref = "LSRK" ;
+  if ( reffreq == -1.0 && nchan != 4 ) {
+    tmpQuantCol.attach( spwtab, "REF_FREQUENCY" ) ;
+    Quantum<Double> qreffreq = tmpQuantCol( spwId ) ;
+    if ( freqRef == MFrequency::LSRK ) {
+      reffreq = qreffreq.getValue("Hz") ;
+    }
+    else {
+      MFrequency::Convert tolsr( freqRef, MFrequency::Ref( MFrequency::LSRK, mf ) ) ;
+      reffreq = tolsr( qreffreq ).get("Hz").getValue() ; 
+    }
+  }
+  Int refchan = nchan / 2 ;
+  IPosition refip( 1, refchan ) ;
+  refpix = 0.5*(nchan-1) ;
+  refval = 0.0 ;
+  ROArrayQuantColumn<Double> sharedQDArrCol( spwtab, "CHAN_WIDTH" ) ;
+  increment = sharedQDArrCol( spwId )( refip ).getValue( "Hz" ) ;
+  //           os_ << "nchan = " << nchan << " refchan = " << refchan << "(even=" << even << ") refpix = " << refpix << LogIO::POST ;
+  sharedQDArrCol.attach( spwtab, "CHAN_FREQ" ) ;
+  Vector< Quantum<Double> > chanFreqs = sharedQDArrCol( spwId ) ;
+  if ( nchan > 1 && chanFreqs[0].getValue("Hz") > chanFreqs[1].getValue("Hz") ) 
+    increment *= -1.0 ;
+  if ( freqRef == MFrequency::LSRK ) {
+    if ( even ) {
+      IPosition refip0( 1, refchan-1 ) ;
+      Double refval0 = chanFreqs(refip0).getValue("Hz") ;
+      Double refval1 = chanFreqs(refip).getValue("Hz") ;
+      refval = 0.5 * ( refval0 + refval1 ) ;
+    }
+    else {
+      refval = chanFreqs(refip).getValue("Hz") ;
+    }
+  }
+  else {
+    MFrequency::Convert tolsr( freqRef, MFrequency::Ref( MFrequency::LSRK, mf ) ) ;
+    if ( even ) {
+      IPosition refip0( 1, refchan-1 ) ;
+      Double refval0 = chanFreqs(refip0).getValue("Hz") ;
+      Double refval1 = chanFreqs(refip).getValue("Hz") ;
+      refval = 0.5 * ( refval0 + refval1 ) ;
+      refval = tolsr( refval ).get("Hz").getValue() ;
+    }
+    else {
+      refval = tolsr( chanFreqs(refip) ).get("Hz").getValue() ;
+    }
+  }
+  
+  //double endSec = gettimeofday_sec() ;
+  //os_ << "end MSFiller::spectralSetup() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
 }
 

branches/parallel/src/MSFiller.h

@@ -90 +90 @@
 
   // get direction for DIRECTION, AZIMUTH, and ELEVATION columns
-  casa::uInt getDirection( casa::uInt idx, casa::Vector<casa::Double> &dir, casa::Vector<casa::Double> &srate, casa::String &ref, casa::MSPointing &tab, casa::Double t ) ;
+  casa::uInt getDirection( casa::uInt idx, 
+                           casa::Vector<casa::Double> &dir, 
+                           casa::Vector<casa::Double> &srate, 
+                           casa::String &ref, 
+                           casa::ROScalarColumn<casa::Double> &ptcol, 
+                           casa::ROArrayColumn<casa::Double> &pdcol, 
+                           casa::Double t ) ;
+  casa::uInt getDirection( casa::uInt idx, 
+                           casa::Vector<casa::Double> &dir, 
+                           casa::Vector<casa::Double> &azel, 
+                           casa::Vector<casa::Double> &srate, 
+                           casa::ROScalarColumn<casa::Double> &ptcol, 
+                           casa::ROArrayColumn<casa::Double> &pdcol,
+                           casa::MEpoch &t, casa::MPosition &antpos ) ;
+  void getSourceDirection( casa::Vector<casa::Double> &dir, 
+                           casa::Vector<casa::Double> &azel, 
+                           casa::Vector<casa::Double> &srate, 
+                           casa::MEpoch &t, 
+                           casa::MPosition &antpos, 
+                           casa::Vector<casa::MDirection> &srcdir ) ;
 
   // create key for TCAL table
@@ -97 +116 @@
   // binary search
   casa::uInt binarySearch( casa::Vector<casa::MEpoch> &timeList, casa::Double target ) ; 
+  casa::uInt binarySearch( casa::Vector<casa::Double> &timeList, casa::Double target ) ; 
 
   // tool for HPC
   double gettimeofday_sec() ;
-  
+
+  // get frequency frame
+  std::string getFrame() ;
+
+  // reshape SPECTRA and FLAGTRA
+  void reshapeSpectraAndFlagtra( casa::Cube<casa::Float> &sp, 
+                                 casa::Cube<casa::Bool> &fl,
+                                 casa::Table &tab,
+                                 casa::Int &npol,
+                                 casa::Int &nchan,
+                                 casa::Int &nrow,
+                                 casa::Vector<casa::Int> &corrtype ) ;
+  
+  // initialize header
+  void initHeader( STHeader &header ) ;
+
+  // get value from table column using object pool
+  casa::String asString( casa::String name,
+                         casa::uInt idx,
+                         casa::Table tab, 
+                         boost::object_pool<casa::ROTableColumn> *pool ) ;
+  casa::Bool asBool( casa::String name,
+                     casa::uInt idx,
+                     casa::Table &tab, 
+                     boost::object_pool<casa::ROTableColumn> *pool ) ;
+  casa::Int asInt( casa::String name,
+                   casa::uInt idx,
+                   casa::Table &tab, 
+                   boost::object_pool<casa::ROTableColumn> *pool ) ;
+  casa::uInt asuInt( casa::String name,
+                     casa::uInt idx,
+                     casa::Table &tab, 
+                     boost::object_pool<casa::ROTableColumn> *pool ) ;
+  casa::Float asFloat( casa::String name,
+                       casa::uInt idx,
+                       casa::Table &tab, 
+                       boost::object_pool<casa::ROTableColumn> *pool ) ;
+  casa::Double asDouble( casa::String name,
+                         casa::uInt idx,
+                         casa::Table &tab, 
+                         boost::object_pool<casa::ROTableColumn> *pool ) ;
+
+  void sourceInfo( casa::Int sourceId,
+                   casa::Int spwId,
+                   casa::String &name, 
+                   casa::MDirection &direction,
+                   casa::Vector<casa::Double> &properMotion,
+                   casa::Vector<casa::Double> &restFreqs,
+                   casa::Vector<casa::String> &transitions,
+                   casa::Vector<casa::Double> &sysVels,
+                   boost::object_pool<casa::ROTableColumn> *pool ) ;
+
+  void spectralSetup( casa::Int spwId,
+                      casa::MEpoch &me,
+                      casa::MPosition &mp,
+                      casa::MDirection &md,
+                      casa::Double &refpix,
+                      casa::Double &refval,
+                      casa::Double &increment,
+                      casa::Int &nchan,
+                      casa::String &freqref,
+                      casa::Double &reffreq,
+                      casa::Double &bandwidth,
+                      boost::object_pool<casa::ROTableColumn> *pool ) ;
+
   casa::CountedPtr<Scantable> table_ ;
   casa::MeasurementSet mstable_ ;
@@ -126 +210 @@
   casa::Vector<casa::Double> mwTime_ ;
   casa::Vector<casa::Double> mwInterval_ ;
+  casa::Vector<casa::uInt> mwIndex_ ;
 
   // Record for TCAL_ID