Changeset 2543 for branches

Timestamp:

05/22/12 11:57:08 (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...

Defiend STMath::copyRows that is able to skip to copy SPECTRA/FLAGTRA/TSYS
if they are not necessary to copy.

Location:

branches/hpc33/src

Files:

• STMath.cpp (modified) (4 diffs)
• STMath.h (modified) (1 diff)

branches/hpc33/src/STMath.cpp

@@ -166 +166 @@
 //   double t2 = 0 ;
 //   double t3 = 0 ;
+//   double t4 = 0 ;
+//   double t5 = 0 ;
 //   TableIterator iter(baset, cols);
 //   int count = 0 ;
@@ -179 +181 @@
     // copy the first row of this selection into the new table
     tout.addRow();
+//     t4 = mathutil::gettimeofday_sec() ;
     //TableCopy::copyRows(tout, subt, outrowCount, 0, 1);
-    TableCopy::copyRows(tout, baset, outrowCount, rows[0], 1);
+    //TableCopy::copyRows(tout, baset, outrowCount, rows[0], 1);
+    // skip to copy SPECTRA, FLAGTRA, and TSYS since those heavy columns are 
+    // overwritten in the following process
+    copyRows( tout, baset, outrowCount, rows[0], 1, False, False, False ) ;
+//     t5 += mathutil::gettimeofday_sec() - t4 ;
     // re-index to 0
     if ( avmode != "SCAN" && avmode != "SOURCE" ) {
@@ -408 +415 @@
 //    cout << "elapsed time for average(): " << t1-t0 << " sec" << endl ;
 //    cout << "   elapsed time for acc.add(): " << t3 << " sec" << endl ;
+//    cout << "   elapsed time for copyRows(): " << t5 << " sec" << endl ;
 
   return out;
@@ -5357 +5365 @@
   return sp ;
 }
+
+void STMath::copyRows( Table &out,
+                       const Table &in,
+                       uInt startout,
+                       uInt startin,
+                       uInt nrow,
+                       Bool copySpectra,
+                       Bool copyFlagtra,
+                       Bool copyTsys )
+{
+  uInt nexclude = 0 ;
+  Block<String> excludeColsBlock( 3 ) ;
+  if ( !copySpectra ) {
+    excludeColsBlock[nexclude] = "SPECTRA" ;
+    nexclude++ ;
+  }
+  if ( !copyFlagtra ) {
+    excludeColsBlock[nexclude] = "FLAGTRA" ;
+    nexclude++ ;
+  }
+  if ( !copyTsys ) {
+    excludeColsBlock[nexclude] = "TSYS" ;
+    nexclude++ ;
+  }
+  //  if ( nexclude < 3 ) {
+  //    excludeCols.resize( nexclude, True ) ;
+  //  }
+  Vector<String> excludeCols( IPosition(1,nexclude), 
+                              excludeColsBlock.storage(),
+                              SHARE ) ;
+//   cout << "excludeCols=" << excludeCols << endl ;
+  TableRow rowout( out, excludeCols, True ) ;
+  ROTableRow rowin( in, excludeCols, True ) ;
+  uInt rin = startin ;
+  uInt rout = startout ;
+  for ( uInt i = 0 ; i < nrow ; i++ ) {
+    rowin.get( rin ) ;
+    rowout.putMatchingFields( rout, rowin.record() ) ;
+    rin++ ;
+    rout++ ;
+  }
+}

branches/hpc33/src/STMath.h

@@ -439 +439 @@
                                         int index ) ;
   double getMJD( string strtime ) ;
+  void copyRows( casa::Table &out, 
+                 const casa::Table &in, 
+                 casa::uInt startout, 
+                 casa::uInt startin, 
+                 casa::uInt nrow, 
+                 casa::Bool copySpectra=true,
+                 casa::Bool copyFlagtra=true, 
+                 casa::Bool copyTsys=true ) ; 
 
   bool insitu_;