Changeset 2255 for trunk/external-alma

Timestamp:

08/01/11 10:32:31 (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...

Azimuth and elevation are derived as following formula:

Az = target[0][0] + offset[0][0] / cos( target[0][1] )
El = target[0][1] + offset[0][1]

File:

• trunk/external-alma/asdm2ASAP/ASDMReader.cc (modified) (1 diff)

trunk/external-alma/asdm2ASAP/ASDMReader.cc

@@ -1880 +1880 @@
 vector< vector<double> > ASDMReader::pointingDir( PointingRow *row ) 
 {
-  //vector< vector<Angle> > aDir = row->getPointingDirection() ;
   vector< vector<Angle> > aDir = row->getTarget() ;
   vector< vector<Angle> > aOff = row->getOffset() ;
   unsigned int n = aDir.size() ;
-  unsigned int m = 0 ;
   vector< vector<double> > dir( n ) ;
+  double factor = 1.0 / cos( aDir[0][1].get() ) ;
   for ( unsigned int i = 0 ; i < n ; i++ ) {
-    m = aDir[i].size() ;
-    dir[i].resize( m ) ;
-    for ( unsigned int j = 0 ; j < m ; j++ ) {
-      //dir[i][j] = aDir[i][j].get() ;
-      dir[i][j] = aDir[i][j].get() + aOff[i][j].get() ;
-    }
+    dir[i].resize( 2 ) ;
+    /**
+     * This is approximate way to add offset
+     * 
+     * az = dir[0][0] = target[0][0] + offset[0][0] / cos(el)
+     * el = dir[0][1] = target[0][1] + offset[0][1]
+     **/
+    dir[i][0] = aDir[i][0].get() + factor * aOff[i][0].get() ;
+    dir[i][1] = aDir[i][1].get() + aOff[i][1].get() ;
   }
   return dir ;