Changeset 1782 for branches/alma/external

Timestamp:

07/30/10 14:46:03 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: No (merge)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): single dish package

Description:

Merged some unimplemented developments from the trunk.
[Details]

1. Restored PKSmsg.cc, PKSmsg.h to alma branch from trunk
2. Updated pks_matchs.cc and src/SConscript to ones in trunk
3. uncommented "@print_log_dec"
4. implemented bug fixes to add(), sub(), mul(), and div() in scantable.py
5. implemented get_region() and get_point() in asaplotbase.py
6. activated interactive keyword for text(), arrow(), annotate(), axvline(), axhline(), axvspan(), and axhspan() in asapplotter.py

Location:

branches/alma/external/atnf

Files:

• PKSIO/PKSmsg.cc (copied) (copied from trunk/external/atnf/PKSIO/PKSmsg.cc )
• PKSIO/PKSmsg.h (copied) (copied from trunk/external/atnf/PKSIO/PKSmsg.h )
• pks/pks_maths.cc (modified) (1 diff, 1 prop)

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

@@ -321 +321 @@
 
   // 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(sin(dec)*sin(lat) + cos(dec)*cos(lat)*cos(ha));
-
 }