Changeset 1815 for branches/newfiller

Timestamp:

08/02/10 14:18:33 (14 years ago)

Author:

Malte Marquarding

Message:

Eradicte raw pointer use.

Location:

branches/newfiller/src

Files:

• PKSFiller.cpp (modified) (12 diffs)
• PKSFiller.h (modified) (1 diff)

branches/newfiller/src/PKSFiller.cpp

@@ -48 +48 @@
 PKSFiller::PKSFiller( CountedPtr< Scantable > stbl ) :
   FillerBase(stbl),
-  reader_(0),
-  header_(0)
+  reader_(0)
 {
   setReferenceRegex(".*(e|w|_R)$");
@@ -66 +65 @@
   }
   */
-  if (reader_)  { delete reader_; reader_ = 0; }
+
   Bool haveBase, haveSpectra;
 
@@ -82 +81 @@
 
   String antenna("");
-  if ( (reader_ = getPKSreader(inName, antenna, 0, 0, format, beams, ifs,
-                              nchans, npols, haveXPol_,haveBase, haveSpectra
-                              )) == 0 )  {
+
+  reader_ = getPKSreader(inName, antenna, 0, 0, format, beams, ifs,
+                         nchans, npols, haveXPol_, haveBase, haveSpectra);
+  if (reader_.null() == True) {
     return False;
   }
 
   if (!haveSpectra) {
-    delete reader_;
     reader_ = 0;
     throw(AipsError("No spectral data in file."));
@@ -103 +102 @@
     }
   }
-  if (header_) delete header_;
-  header_ = new STHeader();
-  header_->nchan = max(nchans);
-  header_->npol = max(npols);
-  header_->nbeam = nBeam_;
-
-  Int status = reader_->getHeader(header_->observer, header_->project,
-                                  header_->antennaname, header_->antennaposition,
-                                  header_->obstype,
-                                  header_->fluxunit,
-                                  header_->equinox,
-                                  header_->freqref,
-                                  header_->utc, header_->reffreq,
-                                  header_->bandwidth);
+  STHeader header;
+  header.nchan = max(nchans);
+  header.npol = max(npols);
+  header.nbeam = nBeam_;
+
+  Int status = reader_->getHeader(header.observer, header.project,
+                                  header.antennaname, header.antennaposition,
+                                  header.obstype,
+                                  header.fluxunit,
+                                  header.equinox,
+                                  header.freqref,
+                                  header.utc, header.reffreq,
+                                  header.bandwidth);
 
   if (status) {
-    delete reader_;
     reader_ = 0;
-    delete header_;
-    header_ = 0;
     throw(AipsError("Failed to get header."));
   }
-  if ((header_->obstype).matches("*SW*")) {
+  if ((header.obstype).matches("*SW*")) {
     // need robust way here - probably read ahead of next timestamp
     os << "Header indicates frequency switched observation.\n"
@@ -131 +126 @@
 
     nIF_ = 1;
-    header_->obstype = String("fswitch");
+    header.obstype = String("fswitch");
   }
   // Determine Telescope and set brightness unit
 
   Bool throwIt = False;
-  Instrument inst = STAttr::convertInstrument(header_->antennaname, throwIt);
+  Instrument inst = STAttr::convertInstrument(header.antennaname, throwIt);
 
   if (inst==ATMOPRA || inst==TIDBINBILLA) {
-    header_->fluxunit = "K";
+    header.fluxunit = "K";
   } else {
     // downcase for use with Quanta
-    if (header_->fluxunit == "JY") {
-      header_->fluxunit = "Jy";
+    if (header.fluxunit == "JY") {
+      header.fluxunit = "Jy";
     }
   }
   STAttr stattr;
-  header_->poltype = stattr.feedPolType(inst);
-  header_->nif = nIF_;
-  header_->epoch = "UTC";
-  // *** header_->frequnit = "Hz"
+  header.poltype = stattr.feedPolType(inst);
+  header.nif = nIF_;
+  header.epoch = "UTC";
+  // *** header.frequnit = "Hz"
   // Apply selection criteria.
   Vector<Int> ref;
@@ -158 +153 @@
   Bool getPt = False;
   reader_->select(beams, ifs, start, end, ref, True, haveXPol_[0], False, getPt);
-  setHeader(*header_);
+  setHeader(header);
   //For MS, add the location of POINTING of the input MS so one get
   //pointing data from there, if necessary.
@@ -170 +165 @@
     ptTabPath.append("/POINTING");
     table_->table().rwKeywordSet().define("POINTING", ptTabPath);
-    if ((header_->antennaname).matches("GBT")) {
+    if (header.antennaname.matches("GBT")) {
       String GOTabPath = datapath.absoluteName();
       GOTabPath.append("/GBT_GO");
@@ -176 +171 @@
     }
   }
-  String freqFrame = header_->freqref;
+  String freqFrame = header.freqref;
   //translate frequency reference frame back to
   //MS style (as PKSMS2reader converts the original frame
@@ -197 +192 @@
   // set both "FRAME" and "BASEFRAME"
   table_->frequencies().setFrame(freqFrame, false);
-  table_->frequencies().setFrame(freqFrame,true);
-  //table_->focus().setParallactify(true);
+  table_->frequencies().setFrame(freqFrame, true);
+  table_->focus().setParallactify(true);
 
   return true;
@@ -205 +200 @@
 void PKSFiller::close( )
 {
-  if (reader_ != 0) {
-    delete reader_;
-    reader_=0;
-  }
-
-  if (header_ != 0) {
-    delete header_;
-    header_=0;
+  if (reader_.null() != False) {
+    reader_ = 0;
   }
   table_ = 0;
@@ -245 +234 @@
   int n = 0;
   bool isGBTFITS = false ;
-  if ((header_->antennaname.find( "GBT" ) != String::npos)
+  if ((table_->getAntennaName().find( "GBT" ) != String::npos)
        && File(filename_).isRegular()) {
     FILE *fp = fopen( filename_.c_str(), "r" ) ;
@@ -265 +254 @@
     Regex filterrx(".*[SL|PA]$");
     Regex obsrx("^AT.+");
-    if ( header_->antennaname.matches(obsrx) &&
+    if ( table_->getAntennaName().matches(obsrx) &&
          pksrec.obsType.matches(filterrx)) {
         //cerr << "ignoring paddle scan" << endl;

branches/newfiller/src/PKSFiller.h

@@ -46 +46 @@
     PKSFiller& operator=(const PKSFiller&);
 
-    PKSreader* reader_;
-    STHeader* header_;
+    casa::CountedPtr<PKSreader> reader_;
     casa::String filename_;
     casa::Int nIF_, nBeam_, nPol_, nChan_, nInDataRow;