Changeset 2218 for trunk

Timestamp:

07/13/11 15:23:29 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-1913

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...

Get frequency reference frame from the data.

Location:

trunk/external-alma/asdm2ASAP

Files:

• ASDMFiller.cc (modified) (2 diffs)
• ASDMFiller.h (modified) (1 diff)
• ASDMReader.cc (modified) (1 diff)
• ASDMReader.h (modified) (1 diff)

trunk/external-alma/asdm2ASAP/ASDMFiller.cc

@@ -63 +63 @@
   // header
   fillHeader() ;
+
+  // set Frame for FREQUENCIES table
+  string sFreqFrame = reader_->getFrame() ;
+  MFrequency::Types freqFrame = toFrameType( sFreqFrame ) ;
+  table_->frequencies().setFrame( freqFrame, false ) ;
+  table_->frequencies().setFrame( freqFrame, true ) ;
   
   Vector<casa::Double> antpos = table_->getHeader().antennaposition ;
@@ -506 +512 @@
 }
 
+MFrequency::Types ASDMFiller::toFrameType( string &s ) 
+{
+  MFrequency::Types ftype = MFrequency::DEFAULT ;
+  if ( s == "LABREST" )
+    ftype = MFrequency::REST ;
+  else {
+    Bool b = MFrequency::getType( ftype, String(s) ) ;
+    if (!b)
+      ftype = MFrequency::DEFAULT ;
+  }
+  return ftype ;
+}

trunk/external-alma/asdm2ASAP/ASDMFiller.h

@@ -74 +74 @@
                 casa::Vector<casa::Double> antpos ) ;
 
+  // get frequency frame enum value from string
+  casa::MFrequency::Types toFrameType( std::string &s ) ;
+
   casa::CountedPtr<ASDMReader> reader_ ;
   casa::Int antennaId_ ;

trunk/external-alma/asdm2ASAP/ASDMReader.cc

@@ -1649 +1649 @@
   logsink_ = logsink ;
 }
+
+string ASDMReader::getFrame()
+{
+  String funcName = "getFrame" ;
+ 
+  // default is TOPO
+  string frame = "TOPO" ;
+
+  SpectralWindowTable &spwtab = asdm_->getSpectralWindow() ;
+  vector<SpectralWindowRow *> rows = spwtab.get() ;
+  vector<FrequencyReferenceCode> measFreqRef( rows.size() ) ;
+  int nref = 0 ;
+  for ( unsigned int irow = 0 ; irow < rows.size() ; irow++ ) {
+    int nchan = rows[irow]->getNumChan() ;
+    if ( nchan != 4 ) {
+      if ( rows[irow]->isMeasFreqRefExists() ) {
+        measFreqRef[nref] = rows[irow]->getMeasFreqRef() ;
+        nref++ ;
+      }
+    }
+  }
+  if ( nref != 0 ) {
+    frame = CFrequencyReferenceCode::toString( measFreqRef[0] ) ;
+  }
+  
+  logsink_->postLocally( LogMessage("frame = "+String::toString(frame),LogOrigin(className_,funcName,WHERE)) ) ;
+
+  return frame ;
+}

trunk/external-alma/asdm2ASAP/ASDMReader.h

@@ -392 +392 @@
    **/
   unsigned int getNumData() { return numData_ ; } ;
+
+  /**
+   * get frequency frame
+   *
+   * @return string representating frequency frame
+   **/
+  std::string getFrame() ;
 
   /**