Changeset 2761 for trunk/src

Timestamp:

02/06/13 13:13:20 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Added new option, freqref, to NRO filler. Posible values are:
1) 'rest' to import frequency in REST frame, which results in an exactly
same frequency label as NEWSTAR, and 2) 'vref' to import frequency
in the frame that source velocity refers, which results in the same
velocity label as NEWSTAR. The option must be given to scantable
constructor.

File:

• trunk/src/NROFiller.cpp (modified) (3 diffs)

trunk/src/NROFiller.cpp

@@ -23 +23 @@
 #include <casa/Quanta/MVTime.h>
 #include <atnf/PKSIO/SrcType.h>
+#include <casa/Logging/LogIO.h>
 
 using namespace casa;
@@ -38 +39 @@
 }
 
-  bool NROFiller::open(const std::string& filename, const Record& rec) 
+bool NROFiller::open(const std::string& filename, const Record& rec) 
 {
   bool status = true ;
+
+  // Parse options
+  String freqref = "DEFAULT (REST)" ;
+  if ( rec.isDefined( "nro" ) ) {
+    Record nrorec = rec.asRecord( "nro" ) ;
+    if ( nrorec.isDefined( "freqref" ) ) {
+      freqref = nrorec.asString( "freqref" ) ;
+      freqref.upcase() ;
+    }
+    LogIO os( LogOrigin( "NROFiller", "open", WHERE ) ) ;
+    os << "Parsing NRO options" << endl ;
+    os << "   freqref = " << freqref << LogIO::POST ;
+  }
 
   // get appropriate reader object
@@ -49 +63 @@
     return status ;
   }  
+
+  // Apply options
+  if ( freqref == "REST" ) {
+    reader_->setFreqRefFromVREF( false ) ;
+  }
+  else if ( freqref == "VREF" ) {
+    reader_->setFreqRefFromVREF( true ) ;
+  }
 
   // get header information