Changeset 2158 for trunk/external-alma

Timestamp:

04/27/11 17:28:12 (14 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: read NRO data

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

BEAMNO is non-zero only when receiver is BEARS (MULT2).

File:

• trunk/external-alma/atnf/PKSIO/NROReader.cc (modified) (1 diff)

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

@@ -552 +552 @@
 
   // beamno
-  string arryt = string( record->ARRYT ) ;
-  string sbeamno = arryt.substr( 1, arryt.size()-1 ) ;
-  uInt ibeamno = atoi( sbeamno.c_str() ) ; 
-  beamno = ibeamno - 1 ;
+  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 ;
+  }
+  else {
+    beamno = 0 ;
+  }
   //cout << "beamno = " << beamno << endl ;