Changeset 921 for trunk/src

Timestamp:

03/24/06 13:27:48 (19 years ago)

Author:

mar637

Message:

Added setFrame form measures, implemented setFrame for both base and userframe

Location:

trunk/src

Files:

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

trunk/src/STFrequencies.cpp

@@ -225 +225 @@
 {
   // get the ref frame
-  String rf = table_.keywordSet().asString("BASEFRAME");
+  String rf;
+  if ( base )
+    rf = table_.keywordSet().asString("BASEFRAME");
+  else
+    rf = table_.keywordSet().asString("FRAME");
 
   // Create SpectralCoordinate (units Hz)
@@ -346 +350 @@
 }
 
-void asap::STFrequencies::setFrame( const std::string & frame )
+void asap::STFrequencies::setFrame(MFrequency::Types frame, bool base )
+{
+  String f = MFrequency::showType(frame);
+  if (base)
+    table_.rwKeywordSet().define("BASEFRAME", f);
+  else
+    table_.rwKeywordSet().define("FRAME", f);
+
+}
+
+void asap::STFrequencies::setFrame( const std::string & frame, bool base )
 {
   MFrequency::Types mdr;
@@ -359 +373 @@
     throw(AipsError(msg));
   } else {
-    table_.rwKeywordSet().define("FRAME", frame);
+    if (base)
+      table_.rwKeywordSet().define("BASEFRAME", frame);
+    else
+      table_.rwKeywordSet().define("FRAME", frame);
   }
 }

trunk/src/STFrequencies.h

@@ -109 +109 @@
    * @param frame a string identifier
    */
-  void setFrame(const std::string& frame);
+  void setFrame(const std::string& frame, bool base=false);
   /**
    * set the frequency frame from a casa::MFrequency::Types
    * @param frame casa::MFrequency::Types
    */
-  void setFrame(casa::MFrequency::Types frame);
+  void setFrame(casa::MFrequency::Types frame, bool base=false);
   void setUnit( const std::string & unit );
   void setDoppler( const std::string & doppler );