Changeset 87 for trunk/src

Timestamp:

11/12/04 12:08:27 (21 years ago)

Author:

mar637

Message:

chnged cerr's to throws, added rest function.

File:

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

trunk/src/SDReader.cc

@@ -30 +30 @@
 //#---------------------------------------------------------------------------
 #include <atnf/PKSIO/PKSreader.h>
-
+#include <casa/Exceptions.h>
 #include "SDReader.h"
 
@@ -59 +59 @@
 void SDReader::reset() {
   cursor_ = 0;
-  open(filename_);
+  table_ = new SDMemTable();
+  if (reader_) delete reader_; reader_ = 0;
+  // re-create the reader
+  Bool   haveBase, haveSpectra, haveXPol;
+  String format;
+  Vector<Bool> beams;
+  if ((reader_ = getPKSreader(filename_, 0, False, format, beams, nIF_,
+                              nChan_, nPol_, haveBase, haveSpectra,
+                              haveXPol)) == 0)  {
+    throw(AipsError("PKSreader failed"));
+  }
+  // re-enter the header
+  table_->putSDHeader(header_);
 }
 
@@ -70 +82 @@
   Bool   haveBase, haveSpectra, haveXPol;
   String inName(filename);
+  filename_ = inName;
   String format;
   Vector<Bool> beams;
@@ -75 +88 @@
                               nChan_, nPol_, haveBase, haveSpectra,
                               haveXPol)) == 0)  {
-    cerr << "PKSreader failed" << endl;
+    throw(AipsError("PKSreader failed"));
+    //cerr << "PKSreader failed" << endl;
   }
   if (!haveSpectra) {
     delete reader_;
     reader_ = 0;
-    cerr << "Spectral data absent." << endl;
+    throw(AipsError("No spectral data in file."));
     return;
   }
@@ -89 +103 @@
   header_.npol = nPol_;
   header_.nbeam = nBeam_;
-
-  Int status = reader_->getHeader(header_.observer, header_.project, 
-                                  header_.antennaname, header_.antennaposition,
-                                  header_.obstype,header_.equinox, 
-                                  header_.freqref,
-                                  header_.utc, header_.reffreq,
+  Int status = reader_->getHeader(header_.observer, header_.project,
+                                  header_.antennaname, header_.antennaposition,
+                                  header_.obstype,header_.equinox,
+                                  header_.freqref,
+                                  header_.utc, header_.reffreq,
                                   header_.bandwidth);
   if (status) {
     delete reader_;
     reader_ = 0;
-    cerr << "Failed to get data description." << endl;
+    throw(AipsError("Failed to get header."));
     return;
   }
-  //header_.print();  
   if ((header_.obstype).matches("*SW*")) {
     // need robust way here - probably read ahead of next timestamp
@@ -123 +135 @@
 
 int SDReader::read(const std::vector<int>& seq) {
-  int status = 0;  
-  
+  int status = 0;
+
   Int    beamNo, IFno, refBeam, scanNo, cycleNo;
-  Float  azimuth, elevation, focusAxi, focusRot, focusTan, 
+  Float  azimuth, elevation, focusAxi, focusRot, focusTan,
     humidity, parAngle, pressure, temperature, windAz, windSpeed;
   Double bandwidth, freqInc, interval, mjd, refFreq, restFreq, srcVel;
@@ -152 +164 @@
       // stepsize as well
       // spectra(nChan,nPol)!!!
-      status = reader_->read(scanNo, cycleNo, mjd, interval, fieldName, 
-                             srcName, srcDir, srcPM, srcVel, IFno, refFreq,
-                             bandwidth, freqInc, restFreq, tcal, tcalTime, 
-                             azimuth, elevation, parAngle, focusAxi, 
-                             focusTan, focusRot, temperature, pressure, 
-                             humidity, windSpeed, windAz, refBeam, 
-                             beamNo, direction, scanRate,
-                             tsys, sigma, calFctr, baseLin, baseSub, 
-                             spectra, flagtra, xCalFctr, xPol);          
+      status = reader_->read(scanNo, cycleNo, mjd, interval, fieldName,
+                             srcName, srcDir, srcPM, srcVel, IFno, refFreq,
+                             bandwidth, freqInc, restFreq, tcal, tcalTime,
+                             azimuth, elevation, parAngle, focusAxi,
+                             focusTan, focusRot, temperature, pressure,
+                             humidity, windSpeed, windAz, refBeam,
+                             beamNo, direction, scanRate,
+                             tsys, sigma, calFctr, baseLin, baseSub,
+                             spectra, flagtra, xCalFctr, xPol);
       if (status) {
-        if (status == -1) {
-          // EOF.
-          if (row < stepsize-1) cerr << "incomplete integration data." << endl;
-          cerr << "EOF" << endl;
-          table_->putSDFreqTable(frequencies_);
-          return status;
-        }
-      }      
+        if (status == -1) {
+          // EOF.
+          if (row < stepsize-1) cerr << "incomplete integration data." << endl;
+          //cerr << "EOF" << endl;
+          table_->putSDFreqTable(frequencies_);
+          return status;
+        }
+      }
       // if in the given list
       if (cursor_ == seq[seqi] || getAll) {
-        // add integration cycle
-        if (row==0) {
-          //add invariant info: scanNo, mjd, interval, fieldName,
-          //srcName, azimuth, elevation, parAngle, focusAxi, focusTan,
-          //focusRot, temperature, pressure, humidity, windSpeed,
-          //windAz  srcDir, srcPM, srcVel
-          sc.timestamp = mjd;
-          sc.interval = interval;         
-          sc.sourcename = srcName;
-        }
-        // add specific info
-        // IFno beamNo are 1-relative
-        // refPix = nChan/2+1 in  Integer arith.!       
-        Int refPix = header_.nchan/2+1; 
-        Int frqslot = frequencies_.addFrequency(refPix, refFreq, freqInc);
-        sc.setFrequencyMap(frqslot,IFno-1);
-
-        sc.scanid = scanNo-1;//make it 0-based
-        sc.setSpectrum(spectra, beamNo-1, IFno-1);
-        sc.setFlags(flagtra,  beamNo-1, IFno-1);
-        sc.setTsys(tsys, beamNo-1, IFno-1);
-        sc.setDirection(direction, beamNo-1);
+        // add integration cycle
+        if (row==0) {
+          //add invariant info: scanNo, mjd, interval, fieldName,
+          //srcName, azimuth, elevation, parAngle, focusAxi, focusTan,
+          //focusRot, temperature, pressure, humidity, windSpeed,
+          //windAz  srcDir, srcPM, srcVel
+          sc.timestamp = mjd;
+          sc.interval = interval;
+          sc.sourcename = srcName;
+        }
+        // add specific info
+        // IFno beamNo are 1-relative
+        // refPix = nChan/2+1 in  Integer arith.!
+        Int refPix = header_.nchan/2+1;
+        Int frqslot = frequencies_.addFrequency(refPix, refFreq, freqInc);
+        sc.setFrequencyMap(frqslot,IFno-1);
+
+        sc.scanid = scanNo-1;//make it 0-based
+        sc.setSpectrum(spectra, beamNo-1, IFno-1);
+        sc.setFlags(flagtra,  beamNo-1, IFno-1);
+        sc.setTsys(tsys, beamNo-1, IFno-1);
+        sc.setDirection(direction, beamNo-1);
       }
     }