Changeset 18 for trunk/src/SDReader.cc

Timestamp:

06/30/04 16:34:24 (20 years ago)

Author:

mmarquar

Message:

Moved SDHeader from SDReader to SDConatiner. Added header to SDMemTable. Added access funtions to nif,nbema,npol,nchan

File:

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

trunk/src/SDReader.cc

@@ -30 +30 @@
 //#---------------------------------------------------------------------------
 #include <atnf/PKSIO/PKSreader.h>
-#include <aips/Quanta/MVTime.h>
-#include "SDContainer.h"
+
 #include "SDReader.h"
 
 using namespace atnf_sd;
-
-void SDHeader::print() const {
-  MVTime mvt(this->utc);
-
-  cout << "Observer: " << this->observer << endl 
-       << "Project: " << this->project << endl
-       << "Obstype: " << this->obstype << endl
-       << "Antenna: " << this->antennaname << endl
-       << "Ant. Position: " << this->antennaposition << endl
-       << "Equinox: " << this->equinox << endl
-       << "Freq. ref.: " << this->freqref << endl
-       << "Ref. frequency: " << this->reffreq << endl
-       << "Bandwidth: "  << this->bandwidth << endl
-       << "Time (utc): " 
-       << mvt.string()
-       << endl;
-  //setprecision(10) << this->utc << endl;
-}
-
 
 SDReader::SDReader() :
@@ -98 +78 @@
   }
   nBeam_ = beams.nelements();
-  cout << "Reading " + format + " format from " + inName << endl;
-  cout << "nChannels = " << nChan_ << ", " << "nPol = " << nPol_ << endl
-       << "nIF = " << nIF_ << endl 
-       << "nBeams = " << nBeam_ << endl;
+  //cout << "Reading " + format + " format from " + inName << endl;
+  //cout << "nChannels = " << nChan_ << ", " << "nPol = " << nPol_ << endl
+  //     << "nIF = " << nIF_ << endl 
+  //     << "nBeams = " << nBeam_ << endl;
   
   // Get basic parameters.
@@ -131 +111 @@
   header_.nif = nIF_;
   // Apply selection criteria.
-  cerr << "applying selection criteria..." << endl; 
   Vector<Int> start(nIF_, 1);
   Vector<Int> end(nIF_, 0);
@@ -138 +117 @@
   Vector<Bool> IFsel(nIF_,True);
   reader_->select(beamSel, IFsel, start, end, ref, True, haveXPol);
-  cerr << "open finished" << endl;
+  table_->putSDHeader(header_);
 }
 
 int SDReader::read(const std::vector<int>& seq) {
-  cerr << "SDReader::read" << endl;
   int status = 0;  
   
@@ -159 +137 @@
   mjd = 0;
   uInt n = seq.size();
-  cerr <<  header_.nif << ", " << header_.nbeam << endl;
+  //cerr <<  header_.nif << ", " << header_.nbeam << endl;
   uInt stepsize = header_.nif*header_.nbeam;
   cerr << "SDReader stepsize = " << stepsize << endl;
@@ -174 +152 @@
     // iterate over one correlator integration cycle = nBeam*nIF
     for (uInt row=0; row < stepsize; row++) {
-      // add scanid from GROUP field -- this will remove the need for
       // stepsize as well
       // spectra(nChan,nPol)!!!
@@ -213 +190 @@
         //uInt frqslot = sdft.addFrequency(refPix, refFreq, freqInc);
 
-        //if ( srcName != prevName ) {//temp
-        //scanid++;//temp
-        // prevName = srcName;//temp
-        //}//temp
         sc.scanid = scanNo;
         //sc.setFrequencyMap(frqslot,IFno-1);