Changeset 2463 for trunk/src

Timestamp:

04/12/12 15:41:33 (13 years ago)

Author:

Kana Sugimoto

Message:

New Development: No (a bug fix)

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): scantable._regrid_specchan

Description: a bug fix in Scantable::regridSpecChannel.

Fixed the calculation of regridded reference channel.

File:

• trunk/src/Scantable.cpp (modified) (1 diff)

trunk/src/Scantable.cpp

@@ -1916 +1916 @@
       firstTime[currId] = false ;
       freqTable_.getEntry( refpix, refval, increment, currId ) ;
-      /***
-       * need to shift refpix to 0
-       ***/
+
       //refval = refval - ( refpix + 0.5 * (1 - factor) ) * increment ;
-      if (factor >= 0 ) {
+      if (factor > 0 ) {
         refpix = (refpix + 0.5)/factor - 0.5;
       } else {
-        refpix = (abcissa.size() + 0.5 - refpix)/abs(factor) - 0.5;
+        refpix = (abcissa.size() - 0.5 - refpix)/abs(factor) - 0.5;
       }
       freqTable_.setEntry( refpix, refval, increment*factor, currId ) ;
-      os << "ID" << currId << ": channel width (Orig) = " << oldincr << " [" << freqTable_.getUnitString() << "], scale factor = " << factor << LogIO::POST ;
-      os << "     frequency increment (Orig) = " << increment << "-> (New) " << increment*factor << LogIO::POST ;
+      //os << "ID" << currId << ": channel width (Orig) = " << oldincr << " [" << freqTable_.getUnitString() << "], scale factor = " << factor << LogIO::POST ;
+      //os << "     frequency increment (Orig) = " << increment << "-> (New) " << increment*factor << LogIO::POST ;
     }
   }