Changeset 206 for trunk

Timestamp:

01/18/05 17:29:02 (20 years ago)

Author:

mar637

Message:

• now using asap::AxisNo enum instead of fixed axis indeces
• using fluxunit, epoch, equinox
• added restfrequencies
• added history
• now using asap::AxisNo enum instead of fixed axis indeces
• added getDirection method

Location:

trunk/src

Files:

• SDMemTable.cc (modified) (51 diffs)
• SDMemTable.h (modified) (4 diffs)

trunk/src/SDMemTable.cc

@@ -30 +30 @@
 //#---------------------------------------------------------------------------
 
+#include <map>
+
 #include <casa/aips.h>
 #include <casa/iostream.h>
@@ -38 +40 @@
 #include <casa/Arrays/ArrayLogical.h>
 #include <casa/Arrays/ArrayAccessor.h>
+#include <casa/Arrays/Vector.h>
 
 #include <tables/Tables/TableParse.h>
@@ -54 +57 @@
 #include <casa/Quanta/MVTime.h>
 
+#include "Definitions.h"
 #include "SDMemTable.h"
 #include "SDContainer.h"
+
 
 using namespace casa;
@@ -63 +68 @@
   IFSel_(0),
   beamSel_(0),
-  polSel_(0) {
+  polSel_(0) 
+{
   setup();
 }
+
 SDMemTable::SDMemTable(const std::string& name) :
   IFSel_(0),
   beamSel_(0),
-  polSel_(0) {
+  polSel_(0)
+{
   Table tab(name);
   table_ = tab.copyToMemoryTable("dummy");
-}
-
-SDMemTable::SDMemTable(const SDMemTable& other, Bool clear) {
+  //cerr << "hello from C SDMemTable @ " << this << endl;
+}
+
+SDMemTable::SDMemTable(const SDMemTable& other, Bool clear)
+{
   IFSel_= other.IFSel_;
   beamSel_= other.beamSel_;
@@ -88 +98 @@
     polSel_ = other.polSel_;
   }
+  //cerr << "hello from CC SDMemTable @ " << this << endl;
 }
 
@@ -93 +104 @@
   IFSel_(0),
   beamSel_(0),
-  polSel_(0) {
+  polSel_(0)
+{
   Table t = tableCommand(exprs,tab);
   if (t.nrow() == 0)
@@ -100 +112 @@
 }
 
-SDMemTable::~SDMemTable(){
+SDMemTable::~SDMemTable()
+{
   //cerr << "goodbye from SDMemTable @ " << this << endl;
 }
 
-SDMemTable SDMemTable::getScan(Int scanID) const {
+SDMemTable SDMemTable::getScan(Int scanID) const
+{
   String cond("SELECT * from $1 WHERE SCANID == ");
   cond += String::toString(scanID);
@@ -110 +124 @@
 }
 
-SDMemTable &SDMemTable::operator=(const SDMemTable& other) {
+SDMemTable &SDMemTable::operator=(const SDMemTable& other)
+{
   if (this != &other) {
      IFSel_= other.IFSel_;
@@ -118 +133 @@
      chanMask_ = other.chanMask_;
      table_ = other.table_.copyToMemoryTable(String("dummy"));
-   }
+  }
+  //cerr << "hello from ASS SDMemTable @ " << this << endl;
   return *this;
 }
 
-SDMemTable SDMemTable::getSource(const std::string& source) const {
+SDMemTable SDMemTable::getSource(const std::string& source) const
+{
   String cond("SELECT * from $1 WHERE SRCNAME == ");
   cond += source;
@@ -128 +145 @@
 }
 
-void SDMemTable::setup() {
+void SDMemTable::setup()
+{
   TableDesc td("", "1", TableDesc::Scratch);
   td.comment() = "A SDMemTable";
@@ -147 +165 @@
   td.addColumn(ScalarColumnDesc<Float>("PARANGLE"));
   td.addColumn(ScalarColumnDesc<Int>("REFBEAM"));
+  td.addColumn(ArrayColumnDesc<String>("HISTORY"));
 
   // Now create a new table from the description.
@@ -154 +173 @@
 }
 
-std::string SDMemTable::getSourceName(Int whichRow) const {
+std::string SDMemTable::getSourceName(Int whichRow) const
+{
   ROScalarColumn<String> src(table_, "SRCNAME");
   String name;
@@ -161 +181 @@
 }
 
-std::string SDMemTable::getTime(Int whichRow) const {
+std::string SDMemTable::getTime(Int whichRow) const
+{
   ROScalarColumn<Double> src(table_, "TIME");
   Double tm;
@@ -172 +193 @@
   return str;
 }
-double SDMemTable::getInterval(Int whichRow) const {
+double SDMemTable::getInterval(Int whichRow) const
+{
   ROScalarColumn<Double> src(table_, "INTERVAL");
   Double intval;
@@ -179 +201 @@
 }
 
-bool SDMemTable::setIF(Int whichIF) {
+bool SDMemTable::setIF(Int whichIF)
+{
   if ( whichIF >= 0 && whichIF < nIF()) {
     IFSel_ = whichIF;
@@ -187 +210 @@
 }
 
-bool SDMemTable::setBeam(Int whichBeam) {
+bool SDMemTable::setBeam(Int whichBeam)
+{
   if ( whichBeam >= 0 && whichBeam < nBeam()) {
     beamSel_ = whichBeam;
@@ -195 +219 @@
 }
 
-bool SDMemTable::setPol(Int whichPol) {
+bool SDMemTable::setPol(Int whichPol)
+{
   if ( whichPol >= 0 && whichPol < nPol()) {
     polSel_ = whichPol;
@@ -203 +228 @@
 }
 
-bool SDMemTable::setMask(std::vector<int> whichChans) {
+bool SDMemTable::setMask(std::vector<int> whichChans)
+{
   ROArrayColumn<uChar> spec(table_, "FLAGTRA");
   std::vector<int>::iterator it;
@@ -225 +251 @@
   Array<uChar> arr;
   spec.get(whichRow, arr);
-  ArrayAccessor<uChar, Axis<0> > aa0(arr);
+  ArrayAccessor<uChar, Axis<asap::BeamAxis> > aa0(arr);
   aa0.reset(aa0.begin(uInt(beamSel_)));//go to beam
-  ArrayAccessor<uChar, Axis<1> > aa1(aa0);
+  ArrayAccessor<uChar, Axis<asap::IFAxis> > aa1(aa0);
   aa1.reset(aa1.begin(uInt(IFSel_)));// go to IF
-  ArrayAccessor<uChar, Axis<2> > aa2(aa1);
+  ArrayAccessor<uChar, Axis<asap::PolAxis> > aa2(aa1);
   aa2.reset(aa2.begin(uInt(polSel_)));// go to pol
 
@@ -239 +265 @@
   miter = tmp.begin();
 
-  for (ArrayAccessor<uChar, Axis<3> > i(aa2); i != i.end(); ++i) {
+  for (ArrayAccessor<uChar, Axis<asap::ChanAxis> > i(aa2); i != i.end(); ++i) {
     bool out =!static_cast<bool>(*i);
     if (useUserMask) {
@@ -249 +275 @@
   return mask;
 }
-std::vector<float> SDMemTable::getSpectrum(Int whichRow) const {
-
+std::vector<float> SDMemTable::getSpectrum(Int whichRow) const 
+{
   std::vector<float> spectrum;
   ROArrayColumn<Float> spec(table_, "SPECTRA");
   Array<Float> arr;
   spec.get(whichRow, arr);
-  ArrayAccessor<Float, Axis<0> > aa0(arr);
+  ArrayAccessor<Float, Axis<asap::BeamAxis> > aa0(arr);
   aa0.reset(aa0.begin(uInt(beamSel_)));//go to beam
-  ArrayAccessor<Float, Axis<1> > aa1(aa0);
+  ArrayAccessor<Float, Axis<asap::IFAxis> > aa1(aa0);
   aa1.reset(aa1.begin(uInt(IFSel_)));// go to IF
-  ArrayAccessor<Float, Axis<2> > aa2(aa1);
+  ArrayAccessor<Float, Axis<asap::PolAxis> > aa2(aa1);
   aa2.reset(aa2.begin(uInt(polSel_)));// go to pol
-  for (ArrayAccessor<Float, Axis<3> > i(aa2); i != i.end(); ++i) {
+  for (ArrayAccessor<Float, Axis<asap::ChanAxis> > i(aa2); i != i.end(); ++i) {
     spectrum.push_back(*i);
   }
   return spectrum;
 }
-std::vector<string> SDMemTable::getCoordInfo() const {
+std::vector<string> SDMemTable::getCoordInfo() const
+{
   String un;
   Table t = table_.keywordSet().asTable("FREQUENCIES");
@@ -283 +310 @@
 }
 
-void SDMemTable::setCoordInfo(std::vector<string> theinfo) {
-
+void SDMemTable::setCoordInfo(std::vector<string> theinfo)
+{
   std::vector<string>::iterator it;
   String un,rfrm,dpl;
@@ -291 +318 @@
   dpl = theinfo[2];
 
-  //String un(theunit);
   Table t = table_.rwKeywordSet().asTable("FREQUENCIES");
   Vector<Double> rstf;
@@ -321 +347 @@
 }
 
-std::vector<double> SDMemTable::getAbcissa(Int whichRow) const {
+std::vector<double> SDMemTable::getAbcissa(Int whichRow) const
+{
   std::vector<double> absc(nChan());
   Vector<Double> absc1(nChan());
@@ -331 +358 @@
   SpectralCoordinate spc = getCoordinate(specidx);
   Table t = table_.keywordSet().asTable("FREQUENCIES");
-  String rf;
-  //t.keywordSet().get("EQUINOX",rf);
-  MDirection::Types mdr;
-  //if (!MDirection::getType(mdr, rf)) {
-  mdr = MDirection::J2000;
-  //cout << "Unknown equinox using J2000" << endl;
-  //}
-  ROArrayColumn<Double> dir(table_, "DIRECTION");
-  Array<Double> posit;
-  dir.get(whichRow,posit);
-  Vector<Double> wpos(2);
-  wpos[0] = posit(IPosition(2,beamSel_,0));
-  wpos[1] = posit(IPosition(2,beamSel_,1));
-  Quantum<Double> lon(wpos[0],Unit(String("rad")));
-  Quantum<Double> lat(wpos[1],Unit(String("rad")));
-  MDirection direct(lon, lat, mdr);
+
+  MDirection direct = getDirection(whichRow);
+
   ROScalarColumn<Double> tme(table_, "TIME");
   Double obstime;
   tme.get(whichRow,obstime);
   MVEpoch tm2(Quantum<Double>(obstime, Unit(String("d"))));
-  MEpoch epoch(tm2);
+  MEpoch::Types met;
+  String ep;
+  table_.keywordSet().get("Epoch",ep);
+  if (!MEpoch::getType(met, ep)) {
+    cerr << "Epoch type uknown - using UTC" << endl;
+    met = MEpoch::UTC;
+  }
+
+  MEpoch epoch(tm2, met);
 
   Vector<Double> antpos;
@@ -448 +470 @@
 }
 
-void SDMemTable::setSpectrum(std::vector<float> spectrum, int whichRow) {
+void SDMemTable::setSpectrum(std::vector<float> spectrum, int whichRow)
+{
   ArrayColumn<Float> spec(table_, "SPECTRA");
   Array<Float> arr;
@@ -456 +479 @@
   }
 
-  ArrayAccessor<Float, Axis<0> > aa0(arr);
+  ArrayAccessor<Float, Axis<asap::BeamAxis> > aa0(arr);
   aa0.reset(aa0.begin(uInt(beamSel_)));//go to beam
-  ArrayAccessor<Float, Axis<1> > aa1(aa0);
+  ArrayAccessor<Float, Axis<asap::IFAxis> > aa1(aa0);
   aa1.reset(aa1.begin(uInt(IFSel_)));// go to IF
-  ArrayAccessor<Float, Axis<2> > aa2(aa1);
+  ArrayAccessor<Float, Axis<asap::PolAxis> > aa2(aa1);
   aa2.reset(aa2.begin(uInt(polSel_)));// go to pol
 
   std::vector<float>::iterator it = spectrum.begin();
-  for (ArrayAccessor<Float, Axis<3> > i(aa2); i != i.end(); ++i) {
+  for (ArrayAccessor<Float, Axis<asap::ChanAxis> > i(aa2); i != i.end(); ++i) {
     (*i) = Float(*it);
     it++;
@@ -471 +494 @@
 }
 
-void SDMemTable::getSpectrum(Vector<Float>& spectrum, Int whichRow) const {
+void SDMemTable::getSpectrum(Vector<Float>& spectrum, Int whichRow) const
+{
   ROArrayColumn<Float> spec(table_, "SPECTRA");
   Array<Float> arr;
   spec.get(whichRow, arr);
   spectrum.resize(arr.shape()(3));
-  ArrayAccessor<Float, Axis<0> > aa0(arr);
+  ArrayAccessor<Float, Axis<asap::BeamAxis> > aa0(arr);
   aa0.reset(aa0.begin(uInt(beamSel_)));//go to beam
-  ArrayAccessor<Float, Axis<1> > aa1(aa0);
+  ArrayAccessor<Float, Axis<asap::IFAxis> > aa1(aa0);
   aa1.reset(aa1.begin(uInt(IFSel_)));// go to IF
-  ArrayAccessor<Float, Axis<2> > aa2(aa1);
+  ArrayAccessor<Float, Axis<asap::PolAxis> > aa2(aa1);
   aa2.reset(aa2.begin(uInt(polSel_)));// go to pol
 
-  ArrayAccessor<Float, Axis<0> > va(spectrum);
-  for (ArrayAccessor<Float, Axis<3> > i(aa2); i != i.end(); ++i) {
+  ArrayAccessor<Float, Axis<asap::BeamAxis> > va(spectrum);
+  for (ArrayAccessor<Float, Axis<asap::ChanAxis> > i(aa2); i != i.end(); ++i) {
     (*va) = (*i);
     va++;
@@ -496 +520 @@
   mask.resize(arr.shape()(3));
 
-  ArrayAccessor<uChar, Axis<0> > aa0(arr);
+  ArrayAccessor<uChar, Axis<asap::BeamAxis> > aa0(arr);
   aa0.reset(aa0.begin(uInt(beamSel_)));//go to beam
-  ArrayAccessor<uChar, Axis<1> > aa1(aa0);
+  ArrayAccessor<uChar, Axis<asap::IFAxis> > aa1(aa0);
   aa1.reset(aa1.begin(uInt(IFSel_)));// go to IF
-  ArrayAccessor<uChar, Axis<2> > aa2(aa1);
+  ArrayAccessor<uChar, Axis<asap::PolAxis> > aa2(aa1);
   aa2.reset(aa2.begin(uInt(polSel_)));// go to pol
 
   Bool useUserMask = ( chanMask_.size() == arr.shape()(3) );
 
-  ArrayAccessor<Bool, Axis<0> > va(mask);
+  ArrayAccessor<Bool, Axis<asap::BeamAxis> > va(mask);
   std::vector<bool> tmp;
   tmp = chanMask_; // WHY the fxxx do I have to make a copy here. The
@@ -512 +536 @@
   miter = tmp.begin();
 
-  for (ArrayAccessor<uChar, Axis<3> > i(aa2); i != i.end(); ++i) {
+  for (ArrayAccessor<uChar, Axis<asap::ChanAxis> > i(aa2); i != i.end(); ++i) {
     bool out =!static_cast<bool>(*i);
     if (useUserMask) {
@@ -535 +559 @@
   MaskedArray<Float> marr;
   if (useSelection) {
-    ArrayAccessor<Float, Axis<0> > aa0(arr);
+    ArrayAccessor<Float, Axis<asap::BeamAxis> > aa0(arr);
     aa0.reset(aa0.begin(uInt(beamSel_)));//go to beam
-    ArrayAccessor<Float, Axis<1> > aa1(aa0);
+    ArrayAccessor<Float, Axis<asap::IFAxis> > aa1(aa0);
     aa1.reset(aa1.begin(uInt(IFSel_)));// go to IF
-    ArrayAccessor<Float, Axis<2> > aa2(aa1);
+    ArrayAccessor<Float, Axis<asap::PolAxis> > aa2(aa1);
     aa2.reset(aa2.begin(uInt(polSel_)));// go to pol
 
-    ArrayAccessor<Bool, Axis<0> > baa0(barr);
+    ArrayAccessor<Bool, Axis<asap::BeamAxis> > baa0(barr);
     baa0.reset(baa0.begin(uInt(beamSel_)));//go to beam
-    ArrayAccessor<Bool, Axis<1> > baa1(baa0);
+    ArrayAccessor<Bool, Axis<asap::IFAxis> > baa1(baa0);
     baa1.reset(baa1.begin(uInt(IFSel_)));// go to IF
-    ArrayAccessor<Bool, Axis<2> > baa2(baa1);
+    ArrayAccessor<Bool, Axis<asap::PolAxis> > baa2(baa1);
     baa2.reset(baa2.begin(uInt(polSel_)));// go to pol
 
     Vector<Float> a(arr.shape()(3));
     Vector<Bool> b(barr.shape()(3));
-    ArrayAccessor<Float, Axis<0> > a0(a);
-    ArrayAccessor<Bool, Axis<0> > b0(b);
-
-    ArrayAccessor<Bool, Axis<3> > j(baa2);
-    for (ArrayAccessor<Float, Axis<3> > i(aa2); i != i.end(); ++i) {
+    ArrayAccessor<Float, Axis<asap::BeamAxis> > a0(a);
+    ArrayAccessor<Bool, Axis<asap::BeamAxis> > b0(b);
+
+    ArrayAccessor<Bool, Axis<asap::ChanAxis> > j(baa2);
+    for (ArrayAccessor<Float, Axis<asap::ChanAxis> > i(aa2); 
+         i != i.end(); ++i) {
       (*a0) = (*i);
       (*b0) = !(*j);
@@ -569 +594 @@
 }
 
-Float SDMemTable::getTsys(Int whichRow) const {
+Float SDMemTable::getTsys(Int whichRow) const
+{
   ROArrayColumn<Float> ts(table_, "TSYS");
   Array<Float> arr;
@@ -580 +606 @@
 }
 
-SpectralCoordinate SDMemTable::getCoordinate(uInt whichIdx)  const {
-
+MDirection SDMemTable::getDirection(Int whichRow) const
+{
+  Float eq;
+  table_.keywordSet().get("Equinox",eq);
+  std::map<float,string> mp;
+  mp[2000.0] = "J2000";
+  mp[1950.0] = "B1950";
+  MDirection::Types mdr;
+  if (!MDirection::getType(mdr, mp[eq])) {
+    mdr = MDirection::J2000;
+    cerr  << "Unknown equinox using J2000" << endl;
+  }
+  ROArrayColumn<Double> dir(table_, "DIRECTION");
+  Array<Double> posit;
+  dir.get(whichRow,posit);
+  Vector<Double> wpos(2);
+  wpos[0] = posit(IPosition(2,beamSel_,0));
+  wpos[1] = posit(IPosition(2,beamSel_,1));
+  Quantum<Double> lon(wpos[0],Unit(String("rad")));
+  Quantum<Double> lat(wpos[1],Unit(String("rad")));
+  MDirection direct(lon, lat, mdr);
+  return direct;
+}
+
+SpectralCoordinate SDMemTable::getCoordinate(uInt whichIdx) const
+{
+  
   Table t = table_.keywordSet().asTable("FREQUENCIES");
   if (whichIdx > t.nrow() ) {
-    cerr << "SDMemTable::getCoordinate - whichIdx out of range" << endl;
-    return SpectralCoordinate();
+    throw(AipsError("SDMemTable::getCoordinate - whichIdx out of range"));
   }
 
@@ -633 +683 @@
 }
 
-void SDMemTable::setRestFreqs(std::vector<double> freqs, const std::string& theunit)
+void SDMemTable::setRestFreqs(std::vector<double> freqs, 
+                              const std::string& theunit)
 {
   Vector<Double> tvec(freqs);
@@ -643 +694 @@
 }
 
-bool SDMemTable::putSDFreqTable(const SDFrequencyTable& sdft) {
+bool SDMemTable::putSDFreqTable(const SDFrequencyTable& sdft)
+{
   TableDesc td("", "1", TableDesc::Scratch);
   td.addColumn(ScalarColumnDesc<Double>("REFPIX"));
@@ -667 +719 @@
   aTable.rwKeywordSet().define("DOPPLER", String("RADIO"));
   Vector<Double> rfvec;
+  String rfunit;
+  sdft.restFrequencies(rfvec,rfunit);
+  Quantum<Vector<Double> > q(rfvec, rfunit);
+  rfvec.resize();
+  rfvec = q.getValue("Hz");
   aTable.rwKeywordSet().define("RESTFREQS", rfvec);
   table_.rwKeywordSet().defineTable ("FREQUENCIES", aTable);
@@ -672 +729 @@
 }
 
-SDFrequencyTable SDMemTable::getSDFreqTable() const  {
+SDFrequencyTable SDMemTable::getSDFreqTable() const
+{
   SDFrequencyTable sdft;
 
@@ -678 +736 @@
 }
 
-bool SDMemTable::putSDContainer(const SDContainer& sdc) {
+bool SDMemTable::putSDContainer(const SDContainer& sdc)
+{
   ScalarColumn<Double> mjd(table_, "TIME");
   ScalarColumn<String> srcn(table_, "SRCNAME");
@@ -695 +754 @@
   ScalarColumn<Float> el(table_, "ELEVATION");
   ScalarColumn<Float> para(table_, "PARANGLE");
+  ArrayColumn<String> hist(table_, "HISTORY");
 
   uInt rno = table_.nrow();
@@ -715 +775 @@
   el.put(rno, sdc.elevation);
   para.put(rno, sdc.parangle);
+  hist.put(rno, sdc.getHistory());
 
   return true;
 }
 
-SDContainer SDMemTable::getSDContainer(uInt whichRow) const {
+SDContainer SDMemTable::getSDContainer(uInt whichRow) const
+{
   ROScalarColumn<Double> mjd(table_, "TIME");
   ROScalarColumn<String> srcn(table_, "SRCNAME");
@@ -736 +798 @@
   ROScalarColumn<Float> el(table_, "ELEVATION");
   ROScalarColumn<Float> para(table_, "PARANGLE");
+  ROArrayColumn<String> hist(table_, "HISTORY");
 
   SDContainer sdc(nBeam(),nIF(),nPol(),nChan());
@@ -756 +819 @@
   Vector<uInt> fmap;
   Array<Double> direction;
+  Vector<String> histo;
   spec.get(whichRow, spectrum);
   sdc.putSpectrum(spectrum);
@@ -766 +830 @@
   dir.get(whichRow, direction);
   sdc.putDirection(direction);
+  hist.get(whichRow, histo);
+  sdc.putHistory(histo);
   return sdc;
 }
 
-bool SDMemTable::putSDHeader(const SDHeader& sdh) {
-  table_.lock();
+bool SDMemTable::putSDHeader(const SDHeader& sdh)
+{
   table_.rwKeywordSet().define("nIF", sdh.nif);
   table_.rwKeywordSet().define("nBeam", sdh.nbeam);
@@ -785 +851 @@
   table_.rwKeywordSet().define("Bandwidth", sdh.bandwidth);
   table_.rwKeywordSet().define("UTC", sdh.utc);
-  table_.unlock();
+  table_.rwKeywordSet().define("FluxUnit", sdh.fluxunit);
+  table_.rwKeywordSet().define("Epoch", sdh.epoch);
   return true;
 }
 
-SDHeader SDMemTable::getSDHeader() const {
+SDHeader SDMemTable::getSDHeader() const
+{
   SDHeader sdh;
   table_.keywordSet().get("nBeam",sdh.nbeam);
@@ -805 +873 @@
   table_.keywordSet().get("Bandwidth", sdh.bandwidth);
   table_.keywordSet().get("UTC", sdh.utc);
+  table_.keywordSet().get("FluxUnit", sdh.fluxunit);
+  table_.keywordSet().get("Epoch", sdh.epoch);
   return sdh;
 }
-void SDMemTable::makePersistent(const std::string& filename) {
+void SDMemTable::makePersistent(const std::string& filename)
+{
   table_.deepCopy(filename,Table::New);
 }
@@ -825 +896 @@
 }
 
-String SDMemTable::formatSec(Double x) {
+String SDMemTable::formatSec(Double x)
+{
   Double xcop = x;
   MVTime mvt(xcop/24./3600.);  // make days
@@ -832 +904 @@
   return mvt.string(MVTime::TIME_CLEAN_NO_H, 7)+" ";
 };
+
+std::string SDMemTable::getFluxUnit() const
+{
+  String tmp;
+  table_.keywordSet().get("FluxUnit", tmp);
+  return tmp;
+}
 
 std::string SDMemTable::summary()   {
@@ -856 +935 @@
   table_.keywordSet().get("AntennaName", tmp);
   oss << setw(15) << "Antenna Name:" << tmp << endl;
+  table_.keywordSet().get("FluxUnit", tmp);
+  oss << setw(15) << "Flux Unit:" << tmp << endl;
   Table t = table_.rwKeywordSet().asTable("FREQUENCIES");
   Vector<Double> vec;
@@ -899 +980 @@
 }
 
-Int SDMemTable::nBeam() const {
+Int SDMemTable::nBeam() const
+{
   Int n;
   table_.keywordSet().get("nBeam",n);
@@ -919 +1001 @@
   return n;
 }
+bool SDMemTable::appendHistory(const std::string& hist, int whichRow)
+{
+  ArrayColumn<String> histo(table_, "HISTORY");
+  Vector<String> history;
+  histo.get(whichRow, history);
+  history.resize(history.nelements()+1,True);
+  history[history.nelements()-1] = hist;
+  histo.put(whichRow, history);
+}
+
+std::vector<std::string> SDMemTable::history(int whichRow) const
+{
+  ROArrayColumn<String> hist(table_, "HISTORY");
+  Vector<String> history;
+  hist.get(whichRow, history);
+  std::vector<std::string> stlout;
+  // there is no Array<String>.tovector(std::vector<std::string>), so
+  // do it by hand
+  for (uInt i=0; i<history.nelements(); ++i) {
+    stlout.push_back(history[i]);
+  }
+  return stlout;
+}
 /*
 void SDMemTable::maskChannels(const std::vector<Int>& whichChans ) {
 
   std::vector<int>::iterator it;
-  ArrayAccessor<uChar, Axis<2> > j(flags_);
+  ArrayAccessor<uChar, Axis<asap::PolAxis> > j(flags_);
   for (it = whichChans.begin(); it != whichChans.end(); it++) {
     j.reset(j.begin(uInt(*it)));
-    for (ArrayAccessor<uChar, Axis<0> > i(j); i != i.end(); ++i) {
-      for (ArrayAccessor<uChar, Axis<1> > ii(i); ii != ii.end(); ++ii) {
-        for (ArrayAccessor<uChar, Axis<3> > iii(ii);
+    for (ArrayAccessor<uChar, Axis<asap::BeamAxis> > i(j); i != i.end(); ++i) {
+      for (ArrayAccessor<uChar, Axis<asap::IFAxis> > ii(i); ii != ii.end(); ++ii) {
+        for (ArrayAccessor<uChar, Axis<asap::ChanAxis> > iii(ii);
              iii != iii.end(); ++iii) {
           (*iii) =
@@ -938 +1043 @@
 }
 */
-void SDMemTable::flag(int whichRow) {
+void SDMemTable::flag(int whichRow)
+{
   ArrayColumn<uChar> spec(table_, "FLAGTRA");
   Array<uChar> arr;
   spec.get(whichRow, arr);
 
-  ArrayAccessor<uChar, Axis<0> > aa0(arr);
+  ArrayAccessor<uChar, Axis<asap::BeamAxis> > aa0(arr);
   aa0.reset(aa0.begin(uInt(beamSel_)));//go to beam
-  ArrayAccessor<uChar, Axis<1> > aa1(aa0);
+  ArrayAccessor<uChar, Axis<asap::IFAxis> > aa1(aa0);
   aa1.reset(aa1.begin(uInt(IFSel_)));// go to IF
-  ArrayAccessor<uChar, Axis<2> > aa2(aa1);
+  ArrayAccessor<uChar, Axis<asap::PolAxis> > aa2(aa1);
   aa2.reset(aa2.begin(uInt(polSel_)));// go to pol
 
-  for (ArrayAccessor<uChar, Axis<3> > i(aa2); i != i.end(); ++i) {
+  for (ArrayAccessor<uChar, Axis<asap::ChanAxis> > i(aa2); i != i.end(); ++i) {
     (*i) = uChar(True);
   }

trunk/src/SDMemTable.h

@@ -100 +100 @@
                             const std::string& theunit);
   virtual void setCoordInfo(std::vector<string> theinfo);
+
+  std::string getFluxUnit() const;
+
   // set the current value
   virtual bool setIF(casa::Int whichIF=0);
@@ -114 +117 @@
   virtual casa::Int getBeam() const { return beamSel_; }
   virtual casa::Int getPol() const { return polSel_; }
-  virtual std::vector<string> getCoordInfo() const;
+  virtual std::vector<std::string> getCoordInfo() const;
 
   // number of scans in table
   virtual casa::Int nScan() const;
 
-  // print a summary to stdout
+  // get a summary of the table
   virtual std::string summary();
 
+  std::vector<std::string> history(int whichRow=0) const;
+  bool appendHistory(const std::string& hist, int whichRow=0);
   // write to disk as aips++ table
   void makePersistent(const std::string& filename);
@@ -145 +150 @@
   // to bool mask
   casa::MaskedArray<casa::Float> rowAsMaskedArray(casa::uInt whichRow,
-                                                  casa::Bool useSelection = casa::False) const;
+                                                  casa::Bool useSelection = 
+                                                  casa::False) const;
 
   casa::SpectralCoordinate getCoordinate(casa::uInt whichIdx) const;
@@ -153 +159 @@
   casa::Int nCoordinates() const;
 
+
   std::vector<double> getAbcissa(int whichRow=0) const;
   std::string getAbcissaString(casa::Int whichRow=0) const;
+  
+  casa::MDirection getDirection(casa::Int whichRow=0) const; 
 
 private: