Changeset 2710

Timestamp:

12/27/12 16:44:08 (12 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...

Reference epoch for frequency frame conversion is taken from header
which is set as start time of the observation (OBSERVATION/TIME_RANGE[0]
for MS, ExecBlock/startTime for ASDM).

Location:

trunk

Files:

• external-alma/asdm2ASAP/ASDMFiller.cc (modified) (2 diffs)
• src/MSFiller.cpp (modified) (3 diffs)

trunk/external-alma/asdm2ASAP/ASDMFiller.cc

@@ -65 +65 @@
   // header
   fillHeader() ;
+  const STHeader hdr = table_->getHeader();
 
   // set Frame for FREQUENCIES table
@@ -256 +257 @@
             refval = (double)toLSRK( casa::Double(refval), 
                                      String(freqref),
-                                     mjd,
+                                     hdr.utc,
                                      antpos,
                                      //direction,

trunk/src/MSFiller.cpp

@@ -361 +361 @@
       Vector<MEpoch> amp ;
       getArrayMeas( "TIME_RANGE", (uInt)columnValue, obstab, amp ) ;
-      header.utc = amp[0].get( "d" ).getValue() ;
+      obsEpoch = amp[0];
+      header.utc = obsEpoch.get( "d" ).getValue() ;
     }
     if ( header.antennaname.empty() )
@@ -435 +436 @@
     map<Int,uInt>::iterator iter = ifmap.find( spwId ) ;
     if ( iter == ifmap.end() ) {
-      MEpoch me ;
-      getScalarMeas( "TIME", recordNo, table, me ) ;
-      spectralSetup( spwId, me, antpos, sourceDir, 
-                     freqId, nchan, 
-                     freqref, reffreq, bandwidth ) ;
+      //MEpoch me ;
+      //getScalarMeas( "TIME", recordNo, table, me ) ;
+      //spectralSetup( spwId, me, antpos, sourceDir, 
+      spectralSetup(spwId, obsEpoch, antpos, sourceDir, 
+                    freqId, nchan, 
+                    freqref, reffreq, bandwidth);
       ifmap.insert( pair<Int,uInt>(spwId,freqId) ) ;
     }
@@ -1265 +1267 @@
   MPosition antpos;
   MEpoch currentTime;
+  MEpoch obsEpoch;
   MeasFrame mf;
   MDirection::Convert toj2000;