Changeset 2564 for branches

Timestamp:

06/12/12 19:18:49 (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...

Bug fix in STMath::averageWithinSession.
Restore modified SCANNO in input scantable.

File:

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

branches/hpc33/src/STMath.cpp

@@ -5556 +5556 @@
     uInt nrow = timeCol->nrow() ;
     Vector<Double> timeSep = timeCol->getColumn() ;
+    Vector<uInt> scannoOrg = s->scanCol_.getColumn() ;
     delete timeCol ;
     for ( uInt i = nrow-2 ; i > 0 ; i-- ) {
@@ -5581 +5582 @@
     vector< CountedPtr<Scantable> > tmp( 1, s ) ;
     CountedPtr<Scantable> a = average( tmp, mask, weight, "SCAN" ) ;
+    s->scanCol_.putColumn( scannoOrg ) ;
 //     double t3 = mathutil::gettimeofday_sec() ;
 //     cout << "a.nrow = " << a->nrow() << endl ;