Changeset 332

Timestamp:

01/31/05 18:17:22 (19 years ago)

Author:

kil064

Message:

add IF and beam selection

Location:

trunk/src

Files:

• SDReader.cc (modified) (7 diffs)
• SDReader.h (modified) (2 diffs)
• SDReaderWrapper.h (modified) (1 diff)
• python_SDReader.cc (modified) (1 diff)

trunk/src/SDReader.cc

@@ -44 +44 @@
   cursor_ = 0;
 }
-SDReader::SDReader(const std::string& filename) :
+SDReader::SDReader(const std::string& filename, int whichIF, int whichBeam) :
   reader_(0),
   table_(new SDMemTable()) {
   cursor_ = 0;
-  open(filename);
+  open(filename, whichIF, whichBeam);
 }
 
@@ -78 +78 @@
 }
 
+
 void SDReader::close() {
   cerr << "disabled" << endl;
 }
 
-void SDReader::open(const std::string& filename) {
+
+
+void SDReader::open(const std::string& filename, int whichIF, int whichBeam) {
   if (reader_) delete reader_; reader_ = 0;
   Bool   haveBase, haveSpectra, haveXPol;
@@ -95 +98 @@
   }
   filename_ = inName;
-//
+
+// Create reader and fill in values for arguments
+
   String format;
   Vector<Bool> beams;
@@ -137 +142 @@
     nIF_ = 1;
   }
+//
   header_.nif = nIF_;
   header_.fluxunit = "K";
   header_.epoch = "UTC";
+
   // Apply selection criteria.
-  Vector<Int> start(nIF_, 1);
-  Vector<Int> end(nIF_, 0);
+
   Vector<Int> ref;
   Vector<Bool> beamSel(nBeam_,True);
   Vector<Bool> IFsel(nIF_,True);
+//
+  ifOffset_ = 0;
+  if (whichIF>=0) {
+    if (whichIF>=0 && whichIF<nIF_) {
+       IFsel = False;
+       IFsel(whichIF) = True;
+       header_.nif = 1;
+       nIF_ = 1;
+       ifOffset_ = whichIF;
+    } else {
+       throw(AipsError("Illegal IF selection"));
+    }
+  }
+//
+  beamOffset_ = 0;
+  if (whichBeam>=0) {
+     if (whichBeam>=0 && whichBeam<nBeam_) {
+        beamSel = False;
+        beamSel(whichBeam) = True;
+        header_.nbeam = 1;
+        nBeam_ = 1;
+        beamOffset_ = whichBeam;
+     } else {
+       throw(AipsError("Illegal Beam selection"));
+     }
+  }
+//
+  Vector<Int> start(nIF_, 1);
+  Vector<Int> end(nIF_, 0);
   reader_->select(beamSel, IFsel, start, end, ref, True, haveXPol);
   table_->putSDHeader(header_);
@@ -190 +225 @@
                              tsys, sigma, calFctr, baseLin, baseSub,
                              spectra, flagtra, xCalFctr, xPol);
+
+// Make sure beam/IF numbers are 0-relative 
+
+      beamNo = beamNo - beamOffset_ - 1;      
+      IFno = IFno - ifOffset_ - 1;
+//
       if (status) {
         if (status == -1) {
@@ -216 +257 @@
         }
         // 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);
-        frequencies_.addRestFrequency(restFreq);
-        sc.setFrequencyMap(frqslot,IFno-1);
+        uInt frqslot = frequencies_.addFrequency(refPix, refFreq, freqInc);
+        uInt restFrqSlot = frequencies_.addRestFrequency(restFreq);
+//   
+        sc.setFrequencyMap(frqslot,IFno);
+        sc.setRestFrequencyMap(restFrqSlot,IFno);
         sc.tcal[0] = tcal[0];sc.tcal[1] = tcal[1];
         sc.tcaltime = tcalTime;
@@ -227 +269 @@
         sc.refbeam = refBeam;
         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);
+        sc.setSpectrum(spectra, beamNo, IFno);
+        sc.setFlags(flagtra,  beamNo, IFno);
+        sc.setTsys(tsys, beamNo, IFno);
+        sc.setDirection(direction, beamNo);
       }
     }

trunk/src/SDReader.h

@@ -51 +51 @@
 public:
   SDReader();
-  SDReader(const std::string& filename);
+  SDReader(const std::string& filename, int whichIF=-1,
+          int whichBeam=-1);
   SDReader(casa::CountedPtr<SDMemTable> tbl);
   virtual ~SDReader();
 
-  void open(const std::string& filename);
+  void open(const std::string& filename,
+            int whichIF=-1,
+            int whichBeam=-1);
   void close();
   int read(const std::vector<int>& seq);
@@ -81 +84 @@
   casa::uInt cursor_;
   casa::Double timestamp_;
+  casa::uInt beamOffset_, ifOffset_;
 };
 

trunk/src/SDReaderWrapper.h

@@ -43 +43 @@
 public:
   SDReaderWrapper() {;}
-  SDReaderWrapper(const std::string& filename) : SDReader(filename) {;}
+  SDReaderWrapper(const std::string& filename, int ifSel=-1, int beamSel=-1) : SDReader(filename,ifSel,beamSel) {;}
   SDReaderWrapper(SDMemTableWrapper tbl) :
     SDReader(tbl.getCP()){;}

trunk/src/python_SDReader.cc

@@ -40 +40 @@
     void python_SDReader() {
       class_<SDReaderWrapper>("sdreader")
-        .def( init < std::string > () )
+        .def( init < std::string, int, int > () )
         .def("open", &SDReaderWrapper::open)
         .def("read", &SDReaderWrapper::read)