diff --git a/CDB/integrations/recvcluster_ConfigDb.json b/CDB/integrations/recvcluster_ConfigDb.json index 3ec6f945842cc131acc182bc2d69f6b2f9a0ccb0..4e8d0f1b461881899cb5cbecca0214989e227840 100644 --- a/CDB/integrations/recvcluster_ConfigDb.json +++ b/CDB/integrations/recvcluster_ConfigDb.json @@ -236,9 +236,7 @@ "3826577.066","461022.948","5064892.786", "3826577.066","461022.948","5064892.786", "3826577.066","461022.948","5064892.786", - "3826577.066", - "461022.948", - "5064892.786" + "3826577.066","461022.948","5064892.786" ], "HBAT_antenna_itrf_offsets": [ "-1.847","-1.180"," 1.493", diff --git a/tangostationcontrol/tangostationcontrol/integration_test/recv_cluster/test_recv_cluster.py b/tangostationcontrol/tangostationcontrol/integration_test/recv_cluster/test_recv_cluster.py index 72a1369d933d0dea46e7e79996a10b2c46c69697..fea5e86b8b896cff43f6c38b8122b8ad2b08ac30 100644 --- a/tangostationcontrol/tangostationcontrol/integration_test/recv_cluster/test_recv_cluster.py +++ b/tangostationcontrol/tangostationcontrol/integration_test/recv_cluster/test_recv_cluster.py @@ -49,17 +49,19 @@ class TestRecvCluster(base.IntegrationTestCase): proxy.set_defaults() self.assertTrue(proxy.state() is DevState.ON) - for proxy in antenna_field_proxies: + for n in range(1, 5): + proxy = antenna_field_proxies[n-1] # setup AntennaField NR_TILES = 48 control_mapping = [[1,i] for i in range(NR_TILES)] antenna_qualities = numpy.array([AntennaQuality.OK] * 96) antenna_use = numpy.array([AntennaUse.AUTO] * 96) - proxy.put_property({"RECV_devices": [f"STAT/RECV/{i}"], + proxy.put_property({"RECV_devices": [f"STAT/RECV/{n}"], "Control_to_RECV_mapping": numpy.array(control_mapping).flatten(), 'Antenna_Quality': antenna_qualities, 'Antenna_Use': antenna_use}) proxy.off() proxy.boot() + self.assertEqual(NR_TILES, proxy.nr_antennas_R) self.assertTrue(proxy.state() is DevState.ON) for proxy in beam_proxies: