Skip to content
Snippets Groups Projects
Commit e7fd1141 authored by Jan David Mol's avatar Jan David Mol
Browse files

Merge branch 'busy-day-fixes-2023-09-21' into 'master'

Busy day fixes 2023 09 21

See merge request !741
parents 672d629a 67234bef
Branches
Tags
1 merge request!741Busy day fixes 2023 09 21
...@@ -260,7 +260,10 @@ class AntennaMapper: ...@@ -260,7 +260,10 @@ class AntennaMapper:
) in enumerate(zip(power_mapping, control_mapping)): ) in enumerate(zip(power_mapping, control_mapping)):
if antenna_type == "LBA" and pwr_attribute: if antenna_type == "LBA" and pwr_attribute:
if dev_power > 0 and dev_control > 0: if dev_power > 0 and dev_control > 0:
mapped_values[dev_power] = set_values[idx] mapped_values[dev_power - 1, dev_input_power] = set_values[idx]
mapped_values[dev_control - 1, dev_input_control] = set_values[
idx
]
else: else:
if dev_power > 0: if dev_power > 0:
mapped_values[dev_power - 1, dev_input_power] = set_values[idx][ mapped_values[dev_power - 1, dev_input_power] = set_values[idx][
......
...@@ -100,7 +100,7 @@ class RECVDevice(OPCUADevice): ...@@ -100,7 +100,7 @@ class RECVDevice(OPCUADevice):
doc="Maximum amount of time to wait after turning RCU(s) on or off", doc="Maximum amount of time to wait after turning RCU(s) on or off",
dtype="DevFloat", dtype="DevFloat",
mandatory=False, mandatory=False,
default_value=30.0, default_value=60.0,
) )
RCU_DTH_On_Off_timeout = device_property( RCU_DTH_On_Off_timeout = device_property(
...@@ -388,10 +388,10 @@ class RECVDevice(OPCUADevice): ...@@ -388,10 +388,10 @@ class RECVDevice(OPCUADevice):
self.RCU_on() self.RCU_on()
self.wait_attribute("RECVTR_translator_busy_R", False, self.RCU_On_Off_timeout) self.wait_attribute("RECVTR_translator_busy_R", False, self.RCU_On_Off_timeout)
self.RCU_DTH_off()
self.wait_attribute( # NB: Powering on RCUs causes DTH to be turned off, which is what we want
"RECVTR_translator_busy_R", False, self.RCU_DTH_On_Off_timeout # to create a steady baseline after powerup. This is done by RECVTR
) # even if the RCUs are already powered on.
def _power_hardware_off(self): def _power_hardware_off(self):
"""Turns off the RCUs.""" """Turns off the RCUs."""
......
...@@ -162,7 +162,7 @@ class BST(Statistics): ...@@ -162,7 +162,7 @@ class BST(Statistics):
comms_id=StatisticsClient, comms_id=StatisticsClient,
comms_annotation={"type": "statistics", "parameter": "bst_timestamps"}, comms_annotation={"type": "statistics", "parameter": "bst_timestamps"},
dims=(N_pn,), dims=(N_pn,),
datatype=numpy.float32, datatype=numpy.uint64,
) )
# reported integration interval # reported integration interval
# from each FPGA in the latest BSTs # from each FPGA in the latest BSTs
......
...@@ -296,12 +296,12 @@ class SDPFirmware(OPCUADevice): ...@@ -296,12 +296,12 @@ class SDPFirmware(OPCUADevice):
def _power_hardware_on(self): def _power_hardware_on(self):
"""Boot the SDP Firmware user image""" """Boot the SDP Firmware user image"""
self._boot_to_image(0) self._boot_to_image(1)
def _power_hardware_off(self): def _power_hardware_off(self):
"""Use the SDP Firmware factory image""" """Use the SDP Firmware factory image"""
self._boot_to_image(1) self._boot_to_image(0)
# -------- # --------
# Commands # Commands
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment