diff --git a/src/aare/daq/operations/rotation/service.py b/src/aare/daq/operations/rotation/service.py index 74a41708..1246c6dd 100644 --- a/src/aare/daq/operations/rotation/service.py +++ b/src/aare/daq/operations/rotation/service.py @@ -68,7 +68,6 @@ class RotationService: ) time.sleep(smargon_time_step) - self.ctx.deps.devs.aerotech.wait_till_done(timeout=int(round(total_time + 60, 0))) self.ctx.deps.devs.aerotech_omega = omega_start diff --git a/src/aare/devices/bec_worker.py b/src/aare/devices/bec_worker.py index d2024e85..40a34af9 100644 --- a/src/aare/devices/bec_worker.py +++ b/src/aare/devices/bec_worker.py @@ -59,7 +59,6 @@ def _bec_state_to_aare_state(bec_state: str) -> BeamlineStateEnum: "MANUAL_SAMPLE_EXCHANGE": BeamlineStateEnum.SampleExchange, "BEAM_VISUALISATION": BeamlineStateEnum.BeamLocation, "FLUX_MEASUREMENT": BeamlineStateEnum.FluxMeasurement, - "BEAMSTOP_ALIGNMENT": BeamlineStateEnum.BeamstopAlignment, "MAINTENANCE": BeamlineStateEnum.Maintenance, "XTAL_SNAPSHOT": BeamlineStateEnum.XtalSnapshot, } diff --git a/src/aare/devices/jfjoch.py b/src/aare/devices/jfjoch.py index b72938e8..4edb52b4 100644 --- a/src/aare/devices/jfjoch.py +++ b/src/aare/devices/jfjoch.py @@ -286,11 +286,11 @@ class JFJochWrapper: logger.debug(status) if status.message_severity == "error": raise self._jfjoch_error( - f"JFJoch status message has error severity after waiting for arm: {status.message}", - error=RuntimeError(status.message), - operation="POST", - endpoint="wait_until_running_post", - ) + f"JFJoch status message has error severity after waiting for arm: {status.message}", + error=RuntimeError(status.message), + operation="POST", + endpoint="wait_until_running_post", + ) return True except Exception as e: raise self._jfjoch_error(