dls-dodal 1.36.2__py3-none-any.whl → 1.36.3__py3-none-any.whl

{dls_dodal-1.36.2.dist-info → dls_dodal-1.36.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dls-dodal
-Version: 1.36.2
+Version: 1.36.3
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -216,7 +216,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async>=0.8.0a5
+Requires-Dist: ophyd-async>=0.9.0a1
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json

{dls_dodal-1.36.2.dist-info → dls_dodal-1.36.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 dodal/__init__.py,sha256=Ksms_WJF8LTkbm38gEpm1jBpGqcQ8NGvmb2ZJlOE1j8,198
 dodal/__main__.py,sha256=kP2S2RPitnOWpNGokjZ1Yq-1umOtp5sNOZk2B3tBPLM,111
-dodal/_version.py,sha256=eqat9FvXyrftwP2dajRS3LWZiDD9Pay4_MD5eY1_jxU,413
+dodal/_version.py,sha256=zCUFph3NXnWsNVGniqwz8NKCDOFFa-siapasQGlkWD4,413
 dodal/cli.py,sha256=NieWNUgLUxyck1rHoFAPJjX1xXLzHNdQ-s4wvxYFfps,3757
 dodal/log.py,sha256=0to7CRsbzbgVfAAfKRAMhsaUuKqF2-7CGdQc-z8Uhno,9499
 dodal/utils.py,sha256=h2sNmTlsaznfxusV1Xj_mXtNjzsWjWAgmps6I0YNA3U,18097
@@ -12,12 +12,12 @@ dodal/beamlines/adsim.py,sha256=DUAFS1ueoZ6DK2cmZkiEm3NElnaro1mUvyodv14pSmU,1839
 dodal/beamlines/b01_1.py,sha256=0gLjg0O9ttMjHzszSyJ_GT3fnoAB6u4aJ4MdAfjJbHA,1788
 dodal/beamlines/i03.py,sha256=WOMkGTcrrKqoBNeRObumMA8Nlo404uIr2ccfn8gK-zs,18063
 dodal/beamlines/i04.py,sha256=z8LUbhyfUDU08oSp85hg7hFE8FJkAyLsqPUQScs5SUA,14567
-dodal/beamlines/i10.py,sha256=0ZoFe1vuwNiP2AvNACxuN0OMXJ4DcQ3Oqa0L-w5Ch_M,7744
+dodal/beamlines/i10.py,sha256=4VrbkRFi1HdNrXN_ItMWOROrx1BRbid-ZbtwcgMWP9w,9129
 dodal/beamlines/i13_1.py,sha256=csXHrdwUh4sXTmb4X6ZiiSS_XxRkNShsVoBMxYI6rG0,1833
 dodal/beamlines/i20_1.py,sha256=MaPgONHqpoZuBtkiKEzYtViJnKBM2_ekeP4OdbmuXHE,1158
 dodal/beamlines/i22.py,sha256=tzx8w86uvJHo5TuwPoIUErB7C5mGhqTzlv45qrppld0,7228
 dodal/beamlines/i23.py,sha256=2j5qLoqE_hg9ETHqNkOVu7LLkVB8qalgXeORnVYKN_I,1075
-dodal/beamlines/i24.py,sha256=w9xkufc7CluVj5nvQww1B7k8VN5RzNQ6AsX8bfyAi9k,8544
+dodal/beamlines/i24.py,sha256=bV1OqQP0KdJDM5SLsru6TGYLSxwXSy2GExpG44Qfo0w,8539
 dodal/beamlines/p38.py,sha256=JJbclLYoRdIxcpzpW4oTj77YJ001CdEAM0bKRk7seYI,8735
 dodal/beamlines/p45.py,sha256=N4SDTIFok3uMqb37higZHMr3xRjxItsT4ib_KacKKAE,2935
 dodal/beamlines/p99.py,sha256=I6c_3NbvEPOpy2z1uwLRqwCkd83Sf15-OXEykLkn0-c,910
@@ -39,7 +39,7 @@ dodal/devices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/adsim.py,sha256=vCexraF4zLssHdjfPod-XuQGJE_sWoCttFdx__HDS8w,488
 dodal/devices/aperture.py,sha256=yyw2ei3gM_lmZWDQ6VTbydB58RCDTen_nqBZyoTP2IM,583
 dodal/devices/aperturescatterguard.py,sha256=PRNnGbxYKFWoa1m70Mz-6Ta4NtFG0ShUprBvv2viUeI,8993
-dodal/devices/apple2_undulator.py,sha256=HtjHiDX80n_nzabuFcUioH-gWH1a6VjZzw_xStq7S4w,22470
+dodal/devices/apple2_undulator.py,sha256=ls_qGM_nGsZdo4I_Zs_stFjUc1oZE6zB1puWrV8-2Wg,22470
 dodal/devices/attenuator.py,sha256=SEDnnNeUpwBArJbPcwHyr5BwkHO1Jvgsrw1bpFz5u-o,2894
 dodal/devices/backlight.py,sha256=nQIr3J-I-OXnOUoWmr3ruy3nhq_q2US1KXC4NrGG_2U,1634
 dodal/devices/cryostream.py,sha256=K-ldpredpeDTzNt4qtQMg99nKJNjBYoXBbK0WJGexzw,656
@@ -53,7 +53,7 @@ dodal/devices/flux.py,sha256=RtPStHw7Mad0igVKntKWVZfuZn2clokVJqH14HLix6M,198
 dodal/devices/focusing_mirror.py,sha256=vdUPkwyCAZBSR3LQ-EojDOoxVy1ZmOaD_nevETbj7BA,6592
 dodal/devices/hutch_shutter.py,sha256=WXY9JwqAa5prbf72IP7_MTKndPDtAltCpPJlNbq-F_0,3313
 dodal/devices/ipin.py,sha256=eq5jlKw7WGQi8VLrAWpaAIsZmfiVf-5Q0td_B22H6A4,473
-dodal/devices/linkam3.py,sha256=O1ufCb5ce6nfGXVwiO3I1WEnZ_Jp0azWxBcrZ7PWQm4,3869
+dodal/devices/linkam3.py,sha256=2sf-_heIsDg4qmqae-w9C2Py8pG8bPB3mT0TFPQIzd0,3869
 dodal/devices/logging_ophyd_device.py,sha256=dUVE-XhWA56WUXez0mrc4sf322CXY3MVLreTycO5j_A,668
 dodal/devices/motors.py,sha256=mduFm9vTZfu9rhwL93AMZpDzGd2TASdqalWzRaMoqec,1114
 dodal/devices/p45.py,sha256=jzBW2fGRhIbGzSRs5Fgupxro6aqE611n1RTcrTTG-yY,1047
@@ -64,11 +64,11 @@ dodal/devices/robot.py,sha256=laLwekoO9RsZzfag_6UGf8NhcGZ5deP4JAutvHqo2KM,5336
 dodal/devices/s4_slit_gaps.py,sha256=j3kgF9WfGFaU9xdUuiAh-QqI5u_vhiAftaDVINt91SM,243
 dodal/devices/scatterguard.py,sha256=jx03in9QgaThWxD4t1S8_Llent2kWrn_hThJ9KkUWTk,330
 dodal/devices/scintillator.py,sha256=PlD6cnJ39PTB_e7QrRspPliLYE4kL_K7ziJURzuxgdA,365
-dodal/devices/slits.py,sha256=uOyVmbgeygiP6e5Z9t5zMPXLuVEWFfYg9GB3ZU76Tug,600
+dodal/devices/slits.py,sha256=b_7ku2sHlzhMHTvWrwiRwee6ufrbxNX9JB_Z0lvk15o,1105
 dodal/devices/smargon.py,sha256=tOHb9fjI8ZCIrboiC4OzS2j1QJDOKkAlQ2SORbBmaGo,4708
 dodal/devices/status.py,sha256=hVrJS1yooQo6PRumRACoIEh-SKBUKxvBlQl-MtLFUMQ,327
 dodal/devices/synchrotron.py,sha256=wLfClZ1lYQWA_D--UsM3NnKLG8bY8mvVsRYER6ob-Ew,2026
-dodal/devices/tetramm.py,sha256=460luDYab-u1QB0CPe7lPihtm9nZxdCDGtLPnXI-XGo,8447
+dodal/devices/tetramm.py,sha256=17uUbwcK7G7RTZ0Q37PgQ8HOot6iMJ_dPGFO8ZblEZM,8455
 dodal/devices/thawer.py,sha256=4t4yF4VDIrT_tQ8RwjmXe_hDMwVjR8A-4rDkPx19b28,1672
 dodal/devices/turbo_slit.py,sha256=B6SPXqviMnG-U4PnUF1BdTO0LBKmTuwAUKRbxMiNJXo,1125
 dodal/devices/undulator.py,sha256=rQjDhrvgf4uXUEO17CiLopNDEagWOgkmpa02BarozDE,5295
@@ -76,7 +76,7 @@ dodal/devices/undulator_dcm.py,sha256=4Y1ZgKatBenQgg4DuZnMtKwLDOH2YvUMo1QkFE0aaX
 dodal/devices/watsonmarlow323_pump.py,sha256=rwU94YE6esgGLYdh-pe8nBo_3tvgp6brrrbPDrqp5_M,1406
 dodal/devices/webcam.py,sha256=mef075ynDbzZ4pNAjfxR_9tdTTqF_rM7hAOVEEOV-Do,2408
 dodal/devices/xbpm_feedback.py,sha256=j8MHhhE0feoe6R54zPKqS5EbQ0bEDR-nOpLHzHhnHHQ,1156
-dodal/devices/zebra.py,sha256=p191eIGfmwM2EE1YJn6rRgChim2kqXl2KIYbMPUSOvg,9474
+dodal/devices/zebra.py,sha256=cOcohj57eDKWgd-747EsL1ypPQWrOVc68EB_9D4L8CI,9474
 dodal/devices/zebra_controlled_shutter.py,sha256=5-SH5HoXp_6P-xAtfDFJKQq6mBDwreubuCULSz78fgw,1852
 dodal/devices/areadetector/plugins/CAM.py,sha256=sZzJm5Ez3eWfXZi_EB67wluhZmMQm1UyOc2bJFfzd1U,964
 dodal/devices/areadetector/plugins/MJPG.py,sha256=QTsxCoWbofNpLMGPoOR2hWoM33KyntuLepbF0YmX0KE,3031
@@ -89,7 +89,9 @@ dodal/devices/detector/detector_motion.py,sha256=UGDQriDWRluDZOZh1mDX9w_fPjMD-_B
 dodal/devices/i03/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/i04/transfocator.py,sha256=uieByXIj0JRbmvMB_om5NOAEbEJkzfkCD24bl2aEo1g,3154
 dodal/devices/i10/i10_apple2.py,sha256=pEZes8wVCPHiOOcuVhEtqPvtnyphMxqbdp39mDp6xXQ,13165
-dodal/devices/i10/i10_setting_data.py,sha256=Pc78L9asOLot9WmKcxkxpaefB3h4FeKIolHcGO4JnOU,161
+dodal/devices/i10/i10_setting_data.py,sha256=69XWgE-YNTiW7C3t67MNcTL5JDDhOo7h-X7DCTpFE5g,164
+dodal/devices/i10/mirrors.py,sha256=E0M5keGI3LGaDHyXQkCCyj6xmixNY1xTSkIaaYwtnP8,794
+dodal/devices/i10/slits.py,sha256=4X50bGiJhTIHxhsOrv-8DATBkQPwQgEaFMNa2OsPrFY,1201
 dodal/devices/i20_1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/i22/dcm.py,sha256=SQDh-Sj1OvplHZ9yTWblJwv8PJrUqxseDPupZOWmcLo,4701
 dodal/devices/i22/fswitch.py,sha256=LSMoo9aDkH0SLcojbUh2NxTWIpUXHZxauTqThc3XtSk,3073
@@ -99,8 +101,8 @@ dodal/devices/i24/aperture.py,sha256=XlnOyQsvdTom1dJHVUg8CUSthq3jlBlZFOUaa9b1eZ4
 dodal/devices/i24/beam_center.py,sha256=c5NRCBjhg9hMjznNMDipIq0M8-T8yM78IzhcRdpNtGw,470
 dodal/devices/i24/beamstop.py,sha256=89ncXUisia1rn1Faf5iWg3k0QW6Rm99j1vq9A8l9Xv8,1221
 dodal/devices/i24/dcm.py,sha256=Q3qqlgsiLJga2cgI8L4jczjyUgQixJh6QWg7shrFpTQ,1988
-dodal/devices/i24/dual_backlight.py,sha256=mhbM4CzfjWQ883ebnG4oP1PLa1I4BlR30s-Ly5nXXb0,2023
-dodal/devices/i24/focus_mirrors.py,sha256=Z5ZSJeKdHa8vGlUNxzZz9fe6pQ1uJUWX6JFHbfPO1JQ,1845
+dodal/devices/i24/dual_backlight.py,sha256=CbQ9mYUNhhozVdNXqR5ac73tEIAWT2RnEpRwXB3EFog,2049
+dodal/devices/i24/focus_mirrors.py,sha256=HO3B4yjV-HMvjkgFd2xTvXft75Qj4lN8d0RNg6HJ4Lo,1857
 dodal/devices/i24/i24_detector_motion.py,sha256=_HgdsZqFYY0tKqUgMzViHaPEUFXL3WlXXioGvDehRUw,364
 dodal/devices/i24/pilatus_metadata.py,sha256=fV8AQSBYGx1Qc91Rqj8VhcFPqPLqLCePNpDdmhcrTYM,1827
 dodal/devices/i24/pmac.py,sha256=lz9FYU_8YN8cC51ddTzdxcUA7MCVTA_ho3P0CHJ9zCo,6837
@@ -119,7 +121,7 @@ dodal/devices/oav/snapshots/grid_overlay.py,sha256=CdvCdTKMCiwMwxm2lV28KpcIUSXls
 dodal/devices/oav/snapshots/snapshot_with_beam_centre.py,sha256=J77RfE3AGTLNdWc6hvsRn2DUdupzuk_FTDGvdP0jqbU,1962
 dodal/devices/oav/snapshots/snapshot_with_grid.py,sha256=EBoCtr1NmOKye2yQHqbTBxSg-DsEKFeyBtMFmOeGPRs,2269
 dodal/devices/p99/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/p99/sample_stage.py,sha256=B795PAcvrtHo3AZexPyke8R7t-g-0Vr3BhO0fQz_wF8,1189
+dodal/devices/p99/sample_stage.py,sha256=v2-KSvuxCmpreVUh0p2OLGj6d1MR_li56cvMBWbvF9g,1189
 dodal/devices/training_rig/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/training_rig/sample_stage.py,sha256=jktTp837ij8wor5LidE3AajCk95L7DebJotMlO7QwTE,355
 dodal/devices/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -128,8 +130,8 @@ dodal/devices/util/epics_util.py,sha256=A8iNL79PnxntuxPTKA9oLGaDRKhnXaaeAVJwS6FN
 dodal/devices/util/lookup_tables.py,sha256=Bk-wZk7JO5_j_8gbot-8reirVqxvFUg9_SIqEIOVZu0,2025
 dodal/devices/util/motor_utils.py,sha256=pNY-aUk9LxaIWeDr5rpMS6udiB9j19wcCXkNDLp1uA0,257
 dodal/devices/util/save_panda.py,sha256=PHFlkerBhkkU0-o5dNEdi2P95_jD9Lk8yYgaqn9R97o,2538
-dodal/devices/util/test_utils.py,sha256=VrSFFGLNKOcCAsWFMZOxwhng3wGR5kV8NqqnKfj8Vuw,562
-dodal/devices/xspress3/xspress3.py,sha256=pD46vyjbblrzE3xhP2ZGcStmN06cp41gSOLuff_bQTs,4636
+dodal/devices/util/test_utils.py,sha256=x0QVKVeST4T-wpsVSSm-169MyNRXlmybVWnPTefv1as,565
+dodal/devices/xspress3/xspress3.py,sha256=75RdPuHpES4Xi-Lcywz0XUhaN2G3vZSoc-dzgcxfNvs,4636
 dodal/devices/xspress3/xspress3_channel.py,sha256=w8tAx2lz5kJ_LeJ_eb_4o--Dtt8MRijsYNgDG6oEIVg,1626
 dodal/devices/zocalo/__init__.py,sha256=dRAZ9o7B9TACqyE7aanT3yzvqWtt019YgV5ZJY7Ylso,517
 dodal/devices/zocalo/zocalo_constants.py,sha256=vu7Xjz7UNEpBUWEEBxDvP4bVFkZIN6NLGfQDpWbCjH8,98
@@ -144,9 +146,9 @@ dodal/plan_stubs/wrapped.py,sha256=nriHKX4BF010CmrhdoUhY3-txClW5W8TPLz64kE_AXU,4
 dodal/plans/__init__.py,sha256=nH1jNxw3DzDMg9O8Uda0kqKIalRVEWBrq07OLY6Ey38,93
 dodal/plans/scanspec.py,sha256=Q0AcvTKRT401iGMRDSqK-D523UX5_ofiVMZ_rNXKOx8,2074
 dodal/plans/wrapped.py,sha256=Cr2iOpQCuk2ORKo5CZOh-zbQXAjoTfaLrfm7r1--GhU,2098
-dls_dodal-1.36.2.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-dls_dodal-1.36.2.dist-info/METADATA,sha256=CWBsjskEIuoboOXY_f3RJ4xuoDWdR5c9RhDjsuqNL3w,16655
-dls_dodal-1.36.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-dls_dodal-1.36.2.dist-info/entry_points.txt,sha256=bycw_EKUzup_rxfCetOwcauXV4kLln_OPpPT8jEnr-I,94
-dls_dodal-1.36.2.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
-dls_dodal-1.36.2.dist-info/RECORD,,
+dls_dodal-1.36.3.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+dls_dodal-1.36.3.dist-info/METADATA,sha256=kxGKgtp3OTCkpiOdg7edQ8FCV9G8Hw4klZobJMmibSA,16655
+dls_dodal-1.36.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+dls_dodal-1.36.3.dist-info/entry_points.txt,sha256=bycw_EKUzup_rxfCetOwcauXV4kLln_OPpPT8jEnr-I,94
+dls_dodal-1.36.3.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
+dls_dodal-1.36.3.dist-info/RECORD,,

dodal/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.36.2'
-__version_tuple__ = version_tuple = (1, 36, 2)
+__version__ = version = '1.36.3'
+__version_tuple__ = version_tuple = (1, 36, 3)

dodal/beamlines/i10.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from dodal.common.beamlines.beamline_utils import device_instantiation
+from dodal.common.beamlines.beamline_utils import device_factory, device_instantiation
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.devices.apple2_undulator import (
     UndulatorGap,
@@ -14,13 +14,18 @@ from dodal.devices.i10.i10_apple2 import (
     LinearArbitraryAngle,
 )
 from dodal.devices.i10.i10_setting_data import I10Grating
+from dodal.devices.i10.mirrors import PiezoMirror
+from dodal.devices.i10.slits import I10PrimarySlits, I10Slits
 from dodal.devices.pgm import PGM
+from dodal.devices.slits import MinimalSlits
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
 BL = get_beamline_name("i10")
 set_log_beamline(BL)
 set_utils_beamline(BL)
+PREFIX = BeamlinePrefix(BL)
+
 
 LOOK_UPTABLE_DIR = "/dls_sw/i10/software/gda/workspace_git/gda-diamond.git/configurations/i10-shared/lookupTables/"
 """
@@ -39,7 +44,7 @@ def idd_gap(
     return device_instantiation(
         device_factory=UndulatorGap,
         name="idd_gap",
-        prefix=f"{BeamlinePrefix(BL).insertion_prefix}-MO-SERVC-01:",
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
         wait=wait_for_connection,
         fake=fake_with_ophyd_sim,
         bl_prefix=False,
@@ -52,7 +57,7 @@ def idd_phase_axes(
     return device_instantiation(
         device_factory=UndulatorPhaseAxes,
         name="idd_phase_axes",
-        prefix=f"{BeamlinePrefix(BL).insertion_prefix}-MO-SERVC-01:",
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
         top_outer="RPQ1",
         top_inner="RPQ2",
         btm_inner="RPQ3",
@@ -69,7 +74,7 @@ def idd_jaw(
     return device_instantiation(
         device_factory=UndulatorJawPhase,
         name="idd_jaw",
-        prefix=f"{BeamlinePrefix(BL).insertion_prefix}-MO-SERVC-01:",
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
         move_pv="RPQ1",
         wait=wait_for_connection,
         fake=fake_with_ophyd_sim,
@@ -83,7 +88,7 @@ def idu_gap(
     return device_instantiation(
         device_factory=UndulatorGap,
         name="idu_gap",
-        prefix=f"{BeamlinePrefix(BL).insertion_prefix}-MO-SERVC-21:",
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-21:",
         wait=wait_for_connection,
         fake=fake_with_ophyd_sim,
         bl_prefix=False,
@@ -96,7 +101,7 @@ def idu_phase_axes(
     return device_instantiation(
         device_factory=UndulatorPhaseAxes,
         name="idu_phase_axes",
-        prefix=f"{BeamlinePrefix(BL).insertion_prefix}-MO-SERVC-21:",
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-21:",
         top_outer="RPQ1",
         top_inner="RPQ2",
         btm_inner="RPQ3",
@@ -113,7 +118,7 @@ def idu_jaw(
     return device_instantiation(
         device_factory=UndulatorJawPhase,
         name="idu_jaw",
-        prefix=f"{BeamlinePrefix(BL).insertion_prefix}-MO-SERVC-21:",
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-21:",
         move_pv="RPQ1",
         wait=wait_for_connection,
         fake=fake_with_ophyd_sim,
@@ -255,3 +260,65 @@ def idd_la_angle(
         wait=wait_for_connection,
         fake=fake_with_ophyd_sim,
     )
+
+
+@device_factory()
+def first_mirror() -> PiezoMirror:
+    return PiezoMirror(prefix=f"{PREFIX.beamline_prefix}-OP-COL-01:")
+
+
+@device_factory()
+def switching_mirror() -> PiezoMirror:
+    return PiezoMirror(prefix=f"{PREFIX.beamline_prefix}-OP-SWTCH-01:")
+
+
+@device_factory()
+def slit_1() -> I10PrimarySlits:
+    return I10PrimarySlits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-01:",
+    )
+
+
+@device_factory()
+def slit_2() -> I10Slits:
+    return I10Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-02:",
+    )
+
+
+@device_factory()
+def slit_3() -> I10Slits:
+    return I10Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-03:",
+    )
+
+
+"""Rasor devices"""
+
+
+@device_factory()
+def focusing_mirror() -> PiezoMirror:
+    return PiezoMirror(prefix=f"{PREFIX.beamline_prefix}-OP-FOCS-01:")
+
+
+@device_factory()
+def slit_4() -> MinimalSlits:
+    return MinimalSlits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-04:",
+        x_gap="XSIZE",
+        y_gap="YSIZE",
+    )
+
+
+@device_factory()
+def slit_5() -> I10Slits:
+    return I10Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-05:",
+    )
+
+
+@device_factory()
+def slit_6() -> I10Slits:
+    return I10Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-06:",
+    )

dodal/beamlines/i24.py

@@ -21,7 +21,7 @@ from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import get_beamline_name, skip_device
 
 ZOOM_PARAMS_FILE = (
-    "/dls_sw/i24/software/gda_versions/gda_9_34/config/xml/jCameraManZoomLevels.xml"
+    "/dls_sw/i24/software/gda_versions/gda/config/xml/jCameraManZoomLevels.xml"
 )
 DISPLAY_CONFIG = "/dls_sw/i24/software/gda_versions/var/display.configuration"
 

dodal/devices/apple2_undulator.py

@@ -21,8 +21,8 @@ from dodal.log import LOGGER
 
 
 class UndulatorGateStatus(StrictEnum):
-    open = "Open"
-    close = "Closed"
+    OPEN = "Open"
+    CLOSE = "Closed"
 
 
 @dataclass
@@ -146,7 +146,7 @@ class UndulatorGap(StandardReadable, Movable):
         timeout = await self._cal_timeout()
         LOGGER.info(f"Moving {self.name} to {value} with timeout = {timeout}")
         await self.set_move.set(value=1, timeout=timeout)
-        await wait_for_value(self.gate, UndulatorGateStatus.close, timeout=timeout)
+        await wait_for_value(self.gate, UndulatorGateStatus.CLOSE, timeout=timeout)
 
     async def _cal_timeout(self) -> float:
         vel = await self.velocity.get_value()
@@ -157,7 +157,7 @@ class UndulatorGap(StandardReadable, Movable):
     async def check_id_status(self) -> None:
         if await self.fault.get_value() != 0:
             raise RuntimeError(f"{self.name} is in fault state")
-        if await self.gate.get_value() == UndulatorGateStatus.open:
+        if await self.gate.get_value() == UndulatorGateStatus.OPEN:
             raise RuntimeError(f"{self.name} is already in motion.")
 
     async def get_timeout(self) -> float:
@@ -251,7 +251,7 @@ class UndulatorPhaseAxes(StandardReadable, Movable):
         )
         timeout = await self._cal_timeout()
         await self.set_move.set(value=1, timeout=timeout)
-        await wait_for_value(self.gate, UndulatorGateStatus.close, timeout=timeout)
+        await wait_for_value(self.gate, UndulatorGateStatus.CLOSE, timeout=timeout)
 
     async def _cal_timeout(self) -> float:
         """
@@ -283,7 +283,7 @@ class UndulatorPhaseAxes(StandardReadable, Movable):
     async def check_id_status(self) -> None:
         if await self.fault.get_value() != 0:
             raise RuntimeError(f"{self.name} is in fault state")
-        if await self.gate.get_value() == UndulatorGateStatus.open:
+        if await self.gate.get_value() == UndulatorGateStatus.OPEN:
             raise RuntimeError(f"{self.name} is already in motion.")
 
     async def get_timeout(self) -> float:
@@ -325,7 +325,7 @@ class UndulatorJawPhase(StandardReadable, Movable):
         )
         timeout = await self._cal_timeout()
         await self.set_move.set(value=1, timeout=timeout)
-        await wait_for_value(self.gate, UndulatorGateStatus.close, timeout=timeout)
+        await wait_for_value(self.gate, UndulatorGateStatus.CLOSE, timeout=timeout)
 
     async def _cal_timeout(self) -> float:
         """
@@ -345,7 +345,7 @@ class UndulatorJawPhase(StandardReadable, Movable):
     async def check_id_status(self) -> None:
         if await self.fault.get_value() != 0:
             raise RuntimeError(f"{self.name} is in fault state")
-        if await self.gate.get_value() == UndulatorGateStatus.open:
+        if await self.gate.get_value() == UndulatorGateStatus.OPEN:
             raise RuntimeError(f"{self.name} is already in motion.")
 
     async def get_timeout(self) -> float:
@@ -458,7 +458,7 @@ class Apple2(StandardReadable, Movable):
             self.phase().set_move.set(value=1, timeout=timeout),
         )
         await wait_for_value(
-            self.gap().gate, UndulatorGateStatus.close, timeout=timeout
+            self.gap().gate, UndulatorGateStatus.CLOSE, timeout=timeout
         )
         self._energy_set(energy)  # Update energy for after move for readback.
 

dodal/devices/i10/i10_setting_data.py

@@ -2,6 +2,6 @@ from ophyd_async.core import StrictEnum
 
 
 class I10Grating(StrictEnum):
-    Au400 = "400 line/mm Au"
-    Si400 = "400 line/mm Si"
-    Au1200 = "1200 line/mm Au"
+    AU_400 = "400 line/mm Au"
+    SI_400 = "400 line/mm Si"
+    AU_1200 = "1200 line/mm Au"

dodal/devices/i10/mirrors.py

@@ -0,0 +1,24 @@
+from ophyd_async.core import StandardReadable
+from ophyd_async.epics.core import epics_signal_rw
+from ophyd_async.epics.motor import Motor
+
+
+class PiezoMirror(StandardReadable):
+    def __init__(
+        self,
+        prefix: str,
+        name: str = "",
+    ):
+        with self.add_children_as_readables():
+            self.x = Motor(prefix + "X")
+            self.y = Motor(prefix + "Y")
+            self.z = Motor(prefix + "Z")
+            self.yaw = Motor(prefix + "YAW")
+            self.pitch = Motor(prefix + "PITCH")
+            self.roll = Motor(prefix + "ROLL")
+            self.fine_pitch = epics_signal_rw(
+                float,
+                read_pv=prefix + "FPITCH:RBV:AI",
+                write_pv=prefix + "FPITCH:DMD:AO",
+            )
+        super().__init__(name=name)

dodal/devices/i10/slits.py

@@ -0,0 +1,37 @@
+from ophyd_async.epics.motor import Motor
+
+from dodal.devices.slits import Slits
+
+
+class I10Slits(Slits):
+    def __init__(self, prefix: str, name: str = "") -> None:
+        with self.add_children_as_readables():
+            self.x_ring_blade = Motor(prefix + "XRING")
+            self.x_hall_blade = Motor(prefix + "XHALL")
+            self.y_top_blade = Motor(prefix + "YPLUS")
+            self.y_bot_blade = Motor(prefix + "YMINUS")
+        super().__init__(
+            prefix=prefix,
+            x_gap="XSIZE",
+            x_centre="XCENTRE",
+            y_gap="YSIZE",
+            y_centre="YCENTRE",
+            name=name,
+        )
+
+
+class I10PrimarySlits(Slits):
+    def __init__(self, prefix: str, name: str = "") -> None:
+        with self.add_children_as_readables():
+            self.x_aptr_1 = Motor(prefix + "APTR1:X")
+            self.x_aptr_2 = Motor(prefix + "APTR2:X")
+            self.y_aptr_1 = Motor(prefix + "APTR1:Y")
+            self.y_aptr_1 = Motor(prefix + "APTR2:Y")
+        super().__init__(
+            prefix=prefix,
+            x_gap="XSIZE",
+            x_centre="XCENTRE",
+            y_gap="YSIZE",
+            y_centre="YCENTRE",
+            name=name,
+        )

dodal/devices/i24/dual_backlight.py

@@ -8,6 +8,7 @@ class BacklightPositions(StrictEnum):
     LOAD_CHECK = "LoadCheck"
     OAV2 = "OAV2"
     DIODE = "Diode"
+    WHITE_IN = "White In"
 
 
 class LEDStatus(StrictEnum):

dodal/devices/i24/focus_mirrors.py

@@ -5,21 +5,21 @@ from dodal.common.signal_utils import create_hardware_backed_soft_signal
 
 
 class HFocusMode(StrictEnum):
-    focus10 = "HMFMfocus10"
-    focus20d = "HMFMfocus20d"
-    focus30d = "HMFMfocus30d"
-    focus50d = "HMFMfocus50d"
-    focus1050d = "HMFMfocus1030d"
-    focus3010d = "HMFMfocus3010d"
+    FOCUS_10 = "HMFMfocus10"
+    FOCUS_20D = "HMFMfocus20d"
+    FOCUS_30D = "HMFMfocus30d"
+    FOCUS_50D = "HMFMfocus50d"
+    FOCUS_1050D = "HMFMfocus1030d"
+    FOCUS_3010D = "HMFMfocus3010d"
 
 
 class VFocusMode(StrictEnum):
-    focus10 = "VMFMfocus10"
-    focus20d = "VMFMfocus20d"
-    focus30d = "VMFMfocus30d"
-    focus50d = "VMFMfocus50d"
-    focus1030d = "VMFMfocus1030d"
-    focus3010d = "VMFMfocus3010d"
+    FOCUS_10 = "VMFMfocus10"
+    FOCUS_20D = "VMFMfocus20d"
+    FOCUS_30D = "VMFMfocus30d"
+    FOCUS_50D = "VMFMfocus50d"
+    FOCUS_1030D = "VMFMfocus1030d"
+    FOCUS_3010D = "VMFMfocus3010d"
 
 
 BEAM_SIZES = {

dodal/devices/linkam3.py

@@ -14,8 +14,8 @@ from ophyd_async.epics.core import epics_signal_r, epics_signal_rw
 
 
 class PumpControl(StrictEnum):
-    Manual = "Manual"
-    Auto = "Auto"
+    MANUAL = "Manual"
+    AUTO = "Auto"
 
 
 class Linkam3(StandardReadable):

dodal/devices/p99/sample_stage.py

@@ -12,22 +12,22 @@ class SampleAngleStage(StandardReadable):
 
 
 class p99StageSelections(SubsetEnum):
-    Empty = "Empty"
-    Mn5um = "Mn 5um"
-    Fe = "Fe (empty)"
-    Co5um = "Co 5um"
-    Ni5um = "Ni 5um"
-    Cu5um = "Cu 5um"
-    Zn5um = "Zn 5um"
-    Zr = "Zr (empty)"
-    Mo = "Mo (empty)"
-    Rh = "Rh (empty)"
-    Pd = "Pd (empty)"
-    Ag = "Ag (empty)"
-    Cd25um = "Cd 25um"
+    EMPTY = "Empty"
+    MN5UM = "Mn 5um"
+    FE = "Fe (empty)"
+    CO5UM = "Co 5um"
+    NI5UM = "Ni 5um"
+    CU5UM = "Cu 5um"
+    ZN5UM = "Zn 5um"
+    ZR = "Zr (empty)"
+    MO = "Mo (empty)"
+    RH = "Rh (empty)"
+    PD = "Pd (empty)"
+    AG = "Ag (empty)"
+    CD25UM = "Cd 25um"
     W = "W (empty)"
-    Pt = "Pt (empty)"
-    User = "User"
+    PT = "Pt (empty)"
+    USER = "User"
 
 
 class FilterMotor(StandardReadable):

dodal/devices/slits.py

@@ -2,16 +2,38 @@ from ophyd_async.core import StandardReadable
 from ophyd_async.epics.motor import Motor
 
 
-class Slits(StandardReadable):
+class MinimalSlits(StandardReadable):
+    """Gap only X Y slits."""
+
+    def __init__(
+        self,
+        prefix: str,
+        x_gap: str = "X:SIZE",
+        y_gap: str = "Y:SIZE",
+        name: str = "",
+    ) -> None:
+        with self.add_children_as_readables():
+            self.x_gap = Motor(prefix + x_gap)
+            self.y_gap = Motor(prefix + y_gap)
+        super().__init__(name=name)
+
+
+class Slits(MinimalSlits):
     """
     Representation of a 4-blade set of slits. Allows control/readout of the gap
     between each pair of blades.
     """
 
-    def __init__(self, prefix: str, name: str = "") -> None:
+    def __init__(
+        self,
+        prefix: str,
+        x_gap: str = "X:SIZE",
+        y_gap: str = "Y:SIZE",
+        x_centre: str = "X:CENTRE",
+        y_centre: str = "Y:CENTRE",
+        name: str = "",
+    ) -> None:
         with self.add_children_as_readables():
-            self.x_gap = Motor(prefix + "X:SIZE")
-            self.y_gap = Motor(prefix + "Y:SIZE")
-            self.x_centre = Motor(prefix + "X:CENTRE")
-            self.y_centre = Motor(prefix + "Y:CENTRE")
-        super().__init__(name)
+            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)

dodal/devices/tetramm.py

@@ -22,31 +22,31 @@ from ophyd_async.epics.core import (
 
 
 class TetrammRange(StrictEnum):
-    uA = "+- 120 uA"
-    nA = "+- 120 nA"
+    UA = "+- 120 uA"
+    NA = "+- 120 nA"
 
 
 class TetrammTrigger(StrictEnum):
-    FreeRun = "Free run"
-    ExtTrigger = "Ext. trig."
-    ExtBulb = "Ext. bulb"
-    ExtGate = "Ext. gate"
+    FREE_RUN = "Free run"
+    EXT_TRIGGER = "Ext. trig."
+    EXT_BULB = "Ext. bulb"
+    EXT_GATE = "Ext. gate"
 
 
 class TetrammChannels(StrictEnum):
-    One = "1"
-    Two = "2"
-    Four = "4"
+    ONE = "1"
+    TWO = "2"
+    FOUR = "4"
 
 
 class TetrammResolution(StrictEnum):
-    SixteenBits = "16 bits"
-    TwentyFourBits = "24 bits"
+    SIXTEEN_BITS = "16 bits"
+    TWENTY_FOUR_BITS = "24 bits"
 
 
 class TetrammGeometry(StrictEnum):
-    Diamond = "Diamond"
-    Square = "Square"
+    DIAMOND = "Diamond"
+    SQUARE = "Square"
 
 
 class TetrammDriver(Device):
@@ -118,7 +118,7 @@ class TetrammController(DetectorController):
         assert trigger_info.livetime is not None
 
         # trigger mode must be set first and on its own!
-        await self._drv.trigger_mode.set(TetrammTrigger.ExtTrigger)
+        await self._drv.trigger_mode.set(TetrammTrigger.EXT_TRIGGER)
 
         await asyncio.gather(
             self._drv.averaging_time.set(trigger_info.livetime),
@@ -134,8 +134,8 @@ class TetrammController(DetectorController):
 
     def _validate_trigger(self, trigger: DetectorTrigger) -> None:
         supported_trigger_types = {
-            DetectorTrigger.edge_trigger,
-            DetectorTrigger.constant_gate,
+            DetectorTrigger.EDGE_TRIGGER,
+            DetectorTrigger.CONSTANT_GATE,
         }
 
         if trigger not in supported_trigger_types:

dodal/devices/util/test_utils.py

@@ -1,8 +1,8 @@
-from ophyd_async.core import (
+from ophyd_async.epics.motor import Motor
+from ophyd_async.testing import (
     callback_on_mock_put,
     set_mock_value,
 )
-from ophyd_async.epics.motor import Motor
 
 
 def patch_motor(motor: Motor, initial_position=0):

dodal/devices/xspress3/xspress3.py

@@ -26,12 +26,12 @@ class TriggerMode(StrictEnum):
     SOFTWARE = "Software"
     HARDWARE = "Hardware"
     BURST = "Burst"
-    TTL_Veto_Only = "TTL Veto Only"
+    TTL_VETO_ONLY = "TTL Veto Only"
     IDC = "IDC"
     SOTWARE_START_STOP = "Software Start/Stop"
     TTL_BOTH = "TTL Both"
     LVDS_VETO_ONLY = "LVDS Veto Only"
-    LVDS_both = "LVDS Both"
+    LVDS_BOTH = "LVDS Both"
 
 
 class UpdateRBV(StrictEnum):
@@ -49,7 +49,7 @@ class DetectorState(StrictEnum):
     ACQUIRE = "Acquire"
     READOUT = "Readout"
     CORRECT = "Correct"
-    Saving = "Saving"
+    SAVING = "Saving"
     ABORTING = "Aborting"
     ERROR = "Error"
     WAITING = "Waiting"

dodal/devices/zebra.py

@@ -59,25 +59,25 @@ class TrigSource(StrictEnum):
 
 
 class EncEnum(StrictEnum):
-    Enc1 = "Enc1"
-    Enc2 = "Enc2"
-    Enc3 = "Enc3"
-    Enc4 = "Enc4"
-    Enc1_4Av = "Enc1-4Av"
+    ENC1 = "Enc1"
+    ENC2 = "Enc2"
+    ENC3 = "Enc3"
+    ENC4 = "Enc4"
+    ENC1_4AV = "Enc1-4Av"
 
 
 class I03Axes:
-    SMARGON_X1 = EncEnum.Enc1
-    SMARGON_Y = EncEnum.Enc2
-    SMARGON_Z = EncEnum.Enc3
-    OMEGA = EncEnum.Enc4
+    SMARGON_X1 = EncEnum.ENC1
+    SMARGON_Y = EncEnum.ENC2
+    SMARGON_Z = EncEnum.ENC3
+    OMEGA = EncEnum.ENC4
 
 
 class I24Axes:
-    VGON_Z = EncEnum.Enc1
-    OMEGA = EncEnum.Enc2
-    VGON_X = EncEnum.Enc3
-    VGON_YH = EncEnum.Enc4
+    VGON_Z = EncEnum.ENC1
+    OMEGA = EncEnum.ENC2
+    VGON_X = EncEnum.ENC3
+    VGON_YH = EncEnum.ENC4
 
 
 class RotationDirection(StrictEnum):