diff --git a/csaxs_bec/device_configs/bl_endstation.yaml b/csaxs_bec/device_configs/bl_endstation.yaml index 4f42bf4..79856ed 100644 --- a/csaxs_bec/device_configs/bl_endstation.yaml +++ b/csaxs_bec/device_configs/bl_endstation.yaml @@ -1039,7 +1039,7 @@ gain_bpm_xbox2: gain_lsb: galilrioesxbox.digital_out.ch0 # Pin 10 -> Galil ch0 gain_mid: galilrioesxbox.digital_out.ch1 # Pin 11 -> Galil ch1 gain_msb: galilrioesxbox.digital_out.ch2 # Pin 12 -> Galil ch2 - coupling: galilrioesxbox.digital_out.ch3 # Pin 13 -> Galil ch3 + coupling_ref: galilrioesxbox.digital_out.ch3 # Pin 13 -> Galil ch3 speed_mode: galilrioesxbox.digital_out.ch4 # Pin 14 -> Galil ch4 enabled: true readoutPriority: baseline @@ -1068,7 +1068,7 @@ gain_bim_xbox3: gain_lsb: galilrioesxbox.digital_out.ch6 # Pin 10 -> Galil ch0 gain_mid: galilrioesxbox.digital_out.ch7 # Pin 11 -> Galil ch1 gain_msb: galilrioesxbox.digital_out.ch8 # Pin 12 -> Galil ch2 - coupling: galilrioesxbox.digital_out.ch9 # Pin 13 -> Galil ch3 + coupling_ref: galilrioesxbox.digital_out.ch9 # Pin 13 -> Galil ch3 speed_mode: galilrioesxbox.digital_out.ch10 # Pin 14 -> Galil ch4 enabled: true readoutPriority: baseline @@ -1112,7 +1112,7 @@ gain_beamstop_diode: gain_lsb: galilrioesft.digital_out.ch0 # Pin 10 -> Galil ch0 gain_mid: galilrioesft.digital_out.ch1 # Pin 11 -> Galil ch1 gain_msb: galilrioesft.digital_out.ch2 # Pin 12 -> Galil ch2 - coupling: galilrioesft.digital_out.ch3 # Pin 13 -> Galil ch3 + coupling_ref: galilrioesft.digital_out.ch3 # Pin 13 -> Galil ch3 speed_mode: galilrioesft.digital_out.ch4 # Pin 14 -> Galil ch4 enabled: true readoutPriority: baseline diff --git a/csaxs_bec/device_configs/bl_optics_hutch.yaml b/csaxs_bec/device_configs/bl_optics_hutch.yaml index 3b339ff..ec5d147 100644 --- a/csaxs_bec/device_configs/bl_optics_hutch.yaml +++ b/csaxs_bec/device_configs/bl_optics_hutch.yaml @@ -356,7 +356,7 @@ galilrioop: # gain_lsb: galilrioop.digital_out.ch0 # Pin 10 -> Galil ch0 # gain_mid: galilrioop.digital_out.ch1 # Pin 11 -> Galil ch1 # gain_msb: galilrioop.digital_out.ch2 # Pin 12 -> Galil ch2 -# coupling: galilrioop.digital_out.ch3 # Pin 13 -> Galil ch3 +# coupling_ref: galilrioop.digital_out.ch3 # Pin 13 -> Galil ch3 # speed_mode: galilrioop.digital_out.ch4 # Pin 14 -> Galil ch4 # enabled: true # readoutPriority: monitored @@ -385,7 +385,7 @@ gain_diodes_xbox1: gain_lsb: galilrioop.digital_out.ch6 # Pin 10 -> Galil ch0 gain_mid: galilrioop.digital_out.ch7 # Pin 11 -> Galil ch1 gain_msb: galilrioop.digital_out.ch8 # Pin 12 -> Galil ch2 - coupling: galilrioop.digital_out.ch9 # Pin 13 -> Galil ch3 + coupling_ref: galilrioop.digital_out.ch9 # Pin 13 -> Galil ch3 speed_mode: galilrioop.digital_out.ch10 # Pin 14 -> Galil ch4 enabled: true readoutPriority: baseline diff --git a/csaxs_bec/devices/pseudo_devices/bpm_control.py b/csaxs_bec/devices/pseudo_devices/bpm_control.py index 63cb198..288732e 100644 --- a/csaxs_bec/devices/pseudo_devices/bpm_control.py +++ b/csaxs_bec/devices/pseudo_devices/bpm_control.py @@ -50,7 +50,7 @@ class BPMControl(PSIPseudoDeviceBase): """ BPM amplifier control pseudo device. It is responsible for controlling the gain and coupling for the BPM amplifier. It relies on signals from a device - in BEC to be available. For cSAXS, these are most liikely to be from the + in BEC to be available. For cSAXS, these are most likely to be from the GalilRIO device that controls the BPM amplifier. Args: @@ -97,7 +97,7 @@ class BPMControl(PSIPseudoDeviceBase): gain_lsb: str, gain_mid: str, gain_msb: str, - coupling: str, + coupling_ref: str, speed_mode: str, device_manager: DeviceManagerDS | None = None, scan_info: ScanInfo | None = None, @@ -116,7 +116,7 @@ class BPMControl(PSIPseudoDeviceBase): object_name=gain_msb, signal_name=self.name, device_manager=device_manager ) self._coupling = self.gain.get_device_object_from_bec( - object_name=coupling, signal_name=self.name, device_manager=device_manager + object_name=coupling_ref, signal_name=self.name, device_manager=device_manager ) self._speed_mode = self.gain.get_device_object_from_bec( object_name=speed_mode, signal_name=self.name, device_manager=device_manager diff --git a/tests/tests_devices/test_pseudo_devices.py b/tests/tests_devices/test_pseudo_devices.py index 632fa92..336e67c 100644 --- a/tests/tests_devices/test_pseudo_devices.py +++ b/tests/tests_devices/test_pseudo_devices.py @@ -43,7 +43,7 @@ def bpm_control(patched_dm): "gain_lsb": "gain_lsb", "gain_mid": "gain_mid", "gain_msb": "gain_msb", - "coupling": "coupling", + "coupling_ref": "coupling", "speed_mode": "speed_mode", }, needs=["gain_lsb", "gain_mid", "gain_msb", "coupling", "speed_mode"], @@ -55,7 +55,7 @@ def bpm_control(patched_dm): gain_lsb="gain_lsb", gain_mid="gain_mid", gain_msb="gain_msb", - coupling="coupling", + coupling_ref="coupling", speed_mode="speed_mode", device_manager=patched_dm, )