Changeset 2212 for trunk/external-alma

Timestamp:

07/08/11 11:37:22 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2819

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...

Update of channel frequency calculation according to a documentation
from NRO.

File:

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

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

@@ -687 +687 @@
   //cout << "NRODataset::getFrequencies()  ib = " << ib << endl ;
 
-//   if ( strncmp( record->ARRYT, "X", 1 ) == 0 ) {
-//     // FX
-//     if ( strncmp( (record->ARRYT)+1, "1", 1 ) == 0 
-//          || strncmp( (record->ARRYT)+1, "3", 1 ) ) {
-//       // FX1, 3
-//       ia = 2 ;
-//     }
-//     else {
-//       // FX2, 4
-//       ia = 1 ;
-//     }
-//   }
-//   else if ( strncmp( record->ARRYT, "A", 1 ) == 0 )
-//     ia = 2 ;  // AC
-//   else if ( strncmp( record->ARRYT, "W", 1 ) == 0 ) {
-//     // AOS-W    
-//     ia = 2 ;  
-//     isAOS = true ;
-//   }
-//   else if ( strncmp( record->ARRYT, "U", 1 ) == 0 ) {
-//     // AOS-U
-//     ia = 2 ;  
-//     isAOS = true ;
-//   }
-//   else if ( strncmp( record->ARRYT, "H", 1 ) == 0 ) {
-//     // AOS-H
-//     isAOS = true ;
-//     //cout << record->ARRYT << " " <<  strlen(record->ARRYT) << endl ;
-//     //cout << (record->ARRYT)+1 << endl ;
-//     if ( strncmp( (record->ARRYT)+2, " ", 1 ) == 0 ) {
-//       // H1-9
-//       if ( strncmp( (record->ARRYT)+1, "9", 1 ) == 0 ) {
-//         // H9
-//         ia = 2 ;
-//       }
-//       else {
-//         // H1-8
-//         ia = 1 ;
-//       }
-//     }
-//     else {
-//       // H10-16
-//       ia = 2 ;
-//     }
-//   }
   if ( arryt[0] == 'W' || arryt[0] == 'U' || arryt[0] == 'H' )
     isAOS = true ;
@@ -802 +757 @@
   }
   else {
-    cw = getBERES()[ib] ;
-
-    if ( !isUSB )
+
+    cw = ( freqs[1] - freqs[0] ) 
+      / ( chcal[1] - chcal[0] ) ;    
+
+    if ( isUSB ) {
+      // channel frequency inversion 
       cw *= -1.0 ;
+      Double tmp = freqs[1] ;
+      freqs[1] = freqs[0] ; 
+      freqs[0] = tmp ;
+    }
     
-    if ( cw == 0.0 ) {
-      cw = ( freqs[1] - freqs[0] ) 
-        / ( chcal[1] - chcal[0] ) ;
-    }
-
     v[0] = chcal[0] - 1 ; // 0-base
     v[1] = freqs[0] ;