Changeset 3109 for trunk

Timestamp:

12/26/16 14:07:42 (8 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Put in Release Notes: No

Module(s): sdsaveold

Description: A fix to the handling of CHBIND for NRO dataset.

File:

• trunk/external-alma/atnf/PKSIO/NRODataset.cc (modified) (2 diffs)

trunk/external-alma/atnf/PKSIO/NRODataset.cc

@@ -1110 +1110 @@
   vector<double> mscale = MLTSCF ;
   double dscale = mscale[getIndex( i )] ;
-  int cbind = CHBIND ;
-  int chmin = CHMIN ;
+//  int cbind = CHBIND ;
+//  int chmin = CHMIN ;
 
   // char -> int -> double
@@ -1160 +1160 @@
   }
 
-  // channel binding if necessary
-  if ( cbind != 1 ) {
-    iter = spec.begin() ;
-    advance( iter, chmin ) ;
-    vector<double>::iterator iter2 = spec.begin() ;
-    for ( int i = 0 ; i < nchan ; i++ ) {
-      double sum0 = 0 ;
-      double sum1 = 0 ;
-      for ( int j = 0 ; j < cbind ; j++ ) {
-        sum0 += *iter ;
-        sum1 += 1.0 ;
-        iter++ ;
-      }
-      *iter2 = sum0 / sum1 ;
-      iter2++ ;
-      // DEBUG
-      //cout << "NRODataset::getSpectrum()  bspec[" << i << "] = " << bspec[i] << endl ;
-      //
-    }
-    spec.resize( nchan ) ;
-  }
+//  // channel binding if necessary
+//  if ( cbind != 1 ) {
+//    iter = spec.begin() ;
+//    advance( iter, chmin ) ;
+//    vector<double>::iterator iter2 = spec.begin() ;
+//    for ( int i = 0 ; i < nchan ; i++ ) {
+//      double sum0 = 0 ;
+//      double sum1 = 0 ;
+//      for ( int j = 0 ; j < cbind ; j++ ) {
+//        sum0 += *iter ;
+//        sum1 += 1.0 ;
+//        iter++ ;
+//      }
+//      *iter2 = sum0 / sum1 ;
+//      iter2++ ;
+//      // DEBUG
+//      //cout << "NRODataset::getSpectrum()  bspec[" << i << "] = " << bspec[i] << endl ;
+//      //
+//    }
+//    spec.resize( nchan ) ;
+//  }
 
   // DEBUG