Changeset 866 for trunk

Timestamp:

03/06/06 10:47:14 (19 years ago)

Author:

mar637

Message:

Update to setInfo
added setUnit, setDoppler

Location:

trunk/src

Files:

• STFrequencies.cpp (modified) (6 diffs)
• STFrequencies.h (modified) (1 diff)

trunk/src/STFrequencies.cpp

@@ -161 +161 @@
     Unit unitu(unitstr);
     if ( unitu == Unit("Hz") ) {
+      Vector<String> wau(1); wau = unitu.getName();
+      spc.setWorldAxisUnits(wau);
     } else {
       spc.setVelocity(unitstr, getDoppler());
@@ -279 +281 @@
     const TableRecord& rec = row.get(i);
     oss <<  setw(8)
-    << "frame" << setw(16) << setprecision(8)
+    << rec.asString("FRAME") << setw(16) << setprecision(8)
     << rec.asDouble("REFVAL") << setw(10)
     << rec.asDouble("REFPIX") << setw(12)
@@ -315 +317 @@
   out.push_back(r.asString("FRAME"));
   out.push_back(r.asString("DOPPLER"));
+  return out;
 }
 
@@ -320 +323 @@
 {
   if ( theinfo.size() != 3 ) throw(AipsError("setInfo needs three parameters"));
-  String un,rfrm,dpl;
-  un = theinfo[0];rfrm = theinfo[1];dpl = theinfo[2];
-  TableRecord& r = table_.rwKeywordSet();
-  setFrame(rfrm);
-  MDoppler::Types dtype;
-  dpl.upcase();
-  if (!MDoppler::getType(dtype, dpl)) {
-    throw(AipsError("Doppler type unknown"));
+  try {
+    setUnit(theinfo[0]);
+    setFrame(theinfo[1]);
+    setDoppler(theinfo[2]);
+  } catch (AipsError& e) {
+    throw(e);
+  }
+}
+
+void asap::STFrequencies::setUnit( const std::string & unit )
+{
+  if (unit == "" || unit == "pixel" || unit == "channel" ) {
+    table_.rwKeywordSet().define("UNIT", "");
   } else {
-    r.define("DOPPLER",dpl);
-  }
-}
+    Unit u(unit);
+    if ( u == Unit("km/s") || u == Unit("Hz") )
+      table_.rwKeywordSet().define("UNIT", unit);
+    else {
+      throw(AipsError("Illegal spectral unit."));
+    }
+  }
+}
+
 void asap::STFrequencies::setFrame( const std::string & frame )
 {
@@ -338 +352 @@
     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)));
+    Vector<String> ftypes(IPosition(1,a), valid);
+    ostringstream oss;
+    oss <<  String("Please specify a legal frequency type. Types are\n");
+    oss << ftypes;
+    String msg(oss);
+    throw(AipsError(msg));
   } else {
     table_.rwKeywordSet().define("FRAME", frame);
@@ -345 +363 @@
 }
 
+void asap::STFrequencies::setDoppler( const std::string & doppler )
+{
+  MDoppler::Types mdt;
+  if (!MDoppler::getType(mdt, doppler)) {
+    cout << "DEBUG" << endl;
+    Int a,b;const uInt* c;
+    const String* valid = MDoppler::allMyTypes(a, b, c);
+    Vector<String> ftypes(IPosition(1,a), valid);
+    ostringstream oss;
+    oss <<  String("Please specify a legal doppler type. Types are\n");
+    oss << ftypes;
+    String msg(oss);
+    throw(AipsError(msg));
+  } else {
+    table_.rwKeywordSet().define("DOPPLER", doppler);
+  }
+}
+
 
 } // namespace

trunk/src/STFrequencies.h

@@ -115 +115 @@
    */
   void setFrame(casa::MFrequency::Types frame);
-
+  void setUnit( const std::string & unit );
+  void setDoppler( const std::string & doppler );
   /**
    * rescale the whole table by a given factor