Changeset 2201 for trunk/external-alma


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


Location:
trunk/external-alma/atnf/PKSIO
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r2198 r2201  
    728728//     }
    729729//   }
    730   if ( arryt[0] == 'A' || arryt[0] == 'W' || arryt[0] == 'U' || arryt[0] == 'H' )
     730  if ( arryt[0] == 'W' || arryt[0] == 'U' || arryt[0] == 'H' )
    731731    isAOS = true ;
    732732

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

    r2200 r2201  
    521521                            uInt &scanno,
    522522                            uInt &cycleno,
     523                            uInt &ifno,
    523524                            uInt &beamno,
    524525                            uInt &polno,
    … …  
    564565  //cout << "cycleno = " << cycleno << endl ;
    565566
    566   // beamno
     567  // beamno and ifno
    567568  string rxname = dataset_->getRX()[0] ;
    568569  if ( rxname.find("MULT2") != string::npos ) {
    569570    string arryt = string( record->ARRYT ) ;
    570     string sbeamno = arryt.substr( 1, arryt.size()-1 ) ;
    571     uInt ibeamno = atoi( sbeamno.c_str() ) ;
    572     beamno = ibeamno - 1 ;
     571    beamno = dataset_->getArrayId( arryt ) ;
     572    ifno = 0 ;
    573573  }
    574574  else {
    575575    beamno = 0 ;
     576    string arryt = string( record->ARRYT ) ;
     577    ifno = dataset_->getArrayId( arryt ) ;
    576578  }
    577579  //cout << "beamno = " << beamno << endl ;

  • trunk/external-alma/atnf/PKSIO/NROReader.h

    r2154 r2201  
    129129                           uInt &scanno,
    130130                           uInt &cycleno,
     131                           uInt &ifno,
    131132                           uInt &beamno,
    132133                           uInt &polno,
Note: See TracChangeset for help on using the changeset viewer.