Changeset 2475 for trunk

Timestamp:

04/23/12 16:43:34 (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...

Bug fix on averageall mode: fixed a bug that cannot handle spectral
Tsys when averaging.

Location:

trunk/src

Files:

• STMath.cpp (modified) (6 diffs)
• Scantable.cpp (modified) (1 diff)

trunk/src/STMath.cpp

@@ -269 +269 @@
         */
         specCol.get(k, spec);
-        tsysCol.get(k, tsys);
+        //tsysCol.get(k, tsys);
+        tsys.assign( tsysCol(k) );
         intCol.get(k, inter);
         mjdCol.get(k, time);
@@ -3605 +3606 @@
     }
     // combine spectra
-    ArrayColumn<Float> specColOut ;
-    specColOut.attach( out->table(), "SPECTRA" ) ;
-    ArrayColumn<uChar> flagColOut ;
-    flagColOut.attach( out->table(), "FLAGTRA" ) ;
-    ScalarColumn<uInt> ifnoColOut ;
-    ifnoColOut.attach( out->table(), "IFNO" ) ;
-    ScalarColumn<uInt> polnoColOut ;
-    polnoColOut.attach( out->table(), "POLNO" ) ;
-    ScalarColumn<uInt> freqidColOut ;
-    freqidColOut.attach( out->table(), "FREQ_ID" ) ;
+    ArrayColumn<Float> specColOut( out->table(), "SPECTRA" ) ;
+    ArrayColumn<uChar> flagColOut( out->table(), "FLAGTRA" ) ;
+    ArrayColumn<Float> tsysColOut( out->table(), "TSYS" ) ;
+    ScalarColumn<uInt> ifnoColOut( out->table(), "IFNO" ) ;
+    ScalarColumn<uInt> polnoColOut( out->table(), "POLNO" ) ;
+    ScalarColumn<uInt> freqidColOut( out->table(), "FREQ_ID" ) ;
 //     MDirection::ScalarColumn dirColOut ;
 //     dirColOut.attach( out->table(), "DIRECTION" ) ;
@@ -3622 +3619 @@
     TableIterator iter( tab, cols ) ;
     vector< vector<uInt> > sizes( freqgrp.size() ) ;
+    vector<uInt> totalsizes( freqgrp.size(), 0 ) ;
+    ArrayColumn<Float> specCols ;
+    ArrayColumn<uChar> flagCols ;
+    ArrayColumn<Float> tsysCols ;
+    ScalarColumn<uInt> polnos ;
+    vector< Vector<Float> > specout( freqgrp.size() ) ;
+    vector< Vector<uChar> > flagout( freqgrp.size() ) ;
+    vector< Vector<Float> > tsysout( freqgrp.size() ) ;
     while( !iter.pastEnd() ) {
-      vector< vector<Float> > specout( freqgrp.size() ) ;
-      vector< vector<uChar> > flagout( freqgrp.size() ) ;
-      ArrayColumn<Float> specCols ;
       specCols.attach( iter.table(), "SPECTRA" ) ;
-      ArrayColumn<uChar> flagCols ;
       flagCols.attach( iter.table(), "FLAGTRA" ) ;
+      tsysCols.attach( iter.table(), "TSYS" ) ;
       ifnoCol.attach( iter.table(), "IFNO" ) ;
-      ScalarColumn<uInt> polnos ;
       polnos.attach( iter.table(), "POLNO" ) ;
 //       MDirection::ScalarColumn dircol ;
@@ -3671 +3672 @@
 //       }
       // get a list of number of channels for each frequency group member
-      for ( uInt igrp = 0 ; igrp < freqgrp.size() ; igrp++ ) {
-        sizes[igrp].resize( freqgrp[igrp].size() ) ;
-        for ( uInt imem = 0 ; imem < freqgrp[igrp].size() ; imem++ ) {
-          for ( uInt irow = 0 ; irow < iter.table().nrow() ; irow++ ) {
-            uInt ifno = ifnoCol( irow ) ;
-            if ( ifno == freqgrp[igrp][imem] ) {
-              Vector<Float> spec = specCols( irow ) ;
-              sizes[igrp][imem] = spec.nelements() ;
-              break ;
-            }
-          }
-        }
-      }
+      if ( totalsizes[0] == 0 ) {
+        for ( uInt igrp = 0 ; igrp < freqgrp.size() ; igrp++ ) {
+          sizes[igrp].resize( freqgrp[igrp].size() ) ;
+          for ( uInt imem = 0 ; imem < freqgrp[igrp].size() ; imem++ ) {
+            for ( uInt irow = 0 ; irow < iter.table().nrow() ; irow++ ) {
+              uInt ifno = ifnoCol( irow ) ;
+              if ( ifno == freqgrp[igrp][imem] ) {
+                Vector<Float> spec = specCols( irow ) ;
+                sizes[igrp][imem] = spec.nelements() ;
+                totalsizes[igrp] += sizes[igrp][imem] ;
+                break ;
+              }
+            }
+          }
+          specout[igrp].resize( totalsizes[igrp] ) ;
+          flagout[igrp].resize( totalsizes[igrp] ) ;
+          tsysout[igrp].resize( totalsizes[igrp] ) ;
+        }
+      }
+
       // combine spectra
       for ( uInt irow = 0 ; irow < out->table().nrow() ; irow++ ) {
@@ -3697 +3705 @@
             }
           }
+          IPosition startpos( 1, 0 ) ;
+          IPosition endpos( 1, 0 ) ;
           for ( uInt imem = 0 ; imem < freqgrp[igrp].size() ; imem++ ) {
             for ( uInt jrow = 0 ; jrow < iter.table().nrow() ; jrow++ ) {
@@ -3711 +3721 @@
 //               if ( ifno == freqgrp[igrp][imem] && dd <= tol ) {
               if ( ifno == freqgrp[igrp][imem] ) {
+                endpos[0] = startpos[0] + sizes[igrp][imem] - 1 ;
                 Vector<Float> spec = specCols( jrow ) ;
                 Vector<uChar> flag = flagCols( jrow ) ;
-                vector<Float> svec ;
-                spec.tovector( svec ) ;
-                vector<uChar> fvec ;
-                flag.tovector( fvec ) ;
+                Vector<Float> tsys = tsysCols( jrow ) ;
                 //os << "spec.size() = " << svec.size() << " fvec.size() = " << fvec.size() << LogIO::POST ;
-                specout[igrp].insert( specout[igrp].end(), svec.begin(), svec.end() ) ;
-                flagout[igrp].insert( flagout[igrp].end(), fvec.begin(), fvec.end() ) ;
+                specout[igrp]( startpos, endpos ) = spec ;
+                flagout[igrp]( startpos, endpos ) = flag ;
+                if ( spec.size() == tsys.size() ) {
+                  tsysout[igrp]( startpos, endpos ) = tsys ;
+                }
+                else {
+                  tsysout[igrp]( startpos, endpos ) = tsys[0] ;
+                }
                 //os << "specout[" << igrp << "].size() = " << specout[igrp].size() << LogIO::POST ;
+                startpos[0] += sizes[igrp][imem] ;
               }
             }
           }
           // set SPECTRA and FRAGTRA
-          Vector<Float> newspec( specout[igrp] ) ;
-          Vector<uChar> newflag( flagout[igrp] ) ;
-          specColOut.put( irow, newspec ) ;
-          flagColOut.put( irow, newflag ) ;
+          specColOut.put( irow, specout[igrp] ) ;
+          flagColOut.put( irow, flagout[igrp] ) ;
+          tsysColOut.put( irow, tsysout[igrp] ) ;
           // IFNO renumbering (renumbered as frequency group ID)
           ifnoColOut.put( irow, igrp ) ; 

trunk/src/Scantable.cpp

@@ -1880 +1880 @@
   Vector<Float> oldspec = specCol_( irow ) ;
   Vector<uChar> oldflag = flagsCol_( irow ) ;
+  Vector<Float> oldtsys = tsysCol_( irow ) ;
   uInt newsize = nmax - nmin + 1 ;
-  specCol_.put( irow, oldspec( Slice( nmin, newsize, 1 ) ) ) ;
-  flagsCol_.put( irow, oldflag( Slice( nmin, newsize, 1 ) ) ) ;
+  Slice slice( nmin, newsize, 1 ) ;
+  specCol_.put( irow, oldspec( slice ) ) ;
+  flagsCol_.put( irow, oldflag( slice ) ) ;
+  if ( oldspec.size() == oldtsys.size() )
+    tsysCol_.put( irow, oldtsys( slice ) ) ;
 
   return ;