Merge pull request #122 from fact-project/fix_cta_coord_trafo

Fix cta coordinate trafos
fact-project · May 13, 2020 · ed8bbc3 · ed8bbc3
2 parents ea901f4 + 2bd9e98
commit ed8bbc3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/aict_tools/__init__.py b/aict_tools/__init__.py
@@ -1 +1 @@
-__version__ = '0.22.1'
+__version__ = '0.22.2'
diff --git a/aict_tools/cta_helpers.py b/aict_tools/cta_helpers.py
@@ -13,19 +13,19 @@ def horizontal_to_camera_cta_simtel(zd, az, zd_pointing, az_pointing, focal_leng
         altaz = AltAz()
         source_altaz = SkyCoord(
             az=u.Quantity(az, u.deg, copy=False),
-            alt=u.Quantity(zd, u.deg, copy=False),
+            alt=u.Quantity(90 - zd, u.deg, copy=False),
             frame=altaz,
         )
 
         tel_pointing = SkyCoord(
-            alt=u.Quantity(zd_pointing, u.deg, copy=False),
+            alt=u.Quantity(90 - zd_pointing, u.deg, copy=False),
             az=u.Quantity(az_pointing, u.deg, copy=False),
             frame=altaz,
         )
         camera_frame = CameraFrame(
             focal_length=u.Quantity(focal_length, u.m, copy=False),
             telescope_pointing=tel_pointing,
         )
- 
+
         cam_coords = source_altaz.transform_to(camera_frame)
         return cam_coords.x.to_value(u.m), cam_coords.y.to_value(u.m)
diff --git a/tests/cta_coord_test.hdf b/tests/cta_coord_test.hdf
diff --git a/tests/test_cta_coords.py b/tests/test_cta_coords.py
@@ -9,11 +9,11 @@ def test_horizontal_to_camera():
     expected_x = df.x
     expected_y = df.y
     transformed_x, transformed_y = horizontal_to_camera_cta_simtel(
-            df.alt,
-            df.az,
-            df.alt_pointing,
-            df.az_pointing,
-            df.focal_length
+            zd=df.zd,
+            az=df.az,
+            zd_pointing=df.zd_pointing,
+            az_pointing=df.az_pointing,
+            focal_length=df.focal_length,
     )
     assert_allclose(expected_x, transformed_x)
     assert_allclose(expected_y, transformed_y)