fix: removed stopped bug at beamline with device

This commit is contained in:
gac-x01da (Resp. Clark Adam Hugh)
2024-08-05 13:49:45 +02:00
parent d0c81d20e7
commit 5296c70ebb

View File

@@ -716,8 +716,8 @@ class Mo1Bragg(Device, PositionerBase):
list(object): list of objects that were unstaged
"""
self.check_scan_id()
self.on_unstage()
self._stopped = False
self.on_unstage()
return super().unstage()
def on_unstage(self) -> None:
@@ -726,7 +726,7 @@ class Mo1Bragg(Device, PositionerBase):
if self.wait_for_signals(
signal_conditions=[(self.scan_control.scan_msg.get, ScanControlLoadMessage.PENDING)],
timeout=self.timeout_for_pvwait,
check_stopped=True,
check_stopped=False,
):
return
@@ -734,7 +734,7 @@ class Mo1Bragg(Device, PositionerBase):
if not self.wait_for_signals(
signal_conditions=[(self.scan_control.scan_msg.get, ScanControlLoadMessage.PENDING)],
timeout=self.timeout_for_pvwait,
check_stopped=True,
check_stopped=False,
):
raise TimeoutError(
f"Timeout after {self.timeout_for_pvwait} while waiting for scan validation"
@@ -850,7 +850,7 @@ class Mo1Bragg(Device, PositionerBase):
# pylint: disable=protected-access
status.set_finished()
else:
if self.parent.stopped:
if self.stopped:
# INFO This will execute a callback to the parent device.stop() method
status.set_exception(exc=DeviceStopError(f"{self.name} was stopped"))
else: