Skip to content

Move i15_1.py from using device_factory to using DeviceManager #1890

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

Merged
DominicOram merged 2 commits into from
Feb 5, 2026
Merged

Move i15_1.py from using device_factory to using DeviceManager #1890

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83a8c17
i15-1 #1882 Move i15_1.py from using device_factory to DeviceManager
Mark-Booth Feb 5, 2026
920218d
Merge branch 'main' into dodal-1882
DominicOram Feb 5, 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
45 changes: 23 additions & 22 deletions src/dodal/beamlines/i15_1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from ophyd_async.epics.motor import Motor

from dodal.common.beamlines.beamline_utils import device_factory
from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
from dodal.device_manager import DeviceManager
from dodal.devices.beamlines.i15.laue import LaueMonochrometer
from dodal.devices.beamlines.i15.motors import NumberedTripleAxisStage
from dodal.devices.beamlines.i15.multilayer_mirror import MultiLayerMirror
Expand All @@ -17,14 +17,15 @@
set_log_beamline(BL) # Configure logging and util functions
set_utils_beamline(BL)

devices = DeviceManager()
"""
Define device factory functions below this point.
A device factory function is any function that has a return type which conforms
to one or more Bluesky Protocols.
"""


@device_factory()
@devices.factory()
def att_y() -> NumberedTripleAxisStage:
return NumberedTripleAxisStage(
f"{PREFIX.beamline_prefix}-OP-ATTN-01:",
Expand All @@ -34,64 +35,64 @@ def att_y() -> NumberedTripleAxisStage:
)


@device_factory()
@devices.factory()
def base_y() -> Motor:
return Motor(f"{PREFIX.beamline_prefix}-MO-TABLE-01:Y")


@device_factory()
@devices.factory()
def blower_y() -> Motor:
"""Same motor as blowerZ."""
return Motor(f"{PREFIX.beamline_prefix}-EA-BLOWR-01:TLATE")


@device_factory()
@devices.factory()
def blower_z() -> Motor:
"""Same motor as blowerY."""
return Motor(f"{PREFIX.beamline_prefix}-EA-BLOWR-01:TLATE")


@device_factory()
@devices.factory()
def bs2() -> XYStage:
return XYStage(f"{PREFIX.beamline_prefix}-MO-SMAR-02:")


@device_factory()
@devices.factory()
def clean() -> XYStage:
return XYStage(f"{PREFIX.beamline_prefix}-MO-ABSB-01:CLEAN:")


@device_factory()
@devices.factory()
def det2() -> YZStage:
return YZStage(f"{PREFIX.beamline_prefix}-EA-DET-02:")


@device_factory()
@devices.factory()
def env_x() -> Motor:
return Motor(f"{PREFIX.beamline_prefix}-MO-TABLE-01:ENV:X")


@device_factory()
@devices.factory()
def f2y() -> Motor:
return Motor(f"{PREFIX.beamline_prefix}-OP-ATTN-02:Y")


@device_factory()
@devices.factory()
def m1() -> MultiLayerMirror:
return MultiLayerMirror(f"{PREFIX.beamline_prefix}-OP-MIRR-01:")


@device_factory()
@devices.factory()
def rail() -> Rail:
return Rail(f"{PREFIX.beamline_prefix}-MO-RAIL-01:")


@device_factory(skip=True)
@devices.factory(skip=True)
def sam() -> XYPhiStage:
return XYPhiStage(f"{PREFIX.beamline_prefix}-MO-TABLE-01:SAMPLE:", phi_infix="PHI2")


@device_factory()
@devices.factory()
def slits_1() -> Slits:
return Slits(
prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-01:",
Expand All @@ -100,7 +101,7 @@ def slits_1() -> Slits:
)


@device_factory()
@devices.factory()
def slits_2() -> Slits:
return Slits(
prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-02:",
Expand All @@ -109,7 +110,7 @@ def slits_2() -> Slits:
)


@device_factory()
@devices.factory()
def slits_3() -> Slits:
return Slits(
prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-03:",
Expand All @@ -118,7 +119,7 @@ def slits_3() -> Slits:
)


@device_factory()
@devices.factory()
def slits_4() -> Slits:
return Slits(
prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-04:",
Expand All @@ -127,7 +128,7 @@ def slits_4() -> Slits:
)


@device_factory()
@devices.factory()
def slits_5() -> Slits:
return Slits(
prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-05:",
Expand All @@ -136,21 +137,21 @@ def slits_5() -> Slits:
)


@device_factory()
@devices.factory()
def synchrotron() -> Synchrotron:
return Synchrotron()


@device_factory()
@devices.factory()
def tth() -> Motor:
return Motor(f"{PREFIX.beamline_prefix}-MO-TABLE-01:TTH")


@device_factory()
@devices.factory()
def trans() -> XYPhiStage:
return XYPhiStage(prefix=f"{PREFIX.beamline_prefix}-MO-TABLE-01:TRANS:")


@device_factory()
@devices.factory()
def xtal() -> LaueMonochrometer:
return LaueMonochrometer(prefix=f"{PREFIX.beamline_prefix}-OP-LAUE-01:")