Changeset 2433 for trunk

Timestamp:

03/14/12 20:34:15 (13 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-2818)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: unit test: sdaverage[test900]

Put in Release Notes: No

Module(s):

Description: Higher precision regridding of frequency axis.

*An additional comment for r2431 (forgot to mention this)*
Scantable::regridChannel now regrids Tsys column if necessary, i.e.,
the number of Tsys channels are equal to that of spectra.

File:

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

trunk/src/Scantable.cpp

@@ -1885 +1885 @@
 }
 
+
 void asap::Scantable::regridChannel( int nChan, double dnu )
 {
@@ -1905 +1906 @@
   }
 
-  // change channel number for specCol_ and flagCol_
-  //Vector<Float> newspec( nChan, 0 ) ;
-  //Vector<uChar> newflag( nChan, false ) ;
+  // change channel number for specCol_, flagCol_, and tsysCol_ (if necessary)
   vector<string> coordinfo = getCoordInfo() ;
   string oldinfo = coordinfo[0] ;
@@ -1955 +1954 @@
   int ichan = 0 ;
   double wsum = 0.0 ;
-  Vector<Float> zi( nChan+1 ) ;
-  Vector<Float> yi( oldsize + 1 ) ;
+  Vector<double> zi( nChan+1 ) ;
+  Vector<double> yi( oldsize + 1 ) ;
   zi[0] = abcissa[0] - 0.5 * olddnu ;
   //zi[1] = zi[1] + dnu ;
@@ -1966 +1965 @@
   for ( int ii = 1 ; ii < oldsize ; ii++ )
     //yi[ii] = abcissa[ii-1] + olddnu ;
-    yi[ii] = yi[0] + olddnu * ii ;
-  yi[oldsize] = abcissa[oldsize-1] + 0.5 * olddnu ;
+    yi[ii] = 0.5* (abcissa[ii-1] + abcissa[ii]) ;
+  yi[oldsize] = abcissa[oldsize-1] \
+    + 0.5 * (abcissa[oldsize-1] - abcissa[oldsize-2]) ;
   if ( dnu > 0.0 ) {
     for ( int ii = 0 ; ii < nChan ; ii++ ) {