Changeset 2908 for trunk

Timestamp:

03/24/14 13:47:07 (10 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-5871, CAS-5873

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: test_tsdsave

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Fixed a bug in Scantable::reshapeSpectrum.

File:

• trunk/src/Scantable.cpp (modified) (2 diffs)

trunk/src/Scantable.cpp

@@ -1864 +1864 @@
 
   // update FREQUENCIES subtable
+  Vector<uInt> freqIdArray = mfreqidCol_.getColumn();
+  uInt numFreqId = GenSort<uInt>::sort(freqIdArray, Sort::Ascending,
+                                       Sort::HeapSort | Sort::NoDuplicates);
   Double refpix ;
   Double refval ;
   Double increment ;
-  int freqnrow = freqTable_.table().nrow() ;
-  Vector<uInt> oldId( freqnrow ) ;
-  Vector<uInt> newId( freqnrow ) ;
-  for ( int irow = 0 ; irow < freqnrow ; irow++ ) {
-    freqTable_.getEntry( refpix, refval, increment, irow ) ;
+  for (uInt irow  = 0; irow < numFreqId; irow++) { 
+    freqTable_.getEntry( refpix, refval, increment, freqIdArray[irow] ) ;
     /***
      * need to shift refpix to nmin
@@ -1878 +1878 @@
     refval = refval - ( refpix - nmin ) * increment ;
     refpix = 0 ;
-    freqTable_.setEntry( refpix, refval, increment, irow ) ;
+    freqTable_.setEntry( refpix, refval, increment, freqIdArray[irow] ) ;
   }