Changeset 2754 for trunk/external-alma

Timestamp:

01/31/13 13:14:27 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CSV-2532 (may be related to CSV-1908 and CSV-2161)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: In tool level, added parameter 'freq_tolsr' to

scantable constructor and function sd.splitant.

Test Programs: test_sdsave, test_importasdm_sd

Put in Release Notes: Yes

Module(s): Module Names change impacts.

Description: Describe your changes here...

In importing MS to Scantable, frequency frame information is
imported as is by default, i.e., base frame in Scantable is
TOPO for ALMA data, which is forcibly converted to LSRK with
wrong time and direction reference.

Some functions have a boolean parameter 'freq_tolsr' that controls
the above behavior. If freq_tolsr is False (default), frequency
is imported as is, while frequency is converted to LSRK (wrongly)
when it is True.

Location:

trunk/external-alma/asdm2ASAP

Files:

• ASDMFiller.cc (modified) (4 diffs)
• ASDMFiller.h (modified) (1 diff)
• asdm2ASAP.cc (modified) (3 diffs)

trunk/external-alma/asdm2ASAP/ASDMFiller.cc

@@ -26 +26 @@
     antennaId_( -1 ),
     antennaName_( "" ),
-    className_("ASDMFiller")
+    className_("ASDMFiller"),
+    freqToLsr_(False)
 {
   reader_ = new ASDMReader() ;
@@ -52 +53 @@
   antennaId_ = reader_->getAntennaId() ;
   antennaName_ = reader_->getAntennaName() ;
+
+  if (rec.isDefined("asdm")) {
+    Record asdmrec = rec.asRecord("asdm") ;
+    if (asdmrec.isDefined("freq_tolsr")) {
+      freqToLsr_ = asdmrec.asBool("freq_tolsr");
+    }
+  }
+  logsink_->postLocally(LogMessage("freqToLsr_ = "+String(freqToLsr_?"True":"False"), LogOrigin(className_, funcName, WHERE)));
 
   //logsink_->postLocally( LogMessage("antennaId_ = "+String::toString(antennaId_),LogOrigin(className_,funcName,WHERE)) ) ;
@@ -72 +81 @@
   MFrequency::Types freqFrame = MFrequency::LSRK ;
   table_->frequencies().setFrame( freqFrame, false ) ;
-  table_->frequencies().setFrame( freqFrame, true ) ;
+  if ( freqToLsr_ ) {
+    table_->frequencies().setFrame( freqFrame, true ) ;
+  }
+  else {
+    string baseFrame = reader_->getFrame() ;
+    table_->frequencies().setFrame( baseFrame, true ) ;
+  }
   //logsink_->postLocally( LogMessage("sFreqFrame = "+sFreqFrame,LogOrigin(className_,funcName,WHERE)) ) ;
   
@@ -615 +630 @@
   //logsink_->postLocally( LogMessage("freqref = "+freqref,LogOrigin(className_,funcName,WHERE)) ) ;
   casa::Double newf = freq ;
-  if ( freqref != "LSRK" ) {
+  if ( freqToLsr_ && freqref != "LSRK" ) {
     MEpoch me( Quantum<casa::Double>( utc, Unit("d") ), MEpoch::UTC ) ;
     Vector< Quantum<casa::Double> > antposQ( 3 ) ;

trunk/external-alma/asdm2ASAP/ASDMFiller.h

@@ -102 +102 @@
 
   casa::String className_ ;
+  casa::Bool freqToLsr_ ;
 
 } ;

trunk/external-alma/asdm2ASAP/asdm2ASAP.cc

@@ -49 +49 @@
   inp.create( "srt", "all", "spectral resolution mode: all|fr(full resolution)|ca(channel average)|bw(baseband wide)|fr+ca|fr+bw|ca+bw", "String" ) ;
   inp.create( "logfile", "", "logger output", "String" ) ;
+  inp.create( "freq-tolsr", "False", "Convert frequency frame to LSRK or not: True|False", "Bool" ) ; 
   inp.readArguments( argc, argv ) ;
 
@@ -60 +61 @@
   string resolutionType = inp.getString( "srt" ) ;
   string logfile = inp.getString( "logfile" ) ;
+  Bool freqToLsr = inp.getBool( "freq-tolsr" ) ;
     
   int numApc = 1 ;
@@ -112 +114 @@
     asdmRec.define( "sampling", timeSampling ) ;
     asdmRec.define( "srt", resolutionType ) ;
+    asdmRec.define( "freq_tolsr", freqToLsr ) ;
     if ( reg.match( antenna.c_str(), antenna.size() ) != String::npos ) {
       // antenna is specifiec as id