diff --git a/debye_bec/devices/mo1_bragg/mo1_bragg.py b/debye_bec/devices/mo1_bragg/mo1_bragg.py index 0779dd0..2c673f7 100644 --- a/debye_bec/devices/mo1_bragg/mo1_bragg.py +++ b/debye_bec/devices/mo1_bragg/mo1_bragg.py @@ -57,7 +57,7 @@ class Mo1Bragg(PSIDeviceBase, Mo1BraggPositioner): progress_signal = Cpt(ProgressSignal, name="progress_signal") - USER_ACCESS = ["set_advanced_xas_settings", "set_xtal"] + USER_ACCESS = ["set_advanced_xas_settings", "set_xtal", "convert_angle_energy"] def __init__(self, name: str, prefix: str = "", scan_info: ScanInfo | None = None, **kwargs): # type: ignore """ @@ -112,8 +112,12 @@ class Mo1Bragg(PSIDeviceBase, Mo1BraggPositioner): scan_name = self.scan_parameters.scan_name if self._check_if_scan_name_is_valid(self.scan_parameters): - if self.scan_parameters.positions: - start, stop = self.scan_parameters.positions if len(self.scan_parameters.positions) == 2 else (None, None) + if self.scan_parameters.positions is not None: + start, stop = ( + self.scan_parameters.positions + if len(self.scan_parameters.positions) == 2 + else (None, None) + ) else: start, stop = (None, None) scan_time = self.scan_parameters.additional_scan_parameters.get("scan_time", None) diff --git a/debye_bec/devices/mo1_bragg/mo1_bragg_devices.py b/debye_bec/devices/mo1_bragg/mo1_bragg_devices.py index fe1d5e5..3b6aca7 100644 --- a/debye_bec/devices/mo1_bragg/mo1_bragg_devices.py +++ b/debye_bec/devices/mo1_bragg/mo1_bragg_devices.py @@ -182,7 +182,7 @@ class Mo1TriggerSettings(Device): class Mo1BraggCalculator(Device): """Mo1 Bragg PVs to convert angle to energy or vice-versa.""" - calc_reset = Cpt(EpicsSignal, suffix="calc_reset", kind="config", put_complete=True) + calc_reset = Cpt(EpicsSignalWithRBV, suffix="calc_reset", kind="config", put_complete=True) calc_done = Cpt(EpicsSignalRO, suffix="calc_done_RBV", kind="config") calc_energy = Cpt(EpicsSignalWithRBV, suffix="calc_energy", kind="config") calc_angle = Cpt(EpicsSignalWithRBV, suffix="calc_angle", kind="config")