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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.51.0
+Version: 1.52.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
@@ -215,7 +215,8 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async>=0.10.0a4
+Requires-Dist: ophyd-async>=0.11
+Requires-Dist: epicscorelibs<=7.0.7.99.1.2a1
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json

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

@@ -1,7 +1,7 @@
-dls_dodal-1.51.0.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+dls_dodal-1.52.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=bIKVhfeJkgHBQ02QO68CDP3rWX1qe-o1xnMH5rP7lM0,513
+dodal/_version.py,sha256=k4ECe4x0D1aLuvOAsB7afSDtXyH_iU-6kRlLtdcNd8M,513
 dodal/cli.py,sha256=NieWNUgLUxyck1rHoFAPJjX1xXLzHNdQ-s4wvxYFfps,3757
 dodal/log.py,sha256=Rt5O3hFZfMnJvQueZvgagQuXnPqHrFxhponOvVkpfrk,9871
 dodal/utils.py,sha256=rqQNalufZPxUPSD2SYuUgWSCpefb8FnqvR6N0t-YcEY,19675
@@ -12,17 +12,17 @@ dodal/beamlines/__init__.py,sha256=lueGFb7cW1kDB_LfFavhrgYdjqGErCwAOk5XoU3BY00,3
 dodal/beamlines/adsim.py,sha256=1RfxzvLkMWCoRnpFQNxnlvoWWGthuJvfHu-IsXv3GeE,1986
 dodal/beamlines/aithre.py,sha256=QpNIT9RVtlyamJoshAa87Cw5U0QfBNwMBcZVvMlD25s,1037
 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/b07.py,sha256=YHqApRUu7yYZTWS9Y7YJpXRBLauMhhil_Rj4he7lLLI,1071
+dodal/beamlines/b07_1.py,sha256=j_ChSI8PhB0MInU5HfLyC8aXtZqij_4zDspszmTAn7k,1075
 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=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/i03.py,sha256=Fvg2Ap1vfvHWK9TqsNvAWKoOvQl87NYskOu8i7794GU,15527
+dodal/beamlines/i04.py,sha256=Eyq--oompg2hgT5LSjFaYza9O4ccJY43PKPfpGA7fGU,13707
+dodal/beamlines/i09.py,sha256=Pc6LBZUdVqQROW1yX-J37ctXSzX4Xggb4iON2JwOctc,1317
+dodal/beamlines/i09_1.py,sha256=yd0X62PtWIuBriH5y2oURaC23ot_13hX3_kFLerVczU,1045
+dodal/beamlines/i09_2.py,sha256=lyYO1rOaIsXNuVOL39Psh-8jQjkhQBXEQMpbXa-Zcw0,713
 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
@@ -30,19 +30,20 @@ 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=GMJiZRdtqxHZJVKVo3JNdRPmqcKnNjQj-kO6JPKDMHw,7759
+dodal/beamlines/i22.py,sha256=4dm6vOJtXlr_Cu7kldw9okhic-di28yO1H6ce9tzBmE,8114
 dodal/beamlines/i23.py,sha256=pf3KmzLZYDVqUB4LkLcNJk6z9H4qkFpTdVB8_0MYehs,3066
-dodal/beamlines/i24.py,sha256=bDrszseW490WiReHkXIdsDj8m_HqMberHjDKuhEXQjk,7120
+dodal/beamlines/i24.py,sha256=dfzf2ofVg1nu6Efy5zggVgHeYaYBqSVwYqgkbgb1wOQ,7104
 dodal/beamlines/k11.py,sha256=sBOl-MLk7FMo10KFykuK5aLqH1zyW4FnI0XXmtQhUfg,978
 dodal/beamlines/p38.py,sha256=bka6zsZfFiBAD-rrLSmIIVAOAw0FvupSkhOHGEG77xo,5708
 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/p60.py,sha256=3M_ipMO4NzrNP89VjBc-nHfz-Eb5y45rohos1nHTrvI,1180
+dodal/beamlines/p99.py,sha256=Rbi9OvmrGIblctOnZxFG_tqqhALLZ9O3ht4mBcb5vU8,2754
 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
 dodal/common/data_util.py,sha256=Z2DgxQl3AzTB940e_qYVDIHuu_9vWzpbycjKb62SFus,555
+dodal/common/device_utils.py,sha256=3hWgLmESiF88fho9bCweZpZH6b5fbbuSZGuSEYXxl4E,1345
 dodal/common/maths.py,sha256=K9x7iL3xXLtWYTV-xlFHDNSTIL9a2UP3Ws7wr6Dm2rQ,1803
 dodal/common/types.py,sha256=fkL7UOwDbe3v2_VJ5f1W5RxR98Wx-Ra-LxUZWkNDtls,486
 dodal/common/udc_directory_provider.py,sha256=v5OBaCUwjtQZAsRQUw6LlVL58UvwwDO1l2MKlilXjdk,2403
@@ -70,7 +71,7 @@ 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/linkam3.py,sha256=Lkw7c05XyHEEA83djfVFqz_8HN4kROCRqZwLwvHwRdA,2054
 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
@@ -84,24 +85,24 @@ dodal/devices/slits.py,sha256=b_7ku2sHlzhMHTvWrwiRwee6ufrbxNX9JB_Z0lvk15o,1105
 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
+dodal/devices/tetramm.py,sha256=EDAEqGp7TT291_-kDUnJxucLJmSa5NpJLCa961zl9B8,8401
 dodal/devices/thawer.py,sha256=mYrO9klUPYcSbpoUuJ4ZuZZEPcHWWaZ2px5jh8XNQ9Y,1675
 dodal/devices/turbo_slit.py,sha256=xhcnhfbdcTYSYozogw6Li4fF4ofoPsc350rEyrRdaNE,1460
 dodal/devices/undulator.py,sha256=ZCdMQ8PKnW7mFV1BmrprOt0aSBCZMSKAH-2yyVH5Ihk,5316
 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/xbpm_feedback.py,sha256=TBvT_H8vUjM1mpxQujuuAanzQ__JhRaS_6hFSqFt4fc,1283
 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/attenuator.py,sha256=XHdRMvq9t0DKJVDxkz-oXMAS3Dt4mbfO_H-x8fGmk_4,4071
 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/b07/__init__.py,sha256=guVqpxADiFcNmCwTVRu8MV0rXqpd1MMm5VY47G3DUNU,89
+dodal/devices/b07/enums.py,sha256=ieqwv3XBQknSZ9rCZHIU03-MDOb-zwSq1sGmVIzxkak,770
+dodal/devices/b07_1/__init__.py,sha256=VtOz6qLTEig66rC8L53vZf9V_TpcVAtoZUADqKskH88,91
+dodal/devices/b07_1/enums.py,sha256=ASdDLDZ1fHfO6-yTBhbQWeBKoyotI2o0g9BPWf6WDV8,480
 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
@@ -117,24 +118,24 @@ dodal/devices/detector/det_resolution.py,sha256=aQkKp24LpRGiwzPAQM3wLVa4ANw32Hdr
 dodal/devices/detector/detector.py,sha256=DqQvlgdjIdKErrZqgM9IH7drc-r6N8nhkFk7KwlgYAk,4815
 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=0Hh6sSvBS26977oVHbUq2SeSJtjAtCcyhgJZeqVh_10,4207
+dodal/devices/electron_analyser/detector.py,sha256=4pXBhhBnGSO-2Xb30f8NiqZ_6dQaJTbWZ1OgHH6ASQA,4213
 dodal/devices/electron_analyser/enums.py,sha256=2QObyZln7pvWyLgixabGGWvfs3aIF98gVSz2B4NS1OM,120
-dodal/devices/electron_analyser/types.py,sha256=k_uRDdHzx3sZQ11KB5PNTDQjxuGL91B3-l6sRuKdHHo,1026
+dodal/devices/electron_analyser/types.py,sha256=48hJN994YmIC1y-8L4aCK22NbWsVbK7SNGbH3ffG2tE,1586
 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/__init__.py,sha256=iwDxHN4yViS05679-aB6RwM2ZINgXrpebdfDgqoLxfI,650
 dodal/devices/electron_analyser/abstract/base_detector.py,sha256=Tcx-lrqHr7dkGmOPMSVibZypefddRauQU_1cZTIwaVU,2979
-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/abstract/base_driver_io.py,sha256=hOUyZxEzNhorCt03i2WJAkCdgHvSrjQJgO4AiFyXON8,9458
+dodal/devices/electron_analyser/abstract/base_region.py,sha256=TqCUJLtJGH3jvTMYmUJfwhRyCPJIfndIfrz2QQmP3Hs,3991
 dodal/devices/electron_analyser/specs/__init__.py,sha256=qN57kY6ERUGdrAWhU5m8CBrc0KaqiOGwPL6h2BNm3i0,291
-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/detector.py,sha256=1Pk_-hup-gtpK1SqvTh0y32_rOL_Wjl2zj6Ux7yjrB4,1007
+dodal/devices/electron_analyser/specs/driver_io.py,sha256=oZuVDMJnZx4ywFpx8-vv76TPDRNOWcgOVPkXjdfehvY,3836
 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/specs/region.py,sha256=5zmSxnilFxlsfu165hhj84eqC2C7dwQ4x49OL6umVSw,1171
 dodal/devices/electron_analyser/vgscienta/__init__.py,sha256=Iq0d2BBp0TJh4uG9twiiL-gJiSVI8zNUEbkg1UF5k6U,395
-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/detector.py,sha256=k4qXrew9MMoDjSRYXEzqqoC_Ep2RU4xHPvJDD4c31Fw,1052
+dodal/devices/electron_analyser/vgscienta/driver_io.py,sha256=Qs0ccWkpa8xp7VbFXKEscWzi6z1ZCHhZ-oxu-Kemn9k,2974
 dodal/devices/electron_analyser/vgscienta/enums.py,sha256=apJZgIaE1aMQPBwIL1tQvV0WJ5trbk3j6iFmc1OqLsw,353
-dodal/devices/electron_analyser/vgscienta/region.py,sha256=URXuHIkKQW-heejweTodoG-tM1XwWj9tPJwTWxpm-DY,2242
+dodal/devices/electron_analyser/vgscienta/region.py,sha256=ES4fRVQnacsrbO0Yyt9Nm3mRXnZ1dEK4sYGgnVdM1M4,2372
 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
@@ -142,9 +143,11 @@ dodal/devices/i04/__init__.py,sha256=Kvukapy4a5lUQ20qaCqYCJzKNaqJn2DfXP5nKZ_Pec8
 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/__init__.py,sha256=hx3z7IQHPljjnVJaBkyaQgLnUjH3oGlDSFMYf_rImsw,134
 dodal/devices/i09/dcm.py,sha256=u0OgfZUE-eFQc-ix7iIfXERZhymAMXHP-Eifu2xWhYA,996
-dodal/devices/i09/grating.py,sha256=i17tUlgXGKc2Ynclj7N6hpmPR9wDIw8w8m95SwzkouM,153
+dodal/devices/i09/enums.py,sha256=74X4ulgqGaEtX6qeftHXPk6E0jU_5FTbFYYZJHgFoK8,332
+dodal/devices/i09_1/__init__.py,sha256=dHSHXpFiPV499ndzxy-VSi7eTuYtwzfMThj_VxS0lYA,52
+dodal/devices/i09_1/enums.py,sha256=hxDclEbSgqWyqtIbvfFYHgDfTmkmdm4m6di7rjccPDk,708
 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
@@ -185,14 +188,15 @@ dodal/devices/oav/oav_detector.py,sha256=DzRm1d1jC52wl7JawvMWiFCaFYdnjO7HT690NzD
 dodal/devices/oav/oav_parameters.py,sha256=nnlTwrX5F6eMVK6wUz_MU39aLfV_P-_EyklfTQFAjZ4,6856
 dodal/devices/oav/oav_to_redis_forwarder.py,sha256=Nz_fOBK9NIsFTVO-G67JB-0qzDybWb_HS7RCkqrHfd8,6265
 dodal/devices/oav/utils.py,sha256=T-xg7J38ritzXwRrKjsWZ7daC_qR7aNhlbkXx75nJ8Q,3188
-dodal/devices/oav/pin_image_recognition/__init__.py,sha256=_eCq-rEtGNXVfrpahfKMLu53lEr49q5rtVqg0GhiODQ,6534
+dodal/devices/oav/pin_image_recognition/__init__.py,sha256=fpUZYUHgp6pOSt0UzmQvGdUrSwxH0knA0mP8eAlYMCw,6398
 dodal/devices/oav/pin_image_recognition/manual_test.py,sha256=h1Rto6ZDCB3jWhjSy9N8ECxRN583iYDJr9LxrTJ8kfE,903
 dodal/devices/oav/pin_image_recognition/utils.py,sha256=L9ypluYqeOFoS7gQuws-vTNc8LqaKl2ZIDNeQ2JaNpg,8592
 dodal/devices/oav/snapshots/grid_overlay.py,sha256=CdvCdTKMCiwMwxm2lV28KpcIUSXlscZmWxb73_KKmiI,3694
 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/__init__.py,sha256=2d2CN4ssnsmjwQO_XjFFltq_q_ouFIpKMDM0xG2zmxE,160
+dodal/devices/p60/enums.py,sha256=wsgbBI7JamTQ29d_U_F4FR-nmqktdjsG1GjMl1p-7t8,286
 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
@@ -227,8 +231,8 @@ dodal/plans/verify_undulator_gap.py,sha256=OcDN09-eCoMzsmhKGxvzsH5EapG2zYz0yGCqU
 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.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,,
+dls_dodal-1.52.0.dist-info/METADATA,sha256=vs_ZKznKwlZf-Jqw5-D72xP7PWzHnUInwAiLTImGIQs,16834
+dls_dodal-1.52.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dls_dodal-1.52.0.dist-info/entry_points.txt,sha256=bycw_EKUzup_rxfCetOwcauXV4kLln_OPpPT8jEnr-I,94
+dls_dodal-1.52.0.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
+dls_dodal-1.52.0.dist-info/RECORD,,

dodal/_version.py

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

dodal/beamlines/b07.py

@@ -2,7 +2,7 @@ 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.b07 import Grating, LensMode
 from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
 from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
@@ -22,12 +22,13 @@ def synchrotron() -> Synchrotron:
 
 @device_factory()
 def pgm() -> PGM:
-    return PGM(prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:", grating=B07BGrating)
+    return PGM(prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:", grating=Grating)
 
 
 @device_factory()
-def analyser_driver() -> SpecsAnalyserDriverIO:
-    return SpecsAnalyserDriverIO(
-        f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
-        {"source1": pgm().energy.user_readback},
+def analyser_driver() -> SpecsAnalyserDriverIO[LensMode]:
+    return SpecsAnalyserDriverIO[LensMode](
+        prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
+        lens_mode_type=LensMode,
+        energy_sources={"source1": pgm().energy.user_readback},
     )

dodal/beamlines/b07_1.py

@@ -2,7 +2,7 @@ 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.b07_1 import Grating, LensMode
 from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
 from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
@@ -22,12 +22,13 @@ def synchrotron() -> Synchrotron:
 
 @device_factory()
 def pgm() -> PGM:
-    return PGM(prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:", grating=B07CGrating)
+    return PGM(prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:", grating=Grating)
 
 
 @device_factory()
-def analyser_driver() -> SpecsAnalyserDriverIO:
-    return SpecsAnalyserDriverIO(
-        f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
-        {"source1": pgm().energy.user_readback},
+def analyser_driver() -> SpecsAnalyserDriverIO[LensMode]:
+    return SpecsAnalyserDriverIO[LensMode](
+        prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
+        lens_mode_type=LensMode,
+        energy_sources={"source1": pgm().energy.user_readback},
     )

dodal/beamlines/i03.py

@@ -92,7 +92,10 @@ def attenuator() -> BinaryFilterAttenuator:
     """Get the i03 attenuator 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 BinaryFilterAttenuator(f"{PREFIX.beamline_prefix}-EA-ATTN-01:")
+    return BinaryFilterAttenuator(
+        prefix=f"{PREFIX.beamline_prefix}-EA-ATTN-01:",
+        num_filters=16,
+    )
 
 
 @device_factory()

dodal/beamlines/i04.py

@@ -137,8 +137,8 @@ def attenuator() -> BinaryFilterAttenuator:
     If this is called when already instantiated in i04, it will return the existing object.
     """
     return BinaryFilterAttenuator(
-        f"{PREFIX.beamline_prefix}-EA-ATTN-01:",
-        "attenuator",
+        prefix=f"{PREFIX.beamline_prefix}-EA-ATTN-01:",
+        num_filters=16,
     )
 
 

dodal/beamlines/i09.py

@@ -3,7 +3,7 @@ from dodal.common.beamlines.beamline_utils import (
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.devices.electron_analyser.vgscienta import VGScientaAnalyserDriverIO
-from dodal.devices.i09 import DCM, I09Grating
+from dodal.devices.i09 import DCM, Grating, LensMode
 from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
@@ -24,7 +24,7 @@ def synchrotron() -> Synchrotron:
 def pgm() -> PGM:
     return PGM(
         prefix=f"{BeamlinePrefix(BL, suffix='J').beamline_prefix}-MO-PGM-01:",
-        grating=I09Grating,
+        grating=Grating,
     )
 
 
@@ -34,11 +34,13 @@ def dcm() -> DCM:
 
 
 @device_factory()
-def analyser_driver() -> VGScientaAnalyserDriverIO:
+def analyser_driver() -> VGScientaAnalyserDriverIO[LensMode]:
     energy_sources = {
         "source1": pgm().energy.user_readback,
         "source2": dcm().energy_in_ev,
     }
-    return VGScientaAnalyserDriverIO(
-        f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:", energy_sources
+    return VGScientaAnalyserDriverIO[LensMode](
+        prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
+        lens_mode_type=LensMode,
+        energy_sources=energy_sources,
     )

dodal/beamlines/i09_1.py

@@ -4,6 +4,7 @@ from dodal.common.beamlines.beamline_utils import (
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
 from dodal.devices.i09.dcm import DCM
+from dodal.devices.i09_1 import LensMode
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
@@ -25,7 +26,9 @@ def dcm() -> DCM:
 
 
 @device_factory()
-def analyser_driver() -> SpecsAnalyserDriverIO:
-    return SpecsAnalyserDriverIO(
-        f"{PREFIX.beamline_prefix}-EA-DET-02:CAM:", {"source1": dcm().energy_in_ev}
+def analyser_driver() -> SpecsAnalyserDriverIO[LensMode]:
+    return SpecsAnalyserDriverIO[LensMode](
+        prefix=f"{PREFIX.beamline_prefix}-EA-DET-02:CAM:",
+        lens_mode_type=LensMode,
+        energy_sources={"source1": dcm().energy_in_ev},
     )

dodal/beamlines/i09_2.py

@@ -2,7 +2,7 @@ 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.i09.grating import I09Grating
+from dodal.devices.i09.enums import Grating
 from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
@@ -21,4 +21,4 @@ def synchrotron() -> Synchrotron:
 
 @device_factory()
 def pgm() -> PGM:
-    return PGM(prefix=f"{PREFIX.beamline_prefix}-MO-PGM-01:", grating=I09Grating)
+    return PGM(prefix=f"{PREFIX.beamline_prefix}-MO-PGM-01:", grating=Grating)

dodal/beamlines/i22.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 
 from ophyd_async.epics.adaravis import AravisDetector
+from ophyd_async.epics.adcore import NDPluginStatsIO
 from ophyd_async.epics.adpilatus import PilatusDetector
 from ophyd_async.fastcs.panda import HDFPanda
 
@@ -101,6 +102,11 @@ def i0() -> TetrammDetector:
         prefix=f"{PREFIX.beamline_prefix}-EA-XBPM-02:",
         path_provider=get_path_provider(),
         type="Cividec Diamond XBPM",
+        plugins={
+            "stats": NDPluginStatsIO(
+                prefix=f"{PREFIX.beamline_prefix}-EA-XBPM-02:SumAll:"
+            )
+        },
     )
 
 
@@ -110,6 +116,11 @@ def it() -> TetrammDetector:
         prefix=f"{PREFIX.beamline_prefix}-EA-TTRM-02:",
         path_provider=get_path_provider(),
         type="PIN Diode",
+        plugins={
+            "stats": NDPluginStatsIO(
+                prefix=f"{PREFIX.beamline_prefix}-EA-TTRM-02:SumAll:"
+            )
+        },
     )
 
 

dodal/beamlines/i24.py

@@ -32,7 +32,7 @@ ZOOM_PARAMS_FILE = (
 DISPLAY_CONFIG = "/dls_sw/i24/software/gda_versions/var/display.configuration"
 
 
-BL = get_beamline_name("s24")
+BL = get_beamline_name("i24")
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
@@ -149,7 +149,7 @@ def pmac() -> PMAC:
     )
 
 
-@device_factory(skip=BL == "s24")
+@device_factory()
 def oav() -> OAVBeamCentreFile:
     return OAVBeamCentreFile(
         prefix=f"{PREFIX.beamline_prefix}-DI-OAV-01:",

dodal/beamlines/p60.py

@@ -3,7 +3,7 @@ from dodal.common.beamlines.beamline_utils import (
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.devices.electron_analyser.vgscienta import VGScientaAnalyserDriverIO
-from dodal.devices.p60 import LabXraySource, LabXraySourceReadable
+from dodal.devices.p60 import LabXraySource, LabXraySourceReadable, LensMode
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -24,11 +24,13 @@ def mg_kalpha_source() -> LabXraySourceReadable:
 
 
 @device_factory()
-def analyser_driver() -> VGScientaAnalyserDriverIO:
+def analyser_driver() -> VGScientaAnalyserDriverIO[LensMode]:
     energy_sources = {
         "source1": al_kalpha_source().energy_ev,
         "source2": mg_kalpha_source().energy_ev,
     }
-    return VGScientaAnalyserDriverIO(
-        f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:", energy_sources
+    return VGScientaAnalyserDriverIO[LensMode](
+        prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
+        lens_mode_type=LensMode,
+        energy_sources=energy_sources,
     )

dodal/beamlines/p99.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 
 from ophyd_async.epics.adandor import Andor2Detector
+from ophyd_async.fastcs.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_utils import (
     device_factory,
@@ -76,3 +77,16 @@ def andor2_point() -> Andor2Point:
         drv_suffix=CAM_SUFFIX,
         read_uncached={"mean": "STAT:MeanValue_RBV", "total": "STAT:Total_RBV"},
     )
+
+
+@device_factory()
+def panda() -> HDFPanda:
+    """
+    The Panda device is connected to two PMAC motors for position comparison under
+     the pcomp[1] and pcomp[2] blocks, which handle positive and negative directions.
+    This setup is used for triggering detectors during a flyscan.
+    """
+    return HDFPanda(
+        f"{PREFIX.beamline_prefix}-MO-PANDA-01:",
+        path_provider=get_path_provider(),
+    )

dodal/common/device_utils.py

@@ -0,0 +1,45 @@
+from asyncio import CancelledError, create_task, sleep
+from contextlib import asynccontextmanager
+
+from dodal.log import LOGGER
+
+
+@asynccontextmanager
+async def periodic_reminder(
+    message: str = "Waiting",
+    schedule: tuple[tuple[int | float, int | None], ...] = (  # seconds, frequency
+        (1, 3),
+        (5, 3),
+        (60, 5),
+        (300, 5),
+        (1800, 5),
+        (3600, None),
+    ),
+):
+    """Periodically logs a message according to a schedule with increasing delays.
+
+    Args:
+        message: The message the user wants to output through logging.
+        schedule: A tuple list of tuples consisting of (int|float, int|None).
+            A sequence of (delay_seconds, count) pairs defining the logging intervals.
+            - delay_seconds is the number of seconds to wait between logs.
+            - count is how many times to log at this interval. If count is None, it logs indefinitely at that delay.
+    """
+
+    async def _log_loop():
+        for delay, count in schedule:
+            n = 0
+            while count is None or n < count:
+                LOGGER.info(message)
+                await sleep(delay)
+                n += 1
+
+    task = create_task(_log_loop())
+    try:
+        yield
+    finally:
+        task.cancel()
+        try:
+            await task
+        except CancelledError:
+            pass

dodal/devices/attenuator/attenuator.py

@@ -39,10 +39,12 @@ class BinaryFilterAttenuator(ReadOnlyAttenuator, Movable[float]):
     Where desired_transmission is fraction e.g. 0-1. When the actual_transmission is
     read from the device it is also fractional"""
 
-    def __init__(self, prefix: str, name: str = ""):
+    def __init__(self, prefix: str, num_filters: int, name: str = ""):
         self._calculated_filter_states: DeviceVector[SignalR[int]] = DeviceVector(
             {
-                int(digit, 16): epics_signal_r(int, f"{prefix}DEC_TO_BIN.B{digit}")
+                int(digit, num_filters): epics_signal_r(
+                    int, f"{prefix}DEC_TO_BIN.B{digit}"
+                )
                 for digit in string.hexdigits
                 if not digit.islower()
             }
@@ -50,7 +52,7 @@ class BinaryFilterAttenuator(ReadOnlyAttenuator, Movable[float]):
         self._filters_in_position: DeviceVector[SignalR[bool]] = DeviceVector(
             {
                 i - 1: epics_signal_r(bool, f"{prefix}FILTER{i}:INLIM")
-                for i in range(1, 17)
+                for i in range(1, num_filters + 1)
             }
         )
 

dodal/devices/b07/__init__.py

@@ -1,3 +1,3 @@
-from dodal.devices.b07.grating import B07BGrating
+from dodal.devices.b07.enums import Grating, LensMode
 
-__all__ = ["B07BGrating"]
+__all__ = ["Grating", "LensMode"]

dodal/devices/b07/enums.py

@@ -0,0 +1,24 @@
+from ophyd_async.core import StrictEnum, SupersetEnum
+
+
+class Grating(StrictEnum):
+    NI_400 = "400 l/mm Ni"
+    NI_1000 = "1000 l/mm Ni"
+    PT_600 = "BAD 600 l/mm Pt"
+    AU_600 = "600 l/mm Au"
+    NO_GRATING = "No Grating"
+
+
+class LensMode(SupersetEnum):
+    LARGE_AREA = "LargeArea"
+    HIGH_MAGNIFICATION = "HighMagnification"
+    MEDIUM_MAGNIFICATION = "MediumMagnification"
+    LOW_MAGNIFICATION = "LowMagnification"
+    MEDIUM_ANGULAR_DISPERSION = "MediumAngularDispersion"
+    LOW_ANGULAR_DISPERSION = "LowAngularDispersion"
+    HIGH_ANGULAR_DISPERSION = "HighAngularDispersion"
+    WIDE_ANGLE_MODE = "WideAngleMode"
+    MEDIUM_AREA = "MediumArea"
+    SMALL_AREA = "SmallArea"
+    HIGH_MAGNIFICATION2 = "HighMagnification2"
+    NOT_CONNECTED = "Not connected"

dodal/devices/b07_1/__init__.py

@@ -1,3 +1,3 @@
-from dodal.devices.b07_1.grating import B07CGrating
+from dodal.devices.b07_1.enums import Grating, LensMode
 
-__all__ = ["B07CGrating"]
+__all__ = ["Grating", "LensMode"]

dodal/devices/b07_1/enums.py

@@ -0,0 +1,18 @@
+from ophyd_async.core import StrictEnum, SupersetEnum
+
+
+class Grating(StrictEnum):
+    AU_400 = "400 l/mm Au"
+    AU_600 = "600 l/mm Au"
+    PT_600 = "600 l/mm Pt"
+    AU_1200 = "1200 l/mm Au"
+    ML_1200 = "1200 l/mm ML"
+    NO_GRATING = "No Grating"
+
+
+class LensMode(SupersetEnum):
+    SMALL_AREA = "SmallArea"
+    ANGLE_RESOLVED_MODE_22 = "AngleResolvedMode22"
+    ANGLE_RESOLVED_MODE_30 = "AngleResolvedMode30"
+    LARGE_AREA = "LargeArea"
+    NOT_CONNECTED = "Not connected"

dodal/devices/electron_analyser/abstract/__init__.py

@@ -8,6 +8,8 @@ from .base_region import (
     AbstractBaseSequence,
     TAbstractBaseRegion,
     TAbstractBaseSequence,
+    TAcquisitionMode,
+    TLensMode,
 )
 
 __all__ = [
@@ -15,6 +17,8 @@ __all__ = [
     "AbstractBaseSequence",
     "TAbstractBaseRegion",
     "TAbstractBaseSequence",
+    "TAcquisitionMode",
+    "TLensMode",
     "AbstractAnalyserDriverIO",
     "AbstractElectronAnalyserDetector",
     "AbstractAnalyserDriverIO",