Changeset 275

Timestamp:

01/24/05 12:31:27 (19 years ago)

Author:

kil064

Message:

finalize implement DOPPLER setting and using. Before it was
just set to RADIO and never changed. Now you can set it

File:

• trunk/src/SDMemTable.cc (modified) (7 diffs)

trunk/src/SDMemTable.cc

@@ -335 +335 @@
   }
   t.rwKeywordSet().define("UNIT", un);
-
+//
   MFrequency::Types mdr;
   if (!MFrequency::getType(mdr, rfrm)) {
@@ -346 +346 @@
     t.rwKeywordSet().define("REFFRAME",rfrm);
   }
-
+//
+  MDoppler::Types dtype;
+  dpl.upcase();
+  if (!MDoppler::getType(dtype, dpl)) {
+    throw(AipsError("Doppler type unknown"));
+  } else {
+    t.rwKeywordSet().define("DOPPLER",dpl);
+  }
 }
 
@@ -386 +393 @@
   MFrequency::Types mtype;
   if (!MFrequency::getType(mtype, frm)) {
-    cout << "Frequency type unknown assuming TOPO" << endl;
+    cout << "Frequency type unknown assuming TOPO" << endl;       // SHould never happen
     mtype = MFrequency::TOPO;
+  }
+  MDoppler::Types dtype;
+  if (!MDoppler::getType(dtype, dpl)) {
+    cout << "Doppler type unknown assuming RADIO" << endl;        // SHould never happen
+    dtype = MDoppler::RADIO;
   }
   
@@ -400 +412 @@
       if (rstf.nelements() >= nIF())
         spc.selectRestFrequency(uInt(IFSel_));
-      spc.setVelocity(u.getName());
+      spc.setVelocity(u.getName(),dtype);
       Vector<Double> wrld;
       spc.pixelToVelocity(wrld,absc1);
@@ -447 +459 @@
   String frm;
   t.keywordSet().get("REFFRAME",frm);
+//
   MFrequency::Types mtype;
   if (!MFrequency::getType(mtype, frm)) {
@@ -453 +466 @@
   }
   spc.setFrequencySystem(mtype);
+//
+  String dpl;
+  t.keywordSet().get("DOPPLER",dpl);
+  MDoppler::Types dtype;
+  MDoppler::getType(dtype, dpl);         // Can't fail
+//
   String s = "Channel";
   if (u == Unit("km/s")) { 
-    spc.setVelocity(u.getName());
+    spc.setVelocity(u.getName(), dtype);
     s = CoordinateUtil::axisLabel(spc,0,True,True,True);
   } else if (u == Unit("Hz")) {
@@ -921 +940 @@
 }
 
+
 void SDMemTable::setInstrument(const std::string& name)
 {