Changeset 2217

Timestamp:

07/13/11 15:15:14 (13 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...

Frequency reference frame is retrieved from MS/SPECTRAL_WINDOW table.

Location:

trunk/src

Files:

• MSFiller.cpp (modified) (2 diffs)
• MSFiller.h (modified) (1 diff)

trunk/src/MSFiller.cpp

@@ -249 +249 @@
 
   // SUBTABLES: FREQUENCIES
-  table_->frequencies().setFrame( "LSRK" ) ;
-  table_->frequencies().setFrame( "LSRK", True ) ;
+  string freqFrame = getFrame() ;
+  table_->frequencies().setFrame( freqFrame ) ;
+  table_->frequencies().setFrame( freqFrame, True ) ;
 
   // SUBTABLES: WEATHER
@@ -1737 +1738 @@
 }
 
+string MSFiller::getFrame()
+{
+  MFrequency::Types frame = MFrequency::DEFAULT ;
+  ROTableColumn numChanCol( mstable_.spectralWindow(), "NUM_CHAN" ) ;
+  ROTableColumn measFreqRefCol( mstable_.spectralWindow(), "MEAS_FREQ_REF" ) ;
+  uInt nrow = numChanCol.nrow() ;
+  Vector<Int> measFreqRef( nrow, MFrequency::DEFAULT ) ;
+  uInt nref = 0 ;
+  for ( uInt irow = 0 ; irow < nrow ; irow++ ) {
+    if ( numChanCol.asInt( irow ) != 4 ) { // exclude WVR
+      measFreqRef[nref] = measFreqRefCol.asInt( irow ) ;
+      nref++ ;
+    }
+  }
+  if ( nref > 0 )
+    frame = (MFrequency::Types)measFreqRef[0] ;
+
+  return MFrequency::showType( frame ) ;
+}
 } ;
 

trunk/src/MSFiller.h

@@ -100 +100 @@
   // tool for HPC
   double gettimeofday_sec() ;
+
+  // get frequency frame
+  std::string getFrame() ;
   
   casa::CountedPtr<Scantable> table_ ;