Changeset 1993 for trunk/src

Timestamp:

02/16/11 13:05:11 (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...

Small improvement on TCAL(_SPECTRUM) and TSYS(_SPECTRUM) handling.

Location:

trunk/src

Files:

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

trunk/src/MSFiller.cpp

@@ -77 +77 @@
     isProcessor_( False ),
     isSysCal_( False ),
-    isWeather_( False )
+    isWeather_( False ),
+    colTsys_( "TSYS_SPECTRUM" ),
+    colTcal_( "TCAL_SPECTRUM" )
 {
   os_ = LogIO() ;
@@ -189 +191 @@
   if ( caltab.nrow() == 0 ) 
     isSysCal_ = False ;
+  else {
+    if ( !caltab.tableDesc().isColumn( colTcal_ ) ) 
+      colTcal_ = "TCAL" ;
+    if ( !caltab.tableDesc().isColumn( colTsys_ ) ) 
+      colTsys_ = "TSYS" ;
+  }
   MSPointing pointtab = mstable_.pointing() ;
   if ( mstable_.weather().nrow() == 0 ) 
@@ -384 +392 @@
           //os_ << "npol = " << npol << LogIO::POST ;
           //os_ << "corrtype = " << corrtype << LogIO::POST ;
-          if ( sdh.npol < npol ) sdh.npol = npol ;
+          sdh.npol = max( sdh.npol, npol ) ;
           if ( sdh.poltype == "" ) sdh.poltype = getPolType( corrtype[0] ) ;
           // source information
@@ -453 +461 @@
           Bool even = False ;
           if ( (nchan/2)*2 == nchan ) even = True ;
-          if ( sdh.nchan < nchan ) sdh.nchan = nchan ;
+          sdh.nchan = max( sdh.nchan, nchan ) ;
           ROScalarQuantColumn<Double> *tmpQuantCol = new ROScalarQuantColumn<Double>( spwtab, "TOTAL_BANDWIDTH" ) ;
           Double totbw = (*tmpQuantCol)( spwId ).getValue( "Hz" ) ;
           delete tmpQuantCol ;
-          if ( sdh.bandwidth < totbw ) sdh.bandwidth = totbw ;
+          sdh.bandwidth = max( sdh.bandwidth, totbw ) ;
           if ( sdh.freqref == "" ) 
             //sdh.freqref = MFrequency::showType( freqRef ) ;
@@ -562 +570 @@
               os_ << "start fill SPECTRA and FLAG: " << time0 << LogIO::POST ;
               ROArrayColumn<Bool> mFlagCol( t5, "FLAG" ) ;
+              //Cube<Bool> mFlagArr = mFlagCol.getColumn() ;
               if ( isFloatData_ ) {
                 //os_ << "FLOAT_DATA exists" << LogIO::POST ;
                 ROArrayColumn<Float> mFloatDataCol( t5, "FLOAT_DATA" ) ;
+                //Cube<Float> mFloatDataArr = mFloatDataCol.getColumn() ;
                 addednr = nrow*npol ;
                 oldnr += addednr ;
@@ -571 +581 @@
                 for ( Int irow = 0 ; irow < nrow ; irow++ ) {
                   Matrix<Float> sp = mFloatDataCol( irow ) ;
+                  //Matrix<Float> sp = mFloatDataArr.xyPlane( irow ) ;
                   for ( Int ipol = 0 ; ipol < npol ; ipol++ ) {
                     spCol->put( prevnr+ipol*nrow+irow, sp.row(ipol) ) ;
@@ -577 +588 @@
                 for ( Int irow = 0 ; irow < nrow ; irow++ ) {
                   Matrix<Bool> flb = mFlagCol( irow ) ;
+                  //Matrix<Bool> flb = mFlagArr.xyPlane( irow ) ;
                   Matrix<uChar> fl( flb.shape() ) ;
                   convertArray( fl, flb ) ;
@@ -592 +604 @@
                 //os_ << "DATA exists" << LogIO::POST ;
                 ROArrayColumn<Complex> mDataCol( t5, "DATA" ) ;
+                //Cube<Complex> mDataArr = mDataCol.getColumn() ;
                 addednr = nrow*npol ;
                 oldnr += addednr ;
@@ -599 +612 @@
                   Bool crossOK = False ;
                   Matrix<Complex> sp = mDataCol( irow ) ;
+                  //Matrix<Complex> sp = mDataArr.xyPlane( irow ) ;
                   for ( Int ipol = 0 ; ipol < npol ; ipol++ ) {
                     if ( corrtype[ipol] == Stokes::XY || corrtype[ipol] == Stokes::YX 
@@ -620 +634 @@
                   Bool crossOK = False ;
                   Matrix<Bool> flb = mFlagCol( irow ) ;
+                  //Matrix<Bool> flb = mFlagArr.xyPlane( irow ) ;
                   Matrix<uChar> fl( flb.shape() ) ;
                   convertArray( fl, flb ) ;
@@ -667 +682 @@
               time0 = gettimeofday_sec() ;
               os_ << "start fill TSYS: " << time0 << LogIO::POST ;
-              Vector<Double> sysCalTime ;
+              Vector<Double> sysCalTime( nrow, -1.0 ) ;
+              //Vector<Double> sysCalTime ;
               if ( isSysCal_ ) {
-                sysCalTime = getSysCalTime( caltabsel, *mTimeCol ) ;
+                //sysCalTime = getSysCalTime( caltabsel, *mTimeCol ) ;
+                getSysCalTime( caltabsel, *mTimeCol, sysCalTime ) ;
                 tidx = prevnr ;
                 uInt calidx = 0 ;
@@ -1455 +1472 @@
     return ;
   } 
-  Bool isSp = sctab.tableDesc().isColumn( "TCAL_SPECTRUM" ) ;
-  //Table sctabsel =  sctab( sctab.col("ANTENNA_ID") == antenna_ ) ;
   Table sctabsel( sctab( sctab.col("ANTENNA_ID") == antenna_ ) ) ;
   if ( sctabsel.nrow() == 0 ) {
@@ -1496 +1511 @@
         //os_ << "fillTcal::t2.nrow = " << nrow << LogIO::POST ;
         ROScalarQuantColumn<Double> scTimeCol( t2, "TIME" ) ;
-        IPosition newShape( 2, 1, nrow ) ;
-        if ( isSp ) {
-          scTcalCol.attach( t2, "TCAL_SPECTRUM" ) ;
-          newShape[0] = scTcalCol.shape(0)(1) ;
-        }
-        else {
-          scTcalCol.attach( t1, "TCAL" ) ;
-        }
+        scTcalCol.attach( t2, colTcal_ ) ;
         tab.addRow( nrow*npol ) ;
         newnr += nrow*npol ;
@@ -1580 +1588 @@
 }
 
-Vector<Double> MSFiller::getSysCalTime( MSSysCal &tab, MEpoch::ROScalarColumn &tcol )
+//Vector<Double> MSFiller::getSysCalTime( MSSysCal &tab, MEpoch::ROScalarColumn &tcol )
+void MSFiller::getSysCalTime( MSSysCal &tab, MEpoch::ROScalarColumn &tcol, Vector<Double> &tstr )
 {
   double startSec = gettimeofday_sec() ;
   os_ << "start MSFiller::getSysCalTime() startSec=" << startSec << LogIO::POST ;
-  uInt nrow = tcol.table().nrow() ;
-  Vector<Double> tstr( nrow, -1.0 ) ;
+  //uInt nrow = tcol.table().nrow() ;
+  uInt nrow = tstr.nelements() ;
+  //Vector<Double> tstr( nrow, -1.0 ) ;
   if ( tab.nrow() == 0 ) 
-    return tstr ;
+    //return tstr ;
+    return ;
   uInt scnrow = tab.nrow() ;
   ROScalarMeasColumn<MEpoch> scTimeCol( tab, "TIME" ) ;
@@ -1615 +1626 @@
   double endSec = gettimeofday_sec() ;
   os_ << "end MSFiller::getSysCalTime() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
-  return tstr ;
+  //return tstr ;
+  return ;
 }
 
@@ -1628 +1640 @@
     return 0 ;
   }
-  Bool isSp = tab.tableDesc().isColumn( "TSYS_SPECTRUM" ) ;
   ROScalarMeasColumn<MEpoch> scTimeCol( tab, "TIME" ) ;
   ROArrayColumn<Float> mTsysCol ;
-  if ( isSp ) {
-    mTsysCol.attach( tab, "TSYS_SPECTRUM" ) ;
-  }
-  else {
-    mTsysCol.attach( tab, "TSYS" ) ;
-  }
+  mTsysCol.attach( tab, colTsys_ ) ;
   for ( uInt i = idx ; i < nrow ; i++ ) {
     Double tref = scTimeCol( i ).get( "s" ).getValue() ;

trunk/src/MSFiller.h

@@ -25 +25 @@
 #include <casa/Arrays/Vector.h>
 #include <casa/Arrays/Matrix.h>
+#include <casa/Arrays/Cube.h>
 #include <casa/Logging/LogIO.h>
 
@@ -84 +85 @@
   // assume that tab is selected by ANTENNA_ID, FEED_ID, SPECTRAL_WINDOW_ID 
   // and sorted by TIME
-  casa::Vector<casa::Double> getSysCalTime( casa::MSSysCal &tab, casa::MEpoch::ROScalarColumn &tcol ) ;
+  //casa::Vector<casa::Double> getSysCalTime( casa::MSSysCal &tab, casa::MEpoch::ROScalarColumn &tcol ) ;
+  void getSysCalTime( casa::MSSysCal &tab, casa::MEpoch::ROScalarColumn &tcal, casa::Vector<casa::Double> &scTime ) ;
 
   // get tsys by time stamp
@@ -117 +119 @@
   casa::Bool isWeather_ ;
 
+  casa::String colTsys_ ;
+  casa::String colTcal_ ;
+
   casa::LogIO os_ ;