From fb88e531fe6eb97af377139028039799f6d75dce Mon Sep 17 00:00:00 2001
From: stedif <stefano.difrischia@inaf.it>
Date: Fri, 16 Sep 2022 18:21:33 +0200
Subject: [PATCH] L2SS-937: fix bug
---
CDB/integrations/recvcluster_ConfigDb.json | 4 +---
.../integration_test/recv_cluster/test_recv_cluster.py | 6 ++++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CDB/integrations/recvcluster_ConfigDb.json b/CDB/integrations/recvcluster_ConfigDb.json
index 3ec6f9458..4e8d0f1b4 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 72a1369d9..fea5e86b8 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:
--
GitLab