Changeset 17 for trunk/src

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:

• trunk/src/SDReader.cc (modified) (3 diffs)

trunk/src/SDReader.cc

@@ -145 +145 @@
   int status = 0;  
   
-  Int    beamNo, IFno, refBeam, scanNo;
+  Int    beamNo, IFno, refBeam, scanNo, cycleNo;
   Float  azimuth, elevation, focusAxi, focusRot, focusTan, 
     humidity, parAngle, pressure, temperature, windAz, windSpeed;
@@ -177 +177 @@
       // stepsize as well
       // spectra(nChan,nPol)!!!
-      status = reader_->read(scanNo, mjd, interval, fieldName, srcName,
+      status = reader_->read(scanNo, cycleNo, mjd, interval, fieldName, 
+                             srcName,
                              srcDir, srcPM, srcVel, IFno, refFreq,
                              bandwidth, freqInc, tcal, tcalTime, 
@@ -212 +213 @@
         //uInt frqslot = sdft.addFrequency(refPix, refFreq, freqInc);
 
-        if ( srcName != prevName ) {//temp
-          scanid++;//temp
-          prevName = srcName;//temp
-        }//temp
-        sc.scanid = scanid;
+        //if ( srcName != prevName ) {//temp
+        //scanid++;//temp
+        // prevName = srcName;//temp
+        //}//temp
+        sc.scanid = scanNo;
         //sc.setFrequencyMap(frqslot,IFno-1);
         sc.setSpectrum(spectra, beamNo-1, IFno-1);