From d924991194e63cd6aa52ab5887b534b2f97711cb Mon Sep 17 00:00:00 2001 From: "Ware, Joseph (DLSLtd,RAL,LSCI)" Date: Thu, 11 Apr 2024 14:04:29 +0100 Subject: [PATCH] Linting, export Pilatus from ad module --- src/ophyd_async/epics/areadetector/__init__.py | 2 ++ src/ophyd_async/epics/areadetector/pilatus.py | 4 +++- tests/epics/areadetector/test_pilatus.py | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/ophyd_async/epics/areadetector/__init__.py b/src/ophyd_async/epics/areadetector/__init__.py index 69383d6741..9464936536 100644 --- a/src/ophyd_async/epics/areadetector/__init__.py +++ b/src/ophyd_async/epics/areadetector/__init__.py @@ -1,3 +1,4 @@ +from .pilatus import PilatusDetector from .single_trigger_det import SingleTriggerDet from .utils import ( FileWriteMode, @@ -16,4 +17,5 @@ "ad_rw", "NDAttributeDataType", "NDAttributesXML", + "PilatusDetector", ] diff --git a/src/ophyd_async/epics/areadetector/pilatus.py b/src/ophyd_async/epics/areadetector/pilatus.py index dfbe3edcee..539726cdf0 100644 --- a/src/ophyd_async/epics/areadetector/pilatus.py +++ b/src/ophyd_async/epics/areadetector/pilatus.py @@ -1,5 +1,7 @@ from typing import Optional, Sequence + from bluesky.protocols import Hints + from ophyd_async.core import DirectoryProvider from ophyd_async.core.detector import StandardDetector from ophyd_async.core.signal import SignalR @@ -40,7 +42,7 @@ def __init__( ADBaseShapeProvider(self.drv), **scalar_sigs, ), - config_sigs=config_sigs or (self.drv.acquire_time, ), + config_sigs=config_sigs or (self.drv.acquire_time,), name=name, ) diff --git a/tests/epics/areadetector/test_pilatus.py b/tests/epics/areadetector/test_pilatus.py index 3f39020304..e3c3c03cbb 100644 --- a/tests/epics/areadetector/test_pilatus.py +++ b/tests/epics/areadetector/test_pilatus.py @@ -1,7 +1,6 @@ -import re - import pytest from bluesky.run_engine import RunEngine + from ophyd_async.core import ( DetectorTrigger, DeviceCollector,