Changeset 1452 for trunk/external/atnf/pks

Timestamp:

11/19/08 20:41:16 (16 years ago)

Author:

Malte Marquarding

Message:

update from livedata CVS

Location:

trunk/external/atnf/pks

Files:

• makefile (modified) (1 diff)
• pks_maths.cc (modified) (4 diffs)

trunk/external/atnf/pks/makefile

@@ -1 @@
-# $Id: makefile,v 19.0 2003/07/16 03:33:47 aips2adm Exp $
+# $Id: makefile,v 19.0 2003-07-16 03:33:47 aips2adm Exp $
 
 # Use the generic AIPS++ class implementation makefile.

trunk/external/atnf/pks/pks_maths.cc

@@ -2 +2 @@
 //# pks_maths.cc: Mathematical functions for Parkes single-dish data reduction
 //#---------------------------------------------------------------------------
-//# Copyright (C) 1994-2006
+//# Copyright (C) 1994-2008
 //# Associated Universities, Inc. Washington DC, USA.
 //#
@@ -27 +27 @@
 //#
 //# Original: Mark Calabretta
-//# $Id: pks_maths.cc,v 1.5 2006-05-19 00:12:35 mcalabre Exp $
+//# $Id: pks_maths.cc,v 1.6 2008-10-17 02:36:16 cal103 Exp $
 //----------------------------------------------------------------------------
 
@@ -295 +295 @@
 //----------------------------------------------------------------------- azel
 
-// Convert (ra,dec) to (az,el), from
-// http://aa.usno.navy.mil/faq/docs/Alt_Az.html.  Position as a Cartesian
-// triplet in m, UT1 in MJD form, and all angles in radian.
+// Convert (ra,dec) to (az,el).  Position as a Cartesian triplet in m, UT1 in
+// MJD form, and all angles in radian.
 
 void azel(const Vector<Double> position, Double ut1, Double ra, Double dec,
           Double &az, Double &el)
 {
-  // Get gocentric longitude and latitude (rad).
+  // Get geocentric longitude and latitude (rad).
   Double x = position(0);
   Double y = position(1);
@@ -318 +317 @@
 
   // Azimuth and elevation (rad).
-  az = atan2(cos(dec)*sin(ha), cos(dec)*sin(lat)*cos(ha) - sin(dec)*cos(lat));
+  az = atan2(-cos(dec)*sin(ha),
+            sin(dec)*cos(lat) - cos(dec)*sin(lat)*cos(ha));
+  el = asin(sin(dec)*sin(lat) + cos(dec)*cos(lat)*cos(ha));
+
   if (az < 0.0) az += C::_2pi;
-  el = asin(cos(dec)*cos(lat)*cos(ha) + sin(dec)*sin(lat));
 }