Skip to content

Add cam and webcam devices #2032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jacob720 wants to merge 4 commits into
base: update_dodal_ophyd_async_v0.17a1
Choose a base branch
from
Open

Add cam and webcam devices #2032

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ebe1223
Add cam and webcam devices
jacob720 Apr 27, 2026
f74bc3a
Update names
jacob720 Apr 28, 2026
f974f53
Update to latest ophyd-async
jacob720 Apr 30, 2026
2c6c528
Unskip attenuator
jacob720 Apr 30, 2026
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
76 changes: 76 additions & 0 deletions src/dodal/beamlines/i15_1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
from functools import cache
from pathlib import Path

from ophyd_async.core import PathProvider
from ophyd_async.epics.adcore import ADWriterType, ContAcqDetector
from ophyd_async.epics.motor import Motor

from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
from dodal.common.beamlines.device_helpers import CAM_SUFFIX
from dodal.common.visit import StaticVisitPathProvider
from dodal.device_manager import DeviceManager
from dodal.devices.beamlines.i15.laue import LaueMonochrometer
from dodal.devices.beamlines.i15.motors import NumberedTripleAxisStage
Expand Down Expand Up @@ -34,6 +41,15 @@
"""


@devices.fixture
@cache
def path_provider() -> PathProvider:
return StaticVisitPathProvider(
BL,
Path("/dls/i15-1/data/2026/cm44163-2/"),
)


@devices.factory()
def att_y() -> NumberedTripleAxisStage:
return NumberedTripleAxisStage(
Expand Down Expand Up @@ -221,3 +237,63 @@ def gonio_interlock() -> GonioInterlock:
return GonioInterlock(
bl_prefix=PREFIX.beamline_prefix, interlock_suffix="-VA-OMRON-01:INT3:ILK"
)


@devices.factory()
def webcam_1(path_provider: PathProvider) -> ContAcqDetector:
return ContAcqDetector(
f"{PREFIX.beamline_prefix}-DI-WEB-01:",
path_provider=path_provider,
driver_suffix=CAM_SUFFIX,
cb_suffix="CIRC:",
writer_type=ADWriterType.JPEG,
writer_suffix="JPEG:",
)


@devices.factory()
def webcam_2(path_provider: PathProvider) -> ContAcqDetector:
return ContAcqDetector(
f"{PREFIX.beamline_prefix}-DI-WEB-02:",
path_provider=path_provider,
driver_suffix=CAM_SUFFIX,
cb_suffix="CIRC:",
writer_type=ADWriterType.JPEG,
writer_suffix="JPEG:",
)


@devices.factory()
def cam_1(path_provider: PathProvider) -> ContAcqDetector:
return ContAcqDetector(
f"{PREFIX.beamline_prefix}-DI-CAM-01:",
path_provider=path_provider,
driver_suffix=CAM_SUFFIX,
cb_suffix="CIRC:",
writer_type=ADWriterType.JPEG,
writer_suffix="JPEG:",
)


@devices.factory()
def cam_2(path_provider: PathProvider) -> ContAcqDetector:
return ContAcqDetector(
f"{PREFIX.beamline_prefix}-DI-CAM-02:",
path_provider=path_provider,
driver_suffix=CAM_SUFFIX,
cb_suffix="CIRC:",
writer_type=ADWriterType.JPEG,
writer_suffix="JPEG:",
)


@devices.factory()
def cam_3(path_provider: PathProvider) -> ContAcqDetector:
return ContAcqDetector(
f"{PREFIX.beamline_prefix}-DI-CAM-03:",
path_provider=path_provider,
driver_suffix=CAM_SUFFIX,
cb_suffix="CIRC:",
writer_type=ADWriterType.JPEG,
writer_suffix="JPEG:",
)
Loading