Changeset 2227 for trunk/external-alma/asdm2ASAP/ASDMFiller.cc

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.

File:

• trunk/external-alma/asdm2ASAP/ASDMFiller.cc (modified) (5 diffs)

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