Changeset 2844 for trunk

Timestamp:

08/27/13 14:52:29 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-5535

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: Removed freq_tolsr option from scantable constructor

Test Programs: sdsave unit test

Put in Release Notes: No

Module(s): sd

Description: Describe your changes here...

The parameter freq_tolsr is removed from scantable constructor.
It is removed from python layer as well as C++ layer.
Now the code always behaves like 'freq_tolsr=False'.

Location:

trunk

Files:

• python/scantable.py (modified) (2 diffs)
• src/MSFiller.cpp (modified) (9 diffs)

trunk/python/scantable.py

@@ -341 +341 @@
                           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:
@@ -376 +369 @@
                     # Measurement Set
                     opts={'ms': {}}
-                    mskeys=['getpt','antenna','freq_tolsr']
+                    mskeys=['getpt','antenna']
                     for key in mskeys:
                         if key in args.keys():

trunk/src/MSFiller.cpp

@@ -257 +257 @@
   MSFillerVisitor(const Table &from, Scantable &to)
     : BaseMSFillerVisitor(from),
-      scantable(to),
-      freqToLsr_(False)
+      scantable(to)
   { 
     antennaId = 0 ;
@@ -715 +714 @@
     sysCalTsysCol.attach( sctab, tsysCol ) ;
   }
-  void setFreqToLsr(Bool b) { freqToLsr_ = b; }
   STHeader getHeader() { return header ; }
   uInt getNumBeam() { return nbeam ; }
@@ -847 +845 @@
     if ( even )
       refval = 0.5 * ( refval + qa[refchan+1].getValue( "Hz" ) ) ;
-    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 ) ) ;
-      refval = tolsr( Quantum<Double>( refval, "Hz" ) ).get( "Hz" ).getValue() ;
-    }
     
     // add new row to FREQUENCIES
@@ -1321 +1313 @@
   //String tsysCol;
   //String tcalCol;
-  Bool freqToLsr_;
 
   // MS subtables
@@ -1593 +1584 @@
     antennaStr_(""),
     getPt_( True ),
-    freqToLsr_( False ),
     isFloatData_( False ),
     isData_( False ),
@@ -1640 +1630 @@
       antenna_ = 0 ;
     }
-    if ( msrec.isDefined( "freq_tolsr" ) ) {
-      freqToLsr_ = msrec.asBool( "freq_tolsr" ) ;
-    }
   }
 
@@ -1663 +1650 @@
   os_ << "   getPt = " << (getPt_ ? "True" : "False") << endl ;
   os_ << "   antenna = " << antenna_ << endl ;
-  os_ << "   antennaStr = " << antennaStr_ << endl ;
-  os_ << "   freqToLsr = " << (freqToLsr_  ? "True" : "False") << LogIO::POST;
+  os_ << "   antennaStr = " << antennaStr_ << LogIO::POST;
 
   mstable_ = MeasurementSet( (*tmpMS)( tmpMS->col("ANTENNA1") == antenna_ 
@@ -1756 +1742 @@
   // SUBTABLES: FREQUENCIES
   //string freqFrame = getFrame() ;
-  if ( freqToLsr_ ) {
-    string freqFrame = "LSRK" ;
-    table_->frequencies().setFrame( freqFrame ) ;
-    table_->frequencies().setFrame( freqFrame, True ) ;
-  }
-  else {
-    string baseFrame = frameFromSpwTable() ;
-    table_->frequencies().setFrame( baseFrame ) ;
-    table_->frequencies().setFrame( baseFrame, True ) ;
-  }
+  string baseFrame = frameFromSpwTable() ;
+  table_->frequencies().setFrame( baseFrame ) ;
+  table_->frequencies().setFrame( baseFrame, True ) ;
 
   // SUBTABLES: WEATHER
@@ -1811 +1790 @@
     if ( isSysCal_ ) 
       myVisitor.setSysCalRecord( tcalrec_ ) ;
-    myVisitor.setFreqToLsr( freqToLsr_ ) ;
     
     //double t2 = mathutil::gettimeofday_sec() ;