Changeset 2201 for trunk/external-alma/atnf/PKSIO/NROReader.cc

Timestamp:

06/24/11 11:40:08 (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...

IFNO is taken from ARRAY number.
Bug fix on checking if spectrometer is AOS or not.

File:

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

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

@@ -521 +521 @@
                             uInt &scanno,
                             uInt &cycleno,
+                            uInt &ifno,
                             uInt &beamno,
                             uInt &polno,
@@ -564 +565 @@
   //cout << "cycleno = " << cycleno << endl ;
 
-  // beamno
+  // beamno and ifno
   string rxname = dataset_->getRX()[0] ;
   if ( rxname.find("MULT2") != string::npos ) {
     string arryt = string( record->ARRYT ) ;
-    string sbeamno = arryt.substr( 1, arryt.size()-1 ) ;
-    uInt ibeamno = atoi( sbeamno.c_str() ) ; 
-    beamno = ibeamno - 1 ;
+    beamno = dataset_->getArrayId( arryt ) ;
+    ifno = 0 ;
   }
   else {
     beamno = 0 ;
+    string arryt = string( record->ARRYT ) ;
+    ifno = dataset_->getArrayId( arryt ) ;
   }
   //cout << "beamno = " << beamno << endl ;