Changeset 306

Timestamp:

01/27/05 21:47:09 (19 years ago)

Author:

kil064

Message:

implement function getSDFreqTable which was empty before

Location:

trunk/src

Files:

• SDMemTable.cc (modified) (3 diffs)
• SDMemTable.h (modified) (2 diffs)

trunk/src/SDMemTable.cc

@@ -331 +331 @@
 {
   std::vector<string>::iterator it;
-  String un,rfrm,dpl;
-  un = theinfo[0];
-  rfrm = theinfo[1];
-  dpl = theinfo[2];
-
+  String un,rfrm, brfrm,dpl;
+  un = theinfo[0];              // Abcissa unit
+  rfrm = theinfo[1];            // Active (or conversion) frame
+  dpl = theinfo[2];             // Doppler
+  brfrm = theinfo[3];           // Base frame
+//
   Table t = table_.rwKeywordSet().asTable("FREQUENCIES");
+//
   Vector<Double> rstf;
   t.keywordSet().get("RESTFREQS",rstf);
+//
   Bool canDo = True;
   Unit u1("km/s");Unit u2("Hz");
@@ -370 +373 @@
     t.rwKeywordSet().define("DOPPLER",dpl);
   }
+//
+  if (!MFrequency::getType(mdr, brfrm)) {
+     Int a,b;const uInt* c;
+     const String* valid = MFrequency::allMyTypes(a, b, c);
+     String pfix = "Please specify a legal frame type. Types are\n";
+     throw(AipsError(pfix+(*valid)));
+   } else {
+    t.rwKeywordSet().define("BASEREFFRAME",brfrm);
+   }
 }
 
@@ -819 +831 @@
 SDFrequencyTable SDMemTable::getSDFreqTable() const
 {
-  // TODO !!!!! implement this properly USE with care
   const Table& t = table_.keywordSet().asTable("FREQUENCIES");
   SDFrequencyTable sdft;
-  sdft.setLength(t.nrow());
+
+// Add refpix/refval/incr.  What are the units ? Hz I suppose
+// but it's nowhere described...
+
+  Vector<Double> refPix, refVal, incr;
+  ScalarColumn<Double> refPixCol(t, "REFPIX");
+  ScalarColumn<Double> refValCol(t, "REFVAL");
+  ScalarColumn<Double> incrCol(t, "INCREMENT");
+  refPix = refPixCol.getColumn();
+  refVal = refValCol.getColumn();
+  incr = incrCol.getColumn();
+//
+  uInt n = refPix.nelements();
+  for (uInt i=0; i<n; i++) {
+     sdft.addFrequency(refPix[i], refVal[i], incr[i]);
+  }
+
+// Frequency reference frame.  I don't know if this
+// is the correct frame.  It might be 'REFFRAME'
+// rather than 'BASEREFFRAME' ?
+
+  String baseFrame;
+  t.keywordSet().get("BASEREFFRAME",baseFrame);
+  sdft.setRefFrame(baseFrame);
+
+// Equinox
+
+  Float equinox;
+  t.keywordSet().get("EQUINOX", equinox);
+  sdft.setEquinox(equinox);
+
+// Rest Frequency
+
+  Vector<Double> restFreqs;
+  t.keywordSet().get("RESTFREQS", restFreqs);
+  for (uInt i=0; i<restFreqs.nelements(); i++) {
+     sdft.addRestFrequency(restFreqs[i]);
+  }
+  sdft.setRestFrequencyUnit(String("Hz"));
+//
   return sdft;
 }

trunk/src/SDMemTable.h

@@ -80 +80 @@
   SDHeader getSDHeader() const;
 
-  // Get SD Frequency table.  Note that this function is largely
-  // unimplemented.  Only the number of freqIDs is filled in presently.
+  // Get SD Frequency table.  
   SDFrequencyTable getSDFreqTable() const;
+
   // get spectrum,mask and tsys for the given row, at the selected
   // cursor - all as stl vectors
@@ -175 +175 @@
 
   // Return SC, setting only the basic construction state (i.e.
-  // no conversion or velocity or rest frequency state)
+  // no conversion or velocity or rest frequency state).
+  // Specify the index of the FreqID you want
   casa::SpectralCoordinate getSpectralCoordinate(casa::uInt whichIdx) const;