Changeset 2201 for trunk/external-alma/atnf/PKSIO
- Timestamp:
- 06/24/11 11:40:08 (14 years ago)
- Location:
- trunk/external-alma/atnf/PKSIO
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/external-alma/atnf/PKSIO/NRODataset.cc
r2198 r2201 728 728 // } 729 729 // } 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' ) 731 731 isAOS = true ; 732 732 -
trunk/external-alma/atnf/PKSIO/NROReader.cc
r2200 r2201 521 521 uInt &scanno, 522 522 uInt &cycleno, 523 uInt &ifno, 523 524 uInt &beamno, 524 525 uInt &polno, … … 564 565 //cout << "cycleno = " << cycleno << endl ; 565 566 566 // beamno 567 // beamno and ifno 567 568 string rxname = dataset_->getRX()[0] ; 568 569 if ( rxname.find("MULT2") != string::npos ) { 569 570 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 ; 573 573 } 574 574 else { 575 575 beamno = 0 ; 576 string arryt = string( record->ARRYT ) ; 577 ifno = dataset_->getArrayId( arryt ) ; 576 578 } 577 579 //cout << "beamno = " << beamno << endl ; -
trunk/external-alma/atnf/PKSIO/NROReader.h
r2154 r2201 129 129 uInt &scanno, 130 130 uInt &cycleno, 131 uInt &ifno, 131 132 uInt &beamno, 132 133 uInt &polno,
Note:
See TracChangeset
for help on using the changeset viewer.