Changeset 1779 for branches/mergetest/external/atnf/pks

Timestamp:

07/29/10 19:13:46 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: No (test merging alma branch)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s):

Description:

Location:

branches/mergetest

Files:

• . (modified) (1 prop)
• external/atnf/pks/makefile (modified) (1 diff)
• external/atnf/pks/pks_maths.cc (modified) (1 diff)
• external/atnf/pks/pksmb_support.cc (deleted)
• external/atnf/pks/pksmb_support.h (deleted)

branches/mergetest/external/atnf/pks/makefile

@@ -1 @@
-# $Id: makefile,v 19.0 2003-07-16 03:33:47 aips2adm Exp $
+# $Id$
 
 # Use the generic AIPS++ class implementation makefile.
 #------------------------------------------------------
-include $(word 1, $(AIPSPATH))/code/install/makefile.imp
+include $(word 1, $(CASAPATH))/code/install/makefile.imp

branches/mergetest/external/atnf/pks/pks_maths.cc

@@ -321 +321 @@
 
   // Azimuth and elevation (rad).
-  az = atan2(-cos(dec)*sin(ha),
-            sin(dec)*cos(lat) - cos(dec)*sin(lat)*cos(ha));
+  az = atan2(cos(dec)*sin(ha), 
+             cos(dec)*sin(lat)*cos(ha) - sin(dec)*cos(lat));
+  if (az < 0.0) az += C::_2pi;
   el = asin(sin(dec)*sin(lat) + cos(dec)*cos(lat)*cos(ha));
 
-  if (az < 0.0) az += C::_2pi;
 }