dls-dodal 1.68.0__py3-none-any.whl → 1.69.0__py3-none-any.whl

{dls_dodal-1.68.0.dist-info → dls_dodal-1.69.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.68.0
+Version: 1.69.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
@@ -232,36 +232,6 @@ Requires-Dist: scanspec>=0.7.3
 Requires-Dist: pyzmq==26.3.0
 Requires-Dist: deepdiff
 Requires-Dist: daq-config-server>=v1.0.0
-Provides-Extra: dev
-Requires-Dist: black; extra == "dev"
-Requires-Dist: diff-cover; extra == "dev"
-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]>=v0.14.0; extra == "dev"
-Requires-Dist: pipdeptree; extra == "dev"
-Requires-Dist: pre-commit; extra == "dev"
-Requires-Dist: psutil; extra == "dev"
-Requires-Dist: pydata-sphinx-theme>=0.12; extra == "dev"
-Requires-Dist: pyright==1.1.406; extra == "dev"
-Requires-Dist: pytest; extra == "dev"
-Requires-Dist: pytest-asyncio; extra == "dev"
-Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: pytest-json-report; extra == "dev"
-Requires-Dist: pytest-random-order; extra == "dev"
-Requires-Dist: ruff; extra == "dev"
-Requires-Dist: sphinx<7.4.6; extra == "dev"
-Requires-Dist: sphinx-autobuild; extra == "dev"
-Requires-Dist: sphinx-copybutton; extra == "dev"
-Requires-Dist: sphinxcontrib-mermaid; extra == "dev"
-Requires-Dist: sphinx-design; extra == "dev"
-Requires-Dist: sphinx-autodoc-typehints; extra == "dev"
-Requires-Dist: tox-direct; extra == "dev"
-Requires-Dist: types-requests; extra == "dev"
-Requires-Dist: types-mock; extra == "dev"
-Requires-Dist: types-PyYAML; extra == "dev"
-Requires-Dist: types-aiofiles; extra == "dev"
 Dynamic: license-file
 
 [![CI](https://github.com/DiamondLightSource/dodal/actions/workflows/ci.yml/badge.svg)](https://github.com/DiamondLightSource/dodal/actions/workflows/ci.yml)

{dls_dodal-1.68.0.dist-info → dls_dodal-1.69.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
-dls_dodal-1.68.0.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+dls_dodal-1.69.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=fKEtAXP7aFyf66hvwaMabE9BzwL6dh3xGKYU6jI5_mA,706
+dodal/_version.py,sha256=UFXClfIoG_GVAx86W6RvFANz85U9g5mM9teyoGU1_GU,706
 dodal/cli.py,sha256=fPFs0ACCf2jEnACCIzEd5xR5ormxRwDKOZjzFlaBC88,4728
 dodal/device_manager.py,sha256=rTW-uaOiMPxkvYg7-yDy5MwhhfTCbbY5XkJXV_kcvj0,21029
 dodal/log.py,sha256=UckmmyY_SdZePyi5lHnjh-DVw6qvnat3ANa_5-y80Og,9877
@@ -10,7 +10,7 @@ dodal/beamline_specific_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 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/adsim.py,sha256=KDhAsdhdYlr4CLruJd01UmRRxqO7TRCwBma2rWldWJc,2379
 dodal/beamlines/aithre.py,sha256=RRNmzJz4Fu5eHRXKoIJpv1D1fNR5e7wmT34d52QwM9Y,1399
 dodal/beamlines/b01_1.py,sha256=H24kiQtF0XnpWBtpsdC_k4w2WU4ibvovU3YPAop_zdg,2830
 dodal/beamlines/b07.py,sha256=BfJJso_h2YX1LU0sRNxGeKJzCNRWngV9Kv2Hc3M6zLM,1430
@@ -18,17 +18,19 @@ dodal/beamlines/b07_1.py,sha256=Lph4PT0JOoOk_PnRBFZxg1R6N6TqNCrmNL7ybCF2Evc,1637
 dodal/beamlines/b16.py,sha256=rK00hEj8KLGNkLZr9omAuoMz_DyLN9rK4eUQssETR9E,1703
 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=HyJzusfTuTYT5hi6ajcB3wQup1BPKWRGrxbLocz8Hmg,10438
-dodal/beamlines/i04.py,sha256=toMPtu1k2NXzfmmX6b8CH_kjhCjmO5LD_8Hs9UQPNhU,14956
-dodal/beamlines/i05.py,sha256=FxzIJ4BFE6PC3Gs6Kq_GjrRbpam8UbRO22EHjuSO2nQ,1281
+dodal/beamlines/i02_1.py,sha256=c4-_XHrrQyPLygn61WvarM6-XRChh0NC3AUrWu5X8XM,2584
+dodal/beamlines/i02_2.py,sha256=Xa4bfEibPDRL-17ycirZWrlcdxokm81a9pRfucrhYMg,802
+dodal/beamlines/i03.py,sha256=9FlLJnSjopLqz_AxqFxZWAPobard5YDEp0LCYQiIWmw,10491
+dodal/beamlines/i03_supervisor.py,sha256=O-v8M-WLR1rN4GugDDC1CHCpunnX2QEk5PPBm0cEMus,517
+dodal/beamlines/i04.py,sha256=Odse2lgjATQ-8hGfyDvVoGwTnz68ns1n9EYnbG1-FzQ,8967
+dodal/beamlines/i05.py,sha256=ZkSZLJrcZBF_x_dticRq0KM12GVveLBLiCplUus5J9c,1497
 dodal/beamlines/i05_1.py,sha256=bzaDqR2doZnoN-dk_oPwWqSGJaVZTDnNtx0wMzGSTp8,714
 dodal/beamlines/i06.py,sha256=V0kjC2NPX4fn9et3T8KLbTgNXsyYki4S5swrC61YwAI,1571
+dodal/beamlines/i06_1.py,sha256=Rm0es2EnnAypdRQNaOj9uirK5SwktmA-YHM27RAFi9w,763
 dodal/beamlines/i07.py,sha256=mnwJPscsXFZnRQ2fKd-FwYiL_VjQu5zbYGQcgg7lplE,1270
-dodal/beamlines/i09.py,sha256=gWVSQOmpQO6X24eARNXHQHafDv5AX7CozGSmj8NR_ak,1910
-dodal/beamlines/i09_1.py,sha256=bcFExeMBPoabzEA-c01cO-EUwFA3KHWBmA0iuQ4gp7A,2543
-dodal/beamlines/i09_2.py,sha256=pEH-a4gwuhf4xRqdLx5eAvOfxDtnc16Nvk57nDUVPSg,3395
+dodal/beamlines/i09.py,sha256=M_aZ1QlPYysIJIvZunkmHENdizIhqK13hI-AjC2p3Iw,3056
+dodal/beamlines/i09_1.py,sha256=JZLsEL1ybPFlsXYyELEFWY6IgpdgJEa_O9m5Wu6HzNE,2739
+dodal/beamlines/i09_2.py,sha256=EKy-2140rKHT3NCDT5XH-fx01Rzala1r6lisgMm-Da4,3475
 dodal/beamlines/i10.py,sha256=LC0ii13rVyZj1ziatBAyRoyuutdyyTCkpSvICGv4IGY,4059
 dodal/beamlines/i10_1.py,sha256=FxnWjr1u55XgIvnuyTfknnj-xPMNJOAtxObq1y9k518,1062
 dodal/beamlines/i10_optics.py,sha256=C8dftjZw1TmdswUMpGoKOF70TsAQ1WAffdQH-1BJ74I,7142
@@ -36,31 +38,31 @@ 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/i16.py,sha256=NDTbyllb11Rklk5MNDVhrmI361Q-aKOMPy_dp09JE74,648
+dodal/beamlines/i16.py,sha256=OQB7jez37jEVQvMCNFZNd6R30TWBcZrJPxpTumsY8go,983
 dodal/beamlines/i17.py,sha256=nlebjLsEruFcrpVGXclNHBsnIMtasQKvsBimwIf2-vI,2788
 dodal/beamlines/i18.py,sha256=vPGfrbh1CY2W2BXIfCA5PIeVyixS5nEJSxHpla1RM4I,3756
 dodal/beamlines/i19_1.py,sha256=aC-R9CEjRZEdSutfYhK9r2rT6J__IOZy4zG95B_fJC8,3466
 dodal/beamlines/i19_2.py,sha256=gNRRRimY69zl_e9FRaEFs-fQxWu6oqFwjHjjVs-AJrk,4514
 dodal/beamlines/i19_optics.py,sha256=fNdAFRJYFA045l4giGI3V68qijDFE1C8gdvD6fncAio,1181
-dodal/beamlines/i20_1.py,sha256=Zsr1lsH7ySbOgK7RhMVMWzNWZAV-fuYW0iAjSEJZicY,2625
-dodal/beamlines/i21.py,sha256=1ZtVPmnZLMvhcIpeVN7OZYnt44hVJpNNnHbfxwGoseQ,3357
+dodal/beamlines/i20_1.py,sha256=ZLVemp8OJT6csSbTJ5zu9uEoJD4-ZOLFAuOP6s1re_8,2956
+dodal/beamlines/i21.py,sha256=ElxLtTga2eeg3s-4IoYb3iAhPR-wcNSqhN9vzol0-9E,3653
 dodal/beamlines/i22.py,sha256=XVGYyx6QEhbXJ5DRm-YWnUZKdagv_X8YJNYjmhXT7II,8097
-dodal/beamlines/i23.py,sha256=ZXvPEiMA4mPbRTXOxvL1NcoVWDg4Deyl8k57cveDg90,3060
-dodal/beamlines/i24.py,sha256=0ZjJCUYIUWIQTPrXFqKviiTCZiyuJh4MkmqMYd9JZ9o,7454
+dodal/beamlines/i23.py,sha256=_aByHf88l_GR5VxL8bJtPdCWSKZkbO5vVBJtlOf1BqE,2908
+dodal/beamlines/i24.py,sha256=CHrpZK-R3zZ6TQal7acPYunQIFnmHt-nzJ-mzdG4sCQ,4850
 dodal/beamlines/k07.py,sha256=jELF4ENfSsPumbFieZDQKP-fDKFeGfox7guhdxJqmD8,1005
 dodal/beamlines/k11.py,sha256=sBOl-MLk7FMo10KFykuK5aLqH1zyW4FnI0XXmtQhUfg,978
 dodal/beamlines/p38.py,sha256=ohFCTkyqR2MWGK20PrJqAIokiEjDPNTAfMRzrn3T0Mg,5778
 dodal/beamlines/p45.py,sha256=tQ7EkWfr7o2okK7Prw1C7DNGYdKPU2ofqjm98wu_-G0,2158
-dodal/beamlines/p60.py,sha256=EEEPwzIMyNecEDZsPDrfn6RskbSumySruLTuYNQCDBI,1485
+dodal/beamlines/p60.py,sha256=oTLABOZIF7CUMMxipE0GO1Awij52OOiD4LJSS632sDA,1699
 dodal/beamlines/p99.py,sha256=Rbi9OvmrGIblctOnZxFG_tqqhALLZ9O3ht4mBcb5vU8,2754
 dodal/beamlines/training_rig.py,sha256=VfMMNLdqej50CX17GluuwBbdXaurc5dnWjmoCT20bT4,1593
-dodal/common/__init__.py,sha256=0fah9eCiHBBLVhdIqN_pjQIgPtxkAu25-3i4KjHRFM4,386
+dodal/common/__init__.py,sha256=y-R5BgS0ms1UKryzkK8eHn8E3NiMVU3VG8upgWC7DcQ,418
 dodal/common/coordination.py,sha256=zvY3n8r-eDU2K3O7RlMzS6eoKI_XWHCWS9mcLwHVZXc,1252
 dodal/common/crystal_metadata.py,sha256=XGr-X81G9SZvPx5b4nBCH4FOnywyX_zYVy6zwDxIMVM,1926
 dodal/common/data_util.py,sha256=Z2DgxQl3AzTB940e_qYVDIHuu_9vWzpbycjKb62SFus,555
 dodal/common/device_utils.py,sha256=3hWgLmESiF88fho9bCweZpZH6b5fbbuSZGuSEYXxl4E,1345
 dodal/common/enums.py,sha256=Q8RSQBIHTCbhngVUKoznzvwazQ7INsT5NE0BcAgT1U0,404
-dodal/common/maths.py,sha256=K9x7iL3xXLtWYTV-xlFHDNSTIL9a2UP3Ws7wr6Dm2rQ,1803
+dodal/common/maths.py,sha256=_nf7Duz7oVnyAdGAKbaoZ_-u_5o-8ApFzghu2A8IWfc,4241
 dodal/common/types.py,sha256=fkL7UOwDbe3v2_VJ5f1W5RxR98Wx-Ra-LxUZWkNDtls,486
 dodal/common/udc_directory_provider.py,sha256=v5OBaCUwjtQZAsRQUw6LlVL58UvwwDO1l2MKlilXjdk,2403
 dodal/common/visit.py,sha256=0KxiIYJolSewuTn9Av-B4NxU2WpQo2l1-WmAO741Du8,5826
@@ -81,11 +83,11 @@ dodal/devices/common_dcm.py,sha256=BmvwnT5mbCmSQI8aGl3GKEfpe7N1axUANEyG-NYgC98,5
 dodal/devices/controllers.py,sha256=W_Ras1c6xLjcOMKPSHN8Z1eCUCH-ktaah2hzQXyuFLk,652
 dodal/devices/cryostream.py,sha256=F8-JVl9LvvR0jvFUwhowazwT7q38HnDuVZxRS-1BOnk,4522
 dodal/devices/diamond_filter.py,sha256=hySd7HnLdplpPNvBrLddLjO_3LqgD8-99Zr__Sy_GbI,689
-dodal/devices/eiger.py,sha256=EywzuUSDnwLDd0XACKilDgwVcet1SnIPixZ28Etf78Q,17527
+dodal/devices/eiger.py,sha256=ssxCeHbZLWIZ36Zv_ghSnMpNq58eTKrEX61B-kr62M0,18138
 dodal/devices/eiger_odin.py,sha256=1JoqPppTp99IZCiFOXJZB3h62xXRYKZINxTYXdLnT8c,7480
 dodal/devices/eurotherm.py,sha256=rdLldmWYP1PZBckoya6svPy1mDxHYaa1IfMleMPGzD4,3832
 dodal/devices/fast_grid_scan.py,sha256=xm2PEPrbqHOQfVrNcXt60S1UT5RtWir6MkdnVlhZNPw,17592
-dodal/devices/fast_shutter.py,sha256=kbHaV-cjAaKFfgEHu7fw9jEBDoJAkIa7N0XXGBZq-xs,2345
+dodal/devices/fast_shutter.py,sha256=FEFDXpRyJIxwasYxCX47Dh2m8BGTP5v1KcU7OeSXF3k,5442
 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
@@ -98,9 +100,10 @@ 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=IBGwLoWw2MIxSs0gqRBOw4SYOX94ahQ0UI40FZlvZeM,7618
+dodal/devices/robot.py,sha256=hsCCXSOorVZUzQ4opkZtfDOZbhwIyanqNzc00KWzEcI,8225
 dodal/devices/s4_slit_gaps.py,sha256=4KdarIQoRqX4ry3LUS1Km7fkjUFahA0VuTd2DvYEqQ8,446
 dodal/devices/scintillator.py,sha256=w6YSf1mY_xJKU00TXS_wfzJVKFvXNX9U7Vs8as-33wM,4249
+dodal/devices/selectable_source.py,sha256=dyfF1RkUpbM_d6ntqBv9EP70Mp0dxAZqEwHIfUNsyZs,1256
 dodal/devices/slits.py,sha256=IJtipn1N5B7pH64frWcF2TFK8mTFwSYXpGt_FMGl68w,1537
 dodal/devices/smargon.py,sha256=JlaNPCRWh0dHbslmjuDtlZhVbIz_clmw4eUIgoSj9tM,4986
 dodal/devices/status.py,sha256=hVrJS1yooQo6PRumRACoIEh-SKBUKxvBlQl-MtLFUMQ,327
@@ -146,21 +149,21 @@ dodal/devices/detector/det_resolution.py,sha256=8OW40MhRg56GlLstM1MOkIxa4DY8eg4q
 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=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/electron_analyser/base/__init__.py,sha256=u8kktlYGxZKXFh-dA98MVVvSsSayAraCHsDI8RtJm3Q,1604
-dodal/devices/electron_analyser/base/base_controller.py,sha256=aFajs4VgmG4J2Gf_4Wt--HM3gaslQlS3JXFUw5YeOWI,2869
+dodal/devices/electron_analyser/base/__init__.py,sha256=FVjJ6o4Gy7eXvw-IhF23iUBh4Ux7EiXpB0Pl2DUxjsg,1616
+dodal/devices/electron_analyser/base/base_controller.py,sha256=i3AZM6JjO1v_5QA8rjDo86Sp6t2aPlELnEn_woqXe5Y,3372
 dodal/devices/electron_analyser/base/base_detector.py,sha256=qNZnf-PS82z250ir9UxGYsGF5ToxvL-y-9gCJWrrWnE,7092
 dodal/devices/electron_analyser/base/base_driver_io.py,sha256=Y1uXIbxZS4wrxzAxv8bIJ5eZHyG3rGTTauLNjptjR-A,8985
-dodal/devices/electron_analyser/base/base_enums.py,sha256=ruSH7LNRhtqMflv7gYxKeAu0uLzZIaoCai7sSTzpvkg,204
-dodal/devices/electron_analyser/base/base_region.py,sha256=VD-7bccwKMfm1AqY9jYSiuqfL5XLKKmxrfiFzi13Crw,7432
+dodal/devices/electron_analyser/base/base_enums.py,sha256=2QObyZln7pvWyLgixabGGWvfs3aIF98gVSz2B4NS1OM,120
+dodal/devices/electron_analyser/base/base_region.py,sha256=e3gFUppmM5zB7YhwY-XwjRoRI7-mlqfgKccGMwfMQOs,7475
 dodal/devices/electron_analyser/base/base_util.py,sha256=nGx3vF7eF4SxjzNysoxWbzqmxdSWvcPPHmghw74UuEc,1245
-dodal/devices/electron_analyser/base/energy_sources.py,sha256=HdslyJYn8GbhCkQ2eOlgDOZ1zrHXBUIEk_4kfUXgLrk,3162
+dodal/devices/electron_analyser/base/energy_sources.py,sha256=_JUOQDoqnqyp5Xw_dEo45vKxzFUgWS8gSS2Kqm7CjFk,3246
 dodal/devices/electron_analyser/specs/__init__.py,sha256=PiId7pXfFqG0UznwzTROAp3iORuU6UEwn_0ohKBxKNk,315
-dodal/devices/electron_analyser/specs/specs_detector.py,sha256=J7TQpvCg6mzVp010LCqtHhHydrcKRweGeApeZeX8GFM,1542
+dodal/devices/electron_analyser/specs/specs_detector.py,sha256=QZFltj9-4e42BWmwT0O3vTCcx6Y6gMAKO5FZmH7yIMk,1740
 dodal/devices/electron_analyser/specs/specs_driver_io.py,sha256=SVb0tQGbb6m9DbjmNxfWKCwDVqMSh5a8Ad5RsMb6rZs,4449
 dodal/devices/electron_analyser/specs/specs_enums.py,sha256=cXPcbIGEN5ZJJt1KeiNJEtZkkcjQ-fz7dBfsU283zYQ,235
 dodal/devices/electron_analyser/specs/specs_region.py,sha256=uF12HNzh1I9csYVS3j-CAGuCHCblVzYFBp_4G7JCnvI,1165
 dodal/devices/electron_analyser/vgscienta/__init__.py,sha256=s8acayQN8E0j1H9YEr6Q47Kxu3OtrPuZHk3ARuuot_A,397
-dodal/devices/electron_analyser/vgscienta/vgscienta_detector.py,sha256=5iJIl1WwnrPVCoyBEMwzaycg0yDURs3DZNq5ceTSRAc,1850
+dodal/devices/electron_analyser/vgscienta/vgscienta_detector.py,sha256=BGHxIo0vojY140Ed2LBg3fheCR9Uqfb3iKqwR_cCao4,2048
 dodal/devices/electron_analyser/vgscienta/vgscienta_driver_io.py,sha256=QADd2CU52BrRwPquHmHO77gX4EY7x-yWmbOfGZhe_k8,3471
 dodal/devices/electron_analyser/vgscienta/vgscienta_enums.py,sha256=3vmX67ExATU8clueVp_mCzw3OUQx799oZMc8gyHtMJE,205
 dodal/devices/electron_analyser/vgscienta/vgscienta_region.py,sha256=SvQmB_NsdzKhuKkuzvkirsYMaqR-1bOjppVsBP4bBqo,2219
@@ -174,10 +177,11 @@ dodal/devices/i03/constants.py,sha256=Y-4tsbmAMEcjV5FBjeRmnA2tl5-LPt5x_icG2xu7Xk
 dodal/devices/i03/dcm.py,sha256=qK9qcPCedjOVMvKZ0TZaWNeyt7CJRsC-Wpjy44OQf4E,2336
 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/beam_centre.py,sha256=joZ2oCabG2caPZDqtj46Hbit5N_TrXy6N3OMpHQIiwA,3004
 dodal/devices/i04/beamsize.py,sha256=0Y8Adz_nSSe86uD95BgcZTyZUfisMMX01aoPi8jQx-I,1582
 dodal/devices/i04/constants.py,sha256=_Dw28NeXldwRYH-h6YP6OHnyj7h0z4NQs_-RysNby5Q,281
-dodal/devices/i04/max_pixel.py,sha256=qH-hElSDOi_ThMzuapiBSkJIAqMZ08K_OyuO3hkw0F0,1565
-dodal/devices/i04/murko_results.py,sha256=y6dNd1aZGRyEPP5mtWTVejbRYBoEa6qXMUNFM4VDCbg,10069
+dodal/devices/i04/max_pixel.py,sha256=Ng-P6LN-EkCEJnBbhP2SuBbEKqKrTjzGwOH82f8JrrA,935
+dodal/devices/i04/murko_results.py,sha256=nEyeMThecri-cmv0ASBfVyG4AU3_nilrzNAaHQ5i-aQ,10631
 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
@@ -195,7 +199,7 @@ dodal/devices/i09_2_shared/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 dodal/devices/i09_2_shared/i09_apple2.py,sha256=6WliOiSdTjuO6N5YrvJK4AKAUgT7sSVHoLnpH1ntTU0,245
 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=zbJFTsBGT0i0ZMFG49bSPLv0z5gbpr1nRrzbhIEDIh8,6880
+dodal/devices/i10/i10_apple2.py,sha256=aTmnrrzpW9B2yEO1Lj_mfmTOQqryRo_72rLkaQ9mpJk,6846
 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
@@ -221,7 +225,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=BQ8yD87S_nLFRTZ2RHlQqUJyXlRgeN1qvHUjESn7t9w,2250
+dodal/devices/i17/i17_apple2.py,sha256=VEGNdPQVIXdvjPn5vhem5KmmKuR-jLl9O6X7AdftuME,2188
 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
@@ -247,25 +251,28 @@ dodal/devices/i24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 dodal/devices/i24/aperture.py,sha256=dlH_g7OPTBc5QRMd-ADU3_GDTKh668kkMHo4k_JxUcY,770
 dodal/devices/i24/beam_center.py,sha256=nQyOif6JtlU_qP7kZP-8wN1ldW81MIbFUykPC1bEm70,446
 dodal/devices/i24/beamstop.py,sha256=6tbiQLlcTlp4PCPhHJ_mlHtkv0kz5ArQ99zg9rwTnrw,1133
-dodal/devices/i24/commissioning_jungfrau.py,sha256=i-B6Sy2braKSGYF2G7QrluPkThXHY-YiULUJRqClFok,4532
+dodal/devices/i24/commissioning_jungfrau.py,sha256=EpU00AkpsYBwZN33N1pju9x5ZeSGq1kK3ofXp_LnKYU,4376
 dodal/devices/i24/dcm.py,sha256=2stTmR-Hx7azjVmMPVRu0gRDrJ-1jjKaWxFrF9IKsJc,1268
 dodal/devices/i24/dual_backlight.py,sha256=N0R7M1mHPRmQ4fks5lGU1wrXjOvcW_ZKIXaRoC8aLDE,2084
 dodal/devices/i24/focus_mirrors.py,sha256=DYiYLpDw8FJ1LYHxLOxE_om5qGfUo2itzskgqhmQZlg,1763
 dodal/devices/i24/pmac.py,sha256=-HYf2HPzaqWvszp4T8TXohdp40-xmKqQq4V0mLvVri8,7028
 dodal/devices/i24/vgonio.py,sha256=sxSmcYZayVJPJz_D_91j9PmNor7Tbl1RGQFRrdtESlw,533
-dodal/devices/insertion_device/__init__.py,sha256=Gx-2YRja1TeW5AMaSH42sCOoiXnoAkuezsy8aJmC3IE,1373
-dodal/devices/insertion_device/apple2_undulator.py,sha256=B0OjfPv8oN0tOVJ8JVhsBqLC9zWeHQxxy9t9ERO6T_Q,30543
-dodal/devices/insertion_device/energy_motor_lookup.py,sha256=8kmw7rNBTK_srKplNQ5pHD5P6b1oOP1fNJ7iNDrKgzY,2708
-dodal/devices/insertion_device/id_enum.py,sha256=IQgVUiY23hcOk3G073OAspeRJ9V4YEx2MntKlUt0Nqk,265
-dodal/devices/insertion_device/lookup_table_models.py,sha256=_lkdHo9W8u0GppBUg5Mas7ABF1ET3la6PjLGavThh3Q,9874
+dodal/devices/insertion_device/__init__.py,sha256=xFELKzqlyk_cdkQmElyH4eg-5hD_HuyCWNu06Mne7zI,1543
+dodal/devices/insertion_device/apple2_controller.py,sha256=Mx-r2M0Yze6zyOyoJhqpJ8iu__ZZTMRA-9j5dVreBOc,15179
+dodal/devices/insertion_device/apple2_undulator.py,sha256=mizSUajWUKeOeXT4rO10KwuzIHf_QlOcpu807uUTF9Y,15165
+dodal/devices/insertion_device/energy.py,sha256=VhxftXZFe_AgAcRSxCKKZ6lwjVEb9KWecTCa4oBGHOQ,2657
+dodal/devices/insertion_device/energy_motor_lookup.py,sha256=ILhcSW13vK7GF3W9j2OVmVApDTRWft3OjwIIAfmRBDM,2705
+dodal/devices/insertion_device/enum.py,sha256=IQgVUiY23hcOk3G073OAspeRJ9V4YEx2MntKlUt0Nqk,265
+dodal/devices/insertion_device/lookup_table_models.py,sha256=g9c4j1V31I8jj-IxM1PX8QXeIdB0pH_EKZJOh3PmvGc,9873
+dodal/devices/insertion_device/polarisation.py,sha256=F6oSoApZp0ygcFYt4RxCGzbjhCUyxYWDSH0cSSdcbYw,1332
 dodal/devices/mx_phase1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=pgQmqot9avffVRjY-NkboKnGxPEtwSovWSDMQD1icvg,2746
-dodal/devices/oav/oav_detector.py,sha256=HHBiXREzX6bDtQ2miPEa5SgR-nVdQzoQr5fpkz9fzdg,8942
+dodal/devices/oav/oav_detector.py,sha256=7Bup2mx09--W7IZFJN-sNl93KzIeErNzRS8CWgOG92Q,11011
 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/utils.py,sha256=6mRmA5s3QzTX97pJWhxnkQF1h7blelPLGEDc61KzMAE,4211
 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=HPPMh4dTXvS4Jr9DqAXkanWQfFi7sA5kOcqLRpT2kjE,9448
@@ -292,8 +299,8 @@ dodal/devices/xspress3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 dodal/devices/xspress3/xspress3.py,sha256=OerapEy-IuK7EFz13B5z0BzBmESVl6pYUlqAWHIwJck,4555
 dodal/devices/xspress3/xspress3_channel.py,sha256=w8tAx2lz5kJ_LeJ_eb_4o--Dtt8MRijsYNgDG6oEIVg,1626
 dodal/devices/zebra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/zebra/zebra.py,sha256=AxGmFIYL62arJcy8WCE2-M1llxVB3xBhum3NV7jpEUQ,9602
-dodal/devices/zebra/zebra_constants_mapping.py,sha256=12Xs_nEbnAxdUN45VNn5fmI6GuUKpcQcJwsv5mifMss,4157
+dodal/devices/zebra/zebra.py,sha256=yaY26Vdl-j-HAKR162rx5h-UUqyMANiHoF7NI91Ee8Q,10072
+dodal/devices/zebra/zebra_constants_mapping.py,sha256=QtBDW8Xtsm1aDZYoAN5RbRuacB3pspBAp5BnVHk9AGc,4212
 dodal/devices/zebra/zebra_controlled_shutter.py,sha256=hrSD1oRW8BY67ub_oggjp6cvhqlRQWlXYsGtn9HBGhk,1876
 dodal/devices/zocalo/__init__.py,sha256=76YCA9dS0MF4AqSa-r5ss6oOgKVVjmVcbQYGtuOyeFA,498
 dodal/devices/zocalo/zocalo_constants.py,sha256=vu7Xjz7UNEpBUWEEBxDvP4bVFkZIN6NLGfQDpWbCjH8,98
@@ -308,7 +315,7 @@ dodal/plan_stubs/motor_utils.py,sha256=smYhhkSfDHQrq_UPa7Szhhyx_HlwnP_1srG0JkiDw
 dodal/plan_stubs/wrapped.py,sha256=kC8HH7bx3-sLYu2oieY_502tAdT2OECF8n-fqoL5Bfc,4266
 dodal/plans/__init__.py,sha256=Hi-PVPyOMWcnbggtrORhhOCsH9TXTCW_mgxYVr5EKEU,94
 dodal/plans/bimorph.py,sha256=JxDmZDiEvZnz5f22tlaoyivpnaNGiX8kSL82qz5uvMM,11738
-dodal/plans/configure_arm_trigger_and_disarm_detector.py,sha256=Yffie3vznQbVGKQUiQFzpl0CxWBKJz1d3-SmschmeAw,6164
+dodal/plans/configure_arm_trigger_and_disarm_detector.py,sha256=YHpuiGoyblFi0quYTrIAa1oAtIb-eQk7K7Hjg4o434Q,6095
 dodal/plans/load_panda_yaml.py,sha256=OF-ZygZyAyQEUdrAWiIxWZ6QhAsVx4Mm9ngRYB1mzKI,433
 dodal/plans/save_panda.py,sha256=X-zR5GysBPp3M7ZpEYEqCUSc4nJYzHJBA44e52uQ6F4,3099
 dodal/plans/spec_path.py,sha256=Q0AcvTKRT401iGMRDSqK-D523UX5_ofiVMZ_rNXKOx8,2074
@@ -316,6 +323,7 @@ dodal/plans/verify_undulator_gap.py,sha256=8FirCLRuDreqIRYTJfFuaefrgInoztKKajD6T
 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=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/testing/electron_analyser/__init__.py,sha256=-lc1opD2dCv0x678-J-ApOhHtvEvcslfOQ7E613U8-Y,118
 dodal/testing/electron_analyser/device_factory.py,sha256=mLeWQems_xBmmxPjyUEBhcp8VIsasY4TsUnVOe10ZaE,2252
 dodal/testing/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -323,8 +331,8 @@ dodal/testing/fixtures/run_engine.py,sha256=_DQivl-pAAoSVpX60XT4jLLmPBJHahCkaVAI
 dodal/testing/fixtures/utils.py,sha256=jy3mfAAn_TFQ7gqCec-OiOlZkaNLUH3TESW2oohvNgo,1861
 dodal/testing/fixtures/devices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/testing/fixtures/devices/apple2.py,sha256=5FbO1YACBF8aM82X9_36gPqk6rjdy1xRu8OdfdPrxAM,2727
-dls_dodal-1.68.0.dist-info/METADATA,sha256=9_RH8_nxq7q8xT5oNB_i10-jiRoqOC6dIxs_RRHg2o0,16923
-dls_dodal-1.68.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dls_dodal-1.68.0.dist-info/entry_points.txt,sha256=0IO1Bjlnv0vJSSFdGEZ-S_pqQNkE2FnPTA6f0-aTBs8,87
-dls_dodal-1.68.0.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
-dls_dodal-1.68.0.dist-info/RECORD,,
+dls_dodal-1.69.0.dist-info/METADATA,sha256=wghMAET73Z9p5xNIrVKnWuVXHszZSNkbSrG38fwtbSk,15601
+dls_dodal-1.69.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dls_dodal-1.69.0.dist-info/entry_points.txt,sha256=0IO1Bjlnv0vJSSFdGEZ-S_pqQNkE2FnPTA6f0-aTBs8,87
+dls_dodal-1.69.0.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
+dls_dodal-1.69.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.68.0'
-__version_tuple__ = version_tuple = (1, 68, 0)
+__version__ = version = '1.69.0'
+__version_tuple__ = version_tuple = (1, 69, 0)
 
 __commit_id__ = commit_id = None

dodal/beamlines/adsim.py

@@ -1,11 +1,8 @@
 from ophyd_async.epics.adsimdetector import SimDetector
 
-from dodal.common.beamlines.beamline_utils import (
-    device_factory,
-    get_path_provider,
-)
 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.device_manager import DeviceManager
 from dodal.devices.motors import XThetaStage
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix
@@ -15,6 +12,8 @@ PREFIX = BeamlinePrefix("t01")
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
+devices = DeviceManager()
+
 
 """
 Beamline module for use with the simulated AreaDetector and motors.
@@ -38,44 +37,52 @@ How to use the devices in a plan:
 In an ipython terminal run:
 
 ```python
-from pathlib import Path
-
 from bluesky.run_engine import RunEngine
-from ophyd_async.core import StaticPathProvider, UUIDFilenameProvider
 
-from dodal.beamlines.adsim import det, stage
-from dodal.common.beamlines.beamline_utils import set_path_provider
+from dodal.beamlines.adsim import devices
 from dodal.plans import count
 
 
-set_path_provider(
-    StaticPathProvider(
-        UUIDFilenameProvider(),
-        "/tmp", # The directory for `det` to write to- may be mounted as a volume
-    )
-)
-
 run_engine = RunEngine()
-d = det(connect_immediately=True)
-s = stage(connect_immediately=True)
+
+built = devices.build_and_connect().or_raise()
+d = built["det"]
+s = built["stage"]
+
 run_engine(count([d], num=10))
 ```
-
 """
 
 
-@device_factory()
+@devices.fixture
+def path_provider():
+    # This fixture is only used if a path_provider is not passed to the device
+    # manager when the devices are built.
+    #
+    # When used via blueAPI with numtracker enabled, it will take priority and
+    # the path provider here will not be created.
+    from pathlib import Path
+
+    from ophyd_async.core import StaticPathProvider, UUIDFilenameProvider
+
+    return StaticPathProvider(
+        UUIDFilenameProvider(),
+        Path("/tmp"),  # The directory for `det` to write to- may be mounted as a volume
+    )
+
+
+@devices.factory()
 def stage() -> XThetaStage:
     return XThetaStage(
         f"{PREFIX.beamline_prefix}-MO-SIMC-01:", x_infix="M1", theta_infix="M2"
     )
 
 
-@device_factory()
-def det() -> SimDetector:
+@devices.factory()
+def det(path_provider) -> SimDetector:
     return SimDetector(
         f"{PREFIX.beamline_prefix}-DI-CAM-01:",
-        path_provider=get_path_provider(),
+        path_provider=path_provider,
         drv_suffix=DET_SUFFIX,
         fileio_suffix=HDF5_SUFFIX,
     )

dodal/beamlines/i02_1.py

@@ -1,10 +1,7 @@
 """Beamline i02-1 is also known as VMXm, or I02J"""
 
-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.device_manager import DeviceManager
 from dodal.devices.attenuator.attenuator import EnumFilterAttenuator
 from dodal.devices.attenuator.filter_selections import (
     I02_1FilterFourSelections,
@@ -37,46 +34,31 @@ I02_1_ZEBRA_MAPPING = ZebraMapping(
     sources=ZebraSources(),
 )
 
+devices = DeviceManager()
 
-@device_factory()
-def eiger(mock: bool = False) -> EigerDetector:
-    """Get the i02-1 Eiger device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i02-1, it will return the existing object.
-    """
-    return device_instantiation(
-        device_factory=EigerDetector,
-        prefix=f"{PREFIX.beamline_prefix}-EA-EIGER-01:",
-        bl_prefix=False,
-        wait=False,
-        fake=mock,
-        name="eiger",
-    )
 
+@devices.v1_init(
+    EigerDetector, prefix=f"{PREFIX.beamline_prefix}-EA-EIGER-01:", wait=False
+)
+def eiger(eiger: EigerDetector) -> EigerDetector:
+    return eiger
 
-@device_factory()
+
+@devices.factory()
 def zebra_fast_grid_scan() -> ZebraFastGridScanTwoD:
-    """Get the i02-1 zebra_fast_grid_scan device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i02-1, it will return the existing object.
-    """
     return ZebraFastGridScanTwoD(
         prefix=f"{PREFIX.beamline_prefix}-MO-SAMP-11:",
         motion_controller_prefix="BL02J-MO-STEP-11:",
     )
 
 
-@device_factory()
+@devices.factory()
 def synchrotron() -> Synchrotron:
-    """Get the i02-1 synchrotron device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i02-1, it will return the existing object.
-    """
     return Synchrotron()
 
 
-@device_factory()
+@devices.factory()
 def zebra() -> Zebra:
-    """Get the i02-1 zebra device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i02-1, it will return the existing object.
-    """
     return Zebra(
         prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-01:",
         mapping=I02_1_ZEBRA_MAPPING,
@@ -84,28 +66,18 @@ def zebra() -> Zebra:
 
 
 # Device not needed after https://github.com/DiamondLightSource/mx-bluesky/issues/1299
-@device_factory()
+@devices.factory()
 def zocalo() -> ZocaloResults:
-    """Get the i02-1 ZocaloResults device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i02-1, it will return the existing object.
-    """
     return ZocaloResults()
 
 
-@device_factory()
+@devices.factory()
 def goniometer() -> SampleMotors:
-    """Get the i02-1 goniometer device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i02-1, it will return the existing object.
-    """
     return SampleMotors(f"{PREFIX.beamline_prefix}-MO-SAMP-01:")
 
 
-@device_factory()
+@devices.factory()
 def attenuator() -> EnumFilterAttenuator:
-    """Get the i02-1 attenuator device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i02-1, it will return the existing object.
-    """
-
     return EnumFilterAttenuator(
         f"{PREFIX.beamline_prefix}-OP-ATTN-01:",
         (

dodal/beamlines/i02_2.py

@@ -1,9 +1,7 @@
 """Beamline i02-2 is also known as VMXi, or I02I"""
 
-from dodal.common.beamlines.beamline_utils import (
-    device_factory,
-)
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.device_manager import DeviceManager
 from dodal.devices.motors import XYStage
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
@@ -15,18 +13,14 @@ set_log_beamline(BL)
 set_utils_beamline(BL)
 DAQ_CONFIGURATION_PATH = "/dls_sw/i02-2/software/daq_configuration"
 
+devices = DeviceManager()
 
-@device_factory()
+
+@devices.factory()
 def synchrotron() -> Synchrotron:
-    """Get the i02-2 synchrotron device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i02-2, it will return the existing object.
-    """
     return Synchrotron()
 
 
-@device_factory()
+@devices.factory()
 def sample_motors() -> XYStage:
-    """Get the i02-2 goniometer device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i02-2, it will return the existing object.
-    """
     return XYStage(f"{PREFIX.beamline_prefix}-MO-GONIO-01:SAMPLE:")

dodal/beamlines/i03.py

@@ -157,8 +157,11 @@ def detector_motion() -> DetectorMotion:
     )
 
 
-@devices.v1_init(EigerDetector, prefix="BL03I-EA-EIGER-01:", wait=False)
+@devices.v1_init(
+    EigerDetector, prefix=f"{PREFIX.beamline_prefix}-EA-EIGER-01:", wait=False
+)
 def eiger(eiger: EigerDetector) -> EigerDetector:
+    eiger.detector_id = 78
     return eiger
 
 

dodal/beamlines/i03_supervisor.py

@@ -0,0 +1,19 @@
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.device_manager import DeviceManager
+from dodal.devices.baton import Baton
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("i03")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+PREFIX = BeamlinePrefix(BL)
+
+
+devices = DeviceManager()
+
+
+@devices.factory()
+def baton() -> Baton:
+    return Baton(f"{PREFIX.beamline_prefix}-CS-BATON-01:")