Changeset 2754 for trunk/src

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/src

Files:

• MSFiller.cpp (modified) (11 diffs)
• MSFiller.h (modified) (2 diffs)

trunk/src/MSFiller.cpp

@@ -257 +257 @@
   MSFillerVisitor(const Table &from, Scantable &to)
     : BaseMSFillerVisitor(from),
-      scantable( to )
+      scantable(to),
+      freqToLsr_(False)
   { 
     antennaId = 0 ;
@@ -712 +713 @@
     sysCalTsysCol.attach( sctab, tsysCol ) ;
   }
+  void setFreqToLsr(Bool b) { freqToLsr_ = b; }
   STHeader getHeader() { return header ; }
   uInt getNumBeam() { return nbeam ; }
@@ -816 +818 @@
     MFrequency::Types freqRef = MFrequency::castType( measFreqRef ) ;
     //freqref = MFrequency::showType( freqRef ) ;
-    freqref = "LSRK" ;
+    //freqref = "LSRK" ;
+    freqref = "TOPO";
     Quantum<Double> q ;
     getScalarQuant( "TOTAL_BANDWIDTH", spwId, spwtab, q ) ;
@@ -842 +845 @@
     if ( even )
       refval = 0.5 * ( refval + qa[refchan+1].getValue( "Hz" ) ) ;
-    if ( freqRef != MFrequency::LSRK ) {
+    if ( freqToLsr_ && freqRef != MFrequency::LSRK ) {
+      //cout << "do conversion to LSRK" << endl;
       MeasFrame mframe( me, mp, md ) ;
       MFrequency::Convert tolsr( freqRef, MFrequency::Ref( MFrequency::LSRK, mframe ) ) ;
@@ -1314 +1318 @@
   //String tsysCol;
   //String tcalCol;
+  Bool freqToLsr_;
 
   // MS subtables
@@ -1585 +1590 @@
     antennaStr_(""),
     getPt_( True ),
+    freqToLsr_( False ),
     isFloatData_( False ),
     isData_( False ),
@@ -1631 +1637 @@
       antenna_ = 0 ;
     }
+    if ( msrec.isDefined( "freq_tolsr" ) ) {
+      freqToLsr_ = msrec.asBool( "freq_tolsr" ) ;
+    }
   }
 
@@ -1649 +1658 @@
 
   os_ << "Parsing MS options" << endl ;
-  os_ << "   getPt = " << getPt_ << endl ;
+  os_ << "   getPt = " << (getPt_ ? "True" : "False") << endl ;
   os_ << "   antenna = " << antenna_ << endl ;
-  os_ << "   antennaStr = " << antennaStr_ << LogIO::POST ;
+  os_ << "   antennaStr = " << antennaStr_ << endl ;
+  os_ << "   freqToLsr = " << (freqToLsr_  ? "True" : "False") << LogIO::POST;
 
   mstable_ = MeasurementSet( (*tmpMS)( tmpMS->col("ANTENNA1") == antenna_ 
@@ -1745 +1755 @@
   string freqFrame = "LSRK" ;
   table_->frequencies().setFrame( freqFrame ) ;
-  table_->frequencies().setFrame( freqFrame, True ) ;
+  if ( freqToLsr_ ) {
+    table_->frequencies().setFrame( freqFrame, True ) ;
+  }
+  else {
+    string baseFrame = frameFromSpwTable() ;
+    table_->frequencies().setFrame( baseFrame, True ) ;
+  }
 
   // SUBTABLES: WEATHER
@@ -1791 +1807 @@
     if ( isSysCal_ ) 
       myVisitor.setSysCalRecord( tcalrec_ ) ;
+    myVisitor.setFreqToLsr( freqToLsr_ ) ;
     
     //double t2 = mathutil::gettimeofday_sec() ;
@@ -2159 +2176 @@
 }
 
+string MSFiller::frameFromSpwTable()
+{
+  string frameString;
+  Table tab = mstable_.spectralWindow();
+  ROScalarColumn<Int> mfrCol(tab, "MEAS_FREQ_REF");
+  Vector<Int> mfr = mfrCol.getColumn();
+  if (allEQ(mfr,mfr[0])) {
+    frameString = MFrequency::showType(mfr[0]);
+    //cout << "all rows have same frame: " << frameString << endl;
+  }
+  else {
+    mfrCol.attach(tab, "NUM_CHAN");
+    for (uInt i = 0; i < tab.nrow(); i++) {
+      if (mfrCol(i) != 4) {
+        frameString = MFrequency::showType(mfr[i]);
+        break;
+      }
+    }
+    if (frameString.size() == 0) {
+      frameString = "TOPO";
+    }
+  }
+
+  //cout << "frameString = " << frameString << endl;
+
+  return frameString;
+}
+
 };

trunk/src/MSFiller.h

@@ -156 +156 @@
   void initHeader( STHeader &header ) ;
 
+  // get base frame from SPECTRAL_WINDOW table
+  std::string frameFromSpwTable();
+
   CountedPtr<Scantable> table_ ;
   MeasurementSet mstable_ ;
@@ -162 +165 @@
   String antennaStr_ ;
   Bool getPt_ ;
+  Bool freqToLsr_ ;
 
   Bool isFloatData_ ;