Changeset 405 for trunk

Timestamp:

02/10/05 15:25:10 (20 years ago)

Author:

mar637

Message:

fixed reder rest behaviour. renamed all pyhton_SDReader functions to "_"

Location:

trunk/src

Files:

• SDReader.cc (modified) (23 diffs)
• SDReader.h (modified) (1 diff)
• python_SDReader.cc (modified) (1 diff)

trunk/src/SDReader.cc

@@ -46 +46 @@
 SDReader::SDReader() :
   reader_(0),
+  header_(0),
+  frequencies_(0),
   table_(new SDMemTable()) {
   cursor_ = 0;
@@ -52 +54 @@
                    int whichIF, int whichBeam) :
   reader_(0),
+  header_(0),
+  frequencies_(0),
   table_(new SDMemTable()) {
   cursor_ = 0;
@@ -59 +63 @@
 SDReader::SDReader(CountedPtr<SDMemTable> tbl) :
   reader_(0),
+  header_(0),
   table_(tbl) {
   cursor_ = 0;
@@ -64 +69 @@
 
 SDReader::~SDReader() {
-  if (reader_) delete reader_; reader_ = 0;
+  if (reader_) delete reader_;
+  if (header_) delete header_; 
+  if (frequencies_) delete frequencies_;
 }
 
@@ -70 +77 @@
   cursor_ = 0;
   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_);
+  open(filename_,ifOffset_, beamOffset_);
 }
 
@@ -88 +84 @@
   cerr << "disabled" << endl;
 }
-
-
 
 void SDReader::open(const std::string& filename, 
@@ -95 +89 @@
   if (reader_) delete reader_; reader_ = 0;
   Bool   haveBase, haveSpectra, haveXPol;
-//
+
   String inName(filename);
   Path path(inName);
   inName = path.expandedName();
-//
+
   File file(inName);
   if (!file.exists()) {
@@ -106 +100 @@
   filename_ = inName;
 
-// Create reader and fill in values for arguments
-
+  // Create reader and fill in values for arguments
   String format;
   Vector<Bool> beams;
@@ -113 +106 @@
                               nChan_, nPol_, haveBase, haveSpectra,
                               haveXPol)) == 0)  {
-    throw(AipsError("PKSreader failed"));
+    throw(AipsError("Creation of PKSreader failed"));
   }
   if (!haveSpectra) {
@@ -121 +114 @@
     return;
   }
+
   nBeam_ = beams.nelements();
   // Get basic parameters.
@@ -127 +121 @@
     nPol_--;    
   }
-  header_ = SDHeader();
-  header_.nchan = nChan_;
-  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,
-                                  header_.bandwidth);
+  if (header_) delete header_;
+  header_ = new SDHeader();
+  header_->nchan = nChan_;
+  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,
+                                  header_->bandwidth);
+
   if (status) {
     delete reader_;
@@ -143 +140 @@
     return;
   }
-  if ((header_.obstype).matches("*SW*")) {
+  if ((header_->obstype).matches("*SW*")) {
     // need robust way here - probably read ahead of next timestamp
     cout << "Header indicates frequency switched observation.\n"
@@ -150 +147 @@
   }
 
-// Determine Telescope and set brightness unit
+  // Determine Telescope and set brightness unit
 
   Bool throwIt = False;
-  Instrument inst = SDMemTable::convertInstrument (header_.antennaname, throwIt);
-  header_.fluxunit = "Jy";
+  Instrument inst = SDMemTable::convertInstrument(header_->antennaname, 
+                                                  throwIt);
+  header_->fluxunit = "Jy";
   if (inst==ATMOPRA || inst==TIDBINBILLA) {
-     header_.fluxunit = "K";
-  }
-//
-  header_.nif = nIF_;
-  header_.epoch = "UTC";
+     header_->fluxunit = "K";
+  }
+
+  header_->nif = nIF_;
+  header_->epoch = "UTC";
 
   // Apply selection criteria.
@@ -167 +165 @@
   Vector<Bool> beamSel(nBeam_,True);
   Vector<Bool> IFsel(nIF_,True);
-//
+
   ifOffset_ = 0;
   if (whichIF>=0) {
@@ -173 +171 @@
        IFsel = False;
        IFsel(whichIF) = True;
-       header_.nif = 1;
+       header_->nif = 1;
        nIF_ = 1;
        ifOffset_ = whichIF;
@@ -180 +178 @@
     }
   }
-//
+
   beamOffset_ = 0;
   if (whichBeam>=0) {
@@ -186 +184 @@
         beamSel = False;
         beamSel(whichBeam) = True;
-        header_.nbeam = 1;
+        header_->nbeam = 1;
         nBeam_ = 1;
         beamOffset_ = whichBeam;
@@ -193 +191 @@
      }
   }
-//
   Vector<Int> start(nIF_, 1);
   Vector<Int> end(nIF_, 0);
   reader_->select(beamSel, IFsel, start, end, ref, True, haveXPol);
-  table_->putSDHeader(header_);
-  frequencies_.setRefFrame(header_.freqref);
-  frequencies_.setRestFrequencyUnit("Hz");
-  frequencies_.setEquinox(header_.equinox);
+  table_->putSDHeader(*header_);
+
+  if (frequencies_) delete frequencies_;
+  frequencies_ = new SDFrequencyTable();
+  frequencies_->setRefFrame(header_->freqref);
+  frequencies_->setRestFrequencyUnit("Hz");
+  frequencies_->setEquinox(header_->equinox);
 }
 
@@ -220 +220 @@
   uInt n = seq.size();
 
-  uInt stepsize = header_.nif*header_.nbeam;
+  uInt stepsize = header_->nif*header_->nbeam;
   uInt seqi = 0;
   Bool getAll = False;
+
   if (seq[n-1] == -1) getAll = True;
   while ( (cursor_ <= seq[n-1]) || getAll) {
     // only needs to be create if in seq
-    SDContainer sc(header_.nbeam,header_.nif,header_.npol,header_.nchan);
+    SDContainer sc(header_->nbeam,header_->nif,header_->npol,header_->nchan);
     // iterate over one correlator integration cycle = nBeam*nIF
     for (uInt row=0; row < stepsize; row++) {
@@ -241 +242 @@
                              spectra, flagtra, xCalFctr, xPol);
 
-// Make sure beam/IF numbers are 0-relative - dealing with possible IF or Beam selection
-
+      // Make sure beam/IF numbers are 0-relative - dealing with
+      // possible IF or Beam selection
       beamNo = beamNo - beamOffset_ - 1;      
       IFno = IFno - ifOffset_ - 1;
-//
+
       if (status) {
         if (status == -1) {
@@ -251 +252 @@
           if (row > 0 && row < stepsize-1) 
             cerr << "incomplete scan data.\n Probably means not all Beams/IFs/Pols within a scan are present." << endl;
-          //cerr << "EOF" << endl;
-          table_->putSDFreqTable(frequencies_);
+
+          // flush frequency table
+          table_->putSDFreqTable(*frequencies_);
           return status;
         }
@@ -273 +275 @@
         // add specific info
         // refPix = nChan/2+1 in  1-rel Integer arith.!
-        Int refPix = header_.nchan/2;                                         // 0-rel
-        uInt freqID = frequencies_.addFrequency(refPix, refFreq, freqInc);
-        uInt restFreqID = frequencies_.addRestFrequency(restFreq);
-//   
+        Int refPix = header_->nchan/2;       // 0-rel
+        uInt freqID = frequencies_->addFrequency(refPix, refFreq, freqInc);
+        uInt restFreqID = frequencies_->addRestFrequency(restFreq);
+
         sc.setFrequencyMap(freqID, IFno);
         sc.setRestFrequencyMap(restFreqID, IFno);
+
         sc.tcal[0] = tcal[0];sc.tcal[1] = tcal[1];
         sc.tcaltime = tcalTime;
@@ -299 +302 @@
 
   }
-  table_->putSDFreqTable(frequencies_);
+  table_->putSDFreqTable(*frequencies_);
   return status;
 }

trunk/src/SDReader.h

@@ -78 +78 @@
   casa::Int nBeam_,nIF_,nPol_,nChan_;
   PKSreader* reader_;  
-  SDHeader header_;
-  SDFrequencyTable frequencies_;
+  SDHeader* header_;
+  SDFrequencyTable* frequencies_;
   casa::CountedPtr<SDMemTable> table_;
   casa::String filename_;

trunk/src/python_SDReader.cc

@@ -41 +41 @@
       class_<SDReaderWrapper>("sdreader")
         .def( init < std::string, int, int > () )
-        .def("open", &SDReaderWrapper::open)
-        .def("read", &SDReaderWrapper::read)
-        .def("reset", &SDReaderWrapper::reset)
-        .def("getdata", &SDReaderWrapper::getSDMemTable)
-        .def("header",  &SDReaderWrapper::pseudoHeader);
+        .def("_open", &SDReaderWrapper::open)
+        .def("_read", &SDReaderWrapper::read)
+        .def("_reset", &SDReaderWrapper::reset)
+        .def("_getdata", &SDReaderWrapper::getSDMemTable)
+        .def("_header",  &SDReaderWrapper::pseudoHeader);
       ;
     };