From 0df20eea8b92982833fb481022d8316e06ac117c Mon Sep 17 00:00:00 2001 From: thijs snijder <snijder@astron.nl> Date: Thu, 15 Sep 2022 11:38:00 +0200 Subject: [PATCH] changed N_beamsets_ctrl to 1 --- tangostationcontrol/tangostationcontrol/devices/sdp/beamlet.py | 2 +- tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/beamlet.py b/tangostationcontrol/tangostationcontrol/devices/sdp/beamlet.py index 79afeacfe..e77459a88 100644 --- a/tangostationcontrol/tangostationcontrol/devices/sdp/beamlet.py +++ b/tangostationcontrol/tangostationcontrol/devices/sdp/beamlet.py @@ -35,7 +35,7 @@ class Beamlet(opcua_device): A_PN = 6 N_POL = 2 N_BEAMLETS_CTRL = 488 - N_BEAMSETS_CTRL = 2 + N_BEAMSETS_CTRL = SDP.N_beamsets_ctrl N_POL_BF = 2 P_SUM = 2 # number of hops that the data of the stream has traveled to reach the BSN aligner on this node diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py b/tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py index 2a7ca8991..d35701ee4 100644 --- a/tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py +++ b/tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py @@ -113,7 +113,7 @@ class SDP(opcua_device): # TODO(needs to not be statically declared as this can change depending on the station and configuration) S_pn = 12 # Number of ADC signal inputs per Processing Node (PN) FPGA. N_pn = 16 # Number of FPGAs per antenna band that is controlled via the SC - SDP interface. - N_beamsets_ctrl = 2 + N_beamsets_ctrl = 1 FPGA_firmware_version_R = attribute_wrapper(comms_annotation=["FPGA_firmware_version_R"], datatype=str, dims=(N_pn,)) FPGA_boot_image_R = attribute_wrapper(comms_annotation=["FPGA_boot_image_R"], datatype=numpy.int32, dims=(N_pn,), doc="Active FPGA image (0=factory, 1=user)") -- GitLab