Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
12 changes: 6 additions & 6 deletions src/cditools/eiger_async.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -35,11 +35,11 @@
# observe_value,
)
from ophyd_async.epics.adcore import (
#ADBaseController,
#ADBaseDatasetDescriber,
# ADBaseController,
# ADBaseDatasetDescriber,
ADBaseIO,
#ADImageMode,
#ADWriter,
# ADImageMode,
# ADWriter,
# AreaDetector,
NDFileIO,
# NDPluginBaseIO,
Expand Down
4 changes: 2 additions & 2 deletions src/cditools/merlin.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ class CDIMerlinDetector(CDIModalTrigger, MerlinDetector):
"HDF1:",
read_attrs=[],
configuration_attrs=[],
write_path_template = '',
write_path_template="",
root="/nsls2/data/cdi/proposals/",
)

Expand Down Expand Up @@ -207,4 +207,4 @@ def stage(self):
return super().stage()

def unstage(self):
return super().unstage()
return super().unstage()
3 changes: 2 additions & 1 deletion src/cditools/merlin_async.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ class MerlinTriggerMode(StrictEnum):
TRIGGER_BOTH_RISING = "Trigger both rising"
SOFTWARE = "Software"


class MerlinTriggerModeRBV(StrictEnum):
"""Trigger modes for the Merlin detector"""

Expand Down Expand Up @@ -128,4 +129,4 @@ def __init__(
plugins=plugins,
config_sigs=config_sigs,
name=name,
)
)
1 change: 0 additions & 1 deletion src/cditools/screens.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
Device,
EpicsMotor,
EpicsSignal,
ImagePlugin,
ProsilicaDetector,
ProsilicaDetectorCam,
ROIPlugin,
Expand Down
Loading