dls-dodal 1.65.0__py3-none-any.whl → 1.66.0__py3-none-any.whl

{dls_dodal-1.65.0.dist-info → dls_dodal-1.66.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.65.0
+Version: 1.66.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
@@ -215,10 +215,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async[ca,pva]>=0.13.5
+Requires-Dist: ophyd-async[ca,pva]>=v0.14.0
 Requires-Dist: bluesky>=1.14.5
 Requires-Dist: pyepics
-Requires-Dist: dataclasses-json
 Requires-Dist: pillow
 Requires-Dist: zocalo>=1.0.0
 Requires-Dist: requests
@@ -240,7 +239,7 @@ Requires-Dist: import-linter; extra == "dev"
 Requires-Dist: ispyb; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: myst-parser; extra == "dev"
-Requires-Dist: ophyd_async[sim]; extra == "dev"
+Requires-Dist: ophyd_async[sim]>=v0.14.0; extra == "dev"
 Requires-Dist: pipdeptree; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: psutil; extra == "dev"

{dls_dodal-1.65.0.dist-info → dls_dodal-1.66.0.dist-info}/RECORD

@@ -1,17 +1,16 @@
-dls_dodal-1.65.0.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+dls_dodal-1.66.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=BccwgLylnQRVOHPFdKWSU7c5OGz6lYaQYHyXYycgMuM,706
+dodal/_version.py,sha256=wWlluwWYDEanXRrpBv_0E4ObSF-E3df6vtpgK3J_YuI,706
 dodal/cli.py,sha256=NJopu78ebawAL3qNSvOoxMpyzcejVRCh9qw2lRpEJZw,4199
 dodal/log.py,sha256=UckmmyY_SdZePyi5lHnjh-DVw6qvnat3ANa_5-y80Og,9877
 dodal/utils.py,sha256=abGitd4FLpLnmckF7lUqOKYUL88r5Ex_NGSVgO4gOf4,19305
 dodal/beamline_specific_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/beamline_specific_utils/i03.py,sha256=P6Ls4FoVtcacH0RJM3v6ZwwGx27oMppcBdW0la-ohTY,377
 dodal/beamline_specific_utils/i05_shared.py,sha256=NmXzoJSJ6daReigaONpxxlNTYGGCSkFvgGYQUpjgteM,425
 dodal/beamlines/README.md,sha256=K9MkL_GomxlsoTB7Mz-_dJA5NNSbmCfMiutchGg3C8o,404
 dodal/beamlines/__init__.py,sha256=kVmxHMi9W1MkrOsVxBK7N1DBFGDrWv4FH1m8_nRxwzo,3242
 dodal/beamlines/adsim.py,sha256=1ciucMo1oNYeKarIeBbqlQjZrVN2viyNrDz8dHw5QxY,2153
-dodal/beamlines/aithre.py,sha256=IoRO5szytOtdkLLEtwYwLl4TLhMllyG6l9A2G1r7Yic,994
+dodal/beamlines/aithre.py,sha256=RRNmzJz4Fu5eHRXKoIJpv1D1fNR5e7wmT34d52QwM9Y,1399
 dodal/beamlines/b01_1.py,sha256=H24kiQtF0XnpWBtpsdC_k4w2WU4ibvovU3YPAop_zdg,2830
 dodal/beamlines/b07.py,sha256=dDg-im7loDU1eBGECU7XbNfE4e8hCk7RMZ2CAt9cZYg,1425
 dodal/beamlines/b07_1.py,sha256=4PZm5t9mQIoGvUpKjO8cXTddw96kh5ONigCJ_vomAug,1632
@@ -20,34 +19,35 @@ dodal/beamlines/b18.py,sha256=ryxrGtcCdwoFgZ8ljWYgr1g9gKvoA7nxkARVxl1IE78,1189
 dodal/beamlines/b21.py,sha256=KGPoUogtu5XutVSGZ8LiQgIHOyWbW_9KAt23TetKTHc,3873
 dodal/beamlines/i02_1.py,sha256=SwRm9v1U6CiT0fwLbSTECbJ6OF1BPEx4TJ0cEReuGZA,4017
 dodal/beamlines/i02_2.py,sha256=Jkghwv1Y5i0VUR2NZZ7hoiK9Ii8O-rIECDoKLX9AKi0,1169
-dodal/beamlines/i03.py,sha256=D1bY46sBYAAqLzSVRZyn-n-yVgo1TcNeMNrYViHLm5Q,16883
-dodal/beamlines/i04.py,sha256=QyprATHFxnw_cP2gak1i2_ywj-i26vrGlvOYM6RmyTY,13758
-dodal/beamlines/i05.py,sha256=n7khcNIrXlUkRJeBr3HDckZxu1_IzhF3f17ZV3GoyrA,700
+dodal/beamlines/i03.py,sha256=FEbVUhFRIfzcIUTh_IAxK-V1n3pmTOVMQDOTXSkF9sg,17560
+dodal/beamlines/i04.py,sha256=1ucCkxuARCN2N_-y5J01IuBgp1ZIR0zP8_Vs4i3cvGQ,14252
+dodal/beamlines/i05.py,sha256=QxPjxSj-tqXZlJSnpDsZDeWWHUaK1lNknpWKDlwjmQ8,1281
 dodal/beamlines/i05_1.py,sha256=bzaDqR2doZnoN-dk_oPwWqSGJaVZTDnNtx0wMzGSTp8,714
-dodal/beamlines/i07.py,sha256=So3qlieBwLufsy-yei-Fj4zLKPhm6swUN3aHDQQWzpM,634
+dodal/beamlines/i06.py,sha256=3oj-tBPlXjJgwRu_EflIsVPQdBEmZi3hxAIyXCRMybM,1571
+dodal/beamlines/i07.py,sha256=mnwJPscsXFZnRQ2fKd-FwYiL_VjQu5zbYGQcgg7lplE,1270
 dodal/beamlines/i09.py,sha256=vRwfF3I3H6PzeJ87_ZzIT0wEwu0iIOS05BwZhbnGBiI,1905
-dodal/beamlines/i09_1.py,sha256=eeJZ59QX8rYI0vZdMc9WuugUxJ7abkHAuhh9EvpJPTo,1671
+dodal/beamlines/i09_1.py,sha256=N2GXFEbH1w1ZXYdX7y5taL3mbsBENSfuC5X5vyHQHyM,1821
 dodal/beamlines/i09_2.py,sha256=wYNo_KRx6JvyZVkHATPSFx4t0X-BevheFeD8DI8M-00,1447
 dodal/beamlines/i10.py,sha256=LC0ii13rVyZj1ziatBAyRoyuutdyyTCkpSvICGv4IGY,4059
 dodal/beamlines/i10_1.py,sha256=FxnWjr1u55XgIvnuyTfknnj-xPMNJOAtxObq1y9k518,1062
-dodal/beamlines/i10_optics.py,sha256=AtsN9KncGC7osoahMwojjDoWGhEPYCNrqqO1TiT8ghE,5954
+dodal/beamlines/i10_optics.py,sha256=QO2s5AT8uRefZ2nzf70ckKB2Ys4hIgx7EKCBOZ94edY,6500
 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=EKg6BCr3wpHxdmG23kSTZYcNnGQxZbkzzulBLwz_Kew,3903
 dodal/beamlines/i17.py,sha256=t6CmuNeWkIDZSvIH-QlHEhEX7S9Pi8U93dyCxg2e8B4,2553
-dodal/beamlines/i18.py,sha256=JAGk4Z1Q0fFHIClWDGGQSKcIhZZ14oKF6gyCC-Xspe0,3741
+dodal/beamlines/i18.py,sha256=vPGfrbh1CY2W2BXIfCA5PIeVyixS5nEJSxHpla1RM4I,3756
 dodal/beamlines/i19_1.py,sha256=4-jU-JiF1J_aunoMW5GsHXE-R2l1xaXxmPH_89_D3IM,3093
 dodal/beamlines/i19_2.py,sha256=k4WA6xTkUHKVO_lx7ftm7H4s8g8RD7d5X7jTTr9j5Ec,4142
 dodal/beamlines/i19_optics.py,sha256=fNdAFRJYFA045l4giGI3V68qijDFE1C8gdvD6fncAio,1181
 dodal/beamlines/i20_1.py,sha256=Zsr1lsH7ySbOgK7RhMVMWzNWZAV-fuYW0iAjSEJZicY,2625
 dodal/beamlines/i21.py,sha256=hrxGVYwSlKGwMq4FSzbNOZu3RVnyykocNOjRN9fzKCA,1411
-dodal/beamlines/i22.py,sha256=lsqLmQQnv5JoR5G6YWMXt87y0UhEN9FtQK3_WOGj0so,7731
+dodal/beamlines/i22.py,sha256=HzVUK2hOxQXoFmzZjjV1ojYvMu8csSXewH-qSbdBI2M,7746
 dodal/beamlines/i23.py,sha256=ZXvPEiMA4mPbRTXOxvL1NcoVWDg4Deyl8k57cveDg90,3060
 dodal/beamlines/i24.py,sha256=0ZjJCUYIUWIQTPrXFqKviiTCZiyuJh4MkmqMYd9JZ9o,7454
 dodal/beamlines/k07.py,sha256=jELF4ENfSsPumbFieZDQKP-fDKFeGfox7guhdxJqmD8,1005
 dodal/beamlines/k11.py,sha256=sBOl-MLk7FMo10KFykuK5aLqH1zyW4FnI0XXmtQhUfg,978
-dodal/beamlines/p38.py,sha256=lxFGzmQhth0JhOFbTrZd9LEbUgvKmQdMtiHDW6UJgDs,5763
+dodal/beamlines/p38.py,sha256=ohFCTkyqR2MWGK20PrJqAIokiEjDPNTAfMRzrn3T0Mg,5778
 dodal/beamlines/p45.py,sha256=tQ7EkWfr7o2okK7Prw1C7DNGYdKPU2ofqjm98wu_-G0,2158
 dodal/beamlines/p60.py,sha256=JtoajfrWGIDHFBQfXDKud4A9O2sV-BTVL1pZYUHx9zY,1480
 dodal/beamlines/p99.py,sha256=Rbi9OvmrGIblctOnZxFG_tqqhALLZ9O3ht4mBcb5vU8,2754
@@ -70,8 +70,8 @@ dodal/common/beamlines/commissioning_mode.py,sha256=KL24Ia4IOkSxi7M4CKRRQQW0T3HU
 dodal/common/beamlines/device_helpers.py,sha256=8sasAIFRDwo6ElHqLrXnpj_v7xcEg-29Zhey_e4r9u8,84
 dodal/devices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/aperture.py,sha256=S7AoIoQg_kFxaQk7HUMijbm1kYkOEi2csbdj76kp1ys,427
-dodal/devices/aperturescatterguard.py,sha256=V3RFNq5BFeFPRK9ZEi4w2zEDpopkKvqBsdjY59PrIg0,13988
-dodal/devices/apple2_undulator.py,sha256=zwSbioULT7R8D2wfpcq08nkI9ljqVgBG0-0h1sFT2EA,25952
+dodal/devices/aperturescatterguard.py,sha256=-9XhNGjmO3vl0O-v0N-2LJPkI2ELdR26AyZAdMkThXE,14013
+dodal/devices/apple2_undulator.py,sha256=QKA_FvwTnt9_kQQ0yeaM-4pwXyQM1JtYDUovkMgV9CI,27324
 dodal/devices/backlight.py,sha256=y40kR6N3qSFVLRaGU8CjJJpwv_hq2QALf_85fLQqras,1415
 dodal/devices/baton.py,sha256=315I_0V73_DYYVT0PBs0luVy4CMqdPo0kLvHBi12MIU,606
 dodal/devices/bimorph_mirror.py,sha256=OGe6aCczG0gVco4OvIRLJVxn2kw5F2QG1e06uqhFLTw,4609
@@ -83,42 +83,42 @@ dodal/devices/diamond_filter.py,sha256=hySd7HnLdplpPNvBrLddLjO_3LqgD8-99Zr__Sy_G
 dodal/devices/eiger.py,sha256=ZKaRXF-YnYWuMW94BIg-gmdKW7JKmtMUvehF3S5XaLY,16670
 dodal/devices/eiger_odin.py,sha256=1JoqPppTp99IZCiFOXJZB3h62xXRYKZINxTYXdLnT8c,7480
 dodal/devices/eurotherm.py,sha256=rdLldmWYP1PZBckoya6svPy1mDxHYaa1IfMleMPGzD4,3832
-dodal/devices/fast_grid_scan.py,sha256=AC-SMTwbOJz_Bu6i_Ab2S66FA8ZjSvXJNayb_Uz123M,17349
+dodal/devices/fast_grid_scan.py,sha256=xm2PEPrbqHOQfVrNcXt60S1UT5RtWir6MkdnVlhZNPw,17592
 dodal/devices/fast_shutter.py,sha256=kbHaV-cjAaKFfgEHu7fw9jEBDoJAkIa7N0XXGBZq-xs,2345
 dodal/devices/fluorescence_detector_motion.py,sha256=hJ1M9Zs6Dlw8DDL9APh7yVePlS4tU2hnlySd16hqfwE,346
 dodal/devices/flux.py,sha256=1CDsq9yU2-ho8MfYBl50Tl9ABZwpUBHnV486PQXKNoQ,462
 dodal/devices/focusing_mirror.py,sha256=2UWVrY6bs6_0i-h6JJ_LAUZPX_FgMzIx04JqZafdtYU,7464
 dodal/devices/hutch_shutter.py,sha256=iY3qWxDr8mDlAvN_BYe2gqpXRM1hlfV3ewdwkwh0_v0,3889
-dodal/devices/ipin.py,sha256=eq5jlKw7WGQi8VLrAWpaAIsZmfiVf-5Q0td_B22H6A4,473
+dodal/devices/ipin.py,sha256=lDXEnCLXa0XLQUpwzq6X5FUkt08zHXnuD_bIqaTepVI,1215
 dodal/devices/linkam3.py,sha256=Lkw7c05XyHEEA83djfVFqz_8HN4kROCRqZwLwvHwRdA,2054
-dodal/devices/motors.py,sha256=3exQwYqTCQsCmtBvv_H5T_Dd5KJXF4__afnR33vTNB0,7741
+dodal/devices/motors.py,sha256=WwBv_CacQtWKYA3_D7w4eAwIBFd3-CHevp8xtg6-ncQ,8117
 dodal/devices/p45.py,sha256=CImflt7ifaOkV20Uip3S8_fde_GlIIhD16y-54ODfHE,1390
 dodal/devices/pgm.py,sha256=grNtQHWP6oSbhmEd12loe9cAFnOn2A7rBlgjwnvH8z8,1182
 dodal/devices/positioner.py,sha256=qf_1uYOI1whS0U5sPA3O3mlZYKrPuW3i0gEKI_q-up0,1289
 dodal/devices/pressure_jump_cell.py,sha256=YGmllfBya7MryLg3EXS0pzBJDRs_TlgDFxt8TzAwKJQ,8734
 dodal/devices/qbpm.py,sha256=FfrWWAHHtYv3fGRT1qljyPpAwoHJYfbooT9CfKg-oXI,465
-dodal/devices/robot.py,sha256=Tmr_gXvmL-RgKg7arS4zITkgyY6Ma2irQMhGqHYsc3Y,6998
+dodal/devices/robot.py,sha256=QOK-6rXvm_L-q9n3CFrzIFgDwl0ZqtyhODkUzdPpCa4,7463
 dodal/devices/s4_slit_gaps.py,sha256=4KdarIQoRqX4ry3LUS1Km7fkjUFahA0VuTd2DvYEqQ8,446
-dodal/devices/scintillator.py,sha256=mzDgpZtnG5ve14TxUuxYKEzk0_SCU9U2BhTqmApK68M,3253
+dodal/devices/scintillator.py,sha256=w6YSf1mY_xJKU00TXS_wfzJVKFvXNX9U7Vs8as-33wM,4249
 dodal/devices/slits.py,sha256=IJtipn1N5B7pH64frWcF2TFK8mTFwSYXpGt_FMGl68w,1537
-dodal/devices/smargon.py,sha256=m3wkiyGVrFw1HSnIcV2JPvuWkflSdii-1eZxoePxSkg,5025
+dodal/devices/smargon.py,sha256=JlaNPCRWh0dHbslmjuDtlZhVbIz_clmw4eUIgoSj9tM,4986
 dodal/devices/status.py,sha256=hVrJS1yooQo6PRumRACoIEh-SKBUKxvBlQl-MtLFUMQ,327
 dodal/devices/synchrotron.py,sha256=OHBrTrm4K39XE8BrE9b_Jn_ZfMRyDp9CHCwvmiV-KOc,1989
 dodal/devices/tetramm.py,sha256=QrS7gXB5BVkHHSqCJxYnAg2bbqnHTg0e4UZNpF9g0gE,10461
-dodal/devices/thawer.py,sha256=Mh__Rx5XWuT7pcMF-QRWtjQuR38r4q9PrIzXMu4Nz8M,1917
+dodal/devices/thawer.py,sha256=RGd9vjLyD4IDTDiP2V0giMZIduk_BJiFy1XRkrCSKY4,611
 dodal/devices/turbo_slit.py,sha256=xhcnhfbdcTYSYozogw6Li4fF4ofoPsc350rEyrRdaNE,1460
-dodal/devices/undulator.py,sha256=_sGayfWnkkz5fBTeM-ZToy8rDwt9zvIMyEKvqsBbtEM,6411
+dodal/devices/undulator.py,sha256=Ohy-5sxSKeb8p8jCORj7VILklkJ6WNYrbVLMFxTMBzs,9223
 dodal/devices/v2f.py,sha256=d9f4w5tLxK0S8vrgD85_9W52oEE0uPf912UvLhEWxDM,1248
 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
 dodal/devices/aithre_lasershaping/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/aithre_lasershaping/goniometer.py,sha256=-2ewYMcdzB1DqP9sMpr4L1i4KeTCrGAJfngAt9-eFWw,1005
+dodal/devices/aithre_lasershaping/goniometer.py,sha256=ljdGf7f_fCtgT62e_7HohNoE5CMGxvJkKqPDKkJ1akI,1447
 dodal/devices/aithre_lasershaping/laser_robot.py,sha256=vy-I1ASYflFYIUYePhT2l3l7g2iekrIFzLxA0GLmKY8,717
 dodal/devices/areadetector/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/areadetector/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/areadetector/plugins/cam.py,sha256=sZzJm5Ez3eWfXZi_EB67wluhZmMQm1UyOc2bJFfzd1U,964
-dodal/devices/areadetector/plugins/mjpg.py,sha256=QTsxCoWbofNpLMGPoOR2hWoM33KyntuLepbF0YmX0KE,3031
+dodal/devices/areadetector/plugins/mjpg.py,sha256=tyJ6azC8eCaM_vhQQMB79E03VA9kljUA_7mBycGMsmw,3205
 dodal/devices/attenuator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/attenuator/attenuator.py,sha256=-rJYY_bHCDl8NVn3yYPytYIANiOPsz0f-3U1zBsT5pE,6246
 dodal/devices/attenuator/filter.py,sha256=xb_8S62ktJdqdNE03PqhsfsTsQyTsRbR9CF1ksfX06M,542
@@ -130,6 +130,8 @@ dodal/devices/b07_1/ccmc.py,sha256=SyxfR8Sd8C7Bx2q0cvItdxP2DOP-ZhbMuAfSvBrbSio,2
 dodal/devices/b07_1/enums.py,sha256=TREiXDSAGFRXR3iUkKADYfm-CmhLmlpGHKZUOQ2Z1as,723
 dodal/devices/b16/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/b16/detector.py,sha256=saI2aFBhT0oTisam5b1mlaMJTRwGT7bHbqPGBP7SDnk,840
+dodal/devices/beamsize/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dodal/devices/beamsize/beamsize.py,sha256=J0xtG9NCPUvlJ0leewWzFpEYY-Oz1GFSOTkSlZ835ms,145
 dodal/devices/current_amplifiers/__init__.py,sha256=-MhT-t-GJ83rrvTDBCoWub_NKYkRtu4sEj8-y5XZBP0,782
 dodal/devices/current_amplifiers/current_amplifier.py,sha256=erDVtstLNFVb4wdSqWwRCQX_ifPxOc07x_2Ba_8Y1Wg,2660
 dodal/devices/current_amplifiers/current_amplifier_detector.py,sha256=YKA769KpU1V4GyYF3ckMgE8sXnaJyzRPUbBqIo7UruM,3968
@@ -139,7 +141,7 @@ dodal/devices/current_amplifiers/struck_scaler_counter.py,sha256=3xTsqOCnLwb8o_Y
 dodal/devices/detector/__init__.py,sha256=-RdACL3tzc3lLArWOoGNje48UUlv2fElOmGOz9yOuO0,317
 dodal/devices/detector/det_dim_constants.py,sha256=arBWvzMwybatdSiCMAiwB4Bq1dX-wkLi54xPPfTfQhY,2772
 dodal/devices/detector/det_dist_to_beam_converter.py,sha256=nSkhiEESyuzdrWoPu6h3C05DnOhCXa6DZd-9vU5JYc0,1625
-dodal/devices/detector/det_resolution.py,sha256=aQkKp24LpRGiwzPAQM3wLVa4ANw32HdrKc2kftHfKQA,3253
+dodal/devices/detector/det_resolution.py,sha256=8OW40MhRg56GlLstM1MOkIxa4DY8eg4q0RBUX7k6PHs,3298
 dodal/devices/detector/detector.py,sha256=DqQvlgdjIdKErrZqgM9IH7drc-r6N8nhkFk7KwlgYAk,4815
 dodal/devices/detector/detector_motion.py,sha256=Ly4nz_AsB-_EDOADMC2u2J0dunpkOMbafVN_dgh3T-E,1389
 dodal/devices/electron_analyser/__init__.py,sha256=mpC48s2fK58aEKI-Fl3CiYBb4tXgcaa4Msj8_jLpH8g,956
@@ -168,25 +170,29 @@ dodal/devices/i02_1/fast_grid_scan.py,sha256=bfiumNayrISFGYqdcd3Bh6lEZvkOxrqyX_B
 dodal/devices/i02_1/sample_motors.py,sha256=fAHAyeuP4hjOnYsp2x5VQNrTh8Di35ezJV1si2YmKPY,607
 dodal/devices/i02_2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/i03/__init__.py,sha256=Kvukapy4a5lUQ20qaCqYCJzKNaqJn2DfXP5nKZ_Pec8,118
+dodal/devices/i03/beamsize.py,sha256=xLbB_PJevGRTYSarILE6ImEmK7tgKQ1xa6D9tl6JjYA,1235
+dodal/devices/i03/constants.py,sha256=Y-4tsbmAMEcjV5FBjeRmnA2tl5-LPt5x_icG2xu7XkI,136
 dodal/devices/i03/dcm.py,sha256=qK9qcPCedjOVMvKZ0TZaWNeyt7CJRsC-Wpjy44OQf4E,2336
-dodal/devices/i03/undulator_dcm.py,sha256=HyeqOdq7qA7bqxw5giY4XvX3SLTOMwzbEKdTc5FQXzQ,2857
+dodal/devices/i03/undulator_dcm.py,sha256=gtlN-t-L9bLeC5E1tN_aibJhpYiSnwt-TNm5ZsPm88M,2867
 dodal/devices/i04/__init__.py,sha256=Kvukapy4a5lUQ20qaCqYCJzKNaqJn2DfXP5nKZ_Pec8,118
+dodal/devices/i04/beamsize.py,sha256=0Y8Adz_nSSe86uD95BgcZTyZUfisMMX01aoPi8jQx-I,1582
 dodal/devices/i04/constants.py,sha256=_Dw28NeXldwRYH-h6YP6OHnyj7h0z4NQs_-RysNby5Q,281
-dodal/devices/i04/murko_results.py,sha256=6VtYDm0HXIBSyd-_v2O1G_6C1D-5fQ45FKMlNMDW--Y,9682
-dodal/devices/i04/transfocator.py,sha256=sVI4Bgv-2-DH4-F1nIXMp5Aktevrm3agZnCA-WgjmW8,3780
+dodal/devices/i04/murko_results.py,sha256=y6dNd1aZGRyEPP5mtWTVejbRYBoEa6qXMUNFM4VDCbg,10069
+dodal/devices/i04/transfocator.py,sha256=gI3UpQ6N0edo3_2aSvW5aWAS3Y1yJcFnZowRNwBvGDI,3250
 dodal/devices/i05/__init__.py,sha256=v0Axsf-vMyLyxcbqS8lljJc0BQ5Tw8yVBTWcO3tG_4g,67
 dodal/devices/i05/enums.py,sha256=9FHBIexkSfZSTHxUnGupravfG9sVriHcrB15jemkQOQ,191
 dodal/devices/i07/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/i07/dcm.py,sha256=AJpBiLX6t_mAjGKw9LmjXIFG5IIe5Ploe5LxS-ZckT8,1250
+dodal/devices/i07/id.py,sha256=CMYY_SOr7wS1KYXPIIRcsKBNgg9vSnopovRV4Y61DZU,1489
 dodal/devices/i09/__init__.py,sha256=5AGY_SKtqrU7NeEbzu9ROazPD_C1fEci1LJfdcuz2VY,135
 dodal/devices/i09/enums.py,sha256=Rfs6OgEHSSxcH2UiVmlR_5wLwxDmcHonXds0UDVRfCc,551
 dodal/devices/i09_1/__init__.py,sha256=dTazun87AkMDXh7J8gIZYJxJth0XUs72qahJ-VvhRBI,72
 dodal/devices/i09_1/enums.py,sha256=FwhsvKnEcm9M22U4gcAJi6FE2RaUBZH0jRjNgJUKRqc,1319
-dodal/devices/i09_1_shared/__init__.py,sha256=rHFCmNUYbca82BQ9lbcSvINFkwncUDxZciqa286-6is,137
-dodal/devices/i09_1_shared/hard_undulator_functions.py,sha256=U5-xzejtseZZs9NbT_J-tDOOP_4OR1tWaGvttzmQeZc,4018
+dodal/devices/i09_1_shared/__init__.py,sha256=1cIAhdM7PyrKCJT7pEWpc25vBWYq8d62krwMqw_hdWA,206
+dodal/devices/i09_1_shared/hard_undulator_functions.py,sha256=e0kpReW1q4lK4pQYVbg-h9JZxDN-M8a-yaPo1cNuY-0,6205
 dodal/devices/i10/__init__.py,sha256=Pa7gI_ulcPO3dN2xpw6tBN1E3CpV3Lj82kmGwIVU7TA,575
 dodal/devices/i10/diagnostics.py,sha256=ULSHpaRPVWcP-HgKAJW2rsdPoYZs_MgF6HJoPj39MwU,6339
-dodal/devices/i10/i10_apple2.py,sha256=K2Xq6t5gxsvhYx85tWv43nDnnSdPBqsadaeXLn6TOA4,15970
+dodal/devices/i10/i10_apple2.py,sha256=EHh9d7vcZZyO2UpJc9E4HFovpbQwkF0QGhlkLCRL1oo,6526
 dodal/devices/i10/i10_setting_data.py,sha256=69XWgE-YNTiW7C3t67MNcTL5JDDhOo7h-X7DCTpFE5g,164
 dodal/devices/i10/mirrors.py,sha256=Zofd0g2f3YvFi_KIHQE_w4dFZNglhmh--65tRnWLuyY,504
 dodal/devices/i10/slits.py,sha256=pBstXJnA6j3ftDqei0EZyAPU--M_heqo6hm2DEOqPdc,5040
@@ -212,7 +218,7 @@ dodal/devices/i15/motors.py,sha256=-kGHisSWc_zuV9m2L0mGgmiSiIZ7puLsimddk28h_7s,8
 dodal/devices/i15/multilayer_mirror.py,sha256=qdxnn6PBAxK0MgeVUpM8Ukkq4tdX3jhjlmyU-AzzH4M,741
 dodal/devices/i15/rail.py,sha256=9cRTRKy6uZBASMhK1wC8K_k_5FfLgHnoh9VblSOTkpQ,428
 dodal/devices/i17/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/i17/i17_apple2.py,sha256=9bjBJJ38NNUI11FPGSuTsfLufY0QrX2WGlNDiLINJGY,1530
+dodal/devices/i17/i17_apple2.py,sha256=QTdX8hQJsfgXSF_jYqwgNud6jyZbSoJlyzZ8gvwMae8,1617
 dodal/devices/i18/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/i18/diode.py,sha256=nk5kvn4LsbhczRpCwHOO0_jJTYOz7MP9qm_uvBWuv7c,1468
 dodal/devices/i18/kb_mirror.py,sha256=W4R3TeulSjosUqAFIIznyWzje_Y2AoEf9f8N-NkisYM,710
@@ -244,21 +250,21 @@ dodal/devices/i24/focus_mirrors.py,sha256=DYiYLpDw8FJ1LYHxLOxE_om5qGfUo2itzskgqh
 dodal/devices/i24/pmac.py,sha256=-HYf2HPzaqWvszp4T8TXohdp40-xmKqQq4V0mLvVri8,7028
 dodal/devices/i24/vgonio.py,sha256=sxSmcYZayVJPJz_D_91j9PmNor7Tbl1RGQFRrdtESlw,533
 dodal/devices/mx_phase1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/mx_phase1/beamstop.py,sha256=GeHLqHVf3XwJSszUHuxZ2JBwQlcDiFs6jVpdHuw7snM,3127
+dodal/devices/mx_phase1/beamstop.py,sha256=zWdZp0j9lCg4YzsZ7GSR3xEcvMfMTJoMO6XdgiC53p4,3765
 dodal/devices/oav/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/oav/oav_calculations.py,sha256=qoaNz4MAdbpu0XHAkWTQ3rebFwsWfa8JA1eerUgISjA,2367
-dodal/devices/oav/oav_detector.py,sha256=oQWTj_b9Oqoui_pCPzPcVbpQgxTM_0EZ9NP2JfFgMTY,6730
-dodal/devices/oav/oav_parameters.py,sha256=CsilW2MtPS7UdOb4UGW5spUaTsDaMYTk6AMaLfpB4OE,6868
-dodal/devices/oav/oav_to_redis_forwarder.py,sha256=2DBbooPAGZoXAjJSQ5WRQfqdHx6hjuNhJ0dmpFh2yfE,6265
-dodal/devices/oav/utils.py,sha256=H2k7bFx7SxxY8w4PIdQoIE0gBUjqTrbeJ7gdb8VXyy8,3180
-dodal/devices/oav/pin_image_recognition/__init__.py,sha256=3lcKiERLh6NM49SOptVEyGKnnzCz4dCmr3h5zmyYapE,6295
+dodal/devices/oav/oav_calculations.py,sha256=pgQmqot9avffVRjY-NkboKnGxPEtwSovWSDMQD1icvg,2746
+dodal/devices/oav/oav_detector.py,sha256=HHBiXREzX6bDtQ2miPEa5SgR-nVdQzoQr5fpkz9fzdg,8942
+dodal/devices/oav/oav_parameters.py,sha256=gBFJwJbPGXyyXWxxhJIRhM5lAF_JxqSGOFOUW8oKL-Q,7017
+dodal/devices/oav/oav_to_redis_forwarder.py,sha256=4F9FuAM0d5vWEUCeLmyNLQl6IUK89Vttw2rX1Kw-mGQ,6400
+dodal/devices/oav/utils.py,sha256=ekDiYypwH-FuT3Ss7QZnEbukjhtAY466SGVMz5T97s8,3517
+dodal/devices/oav/pin_image_recognition/__init__.py,sha256=s5cdeJ6EuKAA-e5n4laaWNlYHza87frPYVC809N3TOw,6573
 dodal/devices/oav/pin_image_recognition/manual_test.py,sha256=h1Rto6ZDCB3jWhjSy9N8ECxRN583iYDJr9LxrTJ8kfE,903
-dodal/devices/oav/pin_image_recognition/utils.py,sha256=8Pi4sfs_PX8_gclneDoqWMDNvyKJwhMXhJYnLF4_Nys,8593
+dodal/devices/oav/pin_image_recognition/utils.py,sha256=HPPMh4dTXvS4Jr9DqAXkanWQfFi7sA5kOcqLRpT2kjE,9448
 dodal/devices/oav/snapshots/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/oav/snapshots/grid_overlay.py,sha256=CdvCdTKMCiwMwxm2lV28KpcIUSXlscZmWxb73_KKmiI,3694
 dodal/devices/oav/snapshots/snapshot.py,sha256=Ksjy6B2wyxFdMyHAPSPcTVhx_UTEd_T9JDnTDMG4VJ0,499
 dodal/devices/oav/snapshots/snapshot_image_processing.py,sha256=nNBOKX0JwBh4AJWflYueEbKEJ_tvIDa4Y5mNgS8RFv0,2318
-dodal/devices/oav/snapshots/snapshot_with_grid.py,sha256=UrlzLOGlC2AVbPmb8kQs_MjOfXagIaidrVETnGY-4JQ,2309
+dodal/devices/oav/snapshots/snapshot_with_grid.py,sha256=04MgMrclfB3cJuv2AmYE8oqQscUAr1JVmQIb5DIa-rU,2448
 dodal/devices/p60/__init__.py,sha256=cLrjUaHNJRtRBb1ic_LTlxIi_nH6_hZN8-5gWCt0Q6w,229
 dodal/devices/p60/enums.py,sha256=S0dFIG4k1aI995q-SSZYfKYiXRog_SnTTOVHOtP-qug,521
 dodal/devices/p60/lab_xray_source.py,sha256=CrvJYNspp4xgmad_VSUwaMG39L5S8sDRiD2wNrmXjEg,603
@@ -273,6 +279,7 @@ dodal/devices/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 dodal/devices/util/adjuster_plans.py,sha256=c40PFZpXFw0YmJLh9jU4VIb8vRxHyafZlmvprTKAOhM,824
 dodal/devices/util/epics_util.py,sha256=4useFL8ngsVF08fhOn48BlnO4oh0T4sEKqjdS6mjvG0,4687
 dodal/devices/util/lookup_tables.py,sha256=8rip4fQI3YaYNcnUPiWF5Bhq9UXJSxFFfqJaFU4a_LU,3706
+dodal/devices/util/lookup_tables_apple2.py,sha256=lpLCrJ8-JwegsxPGzosKP-GzxOzqMdAOEFoCR6QI2Fs,11877
 dodal/devices/xspress3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/xspress3/xspress3.py,sha256=OerapEy-IuK7EFz13B5z0BzBmESVl6pYUlqAWHIwJck,4555
 dodal/devices/xspress3/xspress3_channel.py,sha256=w8tAx2lz5kJ_LeJ_eb_4o--Dtt8MRijsYNgDG6oEIVg,1626
@@ -294,21 +301,20 @@ dodal/plan_stubs/wrapped.py,sha256=kC8HH7bx3-sLYu2oieY_502tAdT2OECF8n-fqoL5Bfc,4
 dodal/plans/__init__.py,sha256=nH1jNxw3DzDMg9O8Uda0kqKIalRVEWBrq07OLY6Ey38,93
 dodal/plans/bimorph.py,sha256=JxDmZDiEvZnz5f22tlaoyivpnaNGiX8kSL82qz5uvMM,11738
 dodal/plans/configure_arm_trigger_and_disarm_detector.py,sha256=mzvno7ikEQkVfY1-vlrINxga2sOYAprRaf1LtySCfCk,6186
+dodal/plans/load_panda_yaml.py,sha256=OF-ZygZyAyQEUdrAWiIxWZ6QhAsVx4Mm9ngRYB1mzKI,433
 dodal/plans/save_panda.py,sha256=X-zR5GysBPp3M7ZpEYEqCUSc4nJYzHJBA44e52uQ6F4,3099
 dodal/plans/scanspec.py,sha256=Q0AcvTKRT401iGMRDSqK-D523UX5_ofiVMZ_rNXKOx8,2074
-dodal/plans/verify_undulator_gap.py,sha256=0YlkAPKH7A2auHbdhoxA9Bo50nGQ2xbNumDrAa6gjtg,628
+dodal/plans/verify_undulator_gap.py,sha256=8FirCLRuDreqIRYTJfFuaefrgInoztKKajD6T-t07yw,638
 dodal/plans/wrapped.py,sha256=BPMw__RcWvk9v5XnhMsi9_k4KsDEbmXogzD2n1ecbUg,2098
 dodal/plans/preprocessors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/plans/preprocessors/verify_undulator_gap.py,sha256=cBZEGq8TW1jrXFXB00iClQVXSEaE_jP_rHMY9WTgYyY,1813
-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
 dodal/testing/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/testing/fixtures/run_engine.py,sha256=L77Sy6k142X2pWDReSygUymrS7PngBH6xR45EFYl_l4,4042
 dodal/testing/fixtures/utils.py,sha256=jy3mfAAn_TFQ7gqCec-OiOlZkaNLUH3TESW2oohvNgo,1861
-dls_dodal-1.65.0.dist-info/METADATA,sha256=qx14nm7jd31hPeMxk4m3Dn95dNqZK4hSB-sdUfao6i4,16950
-dls_dodal-1.65.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dls_dodal-1.65.0.dist-info/entry_points.txt,sha256=0IO1Bjlnv0vJSSFdGEZ-S_pqQNkE2FnPTA6f0-aTBs8,87
-dls_dodal-1.65.0.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
-dls_dodal-1.65.0.dist-info/RECORD,,
+dls_dodal-1.66.0.dist-info/METADATA,sha256=priGbodqVjXBCtK6N2hGI93F8qoyd-PPfMOoE0bkw4U,16928
+dls_dodal-1.66.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dls_dodal-1.66.0.dist-info/entry_points.txt,sha256=0IO1Bjlnv0vJSSFdGEZ-S_pqQNkE2FnPTA6f0-aTBs8,87
+dls_dodal-1.66.0.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
+dls_dodal-1.66.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.65.0'
-__version_tuple__ = version_tuple = (1, 65, 0)
+__version__ = version = '1.66.0'
+__version_tuple__ = version_tuple = (1, 66, 0)
 
 __commit_id__ = commit_id = None

dodal/beamlines/aithre.py

@@ -7,12 +7,19 @@ from dodal.devices.oav.oav_parameters import OAVConfigBeamCentre
 ZOOM_PARAMS_FILE = "/dls_sw/i23/software/aithre/aithre_oav.xml"
 DISPLAY_CONFIG = "/dls_sw/i23/software/aithre/aithre_display.configuration"
 
+
 PREFIX = "LA18L"
 
 
 @device_factory()
 def goniometer() -> Goniometer:
-    return Goniometer(f"{PREFIX}-MO-LSR-01:")
+    return Goniometer(
+        f"{PREFIX}-MO-LSR-01:",
+        y_infix="SAMPZ",
+        z_infix="SAMPY",
+        sampy_infix="Y",
+        sampz_infix="Z",
+    )
 
 
 @device_factory()
@@ -22,8 +29,20 @@ def robot() -> LaserRobot:
 
 @device_factory()
 def oav(params: OAVConfigBeamCentre | None = None) -> OAVBeamCentreFile:
+    config = (
+        params
+        if params is not None
+        else OAVConfigBeamCentre(
+            zoom_params_file=ZOOM_PARAMS_FILE, display_config_file=DISPLAY_CONFIG
+        )
+    )
     return OAVBeamCentreFile(
         prefix=f"{PREFIX}-DI-OAV-01:",
-        config=params or OAVConfigBeamCentre(ZOOM_PARAMS_FILE, DISPLAY_CONFIG),
+        config=config,
         zoom_controller=NullZoomController(),
+        mjpg_x_size_pv="ArraySize0_RBV",
+        mjpg_y_size_pv="ArraySize1_RBV",
+        x_direction=-1,
+        y_direction=-1,
+        z_direction=-1,
     )

dodal/beamlines/i03.py

@@ -31,8 +31,10 @@ from dodal.devices.flux import Flux
 from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, MirrorVoltages
 from dodal.devices.hutch_shutter import HutchShutter
 from dodal.devices.i03 import Beamstop
+from dodal.devices.i03.beamsize import Beamsize
 from dodal.devices.i03.dcm import DCM
 from dodal.devices.i03.undulator_dcm import UndulatorDCM
+from dodal.devices.ipin import IPin
 from dodal.devices.motors import XYZStage
 from dodal.devices.oav.oav_detector import OAVBeamCentreFile
 from dodal.devices.oav.oav_parameters import OAVConfigBeamCentre
@@ -44,7 +46,7 @@ from dodal.devices.scintillator import Scintillator
 from dodal.devices.smargon import Smargon
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.thawer import Thawer
-from dodal.devices.undulator import Undulator
+from dodal.devices.undulator import UndulatorInKeV
 from dodal.devices.webcam import Webcam
 from dodal.devices.xbpm_feedback import XBPMFeedback
 from dodal.devices.xspress3.xspress3 import Xspress3
@@ -256,11 +258,11 @@ def synchrotron() -> Synchrotron:
 
 
 @device_factory()
-def undulator(daq_configuration_path: str | None = None) -> Undulator:
+def undulator(daq_configuration_path: str | None = None) -> UndulatorInKeV:
     """Get the i03 undulator device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i03, it will return the existing object.
     """
-    return Undulator(
+    return UndulatorInKeV(
         f"{BeamlinePrefix(BL).insertion_prefix}-MO-SERVC-01:",
         # evaluate here not as parameter default to enable post-import mocking
         id_gap_lookup_table_path=f"{daq_configuration_path or DAQ_CONFIGURATION_PATH}/lookup/BeamLine_Undulator_toGap.txt",
@@ -456,3 +458,21 @@ def collimation_table() -> CollimationTable:
     If this is called when already instantiated in i03, it will return the existing object.
     """
     return CollimationTable(prefix=f"{PREFIX.beamline_prefix}-MO-TABLE-01")
+
+
+@device_factory()
+def beamsize() -> Beamsize:
+    """Get the i03 beamsize device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i03, it will return the existing object.
+    """
+    return Beamsize(
+        aperture_scatterguard=aperture_scatterguard(),
+    )
+
+
+@device_factory()
+def ipin() -> IPin:
+    """Get the i03 ipin device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i04, it will return the existing object.
+    """
+    return IPin(f"{PREFIX.beamline_prefix}-EA-PIN-01:")

dodal/beamlines/i04.py

@@ -20,6 +20,7 @@ from dodal.devices.eiger import EigerDetector
 from dodal.devices.fast_grid_scan import ZebraFastGridScanThreeD
 from dodal.devices.flux import Flux
 from dodal.devices.i03.dcm import DCM
+from dodal.devices.i04.beamsize import Beamsize
 from dodal.devices.i04.constants import RedisConstants
 from dodal.devices.i04.murko_results import MurkoResultsDevice
 from dodal.devices.i04.transfocator import Transfocator
@@ -36,7 +37,7 @@ from dodal.devices.scintillator import Scintillator
 from dodal.devices.smargon import Smargon
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.thawer import Thawer
-from dodal.devices.undulator import Undulator
+from dodal.devices.undulator import UndulatorInKeV
 from dodal.devices.xbpm_feedback import XBPMFeedback
 from dodal.devices.zebra.zebra import Zebra
 from dodal.devices.zebra.zebra_constants_mapping import (
@@ -228,11 +229,11 @@ def s4_slit_gaps() -> S4SlitGaps:
 
 
 @device_factory()
-def undulator() -> Undulator:
+def undulator() -> UndulatorInKeV:
     """Get the i04 undulator device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i04, it will return the existing object.
     """
-    return Undulator(
+    return UndulatorInKeV(
         prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
         id_gap_lookup_table_path="/dls_sw/i04/software/daq_configuration/lookup/BeamLine_Undulator_toGap.txt",
     )
@@ -281,6 +282,7 @@ def oav_full_screen(params: OAVConfig | None = None) -> OAVBeamCentrePV:
         prefix=f"{PREFIX.beamline_prefix}-DI-OAV-01:",
         config=params or OAVConfig(ZOOM_PARAMS_FILE),
         overlay_channel=3,
+        mjpeg_prefix="XTAL",
     )
 
 
@@ -320,6 +322,8 @@ def oav_to_redis_forwarder() -> OAVToRedisForwarder:
     """
     return OAVToRedisForwarder(
         f"{PREFIX.beamline_prefix}-DI-OAV-01:",
+        oav_roi=oav(),
+        oav_fs=oav_full_screen(),
         redis_host=RedisConstants.REDIS_HOST,
         redis_password=RedisConstants.REDIS_PASSWORD,
         redis_db=RedisConstants.MURKO_REDIS_DB,
@@ -374,3 +378,14 @@ def scintillator() -> Scintillator:
         Reference(aperture_scatterguard()),
         get_beamline_parameters(),
     )
+
+
+@device_factory()
+def beamsize() -> Beamsize:
+    """Get the i04 beamsize device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i04, it will return the existing object.
+    """
+    return Beamsize(
+        transfocator=transfocator(),
+        aperture_scatterguard=aperture_scatterguard(),
+    )

dodal/beamlines/i05.py

@@ -1,6 +1,13 @@
 from dodal.beamline_specific_utils.i05_shared import pgm as i05_pgm
-from dodal.common.beamlines.beamline_utils import device_factory
+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.apple2_undulator import (
+    Apple2,
+    UndulatorGap,
+    UndulatorLockedPhaseAxes,
+)
 from dodal.devices.pgm import PlaneGratingMonochromator
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
@@ -20,3 +27,23 @@ def synchrotron() -> Synchrotron:
 @device_factory()
 def pgm() -> PlaneGratingMonochromator:
     return i05_pgm()
+
+
+@device_factory()
+def id_gap() -> UndulatorGap:
+    return UndulatorGap(prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:")
+
+
+@device_factory()
+def id_phase() -> UndulatorLockedPhaseAxes:
+    return UndulatorLockedPhaseAxes(
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
+        top_outer="PL",
+        btm_inner="PU",
+    )
+
+
+@device_factory()
+def id() -> Apple2:
+    """i05 insertion device."""
+    return Apple2(id_gap=id_gap(), id_phase=id_phase())

dodal/beamlines/i06.py

@@ -0,0 +1,62 @@
+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.apple2_undulator import (
+    Apple2,
+    UndulatorGap,
+    UndulatorLockedPhaseAxes,
+)
+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("i06")
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def idd_gap() -> UndulatorGap:
+    return UndulatorGap(prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:")
+
+
+@device_factory()
+def idd_phase() -> UndulatorLockedPhaseAxes:
+    return UndulatorLockedPhaseAxes(
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
+        top_outer="PL",
+        btm_inner="PU",
+    )
+
+
+@device_factory()
+def idd() -> Apple2:
+    """i06 downstream insertion device."""
+    return Apple2(id_gap=idd_gap(), id_phase=idd_phase())
+
+
+@device_factory()
+def idu_gap() -> UndulatorGap:
+    return UndulatorGap(prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-21:")
+
+
+@device_factory()
+def idu_phase() -> UndulatorLockedPhaseAxes:
+    return UndulatorLockedPhaseAxes(
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-21:",
+        top_outer="PL",
+        btm_inner="PU",
+    )
+
+
+@device_factory()
+def idu() -> Apple2:
+    """i06 upstream insertion device."""
+    return Apple2(id_gap=idd_gap(), id_phase=idd_phase())

dodal/beamlines/i07.py

@@ -1,6 +1,8 @@
 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.i07.dcm import DCM
+from dodal.devices.i07.id import InsertionDevice
+from dodal.devices.undulator import UndulatorOrder
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -19,3 +21,21 @@ def dcm() -> DCM:
         "dcm",
     )
     return dcm
+
+
+@device_factory()
+def harmonic() -> UndulatorOrder:
+    return UndulatorOrder("harmonic")
+
+
+@device_factory()
+def id() -> InsertionDevice:
+    """Get the i07 undulator device, instantiate it if it hasn't already been.
+    If this is called when already instantiated it will return the existing object.
+    """
+    return InsertionDevice(
+        "id",
+        f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
+        harmonic(),
+        id_gap_lookup_table_path="/dls_sw/i07/software/gda/config/lookupTables/IIDCalibrationTable.txt",
+    )

dodal/beamlines/i09_1.py

@@ -11,7 +11,7 @@ from dodal.devices.electron_analyser import EnergySource
 from dodal.devices.electron_analyser.specs import SpecsDetector
 from dodal.devices.i09_1 import LensMode, PsuMode
 from dodal.devices.synchrotron import Synchrotron
-from dodal.devices.undulator import UndulatorOrder
+from dodal.devices.undulator import UndulatorInMm, UndulatorOrder
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -40,7 +40,7 @@ def energy_source() -> EnergySource:
 
 # Connect will work again after this work completed
 # https://jira.diamond.ac.uk/browse/I09-651
-@device_factory()
+@device_factory(skip=True)
 def analyser() -> SpecsDetector[LensMode, PsuMode]:
     return SpecsDetector[LensMode, PsuMode](
         prefix=f"{PREFIX.beamline_prefix}-EA-DET-02:CAM:",
@@ -50,6 +50,11 @@ def analyser() -> SpecsDetector[LensMode, PsuMode]:
     )
 
 
+@device_factory()
+def undulator() -> UndulatorInMm:
+    return UndulatorInMm(prefix=f"{PREFIX.beamline_prefix}-MO-UND-01:")
+
+
 @device_factory()
 def harmonics() -> UndulatorOrder:
     return UndulatorOrder(name="harmonics")