Changeset 78 for trunk

Timestamp:

08/10/04 16:23:15 (20 years ago)

Author:

mar637

Message:

Added support of source direction. This is reflected in the getAbscissa function. Frame conversions enabled.

Location:

trunk/src

Files:

• SDMemTable.cc (modified) (10 diffs)
• SDMemTable.h (modified) (1 diff)

trunk/src/SDMemTable.cc

@@ -50 +50 @@
 #include <aips/Tables/TableRecord.h>
 #include <aips/Measures/MFrequency.h>
+#include <aips/Measures/MeasTable.h>
 #include <aips/Quanta/MVTime.h>
 
@@ -117 +118 @@
   td.addColumn(ScalarColumnDesc<Double>("INTERVAL"));  
   td.addColumn(ArrayColumnDesc<uInt>("FREQID"));
+  td.addColumn(ArrayColumnDesc<Double>("DIRECTION"));
   // Now create a new table from the description.
 
@@ -234 +236 @@
 std::vector<double> SDMemTable::getAbscissa(Int whichRow, 
                                             const std::string& whichUnit,
+                                            const std::string& whichFrame,
                                             double restfreq) {
   std::vector<double> absc(nChan());
@@ -249 +252 @@
   }
   SpectralCoordinate spc = getCoordinate(specidx);
+  Table t = table_.keywordSet().asTable("FREQUENCIES");
+  String rf;
+  t.keywordSet().get("REFFRAME",rf);
+  MDirection::Types mdr;
+  MDirection::getType(mdr, rf);    
+  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);
+  ROScalarColumn<Double> tme(table_, "TIME");
+  Double obstime;
+  tme.get(whichRow,obstime);
+  Quantum<Double> tm(obstime, Unit(String("d")));
+  MVEpoch tm2(tm);
+  MEpoch epoch(tm2);
+
+  Vector<Double> antpos;
+  table_.keywordSet().get("AntennaPosition", antpos);
+  //MPosition pos;
+  MVPosition mvpos(antpos(0),antpos(1),antpos(2));
+  MPosition pos(mvpos);
+  //MeasTable::Observatory(pos, String("ATCA"));
+
+  MFrequency::Types mtype;
+  if (!MFrequency::getType(mtype, whichFrame)) {
+    cerr << "Frequency type unknown assuming TOPO" << endl;
+    mtype = MFrequency::TOPO;
+  }
+  spc.setReferenceConversion(mtype,epoch,pos,direct);  
+
   if ( u == Unit("km/s") ) {
     if (Double(restfreq) >  Double(0.000001)) {
@@ -394 +432 @@
     return SpectralCoordinate();
   }
+  
   Double rp,rv,inc;
   String rf;
@@ -471 +510 @@
   ScalarColumn<Double> integr(table_, "INTERVAL");
   ArrayColumn<uInt> freqid(table_, "FREQID");
+  ArrayColumn<Double> dir(table_, "DIRECTION");
 
   uInt rno = table_.nrow();
@@ -483 +523 @@
   integr.put(rno, sdc.interval);
   freqid.put(rno, sdc.getFreqMap());
+  dir.put(rno, sdc.getDirection());
   
   return true;
@@ -496 +537 @@
   ROScalarColumn<Double> integr(table_, "INTERVAL");
   ROArrayColumn<uInt> freqid(table_, "FREQID");
+  ROArrayColumn<Double> dir(table_, "DIRECTION");
 
   SDContainer sdc(nBeam(),nIF(),nPol(),nChan());
@@ -506 +548 @@
   Array<uChar> flagtrum;
   Vector<uInt> fmap;
+  Array<Double> direction;
   spec.get(whichRow, spectrum);
   sdc.putSpectrum(spectrum);
@@ -514 +557 @@
   freqid.get(whichRow, fmap);
   sdc.putFreqMap(fmap);
+  dir.get(whichRow, direction);
+  sdc.putDirection(direction);
   return sdc;
 }
+
 bool SDMemTable::putSDHeader(const SDHeader& sdh) {
   table_.lock();

trunk/src/SDMemTable.h

@@ -138 +138 @@
   std::vector<double> getAbscissa(int whichRow, 
                                   const std::string& whichUnit="GHz",
+                                  const std::string& whichFrame="TOPO",
                                   double restfreq=0.0);
 private: