Changeset 18 for trunk/src/SDMemTable.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/SDMemTable.cc (modified) (8 diffs)

trunk/src/SDMemTable.cc

@@ -47 +47 @@
 #include <aips/Tables/ScalarColumn.h>
 #include <aips/Tables/ArrayColumn.h>
+#include <aips/Tables/TableRecord.h>
+
 
 #include "SDMemTable.h"
@@ -53 +55 @@
 using namespace atnf_sd;
 
+SDMemTable::SDMemTable() :
+  IFSel_(0),
+  beamSel_(0),
+  polSel_(0) {
+  setup();
+}
 SDMemTable::SDMemTable(const std::string& name) :
   IFSel_(0),
@@ -58 +66 @@
   polSel_(0) {
   name_ = String(name);
-  setup();
+  Table tab(name_);
+  table_ = tab.copyToMemoryTable(name_);
 }
 
@@ -101 +110 @@
   TableDesc td("", "1", TableDesc::Scratch);
   td.comment() = "A SDMemTable";
-  //td.rwKeywordSet().define("VERSION",Float(0.1));
   td.addColumn(ScalarColumnDesc<Double>("TIME"));
   td.addColumn(ScalarColumnDesc<String>("SRCNAME"));
@@ -110 +118 @@
   td.addColumn(ScalarColumnDesc<Double>("INTERVAL"));  
   // Now create a new table from the description.
+
   SetupNewTable aNewTab(name_, td, Table::New);
   table_ = Table(aNewTab, Table::Memory, 0);  
@@ -293 +302 @@
   return true;
 }
+
+bool SDMemTable::putSDHeader(const SDHeader& sdh) {
+  table_.lock();
+  table_.rwKeywordSet().define("nIF", sdh.nif);
+  table_.rwKeywordSet().define("nBeam", sdh.nbeam);
+  table_.rwKeywordSet().define("nPol", sdh.npol);
+  table_.rwKeywordSet().define("nChan", sdh.nchan);
+  table_.rwKeywordSet().define("Observer", sdh.observer);
+  table_.rwKeywordSet().define("Project", sdh.project);
+  table_.rwKeywordSet().define("Obstype", sdh.obstype);
+  table_.rwKeywordSet().define("AntennaName", sdh.antennaname);
+  table_.rwKeywordSet().define("AntennaPosition", sdh.antennaposition);
+  table_.rwKeywordSet().define("Equinox", sdh.equinox);
+  table_.rwKeywordSet().define("FreqRefFrame", sdh.freqref);
+  table_.rwKeywordSet().define("FreqRefVal", sdh.reffreq);
+  table_.rwKeywordSet().define("Bandwidth", sdh.bandwidth);
+  table_.rwKeywordSet().define("UTC", sdh.utc);
+  table_.unlock();
+  cerr << "Table Header set" << endl;
+  return true;
+}
+
 void SDMemTable::makePersistent(const std::string& filename) {
   table_.deepCopy(filename,Table::New);
@@ -298 +329 @@
 
 void SDMemTable::summary() const {
-  cerr << "SDMemTable::summary()" << endl;
   ROScalarColumn<Int> scans(table_, "SCANID");
   ROScalarColumn<String> srcs(table_, "SRCNAME");
+  cout << "*************** Header ***************" << endl;
+  cout << "nBeam = " << nBeam() << "\t"
+       << "nIF   = " << nIF() << endl
+       << "nPol  = " << nPol() << "\t"
+       << "nChan = " << nChan() << "\t" << endl;
+  cout << "*************** Header ***************" << endl;
   uInt count = 0;
   String name;
@@ -316 +352 @@
     }
   }
-  cout << "Table contains " << table_.nrow() << "integrations." << endl;
-  cout << "in " << count << "scans." << endl;
-}
+  cout << "Table contains " << table_.nrow() << " integration(s)." << endl;
+  cout << "in " << count << " scan(s)." << endl;
+}
+
+Int SDMemTable::nBeam() const {
+  Int n;
+  table_.keywordSet().get("nBeam",n);
+  return n;
+}
+Int SDMemTable::nIF() const {
+  Int n;
+  table_.keywordSet().get("nIF",n);
+  return n;
+}
+Int SDMemTable::nPol() const {
+  Int n;
+  table_.keywordSet().get("nPol",n);
+  return n;
+}
+Int SDMemTable::nChan() const {
+  Int n;
+  table_.keywordSet().get("nChan",n);
+  return n;
+}
+
 /*
-void maskChannels(const std::vector<Int>& whichChans ) {
+void SDMemTable::maskChannels(const std::vector<Int>& whichChans ) {
   
   std::vector<int>::iterator it;