Changeset 17 for trunk


Ignore:
Timestamp:
06/30/04 11:15:15 (20 years ago)
Author:
mmarquar
Message:

Changed pksredaer->read() to refelct the changes in the aips++/atnf package. Mark C. has added a new field "cycleNo" to the function args.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/SDReader.cc

    r16 r17  
    145145  int status = 0; 
    146146 
    147   Int    beamNo, IFno, refBeam, scanNo;
     147  Int    beamNo, IFno, refBeam, scanNo, cycleNo;
    148148  Float  azimuth, elevation, focusAxi, focusRot, focusTan,
    149149    humidity, parAngle, pressure, temperature, windAz, windSpeed;
     
    177177      // stepsize as well
    178178      // spectra(nChan,nPol)!!!
    179       status = reader_->read(scanNo, mjd, interval, fieldName, srcName,
     179      status = reader_->read(scanNo, cycleNo, mjd, interval, fieldName,
     180                             srcName,
    180181                             srcDir, srcPM, srcVel, IFno, refFreq,
    181182                             bandwidth, freqInc, tcal, tcalTime,
     
    212213        //uInt frqslot = sdft.addFrequency(refPix, refFreq, freqInc);
    213214
    214         if ( srcName != prevName ) {//temp
    215           scanid++;//temp
    216           prevName = srcName;//temp
    217         }//temp
    218         sc.scanid = scanid;
     215        //if ( srcName != prevName ) {//temp
     216        //scanid++;//temp
     217        // prevName = srcName;//temp
     218        //}//temp
     219        sc.scanid = scanNo;
    219220        //sc.setFrequencyMap(frqslot,IFno-1);
    220221        sc.setSpectrum(spectra, beamNo-1, IFno-1);
Note: See TracChangeset for help on using the changeset viewer.