diff --git a/src/haven/devices/motor.py b/src/haven/devices/motor.py index 2e15aba3..3ede81ef 100644 --- a/src/haven/devices/motor.py +++ b/src/haven/devices/motor.py @@ -4,11 +4,7 @@ from apstools.utils.misc import safe_ophyd_name from ophyd import Component as Cpt from ophyd import EpicsMotor, EpicsSignal, EpicsSignalRO, Kind -from ophyd_async.core import ( - DEFAULT_TIMEOUT, - ConfigSignal, - SubsetEnum, -) +from ophyd_async.core import DEFAULT_TIMEOUT, ConfigSignal, SubsetEnum from ophyd_async.epics.motor import Motor as MotorBase from ophyd_async.epics.signal import epics_signal_r, epics_signal_rw from ophydregistry import Registry diff --git a/src/haven/devices/shutter.py b/src/haven/devices/shutter.py index 7df0243e..82dcfd13 100644 --- a/src/haven/devices/shutter.py +++ b/src/haven/devices/shutter.py @@ -72,9 +72,7 @@ def check_value(self, pos): f"Shutter {self.name} is not permitted to be opened per iconfig.toml. Set `allow_open` for this shutter." ) - async def _actuate_shutter( - self, value: int, open_signal, close_signal - ) -> Mapping: + async def _actuate_shutter(self, value: int, open_signal, close_signal) -> Mapping: """Open/close the shutter using derived-from signals.""" self.check_value(value) if value == ShutterState.OPEN: diff --git a/src/haven/iconfig_testing.toml b/src/haven/iconfig_testing.toml index f2fb3cbe..9056875d 100644 --- a/src/haven/iconfig_testing.toml +++ b/src/haven/iconfig_testing.toml @@ -58,7 +58,6 @@ prefix = "S255ID-PSS:FES:" allow_close = false # allow_open = true # Default - [[ pss_shutter ]] name = "hutch_shutter" prefix = "S255ID-PSS:SCS:" diff --git a/src/haven/positioner.py b/src/haven/positioner.py index e1227b0c..ff16f6b4 100644 --- a/src/haven/positioner.py +++ b/src/haven/positioner.py @@ -1,7 +1,7 @@ import asyncio import logging -from functools import partial import warnings +from functools import partial import numpy as np from bluesky.protocols import Movable, Stoppable