Changeset 847 for trunk/src/STFrequencies.cpp

Timestamp:

02/24/06 10:03:21 (18 years ago)

Author:

mar637

Message:

numerous changes before move to new svn repository sourcecode.atnf.csiro.au

File:

• trunk/src/STFrequencies.cpp (modified) (9 diffs)

trunk/src/STFrequencies.cpp

@@ -33 +33 @@
 namespace asap {
 
-const casa::String STFrequencies::name_ = "FREQUENCIES";
-
-STFrequencies::STFrequencies(casa::Table::TableType tt) :
+const String STFrequencies::name_ = "FREQUENCIES";
+
+STFrequencies::STFrequencies(Table::TableType tt) :
   STSubTable( name_, tt )
 {
@@ -53 +53 @@
   table_.addColumn(ScalarColumnDesc<Double>("INCREMENT"));
 
-  table_.rwKeywordSet().define("REFFRAME", String("TOPO"));
+  table_.rwKeywordSet().define("FRAME", String("TOPO"));
+  table_.rwKeywordSet().define("BASEFRAME", String("TOPO"));
   table_.rwKeywordSet().define("EQUINOX",String( "J2000"));
   table_.rwKeywordSet().define("UNIT", String("Hz"));
@@ -108 +109 @@
 }
 
-SpectralCoordinate STFrequencies::getSpectralCoordinate( uInt freqID )
-{
-  Table t = table_(table_.col("ID") == Int(freqID) );
+SpectralCoordinate STFrequencies::getSpectralCoordinate( uInt id ) const
+{
+  Table t = table_(table_.col("ID") == Int(id) );
 
   if (t.nrow() == 0 ) {
-    throw(AipsError("STFrequencies::getSpectralCoordinate - freqID out of range"));
+    throw(AipsError("STFrequencies::getSpectralCoordinate - ID out of range"));
   }
 
@@ -121 +122 @@
   const TableRecord& rec = row.get(0);
 
-  return SpectralCoordinate( getFrame(), rec.asDouble("REFVAL"),
+  return SpectralCoordinate( getFrame(true), rec.asDouble("REFVAL"),
                              rec.asDouble("INCREMENT"),
                              rec.asDouble("REFPIX"));
 }
 
-void STFrequencies::rescale( casa::Float factor, const std::string& mode )
+SpectralCoordinate
+  asap::STFrequencies::getSpectralCoordinate( const MDirection& md,
+                                              const MPosition& mp,
+                                              const MEpoch& me,
+                                              Double restfreq, uInt id ) const
+{
+  SpectralCoordinate spc = getSpectralCoordinate(id);
+  spc.setRestFrequency(restfreq, True);
+  if ( !spc.setReferenceConversion(getFrame(), me, mp, md) ) {
+    throw(AipsError("Couldn't convert frequency frame."));
+  }
+  String unitstr = getUnitString();
+  if ( !unitstr.empty() ) {
+    Unit unitu(unitstr);
+    if ( unitu == Unit("Hz") ) {
+    } else {
+      spc.setVelocity(unitstr, getDoppler());
+    }
+  }
+  return spc;
+}
+
+
+void STFrequencies::rescale( Float factor, const std::string& mode )
 {
   TableRow row(table_);
@@ -137 +161 @@
     const TableRecord& rec = row.get(i);
 
-    SpectralCoordinate sc ( getFrame(), rec.asDouble("REFVAL"),
+    SpectralCoordinate sc ( getFrame(true), rec.asDouble("REFVAL"),
                             rec.asDouble("INCREMENT"), rec.asDouble("REFPIX") );
 
@@ -177 +201 @@
 
 
-casa::MFrequency::Types STFrequencies::getFrame( ) const
+MFrequency::Types STFrequencies::getFrame(bool base) const
 {
   // get the ref frame
-  String rf;
-  table_.keywordSet().get("REFFRAME", rf);
+  String rf = table_.keywordSet().asString("BASEFRAME");
 
   // Create SpectralCoordinate (units Hz)
@@ -192 +215 @@
 
   return mft;
+}
+
+std::string asap::STFrequencies::getFrameString( bool base ) const
+{
+  if ( base ) return table_.keywordSet().asString("BASEFRAME");
+  else return table_.keywordSet().asString("FRAME");
+}
+
+std::string asap::STFrequencies::getUnitString( ) const
+{
+  return table_.keywordSet().asString("UNIT");
+}
+
+Unit asap::STFrequencies::getUnit( ) const
+{
+  return Unit(table_.keywordSet().asString("UNIT"));
+}
+
+std::string asap::STFrequencies::getDopplerString( ) const
+{
+  return table_.keywordSet().asString("DOPPLER");
+}
+
+MDoppler::Types asap::STFrequencies::getDoppler( ) const
+{
+  String dpl = table_.keywordSet().asString("DOPPLER");
+
+  // Create SpectralCoordinate (units Hz)
+  MDoppler::Types mdt;
+  if (!MDoppler::getType(mdt, dpl)) {
+    throw(AipsError("Doppler type unknown"));
+  }
+  return mdt;
 }
 
@@ -226 +282 @@
   const Record& r = table_.keywordSet();
   const Record& ro = other.table_.keywordSet();
-  return ( r.asString("REFFRAME") == ro.asString("REFFRAME") &&
+  return ( r.asString("FRAME") == ro.asString("FRAME") &&
            r.asString("EQUINOX") == ro.asString("EQUINOX") &&
            r.asString("UNIT") == ro.asString("UNIT") &&
@@ -233 +289 @@
 }
 
+std::vector< std::string > asap::STFrequencies::getInfo( ) const
+{
+  const Record& r = table_.keywordSet();
+  std::vector<std::string> out;
+  out.push_back(r.asString("UNIT"));
+  out.push_back(r.asString("FRAME"));
+  out.push_back(r.asString("DOPPLER"));
+}
+
+void asap::STFrequencies::setInfo( const std::vector< std::string >& theinfo )
+{
+  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"));
+  } else {
+    r.define("DOPPLER",dpl);
+  }
+}
+void asap::STFrequencies::setFrame( const std::string & frame )
+{
+  MFrequency::Types mdr;
+  if (!MFrequency::getType(mdr, frame)) {
+    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 {
+    table_.rwKeywordSet().define("FRAME", frame);
+  }
+}
+
 } // namespace