Merge branch 'L2SS-1557-specialised-antenna-mapper' into 'master'

Resolve L2SS-1557 "Specialised antenna mapper"

Closes L2SS-1557

See merge request !764

tangostationcontrol/tangostationcontrol/devices/base_device_classes/antennafield_device.py

@@ -47,8 +47,8 @@ from tangostationcontrol.devices.base_device_classes.mapper import (
     MappedAttribute,
     AntennaToSdpMapper,
     RecvDeviceWalker,
-    HBAToRecvMapper,
-    LBAToRecvMapper,
+    AFHToRecvMapper,
+    AFLToRecvMapper,
 )
 from tangostationcontrol.devices.types import DeviceTypes
 
@@ -813,13 +813,13 @@ class AF(LOFARDevice):
             MappingKeys.POWER: power_mapping,
         }
         if self.ANTENNA_TYPE == "HBA":
-            self.__recv_mapper = HBAToRecvMapper(
+            self.__recv_mapper = AFHToRecvMapper(
                 recv_mapping,
                 self.get_mapped_dimensions("RECV"),
                 number_of_receivers,
             )
         elif self.ANTENNA_TYPE == "LBA":
-            self.__recv_mapper = LBAToRecvMapper(
+            self.__recv_mapper = AFLToRecvMapper(
                 recv_mapping,
                 self.get_mapped_dimensions("RECV"),
                 number_of_receivers,

tangostationcontrol/test/devices/antennafield/test_afl_device.py

@@ -17,7 +17,7 @@ from tangostationcontrol.common.constants import (
 from tangostationcontrol.devices.antennafield.afl import AFL
 from tangostationcontrol.devices.base_device_classes.mapper import (
     MappingKeys,
-    LBAToRecvMapper,
+    AFLToRecvMapper,
 )
 
 logger = logging.getLogger()
@@ -26,8 +26,8 @@ RECV_MAPPED_ATTRS = AFL.get_mapped_dimensions("RECV")
 DEFAULT_N_LBA = DEFAULT_N_HBA_TILES  # 48 antennas
 
 
-class TestLBAToRecvMapper(base.TestCase):
-    """Test class for AntennaToRecvMapper with LBA AntennaType"""
+class TestAFLToRecvMapper(base.TestCase):
+    """Test class for AntennaField-LBA to RECV Mapper"""
 
     # A mapping where Antennas are all not mapped to power RCUs
     POWER_NOT_CONNECTED = [[-1, -1]] * 2 * DEFAULT_N_LBA
@@ -51,7 +51,7 @@ class TestLBAToRecvMapper(base.TestCase):
             MappingKeys.CONTROL: self.CONTROL_NOT_CONNECTED,
             MappingKeys.POWER: self.POWER_NOT_CONNECTED,
         }
-        mapper = LBAToRecvMapper(
+        mapper = AFLToRecvMapper(
             recv_mapping,
             RECV_MAPPED_ATTRS,
             1,
@@ -67,7 +67,7 @@ class TestLBAToRecvMapper(base.TestCase):
             MappingKeys.CONTROL: self.CONTROL_NOT_CONNECTED,
             MappingKeys.POWER: self.POWER_NOT_CONNECTED,
         }
-        mapper = LBAToRecvMapper(
+        mapper = AFLToRecvMapper(
             recv_mapping,
             RECV_MAPPED_ATTRS,
             2,
@@ -78,14 +78,14 @@ class TestLBAToRecvMapper(base.TestCase):
         actual = mapper.map_write("RCU_PWR_ANT_on_RW", set_values)
         numpy.testing.assert_equal(expected, actual)
 
-    def test_map_write_rcu_pwr_ant_on_hba_0_and_1_on_rcu_1_and_0_of_recv_1_and_no_ctrl(
+    def test_map_write_rcu_pwr_ant_on_lba_0_and_1_on_rcu_1_and_0_of_recv_1_and_no_ctrl(
         self,
     ):
         recv_mapping = {
             MappingKeys.CONTROL: self.CONTROL_NOT_CONNECTED,
             MappingKeys.POWER: self.POWER_LBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1,
         }
-        mapper = LBAToRecvMapper(
+        mapper = AFLToRecvMapper(
             recv_mapping,
             RECV_MAPPED_ATTRS,
             1,
@@ -96,12 +96,12 @@ class TestLBAToRecvMapper(base.TestCase):
         actual = mapper.map_write("RCU_PWR_ANT_on_RW", set_values)
         numpy.testing.assert_equal(expected, actual)
 
-    def test_map_read_rcu_pwr_ant_on_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self):
+    def test_map_read_rcu_pwr_ant_on_lba_0_and_1_on_rcu_1_and_0_of_recv_1(self):
         recv_mapping = {
             MappingKeys.CONTROL: self.CONTROL_LBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1,
             MappingKeys.POWER: self.POWER_LBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1,
         }
-        mapper = LBAToRecvMapper(
+        mapper = AFLToRecvMapper(
             recv_mapping,
             RECV_MAPPED_ATTRS,
             2,
@@ -112,12 +112,12 @@ class TestLBAToRecvMapper(base.TestCase):
         actual = mapper.map_read("RCU_PWR_ANT_on_R", receiver_values)
         numpy.testing.assert_equal(expected, actual)
 
-    def test_map_write_rcu_pwr_ant_on_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self):
+    def test_map_write_rcu_pwr_ant_on_lba_0_and_1_on_rcu_1_and_0_of_recv_1(self):
         recv_mapping = {
             MappingKeys.CONTROL: self.CONTROL_NOT_CONNECTED,
             MappingKeys.POWER: self.POWER_LBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1,
         }
-        mapper = LBAToRecvMapper(
+        mapper = AFLToRecvMapper(
             recv_mapping,
             RECV_MAPPED_ATTRS,
             1,