Skip to content

Make vmxm gonio extend XYZWrappedOmegaStage #2057

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
rtuck99 merged 2 commits into from
May 15, 2026
+7 −3
Merged

Make vmxm gonio extend XYZWrappedOmegaStage #2057

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
067e07a
Make vmxm gonio extend XYZWrappedOmegaStage
rtuck99 May 14, 2026
eb3a6fd
Merge branch 'main' into device_changes_for_vmxm_ispyb
rtuck99 May 15, 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
10 changes: 7 additions & 3 deletions src/dodal/beamlines/i02_1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from dodal.devices.beamlines.i02_1.flux import Flux
from dodal.devices.common_dcm import DoubleCrystalMonochromatorBase, StationaryCrystal
from dodal.devices.eiger import EigerDetector
from dodal.devices.motors import XYZOmegaStage
from dodal.devices.motors import XYZWrappedOmegaStage
from dodal.devices.slits import Slits
from dodal.devices.synchrotron import Synchrotron
from dodal.devices.undulator import UndulatorInKeV
Expand Down Expand Up @@ -117,8 +117,12 @@ def s4_slit_gaps() -> Slits:


@devices.factory(use_factory_name=False)
def goniometer() -> XYZOmegaStage:
return XYZOmegaStage(
def goniometer() -> XYZWrappedOmegaStage:
"""Build the goniometer. Although the sample holders constrain omega motion to a small
window of angles, in practice it is usable in plans requiring WrappedAxis since the
amount of rotation ever requested is very limited.
"""
return XYZWrappedOmegaStage(
f"{PREFIX.beamline_prefix}-MO-",
x_infix="SAMP-01:X",
y_infix="GONJK-01:HEIGHT",
Expand Down
Loading