Changeset 2227 for trunk/external-alma

Timestamp:

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

Frequency is stored as LSRK value although original frequency is
in an arbitrary frequency frame (e.g. TOPO). Conversion is done
in filler if necessary.

Location:

trunk/external-alma/asdm2ASAP

Files:

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

trunk/external-alma/asdm2ASAP/ASDMFiller.cc

@@ -68 +68 @@
   // set Frame for FREQUENCIES table
   string sFreqFrame = reader_->getFrame() ;
-  MFrequency::Types freqFrame = toFrameType( sFreqFrame ) ;
+  //MFrequency::Types freqFrame = toFrameType( sFreqFrame ) ;
+  MFrequency::Types freqFrame = MFrequency::LSRK ;
   table_->frequencies().setFrame( freqFrame, false ) ;
   table_->frequencies().setFrame( freqFrame, true ) ;
@@ -143 +144 @@
         double refval = 0.0 ;
         double incr = 0.0 ;
+        string freqref = "" ;
 
         for ( unsigned int idata = 0 ; idata < numData ; idata++ ) {
@@ -151 +153 @@
           // IFNO
           uInt ifno = reader_->getIFNo( idata ) ;
-
-
-          // REFPIX, REFVAL, INCREMENT
-          String ifkey = getIFKey( ifno ) ;
-          if ( ifrec_.isDefined( ifkey ) ) {
-            getFrequencyRec( ifkey, refpix, refval, incr ) ;
-          }
-          else {
-            reader_->getFrequency( idata, refpix, refval, incr ) ;
-            setFrequencyRec( ifkey, refpix, refval, incr ) ;
-          }
-
-          // fill FREQ_ID and add FREQUENCIES row if necessary
-          setFrequency( (casa::Double)refpix, (casa::Double)refval, (casa::Double)incr ) ;
-
 
           // rest frequency
@@ -176 +163 @@
           setMolecule( restFreqs ) ;
           
-
           // time and interval
           casa::Double mjd = (casa::Double)(reader_->getTime( idata )) ;
@@ -254 +240 @@
           setDirection( direction, (casa::Float)az, (casa::Float)el ) ;
 
+           // REFPIX, REFVAL, INCREMENT
+          String ifkey = getIFKey( ifno ) ;
+          if ( ifrec_.isDefined( ifkey ) ) {
+            getFrequencyRec( ifkey, refpix, refval, incr ) ;
+          }
+          else {
+            reader_->getFrequency( idata, refpix, refval, incr, freqref ) ;
+            refval = (double)toLSRK( casa::Double(refval), 
+                                     String(freqref),
+                                     mjd,
+                                     antpos,
+                                     //direction,
+                                     srcDir,
+                                     "J2000" ) ;
+            setFrequencyRec( ifkey, refpix, refval, incr ) ;
+          }
+
+          // fill FREQ_ID and add FREQUENCIES row if necessary
+          setFrequency( (casa::Double)refpix, (casa::Double)refval, (casa::Double)incr ) ;
+
           // loop on polarization
           vector<unsigned int> dataShape = reader_->getDataShape( idata ) ;

trunk/external-alma/asdm2ASAP/ASDMReader.cc

@@ -48 +48 @@
 bool ASDMReader::open( const string &filename, const casa::Record &rec )
 {
-  String funcName = "open" ;
+  casa::String funcName = "open" ;
 
   // return value
@@ -255 +255 @@
                              casa::String &poltype ) 
 {
-  String funcName = "fillHeader" ;
+  casa::String funcName = "fillHeader" ;
 
   ExecBlockTable &ebtab = asdm_->getExecBlock() ;
@@ -431 +431 @@
 void ASDMReader::selectConfigDescription() 
 {
-  String funcName = "selectConfigDescription" ;
+  casa::String funcName = "selectConfigDescription" ;
 
   vector<ConfigDescriptionRow *> cdrows = asdm_->getConfigDescription().get() ;
@@ -467 +467 @@
 casa::Vector<casa::uInt> ASDMReader::getFieldIdList() 
 {
-  String funcName = "getFieldIdList" ;
+  casa::String funcName = "getFieldIdList" ;
 
   vector<FieldRow *> frows = asdm_->getField().get() ;
@@ -544 +544 @@
 void ASDMReader::setupIFNO() 
 {
-  String funcName = "setupIFNO" ;
+  casa::String funcName = "setupIFNO" ;
 
   vector<SpectralWindowRow *> spwrows = asdm_->getSpectralWindow().get() ;
@@ -601 +601 @@
 // casa::Vector<casa::uInt> ASDMReader::getFeedIdList( casa::uInt cdid ) 
 // {
-//   String funcName = "getFeedIdList" ;
+//   casa::String funcName = "getFeedIdList" ;
 //   
 //   Tag cdTag( (unsigned int)cdid, TagType::ConfigDescription ) ;
@@ -623 +623 @@
 casa::Bool ASDMReader::setData()
 {
-  String funcName = "setData" ;
+  casa::String funcName = "setData" ;
 
   //logsink_->postLocally( LogMessage("try to retrieve binary data",LogOrigin(className_,funcName,WHERE)) ) ;
@@ -705 +705 @@
                                double &refpix, 
                                double &refval, 
-                               double &incr ) 
-{
-  String funcName = "getFrequency" ;
+                               double &incr,
+                               string &freqref ) 
+{
+  casa::String funcName = "getFrequency" ;
 
   Tag ddTag( vmsData_->v_dataDescId[dataIdList_[idx]], TagType::DataDescription ) ;
@@ -714 +715 @@
   SpectralWindowRow *spwrow = ddrow->getSpectralWindowUsingSpectralWindowId() ;
   int nchan = spwrow->getNumChan() ;
+  freqref = "TOPO" ;
+  if ( spwrow->isMeasFreqRefExists() )
+    freqref = CFrequencyReferenceCode::toString( spwrow->getMeasFreqRef() ) ;
   if ( nchan == 1 ) {
     //logsink_->postLocally( LogMessage("channel averaged data",LogOrigin(className_,funcName,WHERE)) ) ;
@@ -1696 +1700 @@
                                     casa::Vector<casa::Double> antpos ) 
 {
-  casa::String funcname = "toJ2000" ;
+  casa::String funcName = "toJ2000" ;
 
   vector<double> newd( dir ) ;
@@ -1733 +1737 @@
 string ASDMReader::getFrame()
 {
-  String funcName = "getFrame" ;
+  casa::String funcName = "getFrame" ;
  
   // default is TOPO
@@ -1762 +1766 @@
 int ASDMReader::getNumIFs()
 {
-  String funcName = "getNumIFs" ;
+  casa::String funcName = "getNumIFs" ;
 
   int nif = 0 ;

trunk/external-alma/asdm2ASAP/ASDMReader.h

@@ -183 +183 @@
    * @param refval REFVAL
    * @param incr INCREMENT
+   * @param freqref frequency reference
    **/
   void getFrequency( unsigned int idx, 
                      double &refpix, 
                      double &refval, 
-                     double &incr ) ;
+                     double &incr,
+                     std::string &freqref ) ;
 
   /**