diff --git a/csaxs_bec/device_configs/bl_endstation.yaml b/csaxs_bec/device_configs/bl_endstation.yaml index 49b8d15..39cf828 100644 --- a/csaxs_bec/device_configs/bl_endstation.yaml +++ b/csaxs_bec/device_configs/bl_endstation.yaml @@ -1059,31 +1059,31 @@ bpm_xbox2_slowrb: needs: - galilrioesxbox -# gain_bim_xbox3: -# description: Gain control for beam intensity monitor ES Xbox3 -# deviceClass: csaxs_bec.devices.pseudo_devices.bpm_control.BPMControl -# deviceConfig: -# 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 -# speed_mode: galilrioesxbox.digital_out.ch10 # Pin 14 -> Galil ch4 -# enabled: true -# readoutPriority: baseline -# onFailure: retry -# needs: -# - galilrioesxbox +gain_bim_xbox3: + description: Gain control for beam intensity monitor ES Xbox3 + deviceClass: csaxs_bec.devices.pseudo_devices.bpm_control.BPMControl + deviceConfig: + 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 + speed_mode: galilrioesxbox.digital_out.ch10 # Pin 14 -> Galil ch4 + enabled: true + readoutPriority: monitored + onFailure: retry + needs: + - galilrioesxbox -# bim_xbox3_slowrb: -# description: Beam intensity slow readback ES XBox3 -# deviceClass: csaxs_bec.devices.pseudo_devices.signal_forwarder.SignalForwarder -# deviceConfig: -# signal: galilrioesxbox.analog_in.ch6 -# enabled: true -# readoutPriority: baseline -# onFailure: retry -# needs: -# - galilrioesxbox +bim_xbox3_slowrb: + description: Beam intensity slow readback ES XBox3 + deviceClass: csaxs_bec.devices.pseudo_devices.signal_forwarder.SignalForwarder + deviceConfig: + signal: galilrioesxbox.analog_in.ch6 + enabled: true + readoutPriority: monitored + onFailure: retry + needs: + - galilrioesxbox diff --git a/csaxs_bec/devices/pseudo_devices/signal_forwarder.py b/csaxs_bec/devices/pseudo_devices/signal_forwarder.py index 17e21fb..2d79ba0 100644 --- a/csaxs_bec/devices/pseudo_devices/signal_forwarder.py +++ b/csaxs_bec/devices/pseudo_devices/signal_forwarder.py @@ -15,27 +15,19 @@ class SignalForwarder(PSIPseudoDeviceBase): BECProcessedSignal, name="signal", model_config=None, - kind=Kind.config, + # kind=Kind.config, + kind=Kind.normal, doc="Forwarded signal", ) - def __init__( - self, - name, - signal: str, - device_manager=None, - scan_info=None, - **kwargs, - ): + def __init__(self, name, signal: str, device_manager=None, scan_info=None, **kwargs): super().__init__(name=name, device_manager=device_manager, scan_info=scan_info, **kwargs) src = self.signal.get_device_object_from_bec( - object_name=signal, - signal_name=self.name, - device_manager=device_manager, + object_name=signal, signal_name=self.name, device_manager=device_manager ) self.signal.set_compute_method(self._compute_signal, signal=src) def _compute_signal(self, signal: Signal) -> float: - return signal.get() \ No newline at end of file + return signal.get()