dls-dodal 1.50.0__py3-none-any.whl → 1.51.0__py3-none-any.whl

{dls_dodal-1.50.0.dist-info → dls_dodal-1.51.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.50.0
+Version: 1.51.0
 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
@@ -208,10 +208,9 @@ License:                                  Apache License
 Project-URL: GitHub, https://github.com/DiamondLightSource/dodal
 Classifier: Development Status :: 3 - Alpha
 Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
@@ -232,9 +231,9 @@ Requires-Dist: numpy
 Requires-Dist: aiofiles
 Requires-Dist: aiohttp
 Requires-Dist: redis
-Requires-Dist: deepdiff
 Requires-Dist: scanspec>=0.7.3
 Requires-Dist: event-model>=1.23
+Requires-Dist: pyzmq==26.3.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"

{dls_dodal-1.50.0.dist-info → dls_dodal-1.51.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
-dls_dodal-1.50.0.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+dls_dodal-1.51.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=EDlHUWODqx60XSwjWm_Ktz1n2BnxgiT-qk2UvfHj1II,513
+dodal/_version.py,sha256=bIKVhfeJkgHBQ02QO68CDP3rWX1qe-o1xnMH5rP7lM0,513
 dodal/cli.py,sha256=NieWNUgLUxyck1rHoFAPJjX1xXLzHNdQ-s4wvxYFfps,3757
 dodal/log.py,sha256=Rt5O3hFZfMnJvQueZvgagQuXnPqHrFxhponOvVkpfrk,9871
 dodal/utils.py,sha256=rqQNalufZPxUPSD2SYuUgWSCpefb8FnqvR6N0t-YcEY,19675
@@ -9,34 +9,36 @@ dodal/beamline_specific_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 dodal/beamline_specific_utils/i03.py,sha256=P6Ls4FoVtcacH0RJM3v6ZwwGx27oMppcBdW0la-ohTY,377
 dodal/beamlines/README.md,sha256=K9MkL_GomxlsoTB7Mz-_dJA5NNSbmCfMiutchGg3C8o,404
 dodal/beamlines/__init__.py,sha256=lueGFb7cW1kDB_LfFavhrgYdjqGErCwAOk5XoU3BY00,3176
-dodal/beamlines/adsim.py,sha256=uOmFYZIGyput93XHk9R5ydZdxnTrS_wA2zSEm62UCVU,1930
+dodal/beamlines/adsim.py,sha256=1RfxzvLkMWCoRnpFQNxnlvoWWGthuJvfHu-IsXv3GeE,1986
 dodal/beamlines/aithre.py,sha256=QpNIT9RVtlyamJoshAa87Cw5U0QfBNwMBcZVvMlD25s,1037
-dodal/beamlines/b01_1.py,sha256=SdjnpssxlpdTwE1D2fuXUsf9WmvUsyg-MSp3DONXyQU,2008
-dodal/beamlines/b07.py,sha256=Fxsn9YDKySnE3zZgtpD8-LSb4IzWlb5xd6sLTCRrvFU,740
-dodal/beamlines/b07_1.py,sha256=nY5fMUDoxn91OG2miVh5cXNQDH8o881yMW9RfZMRlnQ,742
-dodal/beamlines/b16.py,sha256=0MF-wKfogDkZ6wo0DiqCUor0cNG6cYvMdcYr88KuRdY,1690
+dodal/beamlines/b01_1.py,sha256=ru5a2FJar2rUdA2PDEXpQ1fRZwyzEd5Uf76J5qZMVhY,2922
+dodal/beamlines/b07.py,sha256=rD0tczn94eDpuSdDTUWP1KQvTPi6Vtk6rGMIOC6ObV0,994
+dodal/beamlines/b07_1.py,sha256=soR_nF5aBbL0-WtYSoGVpEZcql7pH9vHKYycmVItu2U,998
+dodal/beamlines/b16.py,sha256=36VibkYciQL-K2G4PsDPVp2r460GTQlQPbSJ5vzLUVo,1724
 dodal/beamlines/b18.py,sha256=ryxrGtcCdwoFgZ8ljWYgr1g9gKvoA7nxkARVxl1IE78,1189
+dodal/beamlines/b21.py,sha256=hpPDPrRlgI3AAsZ2voymGynLlI8G4Oj0r0MOfaoQceM,4244
 dodal/beamlines/i02_1.py,sha256=d2IyqFMgeaSEyZYm7GMSjTKr7_02SakyC_oARx-XwnY,1204
-dodal/beamlines/i03.py,sha256=jLiqH3R_TK2sHsI1zCZ91cYcATEtG28-5lMUcsQTXhU,15594
-dodal/beamlines/i04.py,sha256=_ogXHZZbJVNoMIOKLZe_8TbLP3vC4wss5lqqmzctR40,13723
-dodal/beamlines/i09.py,sha256=cr75vG65pgyWkEYdpcdpuuqAhN_tkmBiBqJn76lQN3k,744
-dodal/beamlines/i09_1.py,sha256=UbBn1q4L8BZXjZ1rUZQImwO0zkIYqGd5T8FptlFFMyw,742
-dodal/beamlines/i10.py,sha256=wg-yKw_a2hK_Tx7rym2Rq7oo8GlluoSQK77HcZNohPY,5716
-dodal/beamlines/i13_1.py,sha256=RF8AXBqVKPY7rVf4j1gOxcURAToYVk-Yo9t4FWyaphU,1650
-dodal/beamlines/i18.py,sha256=CbzdLHXcIhLl1T-GmXmnNOhwHojl8V3d3ikxVoCqXII,3657
+dodal/beamlines/i03.py,sha256=OYftBHUkKYUpcrs0KzzSkpjBI4gaA4YmMungixLkemA,15481
+dodal/beamlines/i04.py,sha256=ceL-GCalkKivPkrpZ0lBe4-khhrutodRlMacvemNrIw,13698
+dodal/beamlines/i09.py,sha256=NBdolMK26rkrM6nO1a9DydYCk_-MlfSzt40fRxzPvjY,1229
+dodal/beamlines/i09_1.py,sha256=6k2aQysaXm3VPHE79vhqJDbnUxii_L3oLbEBZ0wHwNA,920
+dodal/beamlines/i09_2.py,sha256=Bi7ty8dOTTQ_va_EsEbj7QUwlPgsUoXvL1VleaS4se8,721
+dodal/beamlines/i10.py,sha256=0rSWOlIihkDtq7ZZaJ5O2jkMBrteRYjl4Hhqe8EP1Yc,5697
+dodal/beamlines/i13_1.py,sha256=7GzkEM1wT5pKsAPNSVd6tSnCBEE-FSOEBQrP-pCpU10,1625
+dodal/beamlines/i18.py,sha256=FuU8G-q1piu6BRou-Shj3BQEbNtsF7CUsSIqqkvCKZc,3615
 dodal/beamlines/i19_1.py,sha256=RsHXje1S2OLwuPnaqkRva02aAIq5Ya1FvPbHEQKo0Uc,2925
 dodal/beamlines/i19_2.py,sha256=zairZIPj1mrs9-dG19CjdMEFeqztGmlyeBmIxj7Kl5I,2329
 dodal/beamlines/i19_optics.py,sha256=RztOdru0lvPXpaIXSUfzSsPVIuwAMKZsEA8vJFU4_Mk,1184
 dodal/beamlines/i20_1.py,sha256=Xp6XXofjXh3Yibrg5wSHet-pXikprJ9oprEhJg19OkI,1825
-dodal/beamlines/i22.py,sha256=GAS1KgRrtpdXhYb7tIO3yHHMRcffxOqcSIaCZyexnDk,7595
+dodal/beamlines/i22.py,sha256=GMJiZRdtqxHZJVKVo3JNdRPmqcKnNjQj-kO6JPKDMHw,7759
 dodal/beamlines/i23.py,sha256=pf3KmzLZYDVqUB4LkLcNJk6z9H4qkFpTdVB8_0MYehs,3066
-dodal/beamlines/i24.py,sha256=D83MIeoyC-tzd5QcR0yiLUyzraAyBTObx7VnP5-okSk,7158
+dodal/beamlines/i24.py,sha256=bDrszseW490WiReHkXIdsDj8m_HqMberHjDKuhEXQjk,7120
 dodal/beamlines/k11.py,sha256=sBOl-MLk7FMo10KFykuK5aLqH1zyW4FnI0XXmtQhUfg,978
 dodal/beamlines/p38.py,sha256=bka6zsZfFiBAD-rrLSmIIVAOAw0FvupSkhOHGEG77xo,5708
-dodal/beamlines/p45.py,sha256=2snO895TGwf4LbNIvg4BkvAGSfvZcevdpv_82MRpXKo,2129
-dodal/beamlines/p60.py,sha256=IJQdemlEkvVMYcyqp2WkyEwPAQrjor33b52wrfEVDIs,615
-dodal/beamlines/p99.py,sha256=hzKgFnJnsCPnVBQ9mAiWUOztLQXnlT5019k3qiMLqr8,2317
-dodal/beamlines/training_rig.py,sha256=TzJnKAfL8Nn5nxCyyt9D9-71YnrvmS8oyGavI_N-iv4,1954
+dodal/beamlines/p45.py,sha256=tQ7EkWfr7o2okK7Prw1C7DNGYdKPU2ofqjm98wu_-G0,2158
+dodal/beamlines/p60.py,sha256=KepKbrgMwwRRdIUmcgKgGtWaaZ-4Zp4_kdzH4zZW6E8,1086
+dodal/beamlines/p99.py,sha256=8AaUZPlqhwzgKHYMD2wT8x-8KNFwB9seuSwla59jlQE,2292
+dodal/beamlines/training_rig.py,sha256=0HeZYy4LkI1yU8joz40f241owLGB26CeCk7s8TW98zw,1902
 dodal/common/__init__.py,sha256=ZC4ICKUDB0BDxRaVy8nmqclVmDBne-dPtk6UJsoFq6I,258
 dodal/common/coordination.py,sha256=OxIjDiO1-9A9KESRPFtzwkvvQlavbgA5RHemlbubBPg,1168
 dodal/common/crystal_metadata.py,sha256=XGr-X81G9SZvPx5b4nBCH4FOnywyX_zYVy6zwDxIMVM,1926
@@ -47,13 +49,12 @@ dodal/common/udc_directory_provider.py,sha256=v5OBaCUwjtQZAsRQUw6LlVL58UvwwDO1l2
 dodal/common/visit.py,sha256=BLpr3GrP7Ij95V135hRJLgg7gWtBKXVxyOibWtcO8RE,5782
 dodal/common/beamlines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/common/beamlines/beamline_parameters.py,sha256=H9d4fLwVist7G-KdKYcv9D28E0tkhPtGPfiJ4V_5iHI,2721
-dodal/common/beamlines/beamline_utils.py,sha256=uy-HWchyUwoIqYYUWAd4BOPPoDzqvvtgkWQGzuKStTg,5061
+dodal/common/beamlines/beamline_utils.py,sha256=te1f4vOu3-E3U_Ynghn9qIS7R6Ob3NJq_AL_Bssg2KY,5162
 dodal/common/beamlines/device_helpers.py,sha256=V0hdBegQZ0ZILTT00tFFA8nNOOFta3tBMH3fsF1ZsBg,1024
 dodal/devices/CTAB.py,sha256=5_261Ox6NG2cJIzzwnjWz289BG0nZoE0wKOaI5V5jqM,1998
 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=i2hLNyf5_7UOuySdkjckb9RWMZrGcZkOF7cfDUj4V-E,12216
+dodal/devices/aperture.py,sha256=S7AoIoQg_kFxaQk7HUMijbm1kYkOEi2csbdj76kp1ys,427
+dodal/devices/aperturescatterguard.py,sha256=Ohp0eZNANHj-YlNE_42IJtWCKazzgGIooTT5AIyI77k,12200
 dodal/devices/apple2_undulator.py,sha256=PlgSpeCYfAMDYwOLx06Vzk_Iz_VGPwht1JbbwHjVyFQ,26291
 dodal/devices/backlight.py,sha256=RcgeA1hE3Z_5jA-jH8S8uLMpBfZjenRLz1lx6HTYeAo,1653
 dodal/devices/baton.py,sha256=BnakfZxx3cIIX6Kxj8-abxn8Z9LaQODhcPbStbD0as4,485
@@ -63,25 +64,24 @@ dodal/devices/cryostream.py,sha256=K-ldpredpeDTzNt4qtQMg99nKJNjBYoXBbK0WJGexzw,6
 dodal/devices/diamond_filter.py,sha256=hySd7HnLdplpPNvBrLddLjO_3LqgD8-99Zr__Sy_GbI,689
 dodal/devices/eiger.py,sha256=pQmklNX9kVCT5DE0WhRd5bAsNNKEo_vfPZG-ZunW67Q,15836
 dodal/devices/eiger_odin.py,sha256=ytUH_18YuM1nJDhplS6OTdtADloYvHpO6ppENjVd4jU,7411
-dodal/devices/fast_grid_scan.py,sha256=NfP746FfuHW-SWs7c7-O9oocWyVjBpu89WW7kaanlLM,11914
+dodal/devices/fast_grid_scan.py,sha256=UpAvlEncAG_toJi6p9iFggmLGeY7PZNfzt6WZiDo51Q,11891
 dodal/devices/fluorescence_detector_motion.py,sha256=-1qCSvW0PdT0m6BcoLxrtc0OJ5UDIBsEe11EOLr-gFw,501
 dodal/devices/flux.py,sha256=1CDsq9yU2-ho8MfYBl50Tl9ABZwpUBHnV486PQXKNoQ,462
 dodal/devices/focusing_mirror.py,sha256=vdUPkwyCAZBSR3LQ-EojDOoxVy1ZmOaD_nevETbj7BA,6592
 dodal/devices/hutch_shutter.py,sha256=iY3qWxDr8mDlAvN_BYe2gqpXRM1hlfV3ewdwkwh0_v0,3889
 dodal/devices/ipin.py,sha256=eq5jlKw7WGQi8VLrAWpaAIsZmfiVf-5Q0td_B22H6A4,473
 dodal/devices/linkam3.py,sha256=2sf-_heIsDg4qmqae-w9C2Py8pG8bPB3mT0TFPQIzd0,3869
-dodal/devices/motors.py,sha256=WSNPt9Pi7f-16yDtzAHApLOlUh1Y0aqnFICJIy2zOEs,1671
-dodal/devices/p45.py,sha256=hoBPpnj3b-njKqmhjAUFb79AyM4qFbWC9tuN6Aa47Rk,1703
-dodal/devices/pgm.py,sha256=am-AST9iTqma1PkGOKLozqAokZWbJUbM3TNcqXzB-6A,1132
+dodal/devices/motors.py,sha256=-gNBsKQHqlYCEeq9cNmnSTdyLLaFX-AmPwfQlmUxdQA,3356
+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
 dodal/devices/pressure_jump_cell.py,sha256=h5nMNtr2PMG_AKM6nOB7qNTYT70GRuiGBwC-Ol2Yby0,10548
 dodal/devices/qbpm.py,sha256=FfrWWAHHtYv3fGRT1qljyPpAwoHJYfbooT9CfKg-oXI,465
-dodal/devices/robot.py,sha256=BoaWRqPeO1Q9EhJ1fnq4od0GaiBconBunzg3u5kK5n0,6859
+dodal/devices/robot.py,sha256=qU_QWvtlVnV9kKbfmKPMpjKIODVy8eE-2tyJXPlBhcg,7023
 dodal/devices/s4_slit_gaps.py,sha256=4KdarIQoRqX4ry3LUS1Km7fkjUFahA0VuTd2DvYEqQ8,446
-dodal/devices/scatterguard.py,sha256=jx03in9QgaThWxD4t1S8_Llent2kWrn_hThJ9KkUWTk,330
 dodal/devices/scintillator.py,sha256=PlD6cnJ39PTB_e7QrRspPliLYE4kL_K7ziJURzuxgdA,365
 dodal/devices/slits.py,sha256=b_7ku2sHlzhMHTvWrwiRwee6ufrbxNX9JB_Z0lvk15o,1105
-dodal/devices/smargon.py,sha256=hLalJ32VDSjWQCCjFMXq4PhO17dven9RD5-9hqy8zNM,5734
+dodal/devices/smargon.py,sha256=uTO01FNToL_4FL6XIcH9WxGZmQB-SP4ujkZU6ChS-3U,5823
 dodal/devices/status.py,sha256=hVrJS1yooQo6PRumRACoIEh-SKBUKxvBlQl-MtLFUMQ,327
 dodal/devices/synchrotron.py,sha256=wLfClZ1lYQWA_D--UsM3NnKLG8bY8mvVsRYER6ob-Ew,2026
 dodal/devices/tetramm.py,sha256=cvlXiKwrvVgYNb3Kt2b_YyRMT5-fqMoKJrOGFNNR150,8643
@@ -91,13 +91,17 @@ dodal/devices/undulator.py,sha256=ZCdMQ8PKnW7mFV1BmrprOt0aSBCZMSKAH-2yyVH5Ihk,53
 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/aithre_lasershaping/goniometer.py,sha256=rZXnifj4-D0Nx3vStK0s-fBijvdepL1SXlHKocV7uKI,1840
+dodal/devices/aithre_lasershaping/goniometer.py,sha256=a3MMFs7ZBSa0eAEXOtlLX5uVbS99MZoDNENQdR84Rn0,1746
 dodal/devices/aithre_lasershaping/laser_robot.py,sha256=BPAHHRa9cYYSR4iv05CQEqRBjt1VKp0INSoVDg0ImRQ,763
 dodal/devices/areadetector/plugins/CAM.py,sha256=sZzJm5Ez3eWfXZi_EB67wluhZmMQm1UyOc2bJFfzd1U,964
 dodal/devices/areadetector/plugins/MJPG.py,sha256=QTsxCoWbofNpLMGPoOR2hWoM33KyntuLepbF0YmX0KE,3031
 dodal/devices/attenuator/attenuator.py,sha256=Vq9Zsyf56S5fePHGeluImTUtxdwEqttBa2YBIdU5tJU,3993
 dodal/devices/attenuator/filter.py,sha256=ZoPsTWXjllyMtKBdSIFLB7Cbc88rGof5k3ymL13VczE,422
 dodal/devices/attenuator/filter_selections.py,sha256=lcmTprCXgSggp2L6uQ6YU0xLMljXvbspAug-WWKCXks,1410
+dodal/devices/b07/__init__.py,sha256=VZfYvg9YkIRC47uqQwe0OpnQT1mLoCHnaej5LIY7nXc,77
+dodal/devices/b07/grating.py,sha256=AY3LZUQaNTohT93M0Qam0H1OYOkwziUUXYb2VsqXy6A,217
+dodal/devices/b07_1/__init__.py,sha256=xBXYQrDNjeGDHlGjacgopo1cQX-LRcy9UfXLZik7Qls,79
+dodal/devices/b07_1/grating.py,sha256=8fAvh6psQ9YQs5tdQ203KIa8pyZld3ZmfmGtTUl-P44,242
 dodal/devices/b16/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/b16/detector.py,sha256=nj0Xl8uleGtD_sk6tN-h7ipAtfz-e-c-DKWVwk_xXuY,1067
 dodal/devices/current_amplifiers/__init__.py,sha256=-MhT-t-GJ83rrvTDBCoWub_NKYkRtu4sEj8-y5XZBP0,782
@@ -111,51 +115,52 @@ dodal/devices/detector/det_dim_constants.py,sha256=arBWvzMwybatdSiCMAiwB4Bq1dX-w
 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/detector.py,sha256=DqQvlgdjIdKErrZqgM9IH7drc-r6N8nhkFk7KwlgYAk,4815
-dodal/devices/detector/detector_motion.py,sha256=UGDQriDWRluDZOZh1mDX9w_fPjMD-_BGe11kA36Kezs,1616
+dodal/devices/detector/detector_motion.py,sha256=Y14WORa6KaUHkm3u6Y7brH_WwH9UoutThKaxiDTaSnQ,1545
 dodal/devices/electron_analyser/__init__.py,sha256=xbOqt6b0J89UkZx6PAqEjPchfY_CMb3xgX3NAMEPf6A,793
-dodal/devices/electron_analyser/detector.py,sha256=V_fCe54S8K0C8cZXcozRKWwqm7n9B-iXf97Y9NtKAvQ,4522
+dodal/devices/electron_analyser/detector.py,sha256=0Hh6sSvBS26977oVHbUq2SeSJtjAtCcyhgJZeqVh_10,4207
 dodal/devices/electron_analyser/enums.py,sha256=2QObyZln7pvWyLgixabGGWvfs3aIF98gVSz2B4NS1OM,120
 dodal/devices/electron_analyser/types.py,sha256=k_uRDdHzx3sZQ11KB5PNTDQjxuGL91B3-l6sRuKdHHo,1026
 dodal/devices/electron_analyser/util.py,sha256=iUFvnYm-Y-0mBHR8oBLofZMKKuDhYYgGkOmvX6y1s1o,437
 dodal/devices/electron_analyser/abstract/__init__.py,sha256=OJ8rm_23azSe-MHmiyQZEUztqDnew4bRTdC2eVaiHT4,572
 dodal/devices/electron_analyser/abstract/base_detector.py,sha256=Tcx-lrqHr7dkGmOPMSVibZypefddRauQU_1cZTIwaVU,2979
-dodal/devices/electron_analyser/abstract/base_driver_io.py,sha256=ZGYtzxDkPIIcrZP4G2FXXJTAGL5uDKwpdAAvcM94gWU,8824
+dodal/devices/electron_analyser/abstract/base_driver_io.py,sha256=L2ToXCohnDnIpB8fZQS9ILIF8lo9W4SVBVy3n3rZPgQ,8665
 dodal/devices/electron_analyser/abstract/base_region.py,sha256=KI4Nk1w9V_1p71wdqLS7IMoal54QPejghDUO4FEdWuw,3648
 dodal/devices/electron_analyser/specs/__init__.py,sha256=qN57kY6ERUGdrAWhU5m8CBrc0KaqiOGwPL6h2BNm3i0,291
-dodal/devices/electron_analyser/specs/detector.py,sha256=9yOmfjVE_cRPJLOLZxaeGUqV1q82YuS_oO-psWE_Wxc,528
-dodal/devices/electron_analyser/specs/driver_io.py,sha256=hAqy0nKCR-9HLlcgJqkXpgIJy77yWsHCtS2bQ7eFM5c,3337
+dodal/devices/electron_analyser/specs/detector.py,sha256=zYu7e5Ob0f8L3cHr-hjv78q2V1_15dwWJ78523Nnrzc,664
+dodal/devices/electron_analyser/specs/driver_io.py,sha256=rIBfnTXxZZGlMArUDxxo_MCr84pfXNszTZbef8WBXak,3449
 dodal/devices/electron_analyser/specs/enums.py,sha256=cXPcbIGEN5ZJJt1KeiNJEtZkkcjQ-fz7dBfsU283zYQ,235
 dodal/devices/electron_analyser/specs/region.py,sha256=hBxrMUJrzOoJGInULEbAdnhBL74fFe7R6-c7nde8nPE,977
 dodal/devices/electron_analyser/vgscienta/__init__.py,sha256=Iq0d2BBp0TJh4uG9twiiL-gJiSVI8zNUEbkg1UF5k6U,395
-dodal/devices/electron_analyser/vgscienta/detector.py,sha256=JdCsTXXLbIIGIYZaNDcEGD-fagz8tjil7IbJDTfak6c,618
-dodal/devices/electron_analyser/vgscienta/driver_io.py,sha256=NijPdgvJoTLRPSVDfO4qB7X41TflPRayZZGxfKw-V-o,2800
+dodal/devices/electron_analyser/vgscienta/detector.py,sha256=3hD8dPMW6Oz76ZpRUwYSVCwGzuOw8qhaSdPF3B5Z3fE,754
+dodal/devices/electron_analyser/vgscienta/driver_io.py,sha256=pThghZHEive80hqY7Gv_QBYcXv4OKOnn4M56uHSRze8,2720
 dodal/devices/electron_analyser/vgscienta/enums.py,sha256=apJZgIaE1aMQPBwIL1tQvV0WJ5trbk3j6iFmc1OqLsw,353
-dodal/devices/electron_analyser/vgscienta/region.py,sha256=b1_L54ZxVaiO7sDOK6IbzWVi8fxgTlPAXnT4OpMfbVY,2273
+dodal/devices/electron_analyser/vgscienta/region.py,sha256=URXuHIkKQW-heejweTodoG-tM1XwWj9tPJwTWxpm-DY,2242
 dodal/devices/i03/__init__.py,sha256=Kvukapy4a5lUQ20qaCqYCJzKNaqJn2DfXP5nKZ_Pec8,118
 dodal/devices/i03/dcm.py,sha256=zDcgxOdMRVOQZBGDsLaIlr7o4UJIK2vehPWHxAxt6VA,2268
 dodal/devices/i03/undulator_dcm.py,sha256=c5H-17Dpt3pIMAlU9fHCnU59lYDnmgKk3qE2qR9gg44,2594
 dodal/devices/i04/__init__.py,sha256=Kvukapy4a5lUQ20qaCqYCJzKNaqJn2DfXP5nKZ_Pec8,118
-dodal/devices/i04/constants.py,sha256=jHZe5Aeph0_hCDJotMx7Yi8v_a_6jyoI6p60AQ8GvGM,271
+dodal/devices/i04/constants.py,sha256=_Dw28NeXldwRYH-h6YP6OHnyj7h0z4NQs_-RysNby5Q,281
 dodal/devices/i04/murko_results.py,sha256=1vVQKQdBGYAwcX22oQzWYheelIppoTQk5_git563y10,7055
 dodal/devices/i04/transfocator.py,sha256=sVI4Bgv-2-DH4-F1nIXMp5Aktevrm3agZnCA-WgjmW8,3780
+dodal/devices/i09/__init__.py,sha256=dBGF2yRW78BJc03VSSjgv0SsiKVaLmO48xS9Ht_bfYA,120
+dodal/devices/i09/dcm.py,sha256=u0OgfZUE-eFQc-ix7iIfXERZhymAMXHP-Eifu2xWhYA,996
+dodal/devices/i09/grating.py,sha256=i17tUlgXGKc2Ynclj7N6hpmPR9wDIw8w8m95SwzkouM,153
 dodal/devices/i10/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/i10/diagnostics.py,sha256=5nnf1oFKtUJZa9Pewh1VxXpFecLscqTR2VakHKr_PaQ,5432
 dodal/devices/i10/i10_apple2.py,sha256=RbavLeqwmmcqAkGJw9-0AmLrWSiP91tAxwJLnXXCY-4,15271
 dodal/devices/i10/i10_setting_data.py,sha256=69XWgE-YNTiW7C3t67MNcTL5JDDhOo7h-X7DCTpFE5g,164
-dodal/devices/i10/mirrors.py,sha256=E0M5keGI3LGaDHyXQkCCyj6xmixNY1xTSkIaaYwtnP8,794
+dodal/devices/i10/mirrors.py,sha256=M9knDxs1I1bdfW96rKsFEVeyVPeB9-0HSTuEb1zsqm8,663
 dodal/devices/i10/slits.py,sha256=jI4wJPVT2vtl4bvabrU9u_v-SdGjOfDLBm0S9GMZC7w,4157
 dodal/devices/i10/rasor/rasor_current_amp.py,sha256=hImaPI3veKiS5YVfYwv-qrQ1AYNBjFVxG_MwTQqtkcc,2368
-dodal/devices/i10/rasor/rasor_motors.py,sha256=0w31rKDuzRL-9tGbLDj0JZljaDjfXvKHQyzMs6fc3sw,1653
+dodal/devices/i10/rasor/rasor_motors.py,sha256=yWBxsiVhbdkQzhaK1S-nUq_wVntwHgdf6T8c8f7wHUE,1327
 dodal/devices/i10/rasor/rasor_scaler_cards.py,sha256=sfWJKNx6pq342PEAlmg_Yt_Tijq7mO1XFjcCDtToQiU,467
 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=XkY8E3UkSzZb9Pw_Ic4bv1DYJvBVADS_3okjHvY4nH4,1453
 dodal/devices/i18/KBMirror.py,sha256=W4R3TeulSjosUqAFIIznyWzje_Y2AoEf9f8N-NkisYM,710
 dodal/devices/i18/diode.py,sha256=nk5kvn4LsbhczRpCwHOO0_jJTYOz7MP9qm_uvBWuv7c,1468
-dodal/devices/i18/table.py,sha256=f6OtVSqCFIpXyoHX97CPLpaVDVXUNc2EvgSFP3qVFKo,446
-dodal/devices/i18/thor_labs_stage.py,sha256=I9JSKY-UqTjN-yBxQWL4CycTNNkUj3vknRrXjA6KZR8,364
 dodal/devices/i19/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/i19/beamstop.py,sha256=aV5gjTN-LEZxd3HnbotagJBB1GMdVB8VbvFPZvIw2U4,885
+dodal/devices/i19/beamstop.py,sha256=htAp2ckioFoYCcYDUBX-xm-0cC-xAmpr6W5AgRZyCFI,707
 dodal/devices/i19/blueapi_device.py,sha256=Tsl4vsREz7FM2d-kKJK-9tGrYbyKq4SLxnMlEKIM-g8,3966
 dodal/devices/i19/hutch_access.py,sha256=hnClUWCL1qTYzuBMmhXX85jiNak7mbYfyHEh54tZ27U,377
 dodal/devices/i19/shutter.py,sha256=Z3_UO3TmSczJrB8AcU5ohk8WlDN04a00XhSyDLAHvbc,1815
@@ -164,15 +169,14 @@ dodal/devices/i22/dcm.py,sha256=IbK56lSvX3PZlYKVeH7mIbRK83-mhJEIoTn1zjQfScE,4494
 dodal/devices/i22/fswitch.py,sha256=LSMoo9aDkH0SLcojbUh2NxTWIpUXHZxauTqThc3XtSk,3073
 dodal/devices/i22/nxsas.py,sha256=093GCM2H2LESt28RF-JfxEljJ8QzRPkL1ByXI2XVhoA,6012
 dodal/devices/i24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/i24/aperture.py,sha256=XlnOyQsvdTom1dJHVUg8CUSthq3jlBlZFOUaa9b1eZ4,837
+dodal/devices/i24/aperture.py,sha256=lSCdmGrcCF1EKSFaknbJVmHzvd1e3Az-5euC76e5C1c,735
 dodal/devices/i24/beam_center.py,sha256=m6LWsG9e_lhtPfZ8pc_hoLNyTYQQGGdRNav8J_2scTo,483
-dodal/devices/i24/beamstop.py,sha256=89ncXUisia1rn1Faf5iWg3k0QW6Rm99j1vq9A8l9Xv8,1221
+dodal/devices/i24/beamstop.py,sha256=6tbiQLlcTlp4PCPhHJ_mlHtkv0kz5ArQ99zg9rwTnrw,1133
 dodal/devices/i24/dcm.py,sha256=9eNCGq-lpyFAftLxLxlhG_enzVmrx1nbwMxGFP_UBvU,1354
 dodal/devices/i24/dual_backlight.py,sha256=CbQ9mYUNhhozVdNXqR5ac73tEIAWT2RnEpRwXB3EFog,2049
 dodal/devices/i24/focus_mirrors.py,sha256=DYiYLpDw8FJ1LYHxLOxE_om5qGfUo2itzskgqhmQZlg,1763
-dodal/devices/i24/i24_detector_motion.py,sha256=_HgdsZqFYY0tKqUgMzViHaPEUFXL3WlXXioGvDehRUw,364
 dodal/devices/i24/pilatus_metadata.py,sha256=I-AR8vd67qf6p0vZnRPTv4aNPN5T4KpSt2Iog4_jvn0,1781
-dodal/devices/i24/pmac.py,sha256=UTcJdTyzr7DL5XanjtjIopsxEyAPn9pv2jwgh2ksWV4,7078
+dodal/devices/i24/pmac.py,sha256=RFkt_jzpO7XBHbkWaep3SxwBbld8jAfRj_zI5JyzRjs,6945
 dodal/devices/i24/vgonio.py,sha256=sxSmcYZayVJPJz_D_91j9PmNor7Tbl1RGQFRrdtESlw,533
 dodal/devices/mx_phase1/beamstop.py,sha256=MeSpp4YpHgIrWCifDU7OTUaJNAMLVpcmgxTMjmOy048,3170
 dodal/devices/oav/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -188,11 +192,11 @@ dodal/devices/oav/snapshots/grid_overlay.py,sha256=CdvCdTKMCiwMwxm2lV28KpcIUSXls
 dodal/devices/oav/snapshots/snapshot.py,sha256=VDHYxko97sATMKvD5wClgvN7WQUtUAjcXXSyoQAL8q8,499
 dodal/devices/oav/snapshots/snapshot_image_processing.py,sha256=wDxH9WPmB0nsotr49PUpw2Ke4l4RFxirrbpPzOUF9s4,2318
 dodal/devices/oav/snapshots/snapshot_with_grid.py,sha256=KAM7KjF0BzhGxx-MXd4Zc16IBbi1BF8S_VT8T84_2OY,2309
+dodal/devices/p60/__init__.py,sha256=XsrXi-4D-zlgKzwCcrTM0UL6H51NYVn-78ETQsjcPv0,137
+dodal/devices/p60/lab_xray_source.py,sha256=4rruJ4yCT8c7QFDqkd6szsrJhLGOauAOh6Y25K-Vz-E,595
 dodal/devices/p99/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/p99/andor2_point.py,sha256=zBoIou7VVzs-tAq3M29XL2xYV8aYZRKPYCGKRLk7MA0,1417
 dodal/devices/p99/sample_stage.py,sha256=DvHU556Gp0wFiufZiwY3o2W4xmsCL5uSwNnhd8HPAnc,528
-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
 dodal/devices/util/adjuster_plans.py,sha256=c40PFZpXFw0YmJLh9jU4VIb8vRxHyafZlmvprTKAOhM,824
 dodal/devices/util/epics_util.py,sha256=3_d0m7BTvN19WIKvz2XSMvoPdTdccg9Z2gOAL-52q4s,4692
@@ -207,7 +211,7 @@ dodal/devices/zebra/zebra_controlled_shutter.py,sha256=tcBq2WQxST9g2VrjVWu-tOomF
 dodal/devices/zocalo/__init__.py,sha256=P9L31CzVJjXv3TQHau5qywYGFPTyopVaHLww8MOYnzc,440
 dodal/devices/zocalo/zocalo_constants.py,sha256=vu7Xjz7UNEpBUWEEBxDvP4bVFkZIN6NLGfQDpWbCjH8,98
 dodal/devices/zocalo/zocalo_interaction.py,sha256=GFukU9xqagQtVSDg5BrL23jxl1w8wjs4b4NLLqdFfpk,3584
-dodal/devices/zocalo/zocalo_results.py,sha256=1OzVrO4YavOzVZfG18ccsoQAjVo9We172P1beERSD8Y,16095
+dodal/devices/zocalo/zocalo_results.py,sha256=NToJUIa55VbVjH80Uipx5bFoBbOzrsSEu-DMERF89xc,13268
 dodal/parameters/experiment_parameter_base.py,sha256=O7JamfuJ5cYHkPf9tsHJPqn-OMHTAGouigvM1cDFehE,313
 dodal/plan_stubs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/plan_stubs/check_topup.py,sha256=3gyLHfHNQBCgEWuAg4QE-ONx7y2Do1vVv5HP8ss0Z1I,5371
@@ -216,15 +220,15 @@ dodal/plan_stubs/motor_utils.py,sha256=Mf8utOA_xmxUa2dLmQ1uRkdfyDTip7D8YcKeCBCQL
 dodal/plan_stubs/wrapped.py,sha256=kC8HH7bx3-sLYu2oieY_502tAdT2OECF8n-fqoL5Bfc,4266
 dodal/plans/__init__.py,sha256=nH1jNxw3DzDMg9O8Uda0kqKIalRVEWBrq07OLY6Ey38,93
 dodal/plans/bimorph.py,sha256=JxDmZDiEvZnz5f22tlaoyivpnaNGiX8kSL82qz5uvMM,11738
-dodal/plans/configure_arm_trigger_and_disarm_detector.py,sha256=pI1AkTH_5hIU56GmmrBdHMhepuDCuQz44V-O4XIaueg,5384
+dodal/plans/configure_arm_trigger_and_disarm_detector.py,sha256=Ndg6Tuqvu4WesTxtDlzzgeJh0BP7aWJ-TbYlforDkjM,5454
 dodal/plans/save_panda.py,sha256=1fumH7Ih8uDIv8ahAtgQ_vUuR3dz0sfUs4n9TEtEbSs,3053
 dodal/plans/scanspec.py,sha256=Q0AcvTKRT401iGMRDSqK-D523UX5_ofiVMZ_rNXKOx8,2074
 dodal/plans/verify_undulator_gap.py,sha256=OcDN09-eCoMzsmhKGxvzsH5EapG2zYz0yGCqUtQxLSc,568
 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
-dls_dodal-1.50.0.dist-info/METADATA,sha256=HHVwD53GPNpl389XdyNTqmiuW6uEBg1tsRZh7j8HU1g,16839
-dls_dodal-1.50.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dls_dodal-1.50.0.dist-info/entry_points.txt,sha256=bycw_EKUzup_rxfCetOwcauXV4kLln_OPpPT8jEnr-I,94
-dls_dodal-1.50.0.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
-dls_dodal-1.50.0.dist-info/RECORD,,
+dls_dodal-1.51.0.dist-info/METADATA,sha256=1MFj5q0Et6Ayr7fvZf7Jc_baoKQzrrNQAoi_r1PhBHQ,16793
+dls_dodal-1.51.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dls_dodal-1.51.0.dist-info/entry_points.txt,sha256=bycw_EKUzup_rxfCetOwcauXV4kLln_OPpPT8jEnr-I,94
+dls_dodal-1.51.0.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
+dls_dodal-1.51.0.dist-info/RECORD,,

dodal/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.50.0'
-__version_tuple__ = version_tuple = (1, 50, 0)
+__version__ = version = '1.51.0'
+__version_tuple__ = version_tuple = (1, 51, 0)

dodal/beamlines/adsim.py

@@ -10,7 +10,7 @@ from dodal.common.beamlines.beamline_utils import (
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.common.beamlines.device_helpers import DET_SUFFIX, HDF5_SUFFIX
 from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
-from dodal.devices.adsim import SimStage
+from dodal.devices.motors import XThetaStage
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix
 
@@ -62,8 +62,10 @@ RE(count([d], num=10))
 
 
 @device_factory()
-def stage() -> SimStage:
-    return SimStage(f"{PREFIX.beamline_prefix}-MO-SIMC-01:")
+def stage() -> XThetaStage:
+    return XThetaStage(
+        f"{PREFIX.beamline_prefix}-MO-SIMC-01:", x_infix="M1", theta_infix="M2"
+    )
 
 
 @device_factory()

dodal/beamlines/b01_1.py

@@ -11,7 +11,7 @@ from dodal.common.beamlines.beamline_utils import (
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.common.beamlines.device_helpers import CAM_SUFFIX, HDF5_SUFFIX
 from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
-from dodal.devices.motors import XYZPositioner
+from dodal.devices.motors import XYZStage
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix
@@ -42,8 +42,13 @@ https://argocd.diamond.ac.uk/applications?showFavorites=false&proj=&sync=&autoSy
 
 @device_factory()
 def panda() -> HDFPanda:
+    """Provides triggering of the detectors.
+
+    Returns:
+        HDFPanda: The HDF5-based detector trigger device.
+    """
     return HDFPanda(
-        f"{PREFIX.beamline_prefix}-EA-PANDA-01:",
+        f"{PREFIX.beamline_prefix}-MO-PANDA-01:",
         path_provider=get_path_provider(),
     )
 
@@ -54,7 +59,16 @@ def synchrotron() -> Synchrotron:
 
 
 @device_factory()
-def manta() -> AravisDetector:
+def oav() -> AravisDetector:
+    """The Manta camera for the spectroscopy experiment.
+
+    Looks at the spectroscopy screen and visualises light
+    transmitted through the sample after it has gone through
+    the diffraction grating.
+
+    Returns:
+        AravisDetector: The spectroscopy camera device.
+    """
     return AravisDetector(
         f"{PREFIX.beamline_prefix}-DI-DCAM-02:",
         path_provider=get_path_provider(),
@@ -64,7 +78,29 @@ def manta() -> AravisDetector:
 
 
 @device_factory()
-def sample_stage() -> XYZPositioner:
-    return XYZPositioner(
+def sample_det() -> AravisDetector:
+    """The Mako camera for the imaging experiment.
+
+    Looks at the on-axis viewing screen.
+
+    Returns:
+        AravisDetector: The imaging camera device.
+    """
+    return AravisDetector(
+        f"{PREFIX.beamline_prefix}-DI-DCAM-01:",
+        path_provider=get_path_provider(),
+        drv_suffix=CAM_SUFFIX,
+        fileio_suffix=HDF5_SUFFIX,
+    )
+
+
+@device_factory()
+def sample_stage() -> XYZStage:
+    """An XYZ stage holding the sample.
+
+    Returns:
+        XYZStage: The XYZ sample stage device.
+    """
+    return XYZStage(
         f"{PREFIX.beamline_prefix}-MO-PPMAC-01:",
     )

dodal/beamlines/b07.py

@@ -2,7 +2,9 @@ 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.b07 import B07BGrating
 from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
+from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
@@ -18,6 +20,14 @@ def synchrotron() -> Synchrotron:
     return Synchrotron()
 
 
+@device_factory()
+def pgm() -> PGM:
+    return PGM(prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:", grating=B07BGrating)
+
+
 @device_factory()
 def analyser_driver() -> SpecsAnalyserDriverIO:
-    return SpecsAnalyserDriverIO(prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:")
+    return SpecsAnalyserDriverIO(
+        f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
+        {"source1": pgm().energy.user_readback},
+    )

dodal/beamlines/b07_1.py

@@ -2,7 +2,9 @@ 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.b07_1 import B07CGrating
 from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
+from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
@@ -18,6 +20,14 @@ def synchrotron() -> Synchrotron:
     return Synchrotron()
 
 
+@device_factory()
+def pgm() -> PGM:
+    return PGM(prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:", grating=B07CGrating)
+
+
 @device_factory()
 def analyser_driver() -> SpecsAnalyserDriverIO:
-    return SpecsAnalyserDriverIO(prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:")
+    return SpecsAnalyserDriverIO(
+        f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
+        {"source1": pgm().energy.user_readback},
+    )

dodal/beamlines/b16.py

@@ -14,7 +14,7 @@ from dodal.common.visit import RemoteDirectoryServiceClient, StaticVisitPathProv
 from dodal.devices.b16.detector import (
     software_triggered_tiff_area_detector,
 )
-from dodal.devices.motors import XYZPositioner
+from dodal.devices.motors import XYZStage
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -59,7 +59,11 @@ def fds2() -> AreaDetector:
 
 
 @device_factory()
-def sim_stage() -> XYZPositioner:
-    return XYZPositioner(
-        f"{PREFIX.beamline_prefix}-MO-SIM-01:", "sim_stage", infix=("M1", "M2", "M3")
+def sim_stage() -> XYZStage:
+    return XYZStage(
+        f"{PREFIX.beamline_prefix}-MO-SIM-01:",
+        "sim_stage",
+        x_infix="M1",
+        y_infix="M2",
+        z_infix="M3",
     )

dodal/beamlines/b21.py

@@ -0,0 +1,148 @@
+from pathlib import Path  # noqa
+from ophyd_async.fastcs.panda import HDFPanda
+from ophyd_async.epics.adaravis import AravisDetector
+from dodal.devices.i22.nxsas import NXSasMetadataHolder, NXSasOAV
+from dodal.common.beamlines.device_helpers import CAM_SUFFIX, HDF5_SUFFIX
+
+
+from dodal.common.beamlines.beamline_utils import (
+    device_factory,
+    get_path_provider,
+    set_path_provider,
+)
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.common.visit import RemoteDirectoryServiceClient, StaticVisitPathProvider
+from ophyd_async.fastcs.eiger import EigerDetector
+
+
+from dodal.devices.linkam3 import Linkam3
+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("b21")
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+# Currently we must hard-code the visit, determining the visit at runtime requires
+# infrastructure that is still WIP.
+# Communication with GDA is also WIP so for now we determine an arbitrary scan number
+# locally and write the commissioning directory. The scan number is not guaranteed to
+# be unique and the data is at risk - this configuration is for testing only.
+set_path_provider(
+    StaticVisitPathProvider(
+        BL,
+        Path("/dls/b21/data/2025/cm40642-3/bluesky"),
+        client=RemoteDirectoryServiceClient(f"http://{BL}-control:8088/api"),
+    )
+)
+
+
+@device_factory(skip=True)
+def saxs() -> EigerDetector:
+    return EigerDetector(
+        prefix=PREFIX.beamline_prefix,
+        path_provider=get_path_provider(),
+        drv_suffix="-EA-EIGER-01:",
+        hdf_suffix="-EA-EIGER-01:OD:",
+        # odin_nodes=1, # TODO: https://github.com/bluesky/ophyd-async/issues/923
+    )
+
+
+@device_factory(skip=True)
+def waxs() -> EigerDetector:
+    return EigerDetector(
+        prefix=PREFIX.beamline_prefix,
+        path_provider=get_path_provider(),
+        drv_suffix="-EA-EIGER-02:",
+        hdf_suffix="-EA-EIGER-02:OD:",
+        # odin_nodes=1, # TODO: https://github.com/bluesky/ophyd-async/issues/923
+    )
+
+
+@device_factory()
+def panda1() -> HDFPanda:
+    return HDFPanda(
+        prefix=f"{PREFIX.beamline_prefix}-MO-PANDA-01:",
+        path_provider=get_path_provider(),
+    )
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def slits_1() -> Slits:
+    return Slits(prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-01:")
+
+
+@device_factory()
+def slits_2() -> Slits:
+    return Slits(prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-02:")
+
+
+@device_factory()
+def slits_3() -> Slits:
+    return Slits(prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-03:")
+
+
+"""
+Slits 4 was removed from B21 after the camera length was fixed, it is not used anymore.
+"""
+
+
+@device_factory()
+def slits_5() -> Slits:
+    return Slits(prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-05:")
+
+
+@device_factory()
+def slits_6() -> Slits:
+    return Slits(prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-06:")
+
+
+@device_factory()
+def slits_7() -> Slits:
+    """
+    Compact JJ slits device is used for B21 slits 7. PV's operate in same way
+    but physically different to other slits, and uses X:GAP nomenclature.
+    """
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-07:",
+        x_gap="X:GAP",
+        y_gap="Y:GAP",
+        x_centre="X:CENTRE",
+        y_centre="Y:CENTRE",
+    )
+
+
+@device_factory()
+def wbscam() -> AravisDetector:
+    metadata_holder = NXSasMetadataHolder(
+        x_pixel_size=(1292, "pixels"),  # Double check this figure
+        y_pixel_size=(964, "pixels"),
+        description="Manta_G-125B",
+        distance=(-1.0, "m"),
+    )
+    return NXSasOAV(
+        prefix=f"{PREFIX.beamline_prefix}-RS-ABSB-02:CAM:",
+        drv_suffix=CAM_SUFFIX,
+        fileio_suffix=HDF5_SUFFIX,
+        path_provider=get_path_provider(),
+        metadata_holder=metadata_holder,
+    )
+
+
+@device_factory(skip=True)
+def linkam() -> Linkam3:
+    return Linkam3(prefix=f"{PREFIX.beamline_prefix}-EA-HPLC-01:")
+
+
+# TODO: https://github.com/DiamondLightSource/dodal/issues/1286
+# def dmm() -> DMM: #b21 uses a dmm so
+#     return DMM()