Changeset 2018

Timestamp:

02/28/11 19:41:13 (13 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...

Performance of fillSysCal() greatly improved.

Location:

trunk/src

Files:

• MSWriter.cpp (modified) (11 diffs)
• MSWriter.h (modified) (1 diff)

trunk/src/MSWriter.cpp

@@ -420 +420 @@
               os_ << "tcalIdArr = " << tcalIdArr << LogIO::POST ;
               String key = String::toString( tcalIdArr[0] ) ;
-              if ( !tcalIdRec_.isDefined( key ) ) //{
+              if ( !tcalIdRec_.isDefined( key ) ) {
                 tcalIdRec_.define( key, tcalIdArr ) ;
-//                 tcalRowRec_.define( key, t5.rowNumbers() ) ;
-//               }
-//               else {
-//                 Vector<uInt> pastrows = tcalRowRec_.asArrayuInt( key ) ;
-//                 tcalRowRec_.define( concatenateArray( pastrows, t5.rowNumbers() ) ) ;
-//               }
+                tcalRowRec_.define( key, t5.rowNumbers() ) ;
+              }
+              else {
+                Vector<uInt> pastrows = tcalRowRec_.asArrayuInt( key ) ;
+                tcalRowRec_.define( key, concatenateArray( pastrows, t5.rowNumbers() ) ) ;
+              }
               
               // fill STATE_ID
@@ -981 +981 @@
 
   // access to MAIN table
-//   Table tab = table_->table() ;
-  Block<String> cols( 5 ) ;
+  Block<String> cols( 6 ) ;
   cols[0] = "TIME" ;
   cols[1] = "TCAL_ID" ;
@@ -988 +987 @@
   cols[3] = "BEAMNO" ;
   cols[4] = "IFNO" ;
+  cols[5] = "INTERVAL" ;
   Table tab = table_->table().project( cols ) ;
 
@@ -994 +994 @@
 
   nrow = tcalIdRec_.nfields() ;
-
-  os_ << "fillSysCal() nrow = " << nrow << LogIO::POST ;
 
   Double midTime ;
@@ -1024 +1022 @@
   ROArrayColumn<Float> tcalCol( sortedstt, "TCAL" ) ;
   ROTableColumn idCol( sortedstt, "ID" ) ;
-  ROArrayColumn<Float> tsysCol ;
-  //Block<Bool> rowmask( tab.nrow(), True ) ;
-  //Table tab2 = tab( rowmask ) ;
+  ROArrayColumn<Float> tsysCol( tab, "TSYS" ) ;
+  ROTableColumn tcalidCol( tab, "TCAL_ID" ) ;
+  ROTableColumn timeCol( tab, "TIME" ) ;
+  ROTableColumn intervalCol( tab, "INTERVAL" ) ;
+  ROTableColumn beamnoCol( tab, "BEAMNO" ) ;
+  ROTableColumn ifnoCol( tab, "IFNO" ) ;
   for ( uInt irow = 0 ; irow < nrow ; irow++ ) {
     double t1 = gettimeofday_sec() ;
@@ -1032 +1033 @@
     os_ << "ids = " << ids << LogIO::POST ;
     uInt npol = ids.size() ;
-    Table tsel = tab( tab.col("TCAL_ID").in(ids) ) ;
-    //Table tsel = tab( tab.col("TCAL_ID").in(ids) ).sort( "TCAL_ID" ) ;
-    //Table tsel = tab2( tab2.col("TCAL_ID").in(ids) ).sort( "TCAL_ID" ) ;
-    uInt nrowsel = tsel.nrow() ;
-    //Vector<uInt> selectedcols = tsel.rowNumbers() ;
-    Vector<uInt> selectedcols = tsel.rowNumbers( tab, True ) ;
-    os_ << "selectedcols = " << selectedcols << LogIO::POST ;
-    Block<Bool> rowmask( tab.nrow(), True ) ;
-    for ( uInt icol = 0 ; icol < selectedcols.nelements() ; icol++ )
-      rowmask[selectedcols[icol]] = False ;
-    //tab2 = tab( rowmask ) ;
-    tab = tab( rowmask ) ;
-    os_ << "tab.nrow() = " << tab.nrow() << LogIO::POST ;
-    tsel = tsel.sort( "TCAL_ID" ) ;
+    Vector<uInt> rows = tcalRowRec_.asArrayuInt( irow ) ;
+    os_ << "rows = " << rows << LogIO::POST ;
+    Vector<Double> atime( rows.nelements() ) ;
+    Vector<Double> ainterval( rows.nelements() ) ;
+    Vector<uInt> atcalid( rows.nelements() ) ;
+    for( uInt jrow = 0 ; jrow < rows.nelements() ; jrow++ ) {
+      atime[jrow] = (Double)timeCol.asdouble( rows[jrow] ) ;
+      ainterval[jrow] = (Double)intervalCol.asdouble( rows[jrow] ) ;
+      atcalid[jrow] = tcalidCol.asuInt( rows[jrow] ) ;
+    }
+    Vector<Float> dummy = tsysCol( rows[0] ) ;
+    Matrix<Float> tsys( npol,dummy.nelements() ) ;
+    tsys.row( 0 ) = dummy ;
+    for ( uInt jrow = 1 ; jrow < npol ; jrow++ )
+      tsys.row( jrow ) = tsysCol( rows[jrow] ) ;
 
     // FEED_ID
-    ROScalarColumn<uInt> uintCol( tsel, "BEAMNO" ) ;
-    *feedRF = uintCol( 0 ) ;
+    *feedRF = beamnoCol.asuInt( rows[0] ) ;
 
     // SPECTRAL_WINDOW_ID
-    uintCol.attach( tsel, "IFNO" ) ;
-    *spwRF = uintCol( 0 ) ;
+    *spwRF = ifnoCol.asuInt( rows[0] ) ;
 
     // TIME and INTERVAL
-    Table tsel1 = tsel( tsel.col("TCAL_ID") == ids[0] ) ;
-    os_ << "tsel.nrow = " << tsel.nrow() << " tsel1.nrow = " << tsel1.nrow() << LogIO::POST ;
-    getValidTimeRange( midTime, interval, tsel1 ) ;
+    getValidTimeRange( midTime, interval, atime, ainterval ) ;
     *timeRF = midTime ;
     *intervalRF = interval ;
@@ -1078 +1076 @@
       tcal.row( 0 ) = dummyC ;
     }
-    tsysCol.attach( tsel, "TSYS" ) ;
-    Vector<Float> dummyS = tsysCol( 0 ) ;
-    Matrix<Float> tsys( npol, dummyS.size() ) ;
-    tsys.row( 0 ) = dummyS ;
-    // get TSYS and TCAL
     if ( npol == 2 ) {
       if ( idCol.asuInt( ids[1] ) == ids[1] ) {
@@ -1094 +1087 @@
         tcal.row( 1 ) = tcalCol( 1 ) ;
       }
-      tsys.row( 1 ) = tsysCol( nrowsel-1 ) ;
     }
     else if ( npol == 3 ) {
@@ -1111 +1103 @@
         tcal.row( 2 ) = tcalCol( 0 ) ;
       }
-      tsys.row( 1 ) = tsysCol( nrowsel/npol ) ;
-      tsys.row( 2 ) = tsysCol( nrowsel-1 ) ;
     }
     else if ( npol == 4 ) {
@@ -1136 +1126 @@
         tcal.row( 3 ) = tcalCol( 0 ) ;
       }
-      tsys.row( 1 ) = tsysCol( nrowsel/3 ) ;
-      tsys.row( 2 ) = tsys.row( 1 ) ;
-      tsys.row( 3 ) = tsysCol( nrowsel-1 ) ;
     }
     if ( tcalSpec_ ) {
@@ -1639 +1626 @@
 }
 
+void MSWriter::getValidTimeRange( Double &me, Double &interval, Vector<Double> &atime, Vector<Double> &ainterval ) 
+{
+  double startSec = gettimeofday_sec() ;
+  os_ << "start MSWriter::getVaridTimeRange() startSec=" << startSec << LogIO::POST ;
+
+  // sort table
+  //Table stab = tab.sort( "TIME" ) ;
+
+  Double minTime ; 
+  Double maxTime ;
+  minMax( minTime, maxTime, atime ) ;
+  Double midTime = 0.5 * ( minTime + maxTime ) * 86400.0 ;
+  // unit for TIME
+  // Scantable: "d"
+  // MS: "s"
+  me = midTime ;
+  interval = ( maxTime - minTime ) * 86400.0 ;
+
+  double endSec = gettimeofday_sec() ;
+  os_ << "end MSWriter::getValidTimeRange() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
+}
+
 //void MSWriter::queryType( Int type, String &stype, Bool &b )
 void MSWriter::queryType( Int type, String &stype, Bool &b, Double &t, Double &l )

trunk/src/MSWriter.h

@@ -79 +79 @@
   casa::Vector<casa::Int> toCorrType( casa::Vector<casa::Int> polnos ) ;
   void getValidTimeRange( casa::Double &me, casa::Double &interval, casa::Table &tab ) ;
+  void getValidTimeRange( casa::Double &me, casa::Double &interval, casa::Vector<casa::Double> &atime, casa::Vector<casa::Double> &ainterval ) ;
   //void queryType( casa::Int type, casa::String &stype, casa::Bool &b ) ; 
   void queryType( casa::Int type, casa::String &stype, casa::Bool &b, casa::Double &t, Double &l ) ;