Changeset 2754 for trunk

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

Files:

• external-alma/asdm2ASAP/ASDMFiller.cc (modified) (4 diffs)
• external-alma/asdm2ASAP/ASDMFiller.h (modified) (1 diff)
• external-alma/asdm2ASAP/asdm2ASAP.cc (modified) (3 diffs)
• python/asapmath.py (modified) (3 diffs)
• python/scantable.py (modified) (1 diff)
• src/MSFiller.cpp (modified) (11 diffs)
• src/MSFiller.h (modified) (2 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

trunk/python/asapmath.py

@@ -949 +949 @@
 
 @asaplog_post_dec
-def splitant(filename, outprefix='',overwrite=False):
+def splitant(filename, outprefix='',overwrite=False, getpt=True, freq_tolsr=False):
     """
     Split Measurement set by antenna name, save data as a scantables,
@@ -963 +963 @@
                     The default False is to return with warning
                     without writing the output. USE WITH CARE.
+       getpt        Whether to import direction from MS/POINTING
+                    table or not. Default is True (import direction).
+       freq_tolsr   Whether to convert frequency frame information
+                    to LSRK or not. Default is False (import as is).
 
     """
@@ -1008 +1012 @@
         tb.open(tablename=filename,nomodify=True)
         tbsel=tb.query('ANTENNA1 == %s && ANTENNA2 == %s'%(antid,antid),tmpname)
-        scan=scantable(tmpname,average=False,getpt=True,antenna=int(antid))
+        scan=scantable(tmpname,average=False,antenna=int(antid),getpt=getpt,freq_tolsr=freq_tolsr,)
         outname=prefix+antnames[antid]+'.asap'
         scan.save(outname,format='ASAP',overwrite=overwrite)

trunk/python/scantable.py

@@ -209 +209 @@
                           Default (false) is taken from rc file.
 
+            getpt:        Whether to import direction from MS/POINTING
+                          table properly or not.
+                          This is effective only when filename is MS.
+                          The default (True) is to import direction
+                          from MS/POINTING.
+
+            freq_tolsr:   Whether to convert frequency frame information
+                          to LSRK or not.
+                          This is effective only when filename is MS.
+                          The default (False) is to import frequency
+                          as is.
+                          
         """
         if average is None:

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_ ;