Changeset 2202 for trunk/external-alma

Timestamp:

06/24/11 12:04:16 (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...

Bug fix on confused use of IFNO and BEAMNO.

Freuqency setting is calculated only once for BEARS (25beam) data.

File:

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

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

@@ -668 +668 @@
   string arryt = string( record->ARRYT ) ;
   uInt ib = getArrayId( arryt ) ;
-
-  if ( frec_.isDefined( arryt ) ) {
+  string rxname = getRX()[0] ;
+  string key = arryt ;
+  if ( rxname.find("MULT2") != string::npos )
+    key = "BEARS" ;
+
+  if ( frec_.isDefined( key ) ) {
     // frequency for the array is already calculated
-    Vector<Double> f =  frec_.asArrayDouble( arryt ) ;
+    Vector<Double> f =  frec_.asArrayDouble( key ) ;
     Double *f_p = f.data() ;
     for ( int i = 0 ; i < 3 ; i++ )
@@ -818 +822 @@
   // register frequency setting to Record
   Vector<Double> f( v ) ;
-  frec_.define( arryt, f ) ;
+  frec_.define( key, f ) ;
 
   return v ;