Skip to content
Snippets Groups Projects
Commit 33fa73b7 authored by Stefano Di Frischia's avatar Stefano Di Frischia
Browse files

L2SS-881: rename HBAT mapper

parent b5662674
No related branches found
No related tags found
1 merge request!410Resolve L2SS-881 "Add lba support"
...@@ -25,7 +25,7 @@ from tangostationcontrol.beam.hba_tile import HBATAntennaOffsets, NUMBER_OF_ELEM ...@@ -25,7 +25,7 @@ from tangostationcontrol.beam.hba_tile import HBATAntennaOffsets, NUMBER_OF_ELEM
import logging import logging
logger = logging.getLogger() logger = logging.getLogger()
__all__ = ["AntennaField", "HBATToRecvMapper", "main"] __all__ = ["AntennaField", "AntennaToRecvMapper", "main"]
# Highest number of HBA tiles we support per AntennaField # Highest number of HBA tiles we support per AntennaField
MAX_NUMBER_OF_HBAT = 96 MAX_NUMBER_OF_HBAT = 96
...@@ -356,7 +356,7 @@ class AntennaField(lofar_device): ...@@ -356,7 +356,7 @@ class AntennaField(lofar_device):
# Reshape of mapping is needed because properties are stored in 1d arrays # Reshape of mapping is needed because properties are stored in 1d arrays
control_mapping = numpy.reshape(self.Control_to_RECV_mapping, (-1, 2)) control_mapping = numpy.reshape(self.Control_to_RECV_mapping, (-1, 2))
power_mapping = numpy.reshape(self.Power_to_RECV_mapping, (-1, 2)) power_mapping = numpy.reshape(self.Power_to_RECV_mapping, (-1, 2))
self.__mapper = HBATToRecvMapper(control_mapping, power_mapping, number_of_receivers) self.__mapper = AntennaToRecvMapper(control_mapping, power_mapping, number_of_receivers)
def get_mapped_attribute(self, mapped_point): def get_mapped_attribute(self, mapped_point):
recv_results = [] recv_results = []
...@@ -442,7 +442,7 @@ class AntennaField(lofar_device): ...@@ -442,7 +442,7 @@ class AntennaField(lofar_device):
return result_values.flatten() return result_values.flatten()
class HBATToRecvMapper(object): class AntennaToRecvMapper(object):
def __init__(self, control_to_recv_mapping, power_to_recv_mapping, number_of_receivers): def __init__(self, control_to_recv_mapping, power_to_recv_mapping, number_of_receivers):
number_of_antennas = len(control_to_recv_mapping) number_of_antennas = len(control_to_recv_mapping)
......
...@@ -106,7 +106,7 @@ class TileBeam(beam_device): ...@@ -106,7 +106,7 @@ class TileBeam(beam_device):
@TimeIt() @TimeIt()
def _apply_weights(self, pointing_direction: numpy.array, timestamp: datetime.datetime, bf_delay_steps: numpy.array): def _apply_weights(self, pointing_direction: numpy.array, timestamp: datetime.datetime, bf_delay_steps: numpy.array):
# Write weights to RECV through the HBATToRecvMapper # Write weights to RECV through the AntennaToRecvMapper
self.antennafield_proxy.HBAT_bf_delay_steps_RW = bf_delay_steps.reshape(self._nr_tiles, NUMBER_OF_ELEMENTS_PER_TILE * 2) self.antennafield_proxy.HBAT_bf_delay_steps_RW = bf_delay_steps.reshape(self._nr_tiles, NUMBER_OF_ELEMENTS_PER_TILE * 2)
# Record where we now point to, now that we've updated the weights. # Record where we now point to, now that we've updated the weights.
......
...@@ -12,12 +12,12 @@ import numpy ...@@ -12,12 +12,12 @@ import numpy
from tango.test_context import DeviceTestContext from tango.test_context import DeviceTestContext
from tangostationcontrol.devices import antennafield from tangostationcontrol.devices import antennafield
from tangostationcontrol.devices.antennafield import HBATToRecvMapper, AntennaQuality, AntennaUse from tangostationcontrol.devices.antennafield import AntennaToRecvMapper, AntennaQuality, AntennaUse
from tangostationcontrol.test import base from tangostationcontrol.test import base
from tangostationcontrol.test.devices import device_base from tangostationcontrol.test.devices import device_base
class TestHBATToRecvMapper(base.TestCase): class TestAntennaToRecvMapper(base.TestCase):
# A mapping where HBATs are all not mapped to power RCUs # A mapping where HBATs are all not mapped to power RCUs
POWER_NOT_CONNECTED = [[-1, -1]] * 48 POWER_NOT_CONNECTED = [[-1, -1]] * 48
...@@ -28,7 +28,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -28,7 +28,7 @@ class TestHBATToRecvMapper(base.TestCase):
CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1 = [[1, 1], [1, 0]] + [[-1, -1]] * 46 CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1 = [[1, 1], [1, 0]] + [[-1, -1]] * 46
def test_ant_read_mask_r_no_mapping(self): def test_ant_read_mask_r_no_mapping(self):
mapper = HBATToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 3) mapper = AntennaToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 3)
receiver_values = [[False] * 96, [False] * 96, [False] * 96] receiver_values = [[False] * 96, [False] * 96, [False] * 96]
expected = [False] * 48 expected = [False] * 48
...@@ -36,7 +36,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -36,7 +36,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_ant_read_mask_r_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self): def test_ant_read_mask_r_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self):
mapper = HBATToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 3) mapper = AntennaToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 3)
receiver_values = [[False, True, False] + [False, False, False] * 31, [False] * 96, [False] * 96] receiver_values = [[False, True, False] + [False, False, False] * 31, [False] * 96, [False] * 96]
expected = [True, False] + [False] * 46 expected = [True, False] + [False] * 46
...@@ -45,14 +45,14 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -45,14 +45,14 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_rcu_band_select_no_mapping(self): def test_rcu_band_select_no_mapping(self):
mapper = HBATToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 3) mapper = AntennaToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 3)
receiver_values = [[0] * 96, [0] * 96, [0] * 96] receiver_values = [[0] * 96, [0] * 96, [0] * 96]
expected = [0] * 48 expected = [0] * 48
actual = mapper.map_read("RCU_band_select_RW", receiver_values) actual = mapper.map_read("RCU_band_select_RW", receiver_values)
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_bf_read_delay_steps_r_no_mapping(self): def test_bf_read_delay_steps_r_no_mapping(self):
mapper = HBATToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 3) mapper = AntennaToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 3)
receiver_values = [[[0] * 32] * 96, [[0] * 32] * 96, [[0] * 32] * 96] receiver_values = [[[0] * 32] * 96, [[0] * 32] * 96, [[0] * 32] * 96]
expected = [[0] * 32] * 48 expected = [[0] * 32] * 48
...@@ -60,7 +60,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -60,7 +60,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_bf_read_delay_steps_r_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self): def test_bf_read_delay_steps_r_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self):
mapper = HBATToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 3) mapper = AntennaToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 3)
receiver_values = [[[2] * 32, [1] * 32] + [[0] * 32] * 94, [[0] * 32] * 96, [[0] * 32] * 96] receiver_values = [[[2] * 32, [1] * 32] + [[0] * 32] * 94, [[0] * 32] * 96, [[0] * 32] * 96]
expected = [[1] * 32, [2] * 32] + [[0] * 32] * 46 expected = [[1] * 32, [2] * 32] + [[0] * 32] * 46
...@@ -69,7 +69,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -69,7 +69,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_bf_read_delay_steps_rw_no_mapping(self): def test_bf_read_delay_steps_rw_no_mapping(self):
mapper = HBATToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 3) mapper = AntennaToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 3)
receiver_values = [[[0] * 32] * 96, [[0] * 32] * 96, [[0] * 32] * 96] receiver_values = [[[0] * 32] * 96, [[0] * 32] * 96, [[0] * 32] * 96]
expected = [[0] * 32] * 48 expected = [[0] * 32] * 48
...@@ -77,7 +77,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -77,7 +77,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_bf_read_delay_steps_rw_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self): def test_bf_read_delay_steps_rw_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self):
mapper = HBATToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 3) mapper = AntennaToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 3)
receiver_values = [[[2] * 32, [1] * 32] + [[0] * 32] * 94, [[0] * 32] * 96, [[0] * 32] * 96] receiver_values = [[[2] * 32, [1] * 32] + [[0] * 32] * 94, [[0] * 32] * 96, [[0] * 32] * 96]
expected = [[1] * 32, [2] * 32] + [[0] * 32] * 46 expected = [[1] * 32, [2] * 32] + [[0] * 32] * 46
...@@ -86,7 +86,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -86,7 +86,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_read_led_on_r_unmapped(self): def test_map_read_led_on_r_unmapped(self):
mapper = HBATToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 3) mapper = AntennaToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 3)
receiver_values = [[[False] * 32] * 96, [[False] * 32] * 96, [[False] * 32] * 96] receiver_values = [[[False] * 32] * 96, [[False] * 32] * 96, [[False] * 32] * 96]
expected = [[False] * 32] * 48 expected = [[False] * 32] * 48
...@@ -94,7 +94,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -94,7 +94,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_read_led_on_r_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self): def test_map_read_led_on_r_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self):
mapper = HBATToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 3) mapper = AntennaToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 3)
receiver_values = [[[False, True] * 16, [True, False] * 16] + [[False] * 32] * 94, [[False] * 32] * 96, [[False] * 32] * 96] receiver_values = [[[False, True] * 16, [True, False] * 16] + [[False] * 32] * 94, [[False] * 32] * 96, [[False] * 32] * 96]
...@@ -103,7 +103,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -103,7 +103,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_read_led_on_rw_unmapped(self): def test_map_read_led_on_rw_unmapped(self):
mapper = HBATToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 3) mapper = AntennaToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 3)
receiver_values = [[[False] * 32] * 96, [[False] * 32] * 96, [[False] * 32] * 96] receiver_values = [[[False] * 32] * 96, [[False] * 32] * 96, [[False] * 32] * 96]
expected = [[False] * 32] * 48 expected = [[False] * 32] * 48
...@@ -111,7 +111,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -111,7 +111,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_read_led_on_rw_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self): def test_map_read_led_on_rw_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self):
mapper = HBATToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 3) mapper = AntennaToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 3)
receiver_values = [[[False, True] * 16, [True, False] * 16] + [[False] * 32] * 94, [[False] * 32] * 96, [[False] * 32] * 96] receiver_values = [[[False, True] * 16, [True, False] * 16] + [[False] * 32] * 94, [[False] * 32] * 96, [[False] * 32] * 96]
...@@ -120,7 +120,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -120,7 +120,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_read_pwr_lna_on_r_unmapped(self): def test_map_read_pwr_lna_on_r_unmapped(self):
mapper = HBATToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 3) mapper = AntennaToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 3)
receiver_values = [[[False] * 32] * 96, [[False] * 32] * 96, [[False] * 32] * 96] receiver_values = [[[False] * 32] * 96, [[False] * 32] * 96, [[False] * 32] * 96]
expected = [[False] * 32] * 48 expected = [[False] * 32] * 48
...@@ -128,7 +128,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -128,7 +128,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_read_pwr_lna_on_r_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self): def test_map_read_pwr_lna_on_r_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self):
mapper = HBATToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 3) mapper = AntennaToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 3)
receiver_values = [[[False, True] * 16, [True, False] * 16] + [[False] * 32] * 94, [[False] * 32] * 96, [[False] * 32] * 96] receiver_values = [[[False, True] * 16, [True, False] * 16] + [[False] * 32] * 94, [[False] * 32] * 96, [[False] * 32] * 96]
...@@ -137,7 +137,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -137,7 +137,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_read_pwr_lna_on_rw_unmapped(self): def test_map_read_pwr_lna_on_rw_unmapped(self):
mapper = HBATToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 3) mapper = AntennaToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 3)
receiver_values = [[[False] * 32] * 96, [[False] * 32] * 96, [[False] * 32] * 96] receiver_values = [[[False] * 32] * 96, [[False] * 32] * 96, [[False] * 32] * 96]
expected = [[False] * 32] * 48 expected = [[False] * 32] * 48
...@@ -145,7 +145,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -145,7 +145,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_read_pwr_lna_on_rw_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self): def test_map_read_pwr_lna_on_rw_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self):
mapper = HBATToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 3) mapper = AntennaToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 3)
receiver_values = [[[False, True] * 16, [True, False] * 16] + [[False] * 32] * 94, [[False] * 32] * 96, [[False] * 32] * 96] receiver_values = [[[False, True] * 16, [True, False] * 16] + [[False] * 32] * 94, [[False] * 32] * 96, [[False] * 32] * 96]
...@@ -154,7 +154,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -154,7 +154,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_read_pwr_on_r_unmapped(self): def test_map_read_pwr_on_r_unmapped(self):
mapper = HBATToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 3) mapper = AntennaToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 3)
receiver_values = [[[False] * 32] * 96, [[False] * 32] * 96, [[False] * 32] * 96] receiver_values = [[[False] * 32] * 96, [[False] * 32] * 96, [[False] * 32] * 96]
expected = [[False] * 32] * 48 expected = [[False] * 32] * 48
...@@ -162,7 +162,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -162,7 +162,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_read_pwr_on_r_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self): def test_map_read_pwr_on_r_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self):
mapper = HBATToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 3) mapper = AntennaToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 3)
receiver_values = [[[False, True] * 16, [True, False] * 16] + [[False] * 32] * 94, [[False] * 32] * 96, [[False] * 32] * 96] receiver_values = [[[False, True] * 16, [True, False] * 16] + [[False] * 32] * 94, [[False] * 32] * 96, [[False] * 32] * 96]
...@@ -171,7 +171,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -171,7 +171,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_read_pwr_on_rw_unmapped(self): def test_map_read_pwr_on_rw_unmapped(self):
mapper = HBATToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 3) mapper = AntennaToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 3)
receiver_values = [[[False] * 32] * 96, [[False] * 32] * 96, [[False] * 32] * 96] receiver_values = [[[False] * 32] * 96, [[False] * 32] * 96, [[False] * 32] * 96]
expected = [[False] * 32] * 48 expected = [[False] * 32] * 48
...@@ -179,7 +179,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -179,7 +179,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_read_pwr_on_rw_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self): def test_map_read_pwr_on_rw_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self):
mapper = HBATToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 3) mapper = AntennaToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 3)
receiver_values = [[[False, True] * 16, [True, False] * 16] + [[False] * 32] * 94, [[False] * 32] * 96, [[False] * 32] * 96] receiver_values = [[[False, True] * 16, [True, False] * 16] + [[False] * 32] * 94, [[False] * 32] * 96, [[False] * 32] * 96]
...@@ -190,7 +190,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -190,7 +190,7 @@ class TestHBATToRecvMapper(base.TestCase):
# Rename to write # Rename to write
def test_map_write_ant_mask_rw_no_mapping_and_one_receiver(self): def test_map_write_ant_mask_rw_no_mapping_and_one_receiver(self):
mapper = HBATToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 1) mapper = AntennaToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 1)
set_values = [False] * 48 set_values = [False] * 48
expected = [[False] * 96] expected = [[False] * 96]
...@@ -198,7 +198,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -198,7 +198,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_write_ant_mask_rw_no_mapping_and_two_receivers(self): def test_map_write_ant_mask_rw_no_mapping_and_two_receivers(self):
mapper = HBATToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 2) mapper = AntennaToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 2)
set_values = [False] * 48 set_values = [False] * 48
expected = [[False] * 96] * 2 expected = [[False] * 96] * 2
...@@ -206,7 +206,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -206,7 +206,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_write_ant_mask_rw_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self): def test_map_write_ant_mask_rw_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self):
mapper = HBATToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 1) mapper = AntennaToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 1)
set_values = [True, False] + [False] * 46 set_values = [True, False] + [False] * 46
expected = [[False, True, False] + [False] * 93] expected = [[False, True, False] + [False] * 93]
...@@ -214,7 +214,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -214,7 +214,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_write_rcu_band_select_no_mapping_and_one_receiver(self): def test_map_write_rcu_band_select_no_mapping_and_one_receiver(self):
mapper = HBATToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 1) mapper = AntennaToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 1)
set_values = [0] * 48 set_values = [0] * 48
expected = [[0] * 96] expected = [[0] * 96]
...@@ -222,7 +222,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -222,7 +222,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_write_rcu_band_select_no_mapping_and_two_receivers(self): def test_map_write_rcu_band_select_no_mapping_and_two_receivers(self):
mapper = HBATToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 2) mapper = AntennaToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 2)
set_values = [0] * 48 set_values = [0] * 48
expected = [[0] * 96] * 2 expected = [[0] * 96] * 2
...@@ -230,7 +230,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -230,7 +230,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_write_rcu_band_select_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self): def test_map_write_rcu_band_select_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self):
mapper = HBATToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 1) mapper = AntennaToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 1)
set_values = [1, 0] + [0] * 46 set_values = [1, 0] + [0] * 46
expected = [[0, 1, 0] + [0] * 93] expected = [[0, 1, 0] + [0] * 93]
...@@ -238,7 +238,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -238,7 +238,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_write_bf_delay_steps_rw_no_mapping_and_one_receiver(self): def test_map_write_bf_delay_steps_rw_no_mapping_and_one_receiver(self):
mapper = HBATToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 1) mapper = AntennaToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 1)
set_values = [[1] * 32] * 48 set_values = [[1] * 32] * 48
expected = [[[0] * 32] * 96] expected = [[[0] * 32] * 96]
...@@ -246,7 +246,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -246,7 +246,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_write_bf_delay_steps_rw_no_mapping_and_two_receivers(self): def test_map_write_bf_delay_steps_rw_no_mapping_and_two_receivers(self):
mapper = HBATToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 2) mapper = AntennaToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 2)
set_values = [[1] * 32] * 48 set_values = [[1] * 32] * 48
expected = [[[0] * 32] * 96, [[0] * 32] * 96] expected = [[[0] * 32] * 96, [[0] * 32] * 96]
...@@ -254,7 +254,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -254,7 +254,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_write_bf_delay_steps_rw_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self): def test_map_write_bf_delay_steps_rw_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self):
mapper = HBATToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 1) mapper = AntennaToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 1)
set_values = [[1] * 32, [2] * 32] + [[0] * 32] * 46 set_values = [[1] * 32, [2] * 32] + [[0] * 32] * 46
expected = [[[2] * 32, [1] * 32] + [[0] * 32] * 94] expected = [[[2] * 32, [1] * 32] + [[0] * 32] * 94]
...@@ -262,7 +262,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -262,7 +262,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_write_led_on_rw_no_mapping_and_one_receiver(self): def test_map_write_led_on_rw_no_mapping_and_one_receiver(self):
mapper = HBATToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 1) mapper = AntennaToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 1)
set_values = [[False] * 32] * 48 set_values = [[False] * 32] * 48
expected = [[[False] * 32] * 96] expected = [[[False] * 32] * 96]
...@@ -270,7 +270,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -270,7 +270,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_write_led_on_rw_no_mapping_and_two_receivers(self): def test_map_write_led_on_rw_no_mapping_and_two_receivers(self):
mapper = HBATToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 2) mapper = AntennaToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 2)
set_values = [[False] * 32] * 48 set_values = [[False] * 32] * 48
expected = [[[False] * 32] * 96, [[False] * 32] * 96] expected = [[[False] * 32] * 96, [[False] * 32] * 96]
...@@ -278,7 +278,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -278,7 +278,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_write_led_on_rw_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self): def test_map_write_led_on_rw_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self):
mapper = HBATToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 1) mapper = AntennaToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 1)
set_values = [[False, True] * 16, [True, False] * 16] + [[False] * 32] * 46 set_values = [[False, True] * 16, [True, False] * 16] + [[False] * 32] * 46
expected = [[[True, False] * 16, [False, True] * 16] + [[False] * 32] * 94] expected = [[[True, False] * 16, [False, True] * 16] + [[False] * 32] * 94]
...@@ -286,7 +286,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -286,7 +286,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_write_pwr_lna_on_rw_no_mapping_and_one_receiver(self): def test_map_write_pwr_lna_on_rw_no_mapping_and_one_receiver(self):
mapper = HBATToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 1) mapper = AntennaToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 1)
set_values = [[False] * 32] * 48 set_values = [[False] * 32] * 48
expected = [[[False] * 32] * 96] expected = [[[False] * 32] * 96]
...@@ -294,7 +294,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -294,7 +294,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_write_pwr_lna_on_rw_no_mapping_and_two_receivers(self): def test_map_write_pwr_lna_on_rw_no_mapping_and_two_receivers(self):
mapper = HBATToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 2) mapper = AntennaToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 2)
set_values = [[False] * 32] * 48 set_values = [[False] * 32] * 48
expected = [[[False] * 32] * 96, [[False] * 32] * 96] expected = [[[False] * 32] * 96, [[False] * 32] * 96]
...@@ -302,7 +302,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -302,7 +302,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_write_pwr_lna_on_rw_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self): def test_map_write_pwr_lna_on_rw_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self):
mapper = HBATToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 1) mapper = AntennaToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 1)
set_values = [[False, True] * 16, [True, False] * 16] + [[False] * 32] * 46 set_values = [[False, True] * 16, [True, False] * 16] + [[False] * 32] * 46
expected = [[[True, False] * 16, [False, True] * 16] + [[False] * 32] * 94] expected = [[[True, False] * 16, [False, True] * 16] + [[False] * 32] * 94]
...@@ -310,7 +310,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -310,7 +310,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_write_pwr_on_rw_no_mapping_and_one_receiver(self): def test_map_write_pwr_on_rw_no_mapping_and_one_receiver(self):
mapper = HBATToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 1) mapper = AntennaToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 1)
set_values = [[False] * 32] * 48 set_values = [[False] * 32] * 48
expected = [[[False] * 32] * 96] expected = [[[False] * 32] * 96]
...@@ -318,7 +318,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -318,7 +318,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_write_lna_on_rw_no_mapping_and_two_receivers(self): def test_map_write_lna_on_rw_no_mapping_and_two_receivers(self):
mapper = HBATToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 2) mapper = AntennaToRecvMapper(self.CONTROL_NOT_CONNECTED, self.POWER_NOT_CONNECTED, 2)
set_values = [[False] * 32] * 48 set_values = [[False] * 32] * 48
expected = [[[False] * 32] * 96, [[False] * 32] * 96] expected = [[[False] * 32] * 96, [[False] * 32] * 96]
...@@ -326,7 +326,7 @@ class TestHBATToRecvMapper(base.TestCase): ...@@ -326,7 +326,7 @@ class TestHBATToRecvMapper(base.TestCase):
numpy.testing.assert_equal(expected, actual) numpy.testing.assert_equal(expected, actual)
def test_map_write_pwr_on_rw_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self): def test_map_write_pwr_on_rw_hba_0_and_1_on_rcu_1_and_0_of_recv_1(self):
mapper = HBATToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 1) mapper = AntennaToRecvMapper(self.CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1, self.POWER_NOT_CONNECTED, 1)
set_values = [[False, True] * 16, [True, False] * 16] + [[False] * 32] * 46 set_values = [[False, True] * 16, [True, False] * 16] + [[False] * 32] * 46
expected = [[[True, False] * 16, [False, True] * 16] + [[False] * 32] * 94] expected = [[[True, False] * 16, [False, True] * 16] + [[False] * 32] * 94]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment