From c91be878a76f224778a1281f19d3d5a9bad7e91c Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Thu, 22 Sep 2022 17:29:28 +0000
Subject: [PATCH] L2SS-876: Fix antennafield restore function
---
.../default/devices/test_device_antennafield.py | 4 ++--
.../default/devices/test_device_digitalbeam.py | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_antennafield.py b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_antennafield.py
index cfc967b18..7d071bc83 100644
--- a/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_antennafield.py
+++ b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_antennafield.py
@@ -31,8 +31,8 @@ class TestAntennaFieldDevice(AbstractTestBases.TestDeviceBase):
def restore_antennafield(self):
self.proxy.put_property({
"RECV_devices": ["STAT/RECV/1"],
- "HBAT_Power_to_RECV_mapping": [-1] * 96,
- "HBAT_Control_to_RECV_mapping": [-1] * 96
+ "Power_to_RECV_mapping": [-1, -1] * 48,
+ "Control_to_RECV_mapping": [-1, -1] * 48
})
@staticmethod
diff --git a/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_digitalbeam.py b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_digitalbeam.py
index d4ba9f993..aed6b3231 100644
--- a/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_digitalbeam.py
+++ b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_digitalbeam.py
@@ -63,9 +63,11 @@ class TestDeviceDigitalBeam(AbstractTestBases.TestDeviceBase):
NR_TILES = 48
antennafield_proxy = TestDeviceProxy(self.antennafield_iden)
control_mapping = [[1,i] for i in range(NR_TILES)]
- antennafield_proxy.put_property({"RECV_devices": [self.recv_iden],
- "HBAT_Control_to_RECV_mapping": numpy.array(control_mapping).flatten(),
- 'Antenna_Quality': antenna_qualities, 'Antenna_Use': antenna_use})
+ antennafield_proxy.put_property({
+ "RECV_devices": [self.recv_iden],
+ "Control_to_RECV_mapping": numpy.array(control_mapping).flatten(),
+ 'Antenna_Quality': antenna_qualities, 'Antenna_Use': antenna_use}
+ )
antennafield_proxy.off()
antennafield_proxy.boot()
return antennafield_proxy
--
GitLab