Skip to content

XThetaStage for tomography #2257

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
tomkane-dls merged 2 commits into from
Nov 3, 2026
Merged

XThetaStage for tomography #2257

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c19304c
swap basic motor for XThetaStage as tomography stage, and rename 'sam…
tomkane-dls Nov 3, 2026
0009569
Merge branch 'main' into visr-tomo-stage
tomkane-dls Nov 3, 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
29 changes: 20 additions & 9 deletions src/dodal/beamlines/b01_1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@
from ophyd_async.core import PathProvider, StaticPathProvider, UUIDFilenameProvider
from ophyd_async.epics.adaravis import AravisDetector
from ophyd_async.epics.adcore import ADWriterFactory, NDROIStatIO
from ophyd_async.epics.motor import Motor
from ophyd_async.epics.pmac import PmacIO
from ophyd_async.fastcs.panda import HDFPanda

from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
from dodal.common.beamlines.device_helpers import DRV_SUFFIX, HDF5_SUFFIX
from dodal.device_manager import DeviceManager
from dodal.devices.beamlines.b01_1.diodes import RGBDiodes
from dodal.devices.motors import XYZStage
from dodal.devices.motors import XThetaStage, XYZStage
from dodal.devices.synchrotron import Synchrotron
from dodal.log import set_beamline as set_log_beamline
from dodal.utils import BeamlinePrefix
Expand Down Expand Up @@ -122,31 +121,43 @@ def tomography_detector(path_provider: PathProvider) -> AravisDetector:


@devices.factory()
def sample_stage() -> XYZStage:
"""An XYZ stage holding the sample.
def spectroscopy_stage() -> XYZStage:
"""An XYZ stage holding the spectroscopy sample.

Returns:
XYZStage: The XYZ sample stage device.
XYZStage: The XYZ spectroscopy stage device.
"""
return XYZStage(
f"{PREFIX.beamline_prefix}-MO-SPEC-01:",
)


@devices.factory()
def tomography_stage() -> Motor:
return Motor(f"{PREFIX.beamline_prefix}-MO-TOMO-01:THETA")
def tomography_stage() -> XThetaStage:
"""An XTheta stage holding the tomography sample.

Returns:
XThetaStage: The XTheta tomography stage device.
"""
return XThetaStage(
prefix=f"{PREFIX.beamline_prefix}-MO-TOMO-01:", x_infix="H", theta_infix="THETA"
)


@devices.factory()
def pmac(sample_stage: XYZStage, tomography_stage) -> PmacIO:
def pmac(spectroscopy_stage: XYZStage, tomography_stage: XThetaStage) -> PmacIO:
"""A Power PMAC.

Returns:
PmacIO: IO interface for the Power PMAC.
"""
return PmacIO(
prefix=f"{PREFIX.beamline_prefix}-MO-PPMAC-01:",
raw_motors=[sample_stage.y, sample_stage.x, tomography_stage],
raw_motors=[
spectroscopy_stage.y,
spectroscopy_stage.x,
tomography_stage.x,
tomography_stage.theta,
],
coord_nums=[1],
)
Loading