diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index e494637..8e4bd9a 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -30,7 +30,7 @@ jobs: fetch-depth: 0 persist-credentials: false - - uses: hynek/build-and-inspect-python-package@c52c3a4710070b50470d903818a7b25115dcd076 # v2.13.0 + - uses: hynek/build-and-inspect-python-package@d44ca7d91762de7a7d5436ddae667c6da6d1c3df # v2.13.0 publish: needs: [dist] diff --git a/src/cditools/eiger_async.py b/src/cditools/eiger_async.py index f8b38b0..578ae6c 100644 --- a/src/cditools/eiger_async.py +++ b/src/cditools/eiger_async.py @@ -7,12 +7,12 @@ # import asyncio # from collections.abc import AsyncGenerator, AsyncIterator, Iterator, Sequence from logging import getLogger + # from pathlib import Path from typing import Annotated as A + # from typing import Any, cast # from urllib.parse import urlunparse - -import numpy as np # type: ignore[import-not-found] # from bluesky.protocols import StreamAsset # from event_model import ( # type: ignore[import-untyped] # ComposeStreamResource, @@ -35,11 +35,11 @@ # observe_value, ) from ophyd_async.epics.adcore import ( - #ADBaseController, - #ADBaseDatasetDescriber, + # ADBaseController, + # ADBaseDatasetDescriber, ADBaseIO, - #ADImageMode, - #ADWriter, + # ADImageMode, + # ADWriter, # AreaDetector, NDFileIO, # NDPluginBaseIO, diff --git a/src/cditools/merlin.py b/src/cditools/merlin.py index 8bfae08..843dac4 100644 --- a/src/cditools/merlin.py +++ b/src/cditools/merlin.py @@ -129,7 +129,7 @@ class CDIMerlinDetector(CDIModalTrigger, MerlinDetector): "HDF1:", read_attrs=[], configuration_attrs=[], - write_path_template = '', + write_path_template="", root="/nsls2/data/cdi/proposals/", ) @@ -207,4 +207,4 @@ def stage(self): return super().stage() def unstage(self): - return super().unstage() \ No newline at end of file + return super().unstage() diff --git a/src/cditools/merlin_async.py b/src/cditools/merlin_async.py index 7d0a2ef..1172184 100644 --- a/src/cditools/merlin_async.py +++ b/src/cditools/merlin_async.py @@ -46,6 +46,7 @@ class MerlinTriggerMode(StrictEnum): TRIGGER_BOTH_RISING = "Trigger both rising" SOFTWARE = "Software" + class MerlinTriggerModeRBV(StrictEnum): """Trigger modes for the Merlin detector""" @@ -128,4 +129,4 @@ def __init__( plugins=plugins, config_sigs=config_sigs, name=name, - ) \ No newline at end of file + ) diff --git a/src/cditools/screens.py b/src/cditools/screens.py index 7fcd69b..d2e22c8 100644 --- a/src/cditools/screens.py +++ b/src/cditools/screens.py @@ -7,7 +7,6 @@ Device, EpicsMotor, EpicsSignal, - ImagePlugin, ProsilicaDetector, ProsilicaDetectorCam, ROIPlugin,