Changeset 2561 for branches/hpc33/src

Timestamp:

06/12/12 10:30:57 (12 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...

Clean up code

File:

• branches/hpc33/src/STMath.cpp (modified) (4 diffs)

branches/hpc33/src/STMath.cpp

@@ -3941 +3941 @@
     vector<bool> masks = s->getMask( 0 ) ;
 
+    // save original table selection
+    Table torg = s->table_ ;
+
     // off scan
-    STSelector orig = s->getSelection() ;
     // TODO 2010/01/08 TN
     // Grouping by time should be needed before averaging.
@@ -3951 +3953 @@
     // share off scan before average with out
     CountedPtr<Scantable> out = getScantable( s, true ) ;
-    Table t = s->table_( s->table_.col("SRCTYPE") == (Int)SrcType::PSOFF ) ;
-    //TableCopy::copyRows( out->table(), t ) ;
-    out->table_ = t ;
+    out->table_ = s->table_( s->table_.col("SRCTYPE") == (Int)SrcType::PSOFF ) ;
     out->attach() ;
     insitu_ = insitu ;
@@ -3959 +3959 @@
                                                        masks,
                                                        "TINT" ) ;
-//     Table ttab = out->table() ;
-//     ROScalarColumn<Double> *timeCol = new ROScalarColumn<Double>( ttab, "TIME" ) ;
-//     uInt nrow = timeCol->nrow() ;
-//     Vector<Double> timeSep = timeCol->getColumn() ;
-//     delete timeCol ;
-//     for ( uInt i = nrow-2 ; i > 0 ; i-- ) {
-//       timeSep[i] -= timeSep[i-1] ;
-//     }
-//     Vector<Double> interval = out->integrCol_.getColumn() ;
-//     interval /= 86400.0 ;
-//     uInt *newscan = new uInt[nrow] ;
-//     Vector<uInt> newscanno( IPosition(1,nrow), newscan, TAKE_OVER ) ; 
-//     uInt *p = newscan ;
-//     uInt newid = 0 ;
-//     for ( uInt i = 0 ; i < nrow - 1 ; i++ ) {
-//       *p = newid ;
-//       double gap = 2.0 * timeSep[i+1] / ( interval[i] + interval[i+1] ) ;
-//       //cout << "gap[" << i << "]=" << setw(5) << gap << endl ;
-//       if ( gap > 1.1 ) {
-// //         cout << "detected gap between " << i << " and " << i+1 << endl ;
-//         newid++ ;
-//       }
-//       p++ ;
-//     }
-//     *p = newid ;
-//     out->scanCol_.putColumn( newscanno ) ;
-//     vector< CountedPtr<Scantable> > tmp( 1, out ) ;
-//     CountedPtr<Scantable> aoff = average( tmp, masks, "TINT", "SCAN" ) ;
-//     t1 = mathutil::gettimeofday_sec() ;
-//     cout << "elapsed time for off averaging: " << t1-t0 << " sec" << endl ;
-    
     // on scan
 //     t0 = mathutil::gettimeofday_sec() ;
     s->table_ = s->table_( s->table_.col("SRCTYPE") == (Int)SrcType::PSON ) ;
     s->attach() ;
-    //out->table().addRow( s->nrow()-out->nrow() ) ;
     out->table_ = out->originalTable_ ;
     out->attach() ;
@@ -4030 +3998 @@
     }
     delete iter ;
-    s->setSelection( orig ) ;
+    s->table_ = torg ;
+    s->attach() ;
 
 //     t1 = mathutil::gettimeofday_sec() ;