Changeset 46 for trunk/src

Timestamp:

07/15/04 14:28:44 (20 years ago)

Author:

mmarquar

Message:

Minor edits to verbose info. added empty close function. Switched pseudoHeader pol<->chan

Location:

trunk/src

Files:

• SDReader.cc (modified) (4 diffs)
• SDReader.h (modified) (3 diffs)

trunk/src/SDReader.cc

@@ -39 +39 @@
   table_(new SDMemTable()) {
   cursor_ = 0;
-  timestamp_ = 0;
+}
+SDReader::SDReader(const std::string& filename) :
+  reader_(0),
+  table_(new SDMemTable()) {
+  cursor_ = 0;
+  open(filename);
 }
 
@@ -46 +51 @@
   table_(tbl) {
   cursor_ = 0;
-  timestamp_ = 0;
 }
 
 SDReader::~SDReader() {
-  delete reader_;reader_ =0;
+  if (reader_) delete reader_; reader_ = 0;
 }
 
 void SDReader::reset() {
-  cursor_ = 0; 
-  timestamp_ = 0;
+  cursor_ = 0;
   open(filename_);
+}
+
+void SDReader::close() {
+  cerr << "disabled" << endl;
 }
 
@@ -95 +102 @@
     return;
   }
-  header_.print();  
+  //header_.print();  
   if ((header_.obstype).matches("*SW*")) {
     // need robust way here - probably read ahead of next timestamp
@@ -183 +190 @@
         sc.setFrequencyMap(frqslot,IFno-1);
 
-        sc.scanid = scanNo;
+        sc.scanid = scanNo-1;//make it 0-based
         sc.setSpectrum(spectra, beamNo-1, IFno-1);
         sc.setFlags(flagtra,  beamNo-1, IFno-1);

trunk/src/SDReader.h

@@ -37 +37 @@
 #include <aips/aips.h>
 #include <aips/iostream.h>
-#include <aips/iomanip.h>
 #include <aips/Utilities/CountedPtr.h>
 #include <aips/Utilities/String.h>
@@ -52 +51 @@
 public:
   SDReader();
+  SDReader(const std::string& filename);
   SDReader(CountedPtr<SDMemTable> tbl);
   virtual ~SDReader();
 
   void open(const std::string& filename);
+  void close();
   int read(const std::vector<int>& seq);
 
@@ -65 +66 @@
     std::vector<int> v;
     v.push_back(nBeam_);v.push_back(nIF_);
-    v.push_back(nChan_);v.push_back(nPol_);
+    v.push_back(nPol_);v.push_back(nChan_);
     return v;
   }