diff --git a/tangostationcontrol/tangostationcontrol/devices/beam.py b/tangostationcontrol/tangostationcontrol/devices/beam.py
index 2662f596aa9f6228e5309df95c0d303a2b7426a8..6b3cff43d19279d9d01d5685ab19cb5cb840381b 100644
--- a/tangostationcontrol/tangostationcontrol/devices/beam.py
+++ b/tangostationcontrol/tangostationcontrol/devices/beam.py
@@ -124,7 +124,7 @@ class Beam(lofar_device):
delays = self._HBAT_delays(pointing_direction, timestamp)
# Convert delays into beam weights
- HBAT_bf_delay_step_delays = self.recv_proxy.HBAT_bf_delay_step_delays
+ HBAT_bf_delay_step_delays = self.recv_proxy.get_hbat_bf_delay_step_delays()
HBAT_bf_delays = self._calculate_HBAT_bf_delays(delays, self.HBAT_signal_input_delays, HBAT_bf_delay_step_delays)
# Write weights to RECV
diff --git a/tangostationcontrol/tangostationcontrol/devices/recv.py b/tangostationcontrol/tangostationcontrol/devices/recv.py
index f0937b0919054508b40f376587b314187d7f7b7c..c6c2e979cf02552d8ced70af9ad2e0815f197de9 100644
--- a/tangostationcontrol/tangostationcontrol/devices/recv.py
+++ b/tangostationcontrol/tangostationcontrol/devices/recv.py
@@ -34,17 +34,6 @@ __all__ = ["RECV", "main"]
@device_logging_to_python()
class RECV(opcua_device):
- # TODO: to be deleted in L2SS-574
- _hbat_bf_delay_step_delays = numpy.array([
- 0.0, 0.5228E-9, 0.9797E-9, 1.4277E-9, 1.9055E-9,
- 2.4616E-9, 2.9539E-9, 3.4016E-9, 3.8076E-9, 4.3461E-9,
- 4.9876E-9, 5.4894E-9, 5.7973E-9, 6.2707E-9, 6.8628E-9,
- 7.3989E-9, 8.0673E-9, 8.6188E-9, 9.1039E-9, 9.5686E-9,
- 10.0463E-9, 10.5774E-9, 11.0509E-9, 11.5289E-9, 11.9374E-9,
- 12.4524E-9, 13.0842E-9, 13.5936E-9, 13.9198E-9, 14.4087E-9,
- 14.9781E-9, 15.5063E-9
- ],dtype=numpy.float64)
-
# -----------------
# Device Properties
# -----------------
@@ -60,20 +49,19 @@ class RECV(opcua_device):
default_value=[True] * 32
)
- # TODO: to be restored in L2SS-574
- # HBAT_bf_delay_step_delays = device_property(
- # dtype="DevVarFloatArray",
- # mandatory=False,
- # default_value=numpy.array([
- # 0.0, 0.5228E-9, 0.9797E-9, 1.4277E-9, 1.9055E-9,
- # 2.4616E-9, 2.9539E-9, 3.4016E-9, 3.8076E-9, 4.3461E-9,
- # 4.9876E-9, 5.4894E-9, 5.7973E-9, 6.2707E-9, 6.8628E-9,
- # 7.3989E-9, 8.0673E-9, 8.6188E-9, 9.1039E-9, 9.5686E-9,
- # 10.0463E-9, 10.5774E-9, 11.0509E-9, 11.5289E-9, 11.9374E-9,
- # 12.4524E-9, 13.0842E-9, 13.5936E-9, 13.9198E-9, 14.4087E-9,
- # 14.9781E-9, 15.5063E-9
- # ],dtype=numpy.float64)
- # )
+ HBAT_bf_delay_step_delays = device_property(
+ dtype="DevVarFloatArray",
+ mandatory=False,
+ default_value=numpy.array([
+ 0.0, 0.5228E-9, 0.9797E-9, 1.4277E-9, 1.9055E-9,
+ 2.4616E-9, 2.9539E-9, 3.4016E-9, 3.8076E-9, 4.3461E-9,
+ 4.9876E-9, 5.4894E-9, 5.7973E-9, 6.2707E-9, 6.8628E-9,
+ 7.3989E-9, 8.0673E-9, 8.6188E-9, 9.1039E-9, 9.5686E-9,
+ 10.0463E-9, 10.5774E-9, 11.0509E-9, 11.5289E-9, 11.9374E-9,
+ 12.4524E-9, 13.0842E-9, 13.5936E-9, 13.9198E-9, 14.4087E-9,
+ 14.9781E-9, 15.5063E-9
+ ],dtype=numpy.float64)
+ )
HBAT_reference_itrf = device_property(
dtype='DevVarFloatArray',
@@ -118,11 +106,6 @@ class RECV(opcua_device):
RCU_LED_colour_R = attribute(dtype=(numpy.uint32,), max_dim_x=32, fget=lambda self: (2 * self.proxy.RCU_LED_green_on_R + 4 * self.proxy.RCU_LED_red_on_R).astype(numpy.uint32))
ANT_mask_RW = attribute_wrapper(comms_annotation=["ANT_mask_RW" ],datatype=numpy.bool_ , dims=(3,32), access=AttrWriteType.READ_WRITE)
-
- # TODO: convert back to property in L2SS-574
- HBAT_bf_delay_step_delays = attribute(access=AttrWriteType.READ,
- dtype=(numpy.float64,), max_dim_x=32,
- fget=lambda self: self._hbat_bf_delay_step_delays)
# The HBAT beamformer delays represent 32 delays for each of the 96 inputs.
# The 32 delays deconstruct as delays[polarisation][dipole], and each delay is the number of 'delay steps' to apply (0.5ns for HBAT1).
@@ -173,6 +156,13 @@ class RECV(opcua_device):
# --------
# Commands
# --------
+ @command(dtype_out=DevVarFloatArray)
+ @DebugIt()
+ @only_in_states([DevState.ON])
+ def get_hbat_bf_delay_step_delays(self):
+ """ Return the property HBAT_bf_delay_step_delays """
+ return self.HBAT_bf_delay_step_delays
+
@command(dtype_out=DevVarFloatArray)
@DebugIt()
@only_in_states([DevState.ON])
diff --git a/tangostationcontrol/tangostationcontrol/integration_test/devices/test_device_beam.py b/tangostationcontrol/tangostationcontrol/integration_test/devices/test_device_beam.py
index c83e0af39512c4acf7dd0aa4c31bf6127ffd318b..a1a9d0b4cb9f8b0eeb2e8544b7cfe01081816655 100644
--- a/tangostationcontrol/tangostationcontrol/integration_test/devices/test_device_beam.py
+++ b/tangostationcontrol/tangostationcontrol/integration_test/devices/test_device_beam.py
@@ -44,7 +44,7 @@ class TestDeviceBeam(AbstractTestBases.TestDeviceBase):
# HBAT_delays_flat = self.proxy.HBAT_delays(numpy.array([["J2000","0deg","0deg"]] * 96).flatten())
# HBAT_delays = numpy.array(HBAT_delays_flat).reshape(96,16)
# HBAT_signal_input_delays = numpy.zeros((96,32), dtype=numpy.float64) # Property of Beam-device
- # HBAT_bf_delay_step_delays = recv_proxy.HBAT_bf_delay_step_delays
+ # HBAT_bf_delay_step_delays = recv_proxy.get_hbat_bf_delay_step_delays()
# HBAT_bf_delays = self.proxy._calculate_HBAT_bf_delays(HBAT_delays, HBAT_signal_input_delays, HBAT_bf_delay_step_delays)
# self.assertNotEqual(HBAT_delays, HBAT_bf_delays)