diff --git a/src/ophyd_async/epics/areadetector/controllers/pilatus_controller.py b/src/ophyd_async/epics/areadetector/controllers/pilatus_controller.py index 23e3f351b1..13d52aca36 100644 --- a/src/ophyd_async/epics/areadetector/controllers/pilatus_controller.py +++ b/src/ophyd_async/epics/areadetector/controllers/pilatus_controller.py @@ -1,5 +1,6 @@ import asyncio from typing import Optional + from ophyd_async.core.async_status import AsyncStatus from ophyd_async.core.detector import DetectorControl, DetectorTrigger from ophyd_async.epics.areadetector.drivers.ad_base import ( @@ -27,7 +28,8 @@ def __init__( def get_deadtime(self, exposure: float) -> float: # Cite: https://media.dectris.com/User_Manual-PILATUS2-V1_4.pdf - """The required minimum time difference between ExpPeriod and ExpTime (readout time) is 2.28 ms""" + """The required minimum time difference between ExpPeriod and ExpTime + (readout time) is 2.28 ms""" return 2.28e-3 async def arm( diff --git a/tests/epics/areadetector/test_controllers.py b/tests/epics/areadetector/test_controllers.py index 7127ff469a..faa5df5d15 100644 --- a/tests/epics/areadetector/test_controllers.py +++ b/tests/epics/areadetector/test_controllers.py @@ -8,9 +8,7 @@ PilatusController, ) from ophyd_async.epics.areadetector.drivers import ADBase, PilatusDriver -from ophyd_async.epics.areadetector.drivers.pilatus_driver import ( - TriggerMode as PilatusTrigger, -) +from ophyd_async.epics.areadetector.drivers.pilatus_driver import PilatusTriggerMode from ophyd_async.epics.areadetector.utils import ImageMode @@ -53,10 +51,10 @@ async def test_pilatus_controller(RE, pilatus: PilatusController): with patch("ophyd_async.core.signal.wait_for_value", return_value=None): await pilatus.arm(num=1, trigger=DetectorTrigger.constant_gate) - driver = pilatus.driver + driver = pilatus._drv assert await driver.num_images.get_value() == 1 assert await driver.image_mode.get_value() == ImageMode.multiple - assert await driver.trigger_mode.get_value() == PilatusTrigger.ext_enable + assert await driver.trigger_mode.get_value() == PilatusTriggerMode.ext_enable assert await driver.acquire.get_value() is True with patch(