dls-dodal 1.59.1__py3-none-any.whl → 1.60.0__py3-none-any.whl

{dls_dodal-1.59.1.dist-info → dls_dodal-1.60.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.59.1
+Version: 1.60.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>, Joseph Ware <joseph.ware@diamond.ac.uk>, Oliver Silvester <Oliver.Silvester@diamond.ac.uk>, Noemi Frisina <noemi.frisina@diamond.ac.uk>
 License:                                  Apache License
@@ -216,7 +216,7 @@ License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
 Requires-Dist: ophyd-async[ca,pva]>=0.13.2
-Requires-Dist: bluesky==1.14.2
+Requires-Dist: bluesky>=1.14.5
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
 Requires-Dist: pillow
@@ -230,7 +230,6 @@ Requires-Dist: aiofiles
 Requires-Dist: aiohttp
 Requires-Dist: redis
 Requires-Dist: scanspec>=0.7.3
-Requires-Dist: event-model>=1.23
 Requires-Dist: pyzmq==26.3.0
 Requires-Dist: deepdiff
 Requires-Dist: daq-config-server>=v1.0.0-rc.2

{dls_dodal-1.59.1.dist-info → dls_dodal-1.60.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
-dls_dodal-1.59.1.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+dls_dodal-1.60.0.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
 dodal/__init__.py,sha256=Ksms_WJF8LTkbm38gEpm1jBpGqcQ8NGvmb2ZJlOE1j8,198
 dodal/__main__.py,sha256=kP2S2RPitnOWpNGokjZ1Yq-1umOtp5sNOZk2B3tBPLM,111
-dodal/_version.py,sha256=wK0DlFmbBUtBSJrrSyAf2e1H4HULMvk71ss8iHGbVFg,706
+dodal/_version.py,sha256=DQ2eCF3LevBLy0Ytmwazcpp3NBvIb4zB_mzF8VnCjP4,706
 dodal/cli.py,sha256=yi8dXOp0hqzlg4ZZXCRGU-LpDa_ydaropDjyREWbZ5Y,4152
 dodal/log.py,sha256=Rt5O3hFZfMnJvQueZvgagQuXnPqHrFxhponOvVkpfrk,9871
 dodal/utils.py,sha256=abGitd4FLpLnmckF7lUqOKYUL88r5Ex_NGSVgO4gOf4,19305
@@ -9,7 +9,7 @@ dodal/beamline_specific_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 dodal/beamline_specific_utils/i03.py,sha256=P6Ls4FoVtcacH0RJM3v6ZwwGx27oMppcBdW0la-ohTY,377
 dodal/beamline_specific_utils/i05_shared.py,sha256=EsgNlOPq9iRbKv7FinR__gCEwp1S2DRclJdklmBpaxo,336
 dodal/beamlines/README.md,sha256=K9MkL_GomxlsoTB7Mz-_dJA5NNSbmCfMiutchGg3C8o,404
-dodal/beamlines/__init__.py,sha256=pYP4kWH7h3VYXmjXdgbt27T_q-EA5PIyiaMZc7C49UA,3198
+dodal/beamlines/__init__.py,sha256=FU0P25acBYfikeXaVlQz0cMssJRrSRPzjak0FMeB4Bc,3220
 dodal/beamlines/adsim.py,sha256=fxj_P-7PsywdWPjfBAsLoOPiSKtApOKmLWHdQ8xCa3s,2048
 dodal/beamlines/aithre.py,sha256=IoRO5szytOtdkLLEtwYwLl4TLhMllyG6l9A2G1r7Yic,994
 dodal/beamlines/b01_1.py,sha256=c82X3HXysBK0s2_JxJkEg1HPXBNewP_OR_DXBU4izzc,2829
@@ -30,10 +30,12 @@ dodal/beamlines/i10-1.py,sha256=9uivujUOgYMaNeVKMq6ZmR4HdXF4je7VEKGk4RtY5xc,736
 dodal/beamlines/i10.py,sha256=EgVmrF7c5hT2WljDdfBpmYi6GVu4vkKuZ3kURdGM1XU,6141
 dodal/beamlines/i11.py,sha256=hzW5Lh74zDzUD0vqXQzekoFVWDp8qEIc0OPRm0Qepqs,3643
 dodal/beamlines/i13_1.py,sha256=VYVqMN8-njy7YSI08gskRccT-K2paRC9edAx0ah-Cwo,1602
+dodal/beamlines/i15.py,sha256=lmUhh1jt5CtD4P_BzkwNufu814aT3uaQlLyDMY_B5AE,5725
+dodal/beamlines/i15_1.py,sha256=TomeTLsYSvL5en8GPvI8driQa5nMObrB5DrMKckHig8,3898
 dodal/beamlines/i17.py,sha256=Nickt8CKQ9JcQ1D_ulNICUT4jjLF1Aib7D9jblSnzA4,987
 dodal/beamlines/i18.py,sha256=FuU8G-q1piu6BRou-Shj3BQEbNtsF7CUsSIqqkvCKZc,3615
-dodal/beamlines/i19_1.py,sha256=tg3eALJTn9p686VFV7GjfUvChGS1mrh8-98uzjdLj_g,2934
-dodal/beamlines/i19_2.py,sha256=hlpAbSsgmhtxrygIVMPso4YL2jAqRfYWuK_L4TS54Fw,3171
+dodal/beamlines/i19_1.py,sha256=xAI9B3fyUKtoO-tnAF7wWQelrXQ6QrYNgEyncHqVzn4,3057
+dodal/beamlines/i19_2.py,sha256=x-k6Dy2_Jy_9Z4Jh5ytcQWsOQlk4MRAsLOX55Fjz4t0,3171
 dodal/beamlines/i19_optics.py,sha256=8hdlDAAMgFrhcXrp5xCPZtLUlrDUEC9VwKnnuUAMbbU,1150
 dodal/beamlines/i20_1.py,sha256=Zsr1lsH7ySbOgK7RhMVMWzNWZAV-fuYW0iAjSEJZicY,2625
 dodal/beamlines/i21.py,sha256=5v6iiTlY4kWlWvQ_uNidJSotvkdNF3qdjR49l7sIYPc,728
@@ -85,7 +87,7 @@ dodal/devices/focusing_mirror.py,sha256=2UWVrY6bs6_0i-h6JJ_LAUZPX_FgMzIx04JqZafd
 dodal/devices/hutch_shutter.py,sha256=iY3qWxDr8mDlAvN_BYe2gqpXRM1hlfV3ewdwkwh0_v0,3889
 dodal/devices/ipin.py,sha256=eq5jlKw7WGQi8VLrAWpaAIsZmfiVf-5Q0td_B22H6A4,473
 dodal/devices/linkam3.py,sha256=Lkw7c05XyHEEA83djfVFqz_8HN4kROCRqZwLwvHwRdA,2054
-dodal/devices/motors.py,sha256=UIc6JZbzYhgT4Vr3DpHqG53_4q391A9-8W_BWHksSG8,6300
+dodal/devices/motors.py,sha256=3exQwYqTCQsCmtBvv_H5T_Dd5KJXF4__afnR33vTNB0,7741
 dodal/devices/p45.py,sha256=CImflt7ifaOkV20Uip3S8_fde_GlIIhD16y-54ODfHE,1390
 dodal/devices/pgm.py,sha256=92yfr3i4fC92g-HPbbUBrazGs4b9n6CjmJfKxmUrMUY,1157
 dodal/devices/positioner.py,sha256=qf_1uYOI1whS0U5sPA3O3mlZYKrPuW3i0gEKI_q-up0,1289
@@ -94,7 +96,7 @@ dodal/devices/qbpm.py,sha256=FfrWWAHHtYv3fGRT1qljyPpAwoHJYfbooT9CfKg-oXI,465
 dodal/devices/robot.py,sha256=k4Vkjpd3R-wXWf6YbYC1225sSdjvTrZS54v5v6Qy_EU,7003
 dodal/devices/s4_slit_gaps.py,sha256=4KdarIQoRqX4ry3LUS1Km7fkjUFahA0VuTd2DvYEqQ8,446
 dodal/devices/scintillator.py,sha256=JresF8SY_-t1raibzR4f0UoMXnFi-Abh3ywGm2DjhKs,3003
-dodal/devices/slits.py,sha256=b_7ku2sHlzhMHTvWrwiRwee6ufrbxNX9JB_Z0lvk15o,1105
+dodal/devices/slits.py,sha256=IJtipn1N5B7pH64frWcF2TFK8mTFwSYXpGt_FMGl68w,1537
 dodal/devices/smargon.py,sha256=m3wkiyGVrFw1HSnIcV2JPvuWkflSdii-1eZxoePxSkg,5025
 dodal/devices/status.py,sha256=hVrJS1yooQo6PRumRACoIEh-SKBUKxvBlQl-MtLFUMQ,327
 dodal/devices/synchrotron.py,sha256=OHBrTrm4K39XE8BrE9b_Jn_ZfMRyDp9CHCwvmiV-KOc,1989
@@ -102,7 +104,7 @@ dodal/devices/tetramm.py,sha256=IKZ49NtOf65L46Zu5CjX0kjQsYkA-bNIdu4BpMI2iLA,1024
 dodal/devices/thawer.py,sha256=HexahKZ1rUxF9jBMeULruqYt6I7fsl6OgXkvcxPQY3M,1963
 dodal/devices/turbo_slit.py,sha256=xhcnhfbdcTYSYozogw6Li4fF4ofoPsc350rEyrRdaNE,1460
 dodal/devices/undulator.py,sha256=SsgYvIEQUNs_zZiUPAzlw0yJPaSExdmBFltlq5ypbc8,5530
-dodal/devices/v2f.py,sha256=MQiC5vEp2scu99ERcx9N5RIVtn5IYTWEUSFaklgbWKY,1225
+dodal/devices/v2f.py,sha256=TL9fFYKEWENBtos031Ma4D6eDVG1uqUmdJON9aQzwwc,1232
 dodal/devices/watsonmarlow323_pump.py,sha256=xNwjoxW3NJIDkeDWHfb0A8Yj95_KKRXMD9AghvX-WLk,1337
 dodal/devices/webcam.py,sha256=UAx2KF0mKi6I-mJJUb5z56MHY-Wd89-tqyPcFbouQFg,2491
 dodal/devices/xbpm_feedback.py,sha256=HKLY3k52FPe2G-EAg8ir2LSdeUuGvhRD73ibDZ4mjH8,1418
@@ -188,6 +190,13 @@ dodal/devices/i11/spinner.py,sha256=PjumM7QRB7iFUtN4b6xCvxKItYUNX2XLLWDupy5LI_M,
 dodal/devices/i13_1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/i13_1/merlin.py,sha256=mgTFSMJftRzLL-HXAUuJkOYxtyA3Rp8YX0L46JCb30Y,1019
 dodal/devices/i13_1/merlin_controller.py,sha256=myfmByOEXyMrlJZfsjOxDHeGQVwZGfsRtzrfSy2001o,1495
+dodal/devices/i15/dcm.py,sha256=QLqnKhNbkcVuCFEy9yB-2Ga4fAR0EOGZQshfSoVN8-w,3113
+dodal/devices/i15/focussing_mirror.py,sha256=o0foDrdqDJNFO5Mv_Cb42fVLcJ8hrMjLau3uUS7_yWE,1863
+dodal/devices/i15/jack.py,sha256=3FmRdVO54O1rsX3J8VBAYRvbmKOJJveAIz836SKTvoc,1024
+dodal/devices/i15/laue.py,sha256=I6aTJuVV93PjwtMtE_P4ZeUCsKTIvZPoG0HlOTUGGnY,527
+dodal/devices/i15/motors.py,sha256=-kGHisSWc_zuV9m2L0mGgmiSiIZ7puLsimddk28h_7s,831
+dodal/devices/i15/multilayer_mirror.py,sha256=KHalIhgz5QX-SPl-d8ypPwIc72iqmj004pzeIMOhytg,772
+dodal/devices/i15/rail.py,sha256=STXoNC8G7UbaK_wBhRv8RwnLJa2qklqE-XzaWxkD7h0,459
 dodal/devices/i18/KBMirror.py,sha256=W4R3TeulSjosUqAFIIznyWzje_Y2AoEf9f8N-NkisYM,710
 dodal/devices/i18/diode.py,sha256=nk5kvn4LsbhczRpCwHOO0_jJTYOz7MP9qm_uvBWuv7c,1468
 dodal/devices/i19/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -270,8 +279,8 @@ dodal/testing/__init__.py,sha256=AUYZKAvVOs7ZvxO1dVhL0pDTleRO34FQlO5MNe_cwgU,96
 dodal/testing/setup.py,sha256=8cQnrzE5MQD4Etf0eqMarmtr-opsUOMQww-k1V7DzIQ,2442
 dodal/testing/electron_analyser/__init__.py,sha256=-lc1opD2dCv0x678-J-ApOhHtvEvcslfOQ7E613U8-Y,118
 dodal/testing/electron_analyser/device_factory.py,sha256=tkMY6fW3iI02DTD1XXHi4lH6sjo8RHHZBGDHSuTdmNU,2243
-dls_dodal-1.59.1.dist-info/METADATA,sha256=vhekTYIeuSt8iSv0nmyRJljih2oZyHJ8mE1vJiKFuoU,16974
-dls_dodal-1.59.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dls_dodal-1.59.1.dist-info/entry_points.txt,sha256=bycw_EKUzup_rxfCetOwcauXV4kLln_OPpPT8jEnr-I,94
-dls_dodal-1.59.1.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
-dls_dodal-1.59.1.dist-info/RECORD,,
+dls_dodal-1.60.0.dist-info/METADATA,sha256=ZayuvRHyJXBJ91LHyhhe137vN9naAJGFYm5NfbTgZ4E,16941
+dls_dodal-1.60.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dls_dodal-1.60.0.dist-info/entry_points.txt,sha256=bycw_EKUzup_rxfCetOwcauXV4kLln_OPpPT8jEnr-I,94
+dls_dodal-1.60.0.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
+dls_dodal-1.60.0.dist-info/RECORD,,

dodal/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.59.1'
-__version_tuple__ = version_tuple = (1, 59, 1)
+__version__ = version = '1.60.0'
+__version_tuple__ = version_tuple = (1, 60, 0)
 
 __commit_id__ = commit_id = None

dodal/beamlines/__init__.py

@@ -13,6 +13,7 @@ _BEAMLINE_NAME_OVERRIDES = {
     "b07-1": "b07_1",
     "i09-1": "i09_1",
     "i13-1": "i13_1",
+    "i15-1": "i15_1",
     "i20-1": "i20_1",
     "i19-1": "i19_1",
     "i19-2": "i19_2",

dodal/beamlines/i15.py

@@ -0,0 +1,242 @@
+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.devices.i15.dcm import DCM
+from dodal.devices.i15.focussing_mirror import (
+    FocusingMirror,
+    FocusingMirrorHorizontal,
+    FocusingMirrorVertical,
+    FocusingMirrorWithRoll,
+)
+from dodal.devices.i15.jack import JackX, JackY
+from dodal.devices.i15.motors import UpstreamDownstreamPair
+from dodal.devices.motors import (
+    SixAxisGonioKappaPhi,
+    XYStage,
+    XYZPitchYawStage,
+    XYZStage,
+)
+from dodal.devices.slits import Slits, SlitsY
+from dodal.devices.synchrotron import Synchrotron
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("i15")  # Default used when not on a live beamline
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)  # Configure logging and util functions
+set_utils_beamline(BL)
+
+"""
+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()
+def arm() -> UpstreamDownstreamPair:
+    return UpstreamDownstreamPair(f"{PREFIX.beamline_prefix}-MO-LHEAT-01:ARM:")
+
+
+@device_factory()
+def beamstop() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-RS-ABSB-04:")
+
+
+@device_factory()
+def bs2() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-RS-ABSB-08:")
+
+
+@device_factory()
+def bs3() -> XYZStage:
+    return XYZStage(f"{PREFIX.beamline_prefix}-RS-ABSB-09:")
+
+
+@device_factory()
+def dcm() -> DCM:
+    return DCM(f"{PREFIX.beamline_prefix}-OP-DCM-01:")
+
+
+@device_factory()
+def det1z() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-MO-DIFF-01:ARM:DETECTOR:Z")
+
+
+@device_factory()
+def det2z() -> Motor:
+    """Deliberately the same as eht2dtx"""
+    return Motor(f"{PREFIX.beamline_prefix}-MO-TABLE-03:DETECTOR2:Z")
+
+
+@device_factory()
+def diffractometer() -> SixAxisGonioKappaPhi:
+    return SixAxisGonioKappaPhi(
+        prefix=f"{PREFIX.beamline_prefix}-MO-DIFF-01:SAMPLE:",
+        phi_infix="KPHI",
+    )
+
+
+@device_factory()
+def djack1() -> JackX:
+    return JackX(f"{PREFIX.beamline_prefix}-MO-DIFF-01:BASE:")
+
+
+@device_factory()
+def eht2dtx() -> Motor:
+    """Deliberately the same as det2z"""
+    return Motor(f"{PREFIX.beamline_prefix}-MO-TABLE-03:DETECTOR2:Z")
+
+
+@device_factory()
+def f2x() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-RS-ABSB-10:X")
+
+
+@device_factory()
+def fs() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-EA-SHTR-01:")
+
+
+@device_factory()
+def fs2() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-EA-SHTR-02:")
+
+
+@device_factory()
+def hfm() -> FocusingMirrorWithRoll:
+    return FocusingMirrorWithRoll(f"{PREFIX.beamline_prefix}-OP-HFM-01:")
+
+
+@device_factory()
+def laserboard() -> XYZStage:
+    return XYZStage(f"{PREFIX.beamline_prefix}-MO-LHEAT-01:")
+
+
+@device_factory()
+def obj() -> UpstreamDownstreamPair:
+    return UpstreamDownstreamPair(f"{PREFIX.beamline_prefix}-MO-LHEAT-01:OBJ:")
+
+
+@device_factory()
+def opticds() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-MO-LHEAT-01:OPTIC:DS:")
+
+
+@device_factory()
+def opticus() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-MO-LHEAT-01:OPTIC:US:")
+
+
+@device_factory()
+def pin3() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-AL-APTR-03:")
+
+
+@device_factory()
+def pin() -> XYZPitchYawStage:
+    return XYZPitchYawStage(f"{PREFIX.beamline_prefix}-AL-APTR-02:")
+
+
+@device_factory()
+def qbpm1() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-DI-QBPM-01:")
+
+
+@device_factory()
+def qbpm2() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-DI-QBPM-02:")
+
+
+@device_factory()
+def s1() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-01:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def s2() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-02:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def s4() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-04:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def s5() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-05:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def s6() -> SlitsY:
+    return SlitsY(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-06:",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def s7() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-07:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def shd() -> XYZStage:
+    return XYZStage(f"{PREFIX.beamline_prefix}-MO-SHEAD-01:")
+
+
+@device_factory()
+def shd2() -> XYZStage:
+    return XYZStage(f"{PREFIX.beamline_prefix}-MO-SHEAD-02:")
+
+
+@device_factory()
+def shfm() -> FocusingMirrorHorizontal:
+    return FocusingMirrorHorizontal(f"{PREFIX.beamline_prefix}-OP-MIRR-03:HFM:")
+
+
+@device_factory()
+def skb() -> JackY:
+    return JackY(f"{PREFIX.beamline_prefix}-OP-MIRR-03:BASE:")
+
+
+@device_factory()
+def svfm() -> FocusingMirrorVertical:
+    return FocusingMirrorVertical(f"{PREFIX.beamline_prefix}-OP-MIRR-03:VFM:")
+
+
+@device_factory()
+def tab2jack() -> JackX:
+    return JackX(f"{PREFIX.beamline_prefix}-MO-TABLE-03:BASE:")
+
+
+@device_factory()
+def vfm() -> FocusingMirror:
+    return FocusingMirror(f"{PREFIX.beamline_prefix}-OP-VFM-01:")
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()

dodal/beamlines/i15_1.py

@@ -0,0 +1,156 @@
+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.devices.i15.laue import LaueMonochrometer
+from dodal.devices.i15.motors import NumberedTripleAxisStage
+from dodal.devices.i15.multilayer_mirror import MultiLayerMirror
+from dodal.devices.i15.rail import Rail
+from dodal.devices.motors import XYPhiStage, XYStage, YZStage
+from dodal.devices.slits import Slits
+from dodal.devices.synchrotron import Synchrotron
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("i15-1")  # Default used when not on a live beamline
+PREFIX = BeamlinePrefix(BL, suffix="J")
+set_log_beamline(BL)  # Configure logging and util functions
+set_utils_beamline(BL)
+
+"""
+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()
+def attY() -> NumberedTripleAxisStage:
+    return NumberedTripleAxisStage(
+        f"{PREFIX.beamline_prefix}-OP-ATTN-01:",
+        axis1_infix="STICK1",
+        axis2_infix="STICK2",
+        axis3_infix="STICK3",
+    )
+
+
+@device_factory()
+def baseY() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-MO-TABLE-01:Y")
+
+
+@device_factory()
+def blowerY() -> Motor:
+    """Same motor as blowerZ"""
+    return Motor(f"{PREFIX.beamline_prefix}-EA-BLOWR-01:TLATE")
+
+
+@device_factory()
+def blowerZ() -> Motor:
+    """Same motor as blowerY"""
+    return Motor(f"{PREFIX.beamline_prefix}-EA-BLOWR-01:TLATE")
+
+
+@device_factory()
+def bs2() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-MO-SMAR-02:")
+
+
+@device_factory()
+def clean() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-MO-ABSB-01:CLEAN:")
+
+
+@device_factory()
+def det2() -> YZStage:
+    return YZStage(f"{PREFIX.beamline_prefix}-EA-DET-02:")
+
+
+@device_factory()
+def envX() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-MO-TABLE-01:ENV:X")
+
+
+@device_factory()
+def f2y() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-OP-ATTN-02:Y")
+
+
+@device_factory()
+def m1() -> MultiLayerMirror:
+    return MultiLayerMirror(f"{PREFIX.beamline_prefix}-OP-MIRR-01:")
+
+
+@device_factory()
+def rail() -> Rail:
+    return Rail(f"{PREFIX.beamline_prefix}-MO-RAIL-01:")
+
+
+@device_factory(skip=True)
+def sam() -> XYPhiStage:
+    return XYPhiStage(f"{PREFIX.beamline_prefix}-MO-TABLE-01:SAMPLE:", phi_infix="PHI2")
+
+
+@device_factory()
+def slits_1() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-01:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def slits_2() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-02:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def slits_3() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-03:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def slits_4() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-04:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def slits_5() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-05:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def tth() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-MO-TABLE-01:TTH")
+
+
+@device_factory()
+def trans() -> XYPhiStage:
+    return XYPhiStage(prefix=f"{PREFIX.beamline_prefix}-MO-TABLE-01:TRANS:")
+
+
+@device_factory()
+def xtal() -> LaueMonochrometer:
+    return LaueMonochrometer(prefix=f"{PREFIX.beamline_prefix}-OP-LAUE-01:")

dodal/beamlines/i19_1.py

@@ -58,6 +58,8 @@ def oav() -> OAVBeamCentreFile:
     )
 
 
+# NOTE EH1 uses the Zebra 2 box. While a Zebra 1 box exists and is connected
+# on the beamline, it is currently not in use
 @device_factory()
 def zebra() -> Zebra:
     """Get the i19-1 zebra device, instantiate it if it hasn't already been.
@@ -65,7 +67,7 @@ def zebra() -> Zebra:
     """
     return Zebra(
         mapping=I19_1_ZEBRA_MAPPING,
-        prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-03:",
+        prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-02:",
     )
 
 

dodal/beamlines/i19_2.py

@@ -57,7 +57,7 @@ def zebra() -> Zebra:
     """
     return Zebra(
         mapping=I19_2_ZEBRA_MAPPING,
-        prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-01:",
+        prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-03:",
     )
 
 

dodal/devices/i15/dcm.py

@@ -0,0 +1,77 @@
+from typing import Generic, TypeVar
+
+from ophyd_async.core import StandardReadable
+from ophyd_async.epics.motor import Motor
+
+from dodal.devices.common_dcm import (
+    StationaryCrystal,
+)
+
+
+class ThetaYCrystal(StationaryCrystal):
+    def __init__(self, prefix):
+        with self.add_children_as_readables():
+            self.theta = Motor(prefix + "THETA")
+            self.y = Motor(prefix + "Y")
+        super().__init__(prefix)
+
+
+class ThetaRollYZCrystal(ThetaYCrystal):
+    def __init__(self, prefix):
+        with self.add_children_as_readables():
+            self.roll = Motor(prefix + "ROLL")
+            self.z = Motor(prefix + "Z")
+        super().__init__(prefix)
+
+
+Xtal_1 = TypeVar("Xtal_1", bound=StationaryCrystal)
+Xtal_2 = TypeVar("Xtal_2", bound=StationaryCrystal)
+
+
+class DualCrystalMonoSimple(StandardReadable, Generic[Xtal_1, Xtal_2]):
+    """
+    Device for simple double crystal monochromators (DCM), which only allow energy of the beam to be selected.
+
+    Features common across all DCM's should include virtual motors to set energy/wavelength and contain two crystals,
+    each of which can be movable. Some DCM's contain crystals with roll motors, and some contain crystals with roll and pitch motors.
+    This base device accounts for all combinations of this.
+
+    This device is more able to act as a parent for beamline-specific DCM's, in which any other missing signals can be added,
+    as it doesn't assume WAVELENGTH, BRAGG and OFFSET are available for all DCM deivces, as BaseDCM does.
+
+    Bluesky plans using DCM's should be typed to specify which types of crystals are required. For example, a plan
+    which only requires one crystal which can roll should be typed 'def my_plan(dcm: BaseDCM[RollCrystal, StationaryCrystal])`
+    """
+
+    def __init__(
+        self, prefix: str, xtal_1: type[Xtal_1], xtal_2: type[Xtal_2], name: str = ""
+    ) -> None:
+        with self.add_children_as_readables():
+            # Virtual motor PV's which set the physical motors so that the DCM produces requested
+            # wavelength/energy
+            self.energy_in_kev = Motor(prefix + "ENERGY")
+            self._make_crystals(prefix, xtal_1, xtal_2)
+
+        super().__init__(name)
+
+    # Prefix convention is different depending on whether there are one or two controllable crystals
+    def _make_crystals(self, prefix: str, xtal_1: type[Xtal_1], xtal_2: type[Xtal_2]):
+        if StationaryCrystal not in [xtal_1, xtal_2]:
+            self.xtal_1 = xtal_1(f"{prefix}XTAL1:")
+            self.xtal_2 = xtal_2(f"{prefix}XTAL2:")
+        else:
+            self.xtal_1 = xtal_1(prefix)
+            self.xtal_2 = xtal_2(prefix)
+
+
+class DCM(DualCrystalMonoSimple[ThetaRollYZCrystal, ThetaYCrystal]):
+    """
+    A double crystal monocromator device, used to select the beam energy.
+    """
+
+    def __init__(self, prefix: str, name: str = "") -> None:
+        with self.add_children_as_readables():
+            self.calibrated_energy_in_kev = Motor(prefix + "CAL")
+            self.x1 = Motor(prefix + "X1")
+
+        super().__init__(prefix, ThetaRollYZCrystal, ThetaYCrystal, name)

dodal/devices/i15/focussing_mirror.py

@@ -0,0 +1,71 @@
+from ophyd_async.core import StandardReadable
+from ophyd_async.epics.motor import Motor
+
+
+class FocusingMirrorBase(StandardReadable):
+    """Focusing Mirror with curve, ellip & pitch"""
+
+    def __init__(
+        self,
+        prefix: str,
+        name: str = "",
+    ):
+        with self.add_children_as_readables():
+            self.curve = Motor(prefix + "CURVE")
+            self.ellipticity = Motor(prefix + "ELLIP")
+            self.pitch = Motor(prefix + "PITCH")
+
+        super().__init__(name)
+
+
+class FocusingMirrorHorizontal(FocusingMirrorBase):
+    """Focusing Mirror with curve, ellip, pitch & X"""
+
+    def __init__(
+        self,
+        prefix: str,
+        name: str = "",
+    ):
+        with self.add_children_as_readables():
+            self.x = Motor(prefix + "X")
+
+        super().__init__(prefix, name)
+
+
+class FocusingMirrorVertical(FocusingMirrorBase):
+    """Focusing Mirror with curve, ellip, pitch & Y"""
+
+    def __init__(
+        self,
+        prefix: str,
+        name: str = "",
+    ):
+        with self.add_children_as_readables():
+            self.y = Motor(prefix + "Y")
+
+        super().__init__(prefix, name)
+
+
+class FocusingMirror(FocusingMirrorBase):
+    """Focusing Mirror with curve, ellip, pitch, yaw, X & Y"""
+
+    def __init__(
+        self,
+        prefix: str,
+        name: str = "",
+    ):
+        with self.add_children_as_readables():
+            self.yaw = Motor(prefix + "YAW")
+            self.x = Motor(prefix + "X")
+            self.y = Motor(prefix + "Y")
+
+        super().__init__(prefix, name)
+
+
+class FocusingMirrorWithRoll(FocusingMirror):
+    """Focusing Mirror with curve, ellip, pitch, roll, yaw, X & Y"""
+
+    def __init__(self, prefix: str, name: str = "") -> None:
+        with self.add_children_as_readables():
+            self.roll = Motor(prefix + "ROLL")
+        super().__init__(prefix, name)

dodal/devices/i15/jack.py

@@ -0,0 +1,39 @@
+from ophyd_async.core import StandardReadable
+from ophyd_async.epics.motor import Motor
+
+
+class JackX(StandardReadable):
+    """Focusing Mirror"""
+
+    def __init__(
+        self,
+        prefix: str,
+        name: str = "",
+    ):
+        with self.add_children_as_readables():
+            self.rotation = Motor(prefix + "Ry")
+            self.transx = Motor(prefix + "X")
+            self.y1 = Motor(prefix + "Y1")
+            self.y2 = Motor(prefix + "Y2")
+            self.y3 = Motor(prefix + "Y3")
+
+        super().__init__(name)
+
+
+class JackY(StandardReadable):
+    """Focusing Mirror"""
+
+    def __init__(
+        self,
+        prefix: str,
+        name: str = "",
+    ):
+        with self.add_children_as_readables():
+            self.j1 = Motor(prefix + "J1")
+            self.j2 = Motor(prefix + "J2")
+            self.j3 = Motor(prefix + "J3")
+            self.pitch = Motor(prefix + "PITCH")
+            self.roll = Motor(prefix + "ROLL")
+            self.y = Motor(prefix + "Y")
+
+        super().__init__(name)

dodal/devices/i15/laue.py

@@ -0,0 +1,18 @@
+from ophyd_async.core import StandardReadable
+from ophyd_async.epics.motor import Motor
+
+
+class LaueMonochrometer(StandardReadable):
+    def __init__(
+        self,
+        prefix: str,
+        name: str = "",
+    ):
+        with self.add_children_as_readables():
+            self.bend = Motor(prefix + "BENDER")
+            self.bragg = Motor(prefix + "PITCH")
+            self.roll = Motor(prefix + "ROLL")
+            self.yaw = Motor(prefix + "YAW")
+            self.y = Motor(prefix + "Y")
+
+        super().__init__(name)

dodal/devices/i15/motors.py

@@ -0,0 +1,27 @@
+from ophyd_async.epics.motor import Motor
+
+from dodal.devices.motors import Stage
+
+
+class UpstreamDownstreamPair(Stage):
+    def __init__(self, prefix: str, name: str = ""):
+        with self.add_children_as_readables():
+            self.upstream = Motor(prefix + "US")
+            self.downstream = Motor(prefix + "DS")
+        super().__init__(name=name)
+
+
+class NumberedTripleAxisStage(Stage):
+    def __init__(
+        self,
+        prefix: str,
+        name: str = "",
+        axis1_infix: str = "AXIS1",
+        axis2_infix: str = "AXIS2",
+        axis3_infix: str = "AXIS3",
+    ):
+        with self.add_children_as_readables():
+            self.axis1 = Motor(prefix + axis1_infix)
+            self.axis2 = Motor(prefix + axis2_infix)
+            self.axis3 = Motor(prefix + axis3_infix)
+        super().__init__(name=name)

dodal/devices/i15/multilayer_mirror.py

@@ -0,0 +1,25 @@
+from ophyd_async.core import StandardReadable
+from ophyd_async.epics.motor import Motor
+
+
+class MultiLayerMirror(StandardReadable):
+    """Multilayer Mirror"""
+
+    def __init__(
+        self,
+        prefix: str,
+        name: str = "",
+    ):
+        with self.add_children_as_readables():
+            self.ds_x = Motor(prefix + "X2")
+            self.ds_y = Motor(prefix + "J3")
+            self.ib_y = Motor(prefix + "J1")
+            self.ob_y = Motor(prefix + "J2")
+            self.pitch = Motor(prefix + "PITCH")
+            self.roll = Motor(prefix + "ROLL")
+            self.us_x = Motor(prefix + "X1")
+            self.x = Motor(prefix + "X")
+            self.y = Motor(prefix + "Y")
+            self.yaw = Motor(prefix + "YAW")
+
+        super().__init__(name)

dodal/devices/i15/rail.py

@@ -0,0 +1,17 @@
+from ophyd_async.core import StandardReadable
+from ophyd_async.epics.motor import Motor
+
+
+class Rail(StandardReadable):
+    def __init__(
+        self,
+        prefix: str,
+        name: str = "",
+    ):
+        with self.add_children_as_readables():
+            self.pitch = Motor(prefix + "PITCH")
+            self.y = Motor(prefix + "Y")
+            self.y1 = Motor(prefix + "Y1")
+            self.y2 = Motor(prefix + "Y2")
+
+        super().__init__(name)

dodal/devices/motors.py

@@ -70,13 +70,27 @@ class XYZThetaStage(XYZStage):
         x_infix: str = _X,
         y_infix: str = _Y,
         z_infix: str = _Z,
-        theta_infix: str = _Z,
+        theta_infix: str = "THETA",
     ) -> None:
         with self.add_children_as_readables():
             self.theta = Motor(prefix + theta_infix)
         super().__init__(prefix, name, x_infix, y_infix, z_infix)
 
 
+class XYPhiStage(XYStage):
+    def __init__(
+        self,
+        prefix: str,
+        x_infix: str = _X,
+        y_infix: str = _Y,
+        phi_infix: str = "PHI",
+        name: str = "",
+    ) -> None:
+        with self.add_children_as_readables():
+            self.phi = Motor(prefix + phi_infix)
+        super().__init__(prefix, name, x_infix, y_infix)
+
+
 class XYPitchStage(XYStage):
     def __init__(
         self,
@@ -91,6 +105,23 @@ class XYPitchStage(XYStage):
         super().__init__(prefix, name, x_infix, y_infix)
 
 
+class XYZPitchYawStage(XYZStage):
+    def __init__(
+        self,
+        prefix: str,
+        name: str = "",
+        x_infix: str = _X,
+        y_infix: str = _Y,
+        z_infix: str = _Z,
+        pitch_infix="PITCH",
+        yaw_infix="YAW",
+    ):
+        with self.add_children_as_readables():
+            self.pitch = Motor(prefix + pitch_infix)
+            self.yaw = Motor(prefix + yaw_infix)
+        super().__init__(prefix, name, x_infix, y_infix, z_infix)
+
+
 class XYZPitchYawRollStage(XYZStage):
     def __init__(
         self,
@@ -136,6 +167,26 @@ class SixAxisGonio(XYZStage):
         )
 
 
+class SixAxisGonioKappaPhi(XYZStage):
+    def __init__(
+        self,
+        prefix: str,
+        name: str = "",
+        x_infix: str = _X,
+        y_infix: str = _Y,
+        z_infix: str = _Z,
+        kappa_infix: str = "KAPPA",
+        phi_infix: str = "PHI",
+    ):
+        """Six-axis goniometer with a standard xyz stage and two axes of rotation:
+        kappa and phi.
+        """
+        with self.add_children_as_readables():
+            self.kappa = Motor(prefix + kappa_infix)
+            self.phi = Motor(prefix + phi_infix)
+        super().__init__(prefix, name, x_infix, y_infix, z_infix)
+
+
 class YZStage(Stage):
     def __init__(
         self, prefix: str, name: str = "", y_infix: str = _Y, z_infix: str = _Z

dodal/devices/slits.py

@@ -37,3 +37,21 @@ class Slits(MinimalSlits):
             self.x_centre = Motor(prefix + x_centre)
             self.y_centre = Motor(prefix + y_centre)
         super().__init__(prefix=prefix, x_gap=x_gap, y_gap=y_gap, name=name)
+
+
+class SlitsY(StandardReadable):
+    """
+    Representation of a 2-blade slits.
+    """
+
+    def __init__(
+        self,
+        prefix: str,
+        y_gap: str = "Y:SIZE",
+        y_centre: str = "Y:CENTRE",
+        name: str = "",
+    ) -> None:
+        with self.add_children_as_readables():
+            self.y_gap = Motor(prefix + y_gap)
+            self.y_centre = Motor(prefix + y_centre)
+        super().__init__(name=name)

dodal/devices/v2f.py

@@ -10,13 +10,13 @@ class V2FGain(StrictEnum):
     LOW_NOISE7 = "10^7 low noise"
     LOW_NOISE8 = "10^8 low noise"
     LOW_NOISE9 = "10^9 low noise"
-    HIGHSPEED5 = "10^5 high speed"
-    HIGHSPEED6 = "10^6 high speed"
-    HIGHSPEED7 = "10^7 high speed"
-    HIGHSPEED8 = "10^8 high speed"
-    HIGHSPEED9 = "10^9 high speed"
-    HIGHSPEED10 = "10^10 high spd"
-    HIGHSPEED11 = "10^11 high spd"
+    HIGH_SPEED5 = "10^5 high speed"
+    HIGH_SPEED6 = "10^6 high speed"
+    HIGH_SPEED7 = "10^7 high speed"
+    HIGH_SPEED8 = "10^8 high speed"
+    HIGH_SPEED9 = "10^9 high speed"
+    HIGH_SPEED10 = "10^10 high spd"
+    HIGH_SPEED11 = "10^11 high spd"
 
 
 class QDV2F(StandardReadable):