From f240d953310ac70e3c96b026f458bbe86eecc7d4 Mon Sep 17 00:00:00 2001
From: Mattia Mancini <mancini@astron.nl>
Date: Thu, 16 May 2019 10:05:45 +0000
Subject: [PATCH] SSB-47: fixing issues in converting the coordinates

---
 CAL/CalibrationCommon/lib/datacontainers/holography_dataset.py  | 2 +-
 .../lib/datacontainers/holography_measurementset.py             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CAL/CalibrationCommon/lib/datacontainers/holography_dataset.py b/CAL/CalibrationCommon/lib/datacontainers/holography_dataset.py
index 709a6ae34ca..9c4a511391b 100644
--- a/CAL/CalibrationCommon/lib/datacontainers/holography_dataset.py
+++ b/CAL/CalibrationCommon/lib/datacontainers/holography_dataset.py
@@ -405,7 +405,7 @@ class HolographyDataset():
         self.antenna_field_position = [list(station_position - antenna_offset)
                                        for antenna_offset in tile_offset]
         self.target_station_position = list(station_position)
-        self.rotation_matrix = axes_coordinates.T
+        self.rotation_matrix = axes_coordinates
 
         if station_name not in target_stations:
             logger.error('Station %s was not involved in the observation.'
diff --git a/CAL/CalibrationCommon/lib/datacontainers/holography_measurementset.py b/CAL/CalibrationCommon/lib/datacontainers/holography_measurementset.py
index b390b8a56c1..37b195c49ed 100644
--- a/CAL/CalibrationCommon/lib/datacontainers/holography_measurementset.py
+++ b/CAL/CalibrationCommon/lib/datacontainers/holography_measurementset.py
@@ -48,7 +48,7 @@ def _compute_lm_from_ra_dec_station_position_rotation_matrix_and_time(ra_dec_epo
                               ('m', numpy.float64)]
 
         return_value = numpy.empty(n_samples, dtype=return_value_dtype)
-        l_m_arrays = pqr_from_icrs(numpy.array((ra, dec)), astropy_times, rotation_matrix)
+        l_m_arrays = pqr_from_icrs(numpy.array((ra, dec)), astropy_times, rotation_matrix.T)
 
         return_value['l'][:] = l_m_arrays[:, 0]
         return_value['m'][:] = l_m_arrays[:, 1]
-- 
GitLab