Changeset 2572 for branches

Timestamp:

06/16/12 10:15:36 (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 on averageWithinSession

File:

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

branches/hpc33/src/STMath.cpp

@@ -5133 +5133 @@
   acc.setUserMask( cmask ) ;
 
-  vector<string> cols( 1, "POLNO" ) ;
+  vector<string> cols( 3 ) ;
+  cols[0] = "IFNO" ;
+  cols[1] = "POLNO" ;
+  cols[2] = "BEAMNO" ;
   STIdxIterAcc iter( s, cols ) ;
 
-  uInt nchan = s->nchan(s->getIF(0)) ;
   Table ttab = s->table() ;
   ROScalarColumn<Double> *timeCol = new ROScalarColumn<Double>( ttab, "TIME" ) ;
@@ -5145 +5147 @@
   uInt outrow = 0 ;
 
-  Vector<uChar> flag( nchan ) ;
-  Vector<Bool> bflag( nchan ) ;
-  Vector<Float> spec( nchan ) ;
-  Vector<Float> tsys( nchan ) ;
-
   while( !iter.pastEnd() ) {
 
     Vector<uInt> rows = iter.getRows( SHARE ) ;
+
+    uInt nchan = s->nchan(s->getIF(rows[0])) ;
+    Vector<uChar> flag( nchan ) ;
+    Vector<Bool> bflag( nchan ) ;
+    Vector<Float> spec( nchan ) ;
+    Vector<Float> tsys( nchan ) ;
+
     uInt len = rows.nelements() ;