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

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

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.52.0
+Version: 1.54.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
-Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
+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
                                    Version 2.0, January 2004
                                 http://www.apache.org/licenses/
@@ -215,8 +215,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async>=0.11
-Requires-Dist: epicscorelibs<=7.0.7.99.1.2a1
+Requires-Dist: ophyd-async[ca,pva]>=0.12.3
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
@@ -226,8 +225,6 @@ Requires-Dist: requests
 Requires-Dist: graypy
 Requires-Dist: pydantic>=2.0
 Requires-Dist: opencv-python-headless
-Requires-Dist: aioca
-Requires-Dist: p4p
 Requires-Dist: numpy
 Requires-Dist: aiofiles
 Requires-Dist: aiohttp
@@ -235,6 +232,7 @@ Requires-Dist: redis
 Requires-Dist: scanspec>=0.7.3
 Requires-Dist: event-model>=1.23
 Requires-Dist: pyzmq==26.3.0
+Requires-Dist: deepdiff
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"

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

@@ -1,42 +1,44 @@
-dls_dodal-1.52.0.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+dls_dodal-1.54.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=k4ECe4x0D1aLuvOAsB7afSDtXyH_iU-6kRlLtdcNd8M,513
+dodal/_version.py,sha256=s5vRCdA-AasTt0uBCvFaQ2gbkK0U3JOd3KpXoER6yQU,513
 dodal/cli.py,sha256=NieWNUgLUxyck1rHoFAPJjX1xXLzHNdQ-s4wvxYFfps,3757
 dodal/log.py,sha256=Rt5O3hFZfMnJvQueZvgagQuXnPqHrFxhponOvVkpfrk,9871
-dodal/utils.py,sha256=rqQNalufZPxUPSD2SYuUgWSCpefb8FnqvR6N0t-YcEY,19675
+dodal/utils.py,sha256=abGitd4FLpLnmckF7lUqOKYUL88r5Ex_NGSVgO4gOf4,19305
 dodal/beamline_specific_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/beamline_specific_utils/i03.py,sha256=P6Ls4FoVtcacH0RJM3v6ZwwGx27oMppcBdW0la-ohTY,377
 dodal/beamlines/README.md,sha256=K9MkL_GomxlsoTB7Mz-_dJA5NNSbmCfMiutchGg3C8o,404
-dodal/beamlines/__init__.py,sha256=lueGFb7cW1kDB_LfFavhrgYdjqGErCwAOk5XoU3BY00,3176
-dodal/beamlines/adsim.py,sha256=1RfxzvLkMWCoRnpFQNxnlvoWWGthuJvfHu-IsXv3GeE,1986
+dodal/beamlines/__init__.py,sha256=pYP4kWH7h3VYXmjXdgbt27T_q-EA5PIyiaMZc7C49UA,3198
+dodal/beamlines/adsim.py,sha256=fxj_P-7PsywdWPjfBAsLoOPiSKtApOKmLWHdQ8xCa3s,2048
 dodal/beamlines/aithre.py,sha256=QpNIT9RVtlyamJoshAa87Cw5U0QfBNwMBcZVvMlD25s,1037
-dodal/beamlines/b01_1.py,sha256=ru5a2FJar2rUdA2PDEXpQ1fRZwyzEd5Uf76J5qZMVhY,2922
-dodal/beamlines/b07.py,sha256=YHqApRUu7yYZTWS9Y7YJpXRBLauMhhil_Rj4he7lLLI,1071
-dodal/beamlines/b07_1.py,sha256=j_ChSI8PhB0MInU5HfLyC8aXtZqij_4zDspszmTAn7k,1075
+dodal/beamlines/b01_1.py,sha256=KNL8M750UBu0ziWIhGDvHfQgJKrUdeht6E9NjnI5B-E,2946
+dodal/beamlines/b07.py,sha256=wtNPxoLCf6KG3XzoRIyWI3QnZDV1VP8XMNmmBUVwFmU,1226
+dodal/beamlines/b07_1.py,sha256=ST8niY5nKJi-svIVPfHslY4rKWq8VDEVvlX8MpDhU2Q,1433
 dodal/beamlines/b16.py,sha256=36VibkYciQL-K2G4PsDPVp2r460GTQlQPbSJ5vzLUVo,1724
 dodal/beamlines/b18.py,sha256=ryxrGtcCdwoFgZ8ljWYgr1g9gKvoA7nxkARVxl1IE78,1189
-dodal/beamlines/b21.py,sha256=hpPDPrRlgI3AAsZ2voymGynLlI8G4Oj0r0MOfaoQceM,4244
+dodal/beamlines/b21.py,sha256=Bawc0nteT2azEK8roo2pakgN_U8DpmsOnnUR_LifGiw,4106
 dodal/beamlines/i02_1.py,sha256=d2IyqFMgeaSEyZYm7GMSjTKr7_02SakyC_oARx-XwnY,1204
 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/i04.py,sha256=tVY_bie6htKD9Ld9YZmSokjzSyh9fGzEHMRqyKEF4y0,13798
+dodal/beamlines/i05.py,sha256=jHw7W-HKAdAX5sn4qzzeIHlK7c3Rdn_fibYnwSHidSE,684
+dodal/beamlines/i05_1.py,sha256=JniSUGiLRl_aiJCfQ9BvaYMK9xPDhh3XLPpvpEC2fmo,518
+dodal/beamlines/i09.py,sha256=u9oICQAxhzCzKUJyN9Dm1fKrkpHcsv8UY9K6PIPyzz0,1544
+dodal/beamlines/i09_1.py,sha256=61l-cSeCpMmjPVS7VFzpKG4RZUatpkczM2-Sl1tKwFI,1199
 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
-dodal/beamlines/i19_1.py,sha256=RsHXje1S2OLwuPnaqkRva02aAIq5Ya1FvPbHEQKo0Uc,2925
+dodal/beamlines/i19_1.py,sha256=ljUng0fyL47VzFWpWWjwtG034ZCgehJN7DBu4BnTGto,2916
 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/i20_1.py,sha256=Zsr1lsH7ySbOgK7RhMVMWzNWZAV-fuYW0iAjSEJZicY,2625
 dodal/beamlines/i22.py,sha256=4dm6vOJtXlr_Cu7kldw9okhic-di28yO1H6ce9tzBmE,8114
 dodal/beamlines/i23.py,sha256=pf3KmzLZYDVqUB4LkLcNJk6z9H4qkFpTdVB8_0MYehs,3066
 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=3M_ipMO4NzrNP89VjBc-nHfz-Eb5y45rohos1nHTrvI,1180
+dodal/beamlines/p60.py,sha256=_sSwhPiUiRtM1s4ohoIvsSqANJqeaihFjT1iGsii18w,1431
 dodal/beamlines/p99.py,sha256=Rbi9OvmrGIblctOnZxFG_tqqhALLZ9O3ht4mBcb5vU8,2754
 dodal/beamlines/training_rig.py,sha256=0HeZYy4LkI1yU8joz40f241owLGB26CeCk7s8TW98zw,1902
 dodal/common/__init__.py,sha256=ZC4ICKUDB0BDxRaVy8nmqclVmDBne-dPtk6UJsoFq6I,258
@@ -49,7 +51,7 @@ dodal/common/types.py,sha256=fkL7UOwDbe3v2_VJ5f1W5RxR98Wx-Ra-LxUZWkNDtls,486
 dodal/common/udc_directory_provider.py,sha256=v5OBaCUwjtQZAsRQUw6LlVL58UvwwDO1l2MKlilXjdk,2403
 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_parameters.py,sha256=1pDL5OwEGTl67LpYvcVAxpBAIiVnBU0H1MnLsfajZ9A,2721
 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
@@ -78,14 +80,14 @@ 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=qU_QWvtlVnV9kKbfmKPMpjKIODVy8eE-2tyJXPlBhcg,7023
+dodal/devices/robot.py,sha256=NusjGnziQq5NjFOpvGPUvTn9xqqd-g_CINbc04u4y4g,6998
 dodal/devices/s4_slit_gaps.py,sha256=4KdarIQoRqX4ry3LUS1Km7fkjUFahA0VuTd2DvYEqQ8,446
 dodal/devices/scintillator.py,sha256=PlD6cnJ39PTB_e7QrRspPliLYE4kL_K7ziJURzuxgdA,365
 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=EDAEqGp7TT291_-kDUnJxucLJmSa5NpJLCa961zl9B8,8401
+dodal/devices/tetramm.py,sha256=MSEoScDHWxGXqVQcq3DdG3_p7EOPsDgQme9K3TdgIOo,8397
 dodal/devices/thawer.py,sha256=mYrO9klUPYcSbpoUuJ4ZuZZEPcHWWaZ2px5jh8XNQ9Y,1675
 dodal/devices/turbo_slit.py,sha256=xhcnhfbdcTYSYozogw6Li4fF4ofoPsc350rEyrRdaNE,1460
 dodal/devices/undulator.py,sha256=ZCdMQ8PKnW7mFV1BmrprOt0aSBCZMSKAH-2yyVH5Ihk,5316
@@ -99,10 +101,11 @@ dodal/devices/areadetector/plugins/MJPG.py,sha256=QTsxCoWbofNpLMGPoOR2hWoM33Kynt
 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=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/b07/__init__.py,sha256=Zw4VkH-68MLoDveswDpR-lTlzK1-IeNz2W4qtkCO3Hs,109
+dodal/devices/b07/enums.py,sha256=GmS6YZEbFH2wEwS1Ni4VNG-2wT98v7NnCzbHqFKo5Pg,1415
+dodal/devices/b07_1/__init__.py,sha256=yInDRarid492g7unaL8zIrWSNpRXhgsj8z7TRTRJfjI,281
+dodal/devices/b07_1/ccmc.py,sha256=ZjbOjJN3Ckbkp4ZZLE48-j9CGXcfidujgdrSROr6TQM,2554
+dodal/devices/b07_1/enums.py,sha256=TREiXDSAGFRXR3iUkKADYfm-CmhLmlpGHKZUOQ2Z1as,723
 dodal/devices/b16/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/b16/detector.py,sha256=nj0Xl8uleGtD_sk6tN-h7ipAtfz-e-c-DKWVwk_xXuY,1067
 dodal/devices/current_amplifiers/__init__.py,sha256=-MhT-t-GJ83rrvTDBCoWub_NKYkRtu4sEj8-y5XZBP0,782
@@ -120,22 +123,23 @@ dodal/devices/detector/detector_motion.py,sha256=Y14WORa6KaUHkm3u6Y7brH_WwH9Uout
 dodal/devices/electron_analyser/__init__.py,sha256=xbOqt6b0J89UkZx6PAqEjPchfY_CMb3xgX3NAMEPf6A,793
 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=48hJN994YmIC1y-8L4aCK22NbWsVbK7SNGbH3ffG2tE,1586
+dodal/devices/electron_analyser/types.py,sha256=_kmdSp4E98fsusg5Wg-Hyo25zHYA_pMe_hFW8lKe3tE,1869
 dodal/devices/electron_analyser/util.py,sha256=iUFvnYm-Y-0mBHR8oBLofZMKKuDhYYgGkOmvX6y1s1o,437
 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=hOUyZxEzNhorCt03i2WJAkCdgHvSrjQJgO4AiFyXON8,9458
-dodal/devices/electron_analyser/abstract/base_region.py,sha256=TqCUJLtJGH3jvTMYmUJfwhRyCPJIfndIfrz2QQmP3Hs,3991
+dodal/devices/electron_analyser/abstract/base_driver_io.py,sha256=tMZYRVIN0KK1QBfYKvt8jutoYBhiSOHMvh5Z0V7WW2Y,8990
+dodal/devices/electron_analyser/abstract/base_region.py,sha256=r5NbeEqVZ4CK7Yxe7effpJMYKSYuQrax7sJDMj_Hdck,3772
+dodal/devices/electron_analyser/abstract/types.py,sha256=eoeO7sqlv5RE7AEnyzsxHyuBXlUzOIYdRLWp0EnLyAU,596
 dodal/devices/electron_analyser/specs/__init__.py,sha256=qN57kY6ERUGdrAWhU5m8CBrc0KaqiOGwPL6h2BNm3i0,291
-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/detector.py,sha256=Q9R7aJoWsuhL6wOo_V2J703a7JVDeekIFH1pSX77hwQ,1109
+dodal/devices/electron_analyser/specs/driver_io.py,sha256=LRyy8Jh9j0_XE1K5Ze8U8kQdq4aL5YgPhcRPXxwES0c,5078
 dodal/devices/electron_analyser/specs/enums.py,sha256=cXPcbIGEN5ZJJt1KeiNJEtZkkcjQ-fz7dBfsU283zYQ,235
-dodal/devices/electron_analyser/specs/region.py,sha256=5zmSxnilFxlsfu165hhj84eqC2C7dwQ4x49OL6umVSw,1171
+dodal/devices/electron_analyser/specs/region.py,sha256=yI69LhcsdgxcymghUA-4p3o2YU97BgOQnkQABRDumFo,1210
 dodal/devices/electron_analyser/vgscienta/__init__.py,sha256=Iq0d2BBp0TJh4uG9twiiL-gJiSVI8zNUEbkg1UF5k6U,395
-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/detector.py,sha256=sCPxRMUkpDCJOnemz6ohsny8lGocyVhkc_0GTYcLlGU,1416
+dodal/devices/electron_analyser/vgscienta/driver_io.py,sha256=EysNucdqZ11bo8pwZRcMMkKNpBRPesRr4SDWGwU28NA,4180
 dodal/devices/electron_analyser/vgscienta/enums.py,sha256=apJZgIaE1aMQPBwIL1tQvV0WJ5trbk3j6iFmc1OqLsw,353
-dodal/devices/electron_analyser/vgscienta/region.py,sha256=ES4fRVQnacsrbO0Yyt9Nm3mRXnZ1dEK4sYGgnVdM1M4,2372
+dodal/devices/electron_analyser/vgscienta/region.py,sha256=4Se2K1QWXkB6gAvi3Alcm5LBsxiOcVxw4YS86K9mK34,3057
 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
@@ -143,11 +147,13 @@ 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=hx3z7IQHPljjnVJaBkyaQgLnUjH3oGlDSFMYf_rImsw,134
+dodal/devices/i05/__init__.py,sha256=v0Axsf-vMyLyxcbqS8lljJc0BQ5Tw8yVBTWcO3tG_4g,67
+dodal/devices/i05/enums.py,sha256=9FHBIexkSfZSTHxUnGupravfG9sVriHcrB15jemkQOQ,191
+dodal/devices/i09/__init__.py,sha256=J6l3njc1VGju6d90QR-awx4xRLirNnqiD86QKcq88Z4,180
 dodal/devices/i09/dcm.py,sha256=u0OgfZUE-eFQc-ix7iIfXERZhymAMXHP-Eifu2xWhYA,996
-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/i09/enums.py,sha256=mh1C4A520rJ6uFqeJQxpY2-U6quPFYO6Cmb3bQLV99A,535
+dodal/devices/i09_1/__init__.py,sha256=dTazun87AkMDXh7J8gIZYJxJth0XUs72qahJ-VvhRBI,72
+dodal/devices/i09_1/enums.py,sha256=FwhsvKnEcm9M22U4gcAJi6FE2RaUBZH0jRjNgJUKRqc,1319
 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
@@ -159,11 +165,11 @@ dodal/devices/i10/rasor/rasor_motors.py,sha256=yWBxsiVhbdkQzhaK1S-nUq_wVntwHgdf6
 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/i13_1/merlin_controller.py,sha256=UjYBWOqu1uLDvm2TGXTxtdW8ADvBk9gDx_1T1koGb1o,1483
 dodal/devices/i18/KBMirror.py,sha256=W4R3TeulSjosUqAFIIznyWzje_Y2AoEf9f8N-NkisYM,710
 dodal/devices/i18/diode.py,sha256=nk5kvn4LsbhczRpCwHOO0_jJTYOz7MP9qm_uvBWuv7c,1468
 dodal/devices/i19/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/i19/beamstop.py,sha256=htAp2ckioFoYCcYDUBX-xm-0cC-xAmpr6W5AgRZyCFI,707
+dodal/devices/i19/beamstop.py,sha256=JkcvkEmcC3eY3GHrvYNGqv2yDwrfgdpWKVZJWSadWW8,715
 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
@@ -172,7 +178,7 @@ 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=lSCdmGrcCF1EKSFaknbJVmHzvd1e3Az-5euC76e5C1c,735
+dodal/devices/i24/aperture.py,sha256=xADARfvUD5SLkLxb-Lhlfy6hGJgDf4dWQ4Dhe-0xIjI,743
 dodal/devices/i24/beam_center.py,sha256=m6LWsG9e_lhtPfZ8pc_hoLNyTYQQGGdRNav8J_2scTo,483
 dodal/devices/i24/beamstop.py,sha256=6tbiQLlcTlp4PCPhHJ_mlHtkv0kz5ArQ99zg9rwTnrw,1133
 dodal/devices/i24/dcm.py,sha256=9eNCGq-lpyFAftLxLxlhG_enzVmrx1nbwMxGFP_UBvU,1354
@@ -186,17 +192,17 @@ dodal/devices/oav/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 dodal/devices/oav/oav_calculations.py,sha256=qoaNz4MAdbpu0XHAkWTQ3rebFwsWfa8JA1eerUgISjA,2367
 dodal/devices/oav/oav_detector.py,sha256=DzRm1d1jC52wl7JawvMWiFCaFYdnjO7HT690NzDQIXs,6730
 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/oav_to_redis_forwarder.py,sha256=UAEBWPBiEXrn4AbDeDbjUsM2z0LHhq2coeeHIuom9kE,6265
 dodal/devices/oav/utils.py,sha256=T-xg7J38ritzXwRrKjsWZ7daC_qR7aNhlbkXx75nJ8Q,3188
-dodal/devices/oav/pin_image_recognition/__init__.py,sha256=fpUZYUHgp6pOSt0UzmQvGdUrSwxH0knA0mP8eAlYMCw,6398
+dodal/devices/oav/pin_image_recognition/__init__.py,sha256=YSh8OF69O9nZGNTiy8-XrcrhtF77PlKt3KaNleXJU40,6364
 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=2d2CN4ssnsmjwQO_XjFFltq_q_ouFIpKMDM0xG2zmxE,160
-dodal/devices/p60/enums.py,sha256=wsgbBI7JamTQ29d_U_F4FR-nmqktdjsG1GjMl1p-7t8,286
+dodal/devices/p60/__init__.py,sha256=cLrjUaHNJRtRBb1ic_LTlxIi_nH6_hZN8-5gWCt0Q6w,229
+dodal/devices/p60/enums.py,sha256=XN-bRzATHaD5RtQ_DMdq29TpsHDxbRfhb-wFLhPo7x0,505
 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
@@ -231,8 +237,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.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,,
+dls_dodal-1.54.0.dist-info/METADATA,sha256=JFgmTg2KvKy5c9J__jf5q1LDzpylrsGv8cLlN3ZJT-Y,16920
+dls_dodal-1.54.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dls_dodal-1.54.0.dist-info/entry_points.txt,sha256=bycw_EKUzup_rxfCetOwcauXV4kLln_OPpPT8jEnr-I,94
+dls_dodal-1.54.0.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
+dls_dodal-1.54.0.dist-info/RECORD,,

dodal/_version.py

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

dodal/beamlines/__init__.py

@@ -9,6 +9,7 @@ from pathlib import Path
 # module name. Add any new beamlines whose name differs from their module name to this
 # dictionary, which maps ${BEAMLINE} to dodal.beamlines.<MODULE NAME>
 _BEAMLINE_NAME_OVERRIDES = {
+    "i05-1": "i05_1",
     "b07-1": "b07_1",
     "i09-1": "i09_1",
     "i13-1": "i13_1",

dodal/beamlines/adsim.py

@@ -1,15 +1,11 @@
-from pathlib import Path
-
 from ophyd_async.epics.adsimdetector import SimDetector
 
 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.beamlines.device_helpers import DET_SUFFIX, HDF5_SUFFIX
-from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
 from dodal.devices.motors import XThetaStage
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix
@@ -19,13 +15,6 @@ PREFIX = BeamlinePrefix("t01")
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
-set_path_provider(
-    StaticVisitPathProvider(
-        BL,
-        Path("/tmp"),
-        client=LocalDirectoryServiceClient(),
-    )
-)
 
 """
 Beamline module for use with the simulated AreaDetector and motors.
@@ -47,11 +36,23 @@ 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.plans import count
 
+
+set_path_provider(
+    StaticPathProvider(
+        UUIDFilenameProvider(),
+        "/tmp", # The directory for `det` to write to- may be mounted as a volume
+    )
+)
+
 RE = RunEngine()
 d = det(connect_immediately=True)
 s = stage(connect_immediately=True)

dodal/beamlines/b01_1.py

@@ -59,7 +59,7 @@ def synchrotron() -> Synchrotron:
 
 
 @device_factory()
-def oav() -> AravisDetector:
+def spectroscopy_detector() -> AravisDetector:
     """The Manta camera for the spectroscopy experiment.
 
     Looks at the spectroscopy screen and visualises light
@@ -78,7 +78,7 @@ def oav() -> AravisDetector:
 
 
 @device_factory()
-def sample_det() -> AravisDetector:
+def imaging_detector() -> AravisDetector:
     """The Mako camera for the imaging experiment.
 
     Looks at the on-axis viewing screen.

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 Grating, LensMode
+from dodal.devices.b07 import Grating, LensMode, PsuMode
 from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
 from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
@@ -25,10 +25,13 @@ def pgm() -> PGM:
     return PGM(prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:", grating=Grating)
 
 
+# Connect will work again after this work completed
+# https://jira.diamond.ac.uk/browse/B07-1104
 @device_factory()
-def analyser_driver() -> SpecsAnalyserDriverIO[LensMode]:
-    return SpecsAnalyserDriverIO[LensMode](
+def analyser_driver() -> SpecsAnalyserDriverIO[LensMode, PsuMode]:
+    return SpecsAnalyserDriverIO[LensMode, PsuMode](
         prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
         lens_mode_type=LensMode,
+        psu_mode_type=PsuMode,
         energy_sources={"source1": pgm().energy.user_readback},
     )

dodal/beamlines/b07_1.py

@@ -1,8 +1,11 @@
-from dodal.common.beamlines.beamline_utils import (
-    device_factory,
-)
+from dodal.common.beamlines.beamline_utils import device_factory
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
-from dodal.devices.b07_1 import Grating, LensMode
+from dodal.devices.b07 import PsuMode
+from dodal.devices.b07_1 import (
+    ChannelCutMonochromator,
+    Grating,
+    LensMode,
+)
 from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
 from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
@@ -25,10 +28,18 @@ def pgm() -> PGM:
     return PGM(prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:", grating=Grating)
 
 
+# Connect will work again after this work completed
+# https://jira.diamond.ac.uk/browse/B07-1104
+@device_factory()
+def ccmc() -> ChannelCutMonochromator:
+    return ChannelCutMonochromator(prefix=f"{PREFIX.beamline_prefix}-OP-CCM-01:")
+
+
 @device_factory()
-def analyser_driver() -> SpecsAnalyserDriverIO[LensMode]:
-    return SpecsAnalyserDriverIO[LensMode](
+def analyser_driver() -> SpecsAnalyserDriverIO[LensMode, PsuMode]:
+    return SpecsAnalyserDriverIO[LensMode, PsuMode](
         prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
         lens_mode_type=LensMode,
+        psu_mode_type=PsuMode,
         energy_sources={"source1": pgm().energy.user_readback},
     )

dodal/beamlines/b21.py

@@ -41,25 +41,25 @@ set_path_provider(
 )
 
 
-@device_factory(skip=True)
+@device_factory()
 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
+        odin_nodes=1,
     )
 
 
-@device_factory(skip=True)
+@device_factory()
 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
+        odin_nodes=1,
     )
 
 

dodal/beamlines/i04.py

@@ -46,10 +46,9 @@ from dodal.devices.zocalo import ZocaloResults
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
-ZOOM_PARAMS_FILE = (
-    "/dls_sw/i04/software/gda/configurations/i04-config/xml/jCameraManZoomLevels.xml"
-)
-DISPLAY_CONFIG = "/dls_sw/i04/software/gda_versions/var/display.configuration"
+# Use BlueAPI scratch until https://github.com/DiamondLightSource/mx-bluesky/issues/1097 is done
+ZOOM_PARAMS_FILE = "/dls_sw/i04/software/bluesky/scratch/jCameraManZoomLevels.xml"
+DISPLAY_CONFIG = "/dls_sw/i04/software/bluesky/scratch/display.configuration"
 DAQ_CONFIGURATION_PATH = "/dls_sw/i04/software/daq_configuration"
 
 
@@ -296,7 +295,9 @@ def zebra() -> Zebra:
     )
 
 
-@device_factory(skip=BL == "s04")
+@device_factory(
+    skip=BL == "s04",
+)
 def oav(params: OAVConfig | None = None) -> OAVBeamCentrePV:
     """Get the i04 OAV device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i04, it will return the existing object.
@@ -307,7 +308,9 @@ def oav(params: OAVConfig | None = None) -> OAVBeamCentrePV:
     )
 
 
-@device_factory(skip=BL == "s04")
+@device_factory(
+    skip=BL == "s04",
+)
 def oav_full_screen(params: OAVConfig | None = None) -> OAVBeamCentrePV:
     """Get the i04 OAV device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i04, it will return the existing object.
@@ -319,7 +322,9 @@ def oav_full_screen(params: OAVConfig | None = None) -> OAVBeamCentrePV:
     )
 
 
-@device_factory(skip=BL == "s04")
+@device_factory(
+    skip=BL == "s04",
+)
 def detector_motion() -> DetectorMotion:
     """Get the i04 detector motion device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i04, it will return the existing object.

dodal/beamlines/i05.py

@@ -0,0 +1,22 @@
+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.i05 import Grating
+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
+
+BL = get_beamline_name("i05")
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def pgm() -> PGM:
+    return PGM(prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:", grating=Grating)

dodal/beamlines/i05_1.py

@@ -0,0 +1,17 @@
+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.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("i05-1")
+PREFIX = BeamlinePrefix(BL, suffix="J")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()

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, Grating, LensMode
+from dodal.devices.i09 import DCM, Grating, LensMode, PassEnergy, PsuMode
 from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
@@ -33,14 +33,18 @@ def dcm() -> DCM:
     return DCM(prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01:")
 
 
+# Connect will work again after this work completed
+# https://jira.diamond.ac.uk/browse/I09-651
 @device_factory()
-def analyser_driver() -> VGScientaAnalyserDriverIO[LensMode]:
+def analyser_driver() -> VGScientaAnalyserDriverIO[LensMode, PsuMode, PassEnergy]:
     energy_sources = {
         "source1": pgm().energy.user_readback,
         "source2": dcm().energy_in_ev,
     }
-    return VGScientaAnalyserDriverIO[LensMode](
+    return VGScientaAnalyserDriverIO[LensMode, PsuMode, PassEnergy](
         prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
         lens_mode_type=LensMode,
+        psu_mode_type=PsuMode,
+        pass_energy_type=PassEnergy,
         energy_sources=energy_sources,
     )

dodal/beamlines/i09_1.py

@@ -4,7 +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.i09_1 import LensMode, PsuMode
 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,10 +25,13 @@ def dcm() -> DCM:
     return DCM(prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01:")
 
 
+# Connect will work again after this work completed
+# https://jira.diamond.ac.uk/browse/I09-651
 @device_factory()
-def analyser_driver() -> SpecsAnalyserDriverIO[LensMode]:
-    return SpecsAnalyserDriverIO[LensMode](
+def analyser_driver() -> SpecsAnalyserDriverIO[LensMode, PsuMode]:
+    return SpecsAnalyserDriverIO[LensMode, PsuMode](
         prefix=f"{PREFIX.beamline_prefix}-EA-DET-02:CAM:",
         lens_mode_type=LensMode,
+        psu_mode_type=PsuMode,
         energy_sources={"source1": dcm().energy_in_ev},
     )

dodal/beamlines/i19_1.py

@@ -42,7 +42,7 @@ DISPLAY_CONFIG = "/dls_sw/i19-1/software/daq_configuration/domain/display.config
 
 # Needs to wait until enum is fixed on the beamline
 # See https://github.com/DiamondLightSource/dodal/issues/1150
-@device_factory(skip=True)
+@device_factory()
 def beamstop() -> BeamStop:
     """Get the i19-1 beamstop device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i19-1, it will return the existing object.