Merge branch 'L2SS-995' into 'master'

L2SS-995: Rename HBAT_PQR_to_ETRS_rotation_matrix

Closes L2SS-995

See merge request !439

CDB/integrations/recvcluster_ConfigDb.json

@@ -117,7 +117,7 @@
                                "24",
                                "24"
                             ],
-                            "HBAT_PQR_to_ETRS_rotation_matrix": [
+                            "PQR_to_ETRS_rotation_matrix": [
                                "-0.1195951054", "-0.7919544517", "0.5987530018",
                                " 0.9928227484", "-0.0954186800", "0.0720990002",
                                " 0.0000330969", " 0.6030782884", "0.7976820024"
@@ -229,7 +229,7 @@
                                "24",
                                "24"
                             ],
-                            "HBAT_PQR_to_ETRS_rotation_matrix": [
+                            "PQR_to_ETRS_rotation_matrix": [
                                "-0.1195951054", "-0.7919544517", "0.5987530018",
                                " 0.9928227484", "-0.0954186800", "0.0720990002",
                                " 0.0000330969", " 0.6030782884", "0.7976820024"
@@ -341,7 +341,7 @@
                                "24",
                                "24"
                             ],
-                            "HBAT_PQR_to_ETRS_rotation_matrix": [
+                            "PQR_to_ETRS_rotation_matrix": [
                                "-0.1195951054", "-0.7919544517", "0.5987530018",
                                " 0.9928227484", "-0.0954186800", "0.0720990002",
                                " 0.0000330969", " 0.6030782884", "0.7976820024"
@@ -453,7 +453,7 @@
                                "24",
                                "24"
                             ],
-                            "HBAT_PQR_to_ETRS_rotation_matrix": [
+                            "PQR_to_ETRS_rotation_matrix": [
                                "-0.1195951054", "-0.7919544517", "0.5987530018",
                                " 0.9928227484", "-0.0954186800", "0.0720990002",
                                " 0.0000330969", " 0.6030782884", "0.7976820024"

CDB/stations/DTS_ConfigDb.json

@@ -181,7 +181,7 @@
                                 "45.73",
                                 "54.40"
                             ],
-                            "HBAT_PQR_to_ETRS_rotation_matrix": [
+                            "PQR_to_ETRS_rotation_matrix": [
                                 "-0.11660087", "-0.79095632", "0.60065992",
                                 " 0.99317077", "-0.09529842", "0.06730545",
                                 " 0.00400627", " 0.60440575", "0.79666658"

CDB/stations/DTS_Outside_ConfigDb.json

@@ -213,7 +213,7 @@
                                 "45.73",
                                 "54.40"
                             ],
-                            "HBAT_PQR_to_ETRS_rotation_matrix": [
+                            "PQR_to_ETRS_rotation_matrix": [
                                 "-0.11660087","-0.79095632","0.60065992",
                                 " 0.99317077","-0.09529842","0.06730545",
                                 " 0.00400627"," 0.60440575","0.79666658"

CDB/stations/dummy_positions_ConfigDb.json

@@ -208,7 +208,7 @@
                                "24",
                                "24"
                             ],
-                            "HBAT_PQR_to_ETRS_rotation_matrix": [
+                            "PQR_to_ETRS_rotation_matrix": [
                                "-0.1195951054", "-0.7919544517", "0.5987530018",
                                " 0.9928227484", "-0.0954186800", "0.0720990002",
                                " 0.0000330969", " 0.6030782884", "0.7976820024"

tangostationcontrol/docs/source/devices/antennafield.rst

@@ -99,7 +99,7 @@ These facts allow us to use the following information to calculate the absolute
 
   :type: ``float[96]``
 
-:recv.HBAT_PQR_to_ETRS_rotation_matrix: (property) The 3D rotation matrix to convert PQR coordinates into relative ETRS coordinates.
+:recv.PQR_to_ETRS_rotation_matrix: (property) The 3D rotation matrix to convert PQR coordinates into relative ETRS coordinates.
 
   :type: ``float[3][3]``
 

tangostationcontrol/tangostationcontrol/devices/antennafield.py

@@ -170,7 +170,7 @@ class AntennaField(lofar_device):
         default_value = [0.0] * MAX_NUMBER_OF_HBAT
     )
 
-    HBAT_PQR_to_ETRS_rotation_matrix = device_property(
+    PQR_to_ETRS_rotation_matrix = device_property(
         doc="Field-specific rotation matrix to convert PQR offsets to ETRS/ITRF offsets.",
         dtype='DevVarFloatArray',
         mandatory=False,
@@ -336,7 +336,7 @@ class AntennaField(lofar_device):
             This takes the relative offsets between the elements in the tiles as described in
             HBAT_base_antenna_offsets. These offsets are in PQR space, which is the plane of the station.
             The tiles are rotated locally in this space according to the HBAT_PQR_rotation_angles_deg,
-            and finally translated into global ETRS coordinates using the HBAT_PQR_to_ETRS_rotation_matrix.
+            and finally translated into global ETRS coordinates using the PQR_to_ETRS_rotation_matrix.
 
             The relative ITRF offsets are the same as relative ETRS offsets.
 
@@ -346,7 +346,7 @@ class AntennaField(lofar_device):
         # the relative offsets between the elements is fixed in HBAT_base_antenna_offsets
         base_antenna_offsets        = numpy.array(self.HBAT_base_antenna_offsets).reshape(NUMBER_OF_ELEMENTS_PER_TILE,3)
 
-        PQR_to_ETRS_rotation_matrix = numpy.array(self.HBAT_PQR_to_ETRS_rotation_matrix).reshape(3,3)
+        PQR_to_ETRS_rotation_matrix = numpy.array(self.PQR_to_ETRS_rotation_matrix).reshape(3,3)
 
         # each tile has its own rotation angle, resulting in different offsets per tile
         all_offsets = numpy.array(