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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.48.0
+Version: 1.50.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
@@ -234,6 +234,7 @@ Requires-Dist: aiohttp
 Requires-Dist: redis
 Requires-Dist: deepdiff
 Requires-Dist: scanspec>=0.7.3
+Requires-Dist: event-model>=1.23
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"

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

@@ -1,7 +1,7 @@
-dls_dodal-1.48.0.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+dls_dodal-1.50.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=24VKZlawQ9AuOnPMmQ73o0O0fvXG6A-_3ZeLR40kRI0,513
+dodal/_version.py,sha256=EDlHUWODqx60XSwjWm_Ktz1n2BnxgiT-qk2UvfHj1II,513
 dodal/cli.py,sha256=NieWNUgLUxyck1rHoFAPJjX1xXLzHNdQ-s4wvxYFfps,3757
 dodal/log.py,sha256=Rt5O3hFZfMnJvQueZvgagQuXnPqHrFxhponOvVkpfrk,9871
 dodal/utils.py,sha256=rqQNalufZPxUPSD2SYuUgWSCpefb8FnqvR6N0t-YcEY,19675
@@ -10,16 +10,18 @@ dodal/beamline_specific_utils/i03.py,sha256=P6Ls4FoVtcacH0RJM3v6ZwwGx27oMppcBdW0
 dodal/beamlines/README.md,sha256=K9MkL_GomxlsoTB7Mz-_dJA5NNSbmCfMiutchGg3C8o,404
 dodal/beamlines/__init__.py,sha256=lueGFb7cW1kDB_LfFavhrgYdjqGErCwAOk5XoU3BY00,3176
 dodal/beamlines/adsim.py,sha256=uOmFYZIGyput93XHk9R5ydZdxnTrS_wA2zSEm62UCVU,1930
-dodal/beamlines/aithre.py,sha256=gEIyCwvIewNgSxrEmvPsCDuyXVmHjYHt-Go69HITIrE,436
+dodal/beamlines/aithre.py,sha256=QpNIT9RVtlyamJoshAa87Cw5U0QfBNwMBcZVvMlD25s,1037
 dodal/beamlines/b01_1.py,sha256=SdjnpssxlpdTwE1D2fuXUsf9WmvUsyg-MSp3DONXyQU,2008
 dodal/beamlines/b07.py,sha256=Fxsn9YDKySnE3zZgtpD8-LSb4IzWlb5xd6sLTCRrvFU,740
 dodal/beamlines/b07_1.py,sha256=nY5fMUDoxn91OG2miVh5cXNQDH8o881yMW9RfZMRlnQ,742
+dodal/beamlines/b16.py,sha256=0MF-wKfogDkZ6wo0DiqCUor0cNG6cYvMdcYr88KuRdY,1690
+dodal/beamlines/b18.py,sha256=ryxrGtcCdwoFgZ8ljWYgr1g9gKvoA7nxkARVxl1IE78,1189
 dodal/beamlines/i02_1.py,sha256=d2IyqFMgeaSEyZYm7GMSjTKr7_02SakyC_oARx-XwnY,1204
 dodal/beamlines/i03.py,sha256=jLiqH3R_TK2sHsI1zCZ91cYcATEtG28-5lMUcsQTXhU,15594
 dodal/beamlines/i04.py,sha256=_ogXHZZbJVNoMIOKLZe_8TbLP3vC4wss5lqqmzctR40,13723
 dodal/beamlines/i09.py,sha256=cr75vG65pgyWkEYdpcdpuuqAhN_tkmBiBqJn76lQN3k,744
 dodal/beamlines/i09_1.py,sha256=UbBn1q4L8BZXjZ1rUZQImwO0zkIYqGd5T8FptlFFMyw,742
-dodal/beamlines/i10.py,sha256=k8tnUwAb6jX2xY8hgST3ZP4jX3s4I4ispL5M6HF-M5k,11221
+dodal/beamlines/i10.py,sha256=wg-yKw_a2hK_Tx7rym2Rq7oo8GlluoSQK77HcZNohPY,5716
 dodal/beamlines/i13_1.py,sha256=RF8AXBqVKPY7rVf4j1gOxcURAToYVk-Yo9t4FWyaphU,1650
 dodal/beamlines/i18.py,sha256=CbzdLHXcIhLl1T-GmXmnNOhwHojl8V3d3ikxVoCqXII,3657
 dodal/beamlines/i19_1.py,sha256=RsHXje1S2OLwuPnaqkRva02aAIq5Ya1FvPbHEQKo0Uc,2925
@@ -29,6 +31,7 @@ dodal/beamlines/i20_1.py,sha256=Xp6XXofjXh3Yibrg5wSHet-pXikprJ9oprEhJg19OkI,1825
 dodal/beamlines/i22.py,sha256=GAS1KgRrtpdXhYb7tIO3yHHMRcffxOqcSIaCZyexnDk,7595
 dodal/beamlines/i23.py,sha256=pf3KmzLZYDVqUB4LkLcNJk6z9H4qkFpTdVB8_0MYehs,3066
 dodal/beamlines/i24.py,sha256=D83MIeoyC-tzd5QcR0yiLUyzraAyBTObx7VnP5-okSk,7158
+dodal/beamlines/k11.py,sha256=sBOl-MLk7FMo10KFykuK5aLqH1zyW4FnI0XXmtQhUfg,978
 dodal/beamlines/p38.py,sha256=bka6zsZfFiBAD-rrLSmIIVAOAw0FvupSkhOHGEG77xo,5708
 dodal/beamlines/p45.py,sha256=2snO895TGwf4LbNIvg4BkvAGSfvZcevdpv_82MRpXKo,2129
 dodal/beamlines/p60.py,sha256=IJQdemlEkvVMYcyqp2WkyEwPAQrjor33b52wrfEVDIs,615
@@ -45,16 +48,16 @@ dodal/common/visit.py,sha256=BLpr3GrP7Ij95V135hRJLgg7gWtBKXVxyOibWtcO8RE,5782
 dodal/common/beamlines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/common/beamlines/beamline_parameters.py,sha256=H9d4fLwVist7G-KdKYcv9D28E0tkhPtGPfiJ4V_5iHI,2721
 dodal/common/beamlines/beamline_utils.py,sha256=uy-HWchyUwoIqYYUWAd4BOPPoDzqvvtgkWQGzuKStTg,5061
-dodal/common/beamlines/device_helpers.py,sha256=lh7eih7KoFiqxo8PLQIDjbpBbhHuAXSeApt7K3KF9to,1002
+dodal/common/beamlines/device_helpers.py,sha256=V0hdBegQZ0ZILTT00tFFA8nNOOFta3tBMH3fsF1ZsBg,1024
 dodal/devices/CTAB.py,sha256=5_261Ox6NG2cJIzzwnjWz289BG0nZoE0wKOaI5V5jqM,1998
 dodal/devices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/adsim.py,sha256=vCexraF4zLssHdjfPod-XuQGJE_sWoCttFdx__HDS8w,488
 dodal/devices/aperture.py,sha256=yyw2ei3gM_lmZWDQ6VTbydB58RCDTen_nqBZyoTP2IM,583
 dodal/devices/aperturescatterguard.py,sha256=i2hLNyf5_7UOuySdkjckb9RWMZrGcZkOF7cfDUj4V-E,12216
-dodal/devices/apple2_undulator.py,sha256=R4KDgA4HcFj9zg1rPAEP9E0mKVzE06bhyxNRUrsi3Sw,20826
+dodal/devices/apple2_undulator.py,sha256=PlgSpeCYfAMDYwOLx06Vzk_Iz_VGPwht1JbbwHjVyFQ,26291
 dodal/devices/backlight.py,sha256=RcgeA1hE3Z_5jA-jH8S8uLMpBfZjenRLz1lx6HTYeAo,1653
 dodal/devices/baton.py,sha256=BnakfZxx3cIIX6Kxj8-abxn8Z9LaQODhcPbStbD0as4,485
-dodal/devices/bimorph_mirror.py,sha256=D5PkrOggJRVAnv38lTdy8rErKLu_O2juLEvSqwcotxY,4825
+dodal/devices/bimorph_mirror.py,sha256=-35vDYKZZrBgD37xBQPwuAR8SsMdm0YzWo2bgkTX4jA,4652
 dodal/devices/common_dcm.py,sha256=8QSRE6Z10RQjfL3g4JZhyHRNI_aCKxWlzKSsDgiJHhE,3049
 dodal/devices/cryostream.py,sha256=K-ldpredpeDTzNt4qtQMg99nKJNjBYoXBbK0WJGexzw,656
 dodal/devices/diamond_filter.py,sha256=hySd7HnLdplpPNvBrLddLjO_3LqgD8-99Zr__Sy_GbI,689
@@ -64,7 +67,7 @@ dodal/devices/fast_grid_scan.py,sha256=NfP746FfuHW-SWs7c7-O9oocWyVjBpu89WW7kaanl
 dodal/devices/fluorescence_detector_motion.py,sha256=-1qCSvW0PdT0m6BcoLxrtc0OJ5UDIBsEe11EOLr-gFw,501
 dodal/devices/flux.py,sha256=1CDsq9yU2-ho8MfYBl50Tl9ABZwpUBHnV486PQXKNoQ,462
 dodal/devices/focusing_mirror.py,sha256=vdUPkwyCAZBSR3LQ-EojDOoxVy1ZmOaD_nevETbj7BA,6592
-dodal/devices/hutch_shutter.py,sha256=UvGpsiIQcNW8IGd8ZA8Omus30bSNcVFE1poqO3yK9TE,3859
+dodal/devices/hutch_shutter.py,sha256=iY3qWxDr8mDlAvN_BYe2gqpXRM1hlfV3ewdwkwh0_v0,3889
 dodal/devices/ipin.py,sha256=eq5jlKw7WGQi8VLrAWpaAIsZmfiVf-5Q0td_B22H6A4,473
 dodal/devices/linkam3.py,sha256=2sf-_heIsDg4qmqae-w9C2Py8pG8bPB3mT0TFPQIzd0,3869
 dodal/devices/motors.py,sha256=WSNPt9Pi7f-16yDtzAHApLOlUh1Y0aqnFICJIy2zOEs,1671
@@ -95,6 +98,8 @@ dodal/devices/areadetector/plugins/MJPG.py,sha256=QTsxCoWbofNpLMGPoOR2hWoM33Kynt
 dodal/devices/attenuator/attenuator.py,sha256=Vq9Zsyf56S5fePHGeluImTUtxdwEqttBa2YBIdU5tJU,3993
 dodal/devices/attenuator/filter.py,sha256=ZoPsTWXjllyMtKBdSIFLB7Cbc88rGof5k3ymL13VczE,422
 dodal/devices/attenuator/filter_selections.py,sha256=lcmTprCXgSggp2L6uQ6YU0xLMljXvbspAug-WWKCXks,1410
+dodal/devices/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
 dodal/devices/current_amplifiers/current_amplifier.py,sha256=erDVtstLNFVb4wdSqWwRCQX_ifPxOc07x_2Ba_8Y1Wg,2660
 dodal/devices/current_amplifiers/current_amplifier_detector.py,sha256=YKA769KpU1V4GyYF3ckMgE8sXnaJyzRPUbBqIo7UruM,3968
@@ -107,21 +112,25 @@ dodal/devices/detector/det_dist_to_beam_converter.py,sha256=nSkhiEESyuzdrWoPu6h3
 dodal/devices/detector/det_resolution.py,sha256=aQkKp24LpRGiwzPAQM3wLVa4ANw32HdrKc2kftHfKQA,3253
 dodal/devices/detector/detector.py,sha256=DqQvlgdjIdKErrZqgM9IH7drc-r6N8nhkFk7KwlgYAk,4815
 dodal/devices/detector/detector_motion.py,sha256=UGDQriDWRluDZOZh1mDX9w_fPjMD-_BGe11kA36Kezs,1616
-dodal/devices/electron_analyser/__init__.py,sha256=zeTwdPFK8Su5kviLu-gertJRRth4jCED9d0NoZl11vg,484
-dodal/devices/electron_analyser/types.py,sha256=2QObyZln7pvWyLgixabGGWvfs3aIF98gVSz2B4NS1OM,120
-dodal/devices/electron_analyser/util.py,sha256=prZXwwxw3F3JD7S00WLuYTKQx04xvZqzpIC8xESdxJw,437
+dodal/devices/electron_analyser/__init__.py,sha256=xbOqt6b0J89UkZx6PAqEjPchfY_CMb3xgX3NAMEPf6A,793
+dodal/devices/electron_analyser/detector.py,sha256=V_fCe54S8K0C8cZXcozRKWwqm7n9B-iXf97Y9NtKAvQ,4522
+dodal/devices/electron_analyser/enums.py,sha256=2QObyZln7pvWyLgixabGGWvfs3aIF98gVSz2B4NS1OM,120
+dodal/devices/electron_analyser/types.py,sha256=k_uRDdHzx3sZQ11KB5PNTDQjxuGL91B3-l6sRuKdHHo,1026
+dodal/devices/electron_analyser/util.py,sha256=iUFvnYm-Y-0mBHR8oBLofZMKKuDhYYgGkOmvX6y1s1o,437
 dodal/devices/electron_analyser/abstract/__init__.py,sha256=OJ8rm_23azSe-MHmiyQZEUztqDnew4bRTdC2eVaiHT4,572
-dodal/devices/electron_analyser/abstract/base_detector.py,sha256=FKMpd2Igg_ZaHeqgLMfD6eKgZTpfovEMnW2FspXtKkw,7146
-dodal/devices/electron_analyser/abstract/base_driver_io.py,sha256=ms3BwmDA6X9efBNihvq_RZWiWQc89eFAKPBCQ6IVDp8,8705
-dodal/devices/electron_analyser/abstract/base_region.py,sha256=BE4NGNvSm9Gg7c9Vjq1W51dWpuhwEW5EIQWNR9rGf5M,3522
-dodal/devices/electron_analyser/specs/__init__.py,sha256=zzVEeFczfxVsVlBnt6spWhht4ScjKaah_pHC3R4Zy5g,233
-dodal/devices/electron_analyser/specs/detector.py,sha256=HgVuGkEI8Xx2WAYplXNycGE9zut__esv91i9-4ee73M,542
-dodal/devices/electron_analyser/specs/driver_io.py,sha256=qNFMnUJdrR3dAcgJySm92lN73H816B8uG6m1nk0miyQ,3339
-dodal/devices/electron_analyser/specs/region.py,sha256=Z39jr_d28fQ13KQq7Z3NCeHVSM73rbCkDyZNXzDzPzI,862
-dodal/devices/electron_analyser/vgscienta/__init__.py,sha256=LL_rvNUZcOFNUvWmuuqAapQ_YbjzNQn7ootJEhZFttI,337
-dodal/devices/electron_analyser/vgscienta/detector.py,sha256=zMFV0YPI9h0WjU9QDsM1JfOOCXKLV8Umy3iuu6nVyb8,632
-dodal/devices/electron_analyser/vgscienta/driver_io.py,sha256=L0dv7bPTD0ZH9RCEUULePtNwa_joHxhdc0ec5MfUTFo,2707
-dodal/devices/electron_analyser/vgscienta/region.py,sha256=h3uQqjWNyZDqDkhDYeJkGBNgZAETn7lr3AfhWynK3Po,2502
+dodal/devices/electron_analyser/abstract/base_detector.py,sha256=Tcx-lrqHr7dkGmOPMSVibZypefddRauQU_1cZTIwaVU,2979
+dodal/devices/electron_analyser/abstract/base_driver_io.py,sha256=ZGYtzxDkPIIcrZP4G2FXXJTAGL5uDKwpdAAvcM94gWU,8824
+dodal/devices/electron_analyser/abstract/base_region.py,sha256=KI4Nk1w9V_1p71wdqLS7IMoal54QPejghDUO4FEdWuw,3648
+dodal/devices/electron_analyser/specs/__init__.py,sha256=qN57kY6ERUGdrAWhU5m8CBrc0KaqiOGwPL6h2BNm3i0,291
+dodal/devices/electron_analyser/specs/detector.py,sha256=9yOmfjVE_cRPJLOLZxaeGUqV1q82YuS_oO-psWE_Wxc,528
+dodal/devices/electron_analyser/specs/driver_io.py,sha256=hAqy0nKCR-9HLlcgJqkXpgIJy77yWsHCtS2bQ7eFM5c,3337
+dodal/devices/electron_analyser/specs/enums.py,sha256=cXPcbIGEN5ZJJt1KeiNJEtZkkcjQ-fz7dBfsU283zYQ,235
+dodal/devices/electron_analyser/specs/region.py,sha256=hBxrMUJrzOoJGInULEbAdnhBL74fFe7R6-c7nde8nPE,977
+dodal/devices/electron_analyser/vgscienta/__init__.py,sha256=Iq0d2BBp0TJh4uG9twiiL-gJiSVI8zNUEbkg1UF5k6U,395
+dodal/devices/electron_analyser/vgscienta/detector.py,sha256=JdCsTXXLbIIGIYZaNDcEGD-fagz8tjil7IbJDTfak6c,618
+dodal/devices/electron_analyser/vgscienta/driver_io.py,sha256=NijPdgvJoTLRPSVDfO4qB7X41TflPRayZZGxfKw-V-o,2800
+dodal/devices/electron_analyser/vgscienta/enums.py,sha256=apJZgIaE1aMQPBwIL1tQvV0WJ5trbk3j6iFmc1OqLsw,353
+dodal/devices/electron_analyser/vgscienta/region.py,sha256=b1_L54ZxVaiO7sDOK6IbzWVi8fxgTlPAXnT4OpMfbVY,2273
 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
@@ -129,8 +138,9 @@ dodal/devices/i04/__init__.py,sha256=Kvukapy4a5lUQ20qaCqYCJzKNaqJn2DfXP5nKZ_Pec8
 dodal/devices/i04/constants.py,sha256=jHZe5Aeph0_hCDJotMx7Yi8v_a_6jyoI6p60AQ8GvGM,271
 dodal/devices/i04/murko_results.py,sha256=1vVQKQdBGYAwcX22oQzWYheelIppoTQk5_git563y10,7055
 dodal/devices/i04/transfocator.py,sha256=sVI4Bgv-2-DH4-F1nIXMp5Aktevrm3agZnCA-WgjmW8,3780
+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=ErObNNE59NuYssde6ojWJb8wo3SVohkQsvK0Bjnf1T8,13192
+dodal/devices/i10/i10_apple2.py,sha256=RbavLeqwmmcqAkGJw9-0AmLrWSiP91tAxwJLnXXCY-4,15271
 dodal/devices/i10/i10_setting_data.py,sha256=69XWgE-YNTiW7C3t67MNcTL5JDDhOo7h-X7DCTpFE5g,164
 dodal/devices/i10/mirrors.py,sha256=E0M5keGI3LGaDHyXQkCCyj6xmixNY1xTSkIaaYwtnP8,794
 dodal/devices/i10/slits.py,sha256=jI4wJPVT2vtl4bvabrU9u_v-SdGjOfDLBm0S9GMZC7w,4157
@@ -152,7 +162,7 @@ dodal/devices/i19/shutter.py,sha256=Z3_UO3TmSczJrB8AcU5ohk8WlDN04a00XhSyDLAHvbc,
 dodal/devices/i20_1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/i22/dcm.py,sha256=IbK56lSvX3PZlYKVeH7mIbRK83-mhJEIoTn1zjQfScE,4494
 dodal/devices/i22/fswitch.py,sha256=LSMoo9aDkH0SLcojbUh2NxTWIpUXHZxauTqThc3XtSk,3073
-dodal/devices/i22/nxsas.py,sha256=lFB_h6ns6yETPFZjDghOMZLg16nDnWveMOJV34TDSYk,5994
+dodal/devices/i22/nxsas.py,sha256=093GCM2H2LESt28RF-JfxEljJ8QzRPkL1ByXI2XVhoA,6012
 dodal/devices/i24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/i24/aperture.py,sha256=XlnOyQsvdTom1dJHVUg8CUSthq3jlBlZFOUaa9b1eZ4,837
 dodal/devices/i24/beam_center.py,sha256=m6LWsG9e_lhtPfZ8pc_hoLNyTYQQGGdRNav8J_2scTo,483
@@ -167,7 +177,7 @@ dodal/devices/i24/vgonio.py,sha256=sxSmcYZayVJPJz_D_91j9PmNor7Tbl1RGQFRrdtESlw,5
 dodal/devices/mx_phase1/beamstop.py,sha256=MeSpp4YpHgIrWCifDU7OTUaJNAMLVpcmgxTMjmOy048,3170
 dodal/devices/oav/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/oav/oav_calculations.py,sha256=qoaNz4MAdbpu0XHAkWTQ3rebFwsWfa8JA1eerUgISjA,2367
-dodal/devices/oav/oav_detector.py,sha256=f6z5DIOZOba4nXJq3kusdOF-qpV0gJ-SeDh-oRpfqsM,5874
+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/utils.py,sha256=T-xg7J38ritzXwRrKjsWZ7daC_qR7aNhlbkXx75nJ8Q,3188
@@ -205,6 +215,7 @@ dodal/plan_stubs/data_session.py,sha256=Syc6XKaN1usf7bNWOez8_vAH3byrcROqskmBrSUW
 dodal/plan_stubs/motor_utils.py,sha256=Mf8utOA_xmxUa2dLmQ1uRkdfyDTip7D8YcKeCBCQLUQ,4458
 dodal/plan_stubs/wrapped.py,sha256=kC8HH7bx3-sLYu2oieY_502tAdT2OECF8n-fqoL5Bfc,4266
 dodal/plans/__init__.py,sha256=nH1jNxw3DzDMg9O8Uda0kqKIalRVEWBrq07OLY6Ey38,93
+dodal/plans/bimorph.py,sha256=JxDmZDiEvZnz5f22tlaoyivpnaNGiX8kSL82qz5uvMM,11738
 dodal/plans/configure_arm_trigger_and_disarm_detector.py,sha256=pI1AkTH_5hIU56GmmrBdHMhepuDCuQz44V-O4XIaueg,5384
 dodal/plans/save_panda.py,sha256=1fumH7Ih8uDIv8ahAtgQ_vUuR3dz0sfUs4n9TEtEbSs,3053
 dodal/plans/scanspec.py,sha256=Q0AcvTKRT401iGMRDSqK-D523UX5_ofiVMZ_rNXKOx8,2074
@@ -212,8 +223,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.48.0.dist-info/METADATA,sha256=faFiABQKyznao1MadSS2zvfIcvbLIxz29YRaLXLtnDk,16806
-dls_dodal-1.48.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dls_dodal-1.48.0.dist-info/entry_points.txt,sha256=bycw_EKUzup_rxfCetOwcauXV4kLln_OPpPT8jEnr-I,94
-dls_dodal-1.48.0.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
-dls_dodal-1.48.0.dist-info/RECORD,,
+dls_dodal-1.50.0.dist-info/METADATA,sha256=HHVwD53GPNpl389XdyNTqmiuW6uEBg1tsRZh7j8HU1g,16839
+dls_dodal-1.50.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dls_dodal-1.50.0.dist-info/entry_points.txt,sha256=bycw_EKUzup_rxfCetOwcauXV4kLln_OPpPT8jEnr-I,94
+dls_dodal-1.50.0.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
+dls_dodal-1.50.0.dist-info/RECORD,,

dodal/_version.py

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

dodal/beamlines/aithre.py

@@ -1,6 +1,11 @@
 from dodal.common.beamlines.beamline_utils import device_factory
 from dodal.devices.aithre_lasershaping.goniometer import Goniometer
 from dodal.devices.aithre_lasershaping.laser_robot import LaserRobot
+from dodal.devices.oav.oav_detector import NullZoomController, OAVBeamCentreFile
+from dodal.devices.oav.oav_parameters import OAVConfigBeamCentre
+
+ZOOM_PARAMS_FILE = "/dls_sw/i23/software/aithre/aithre_oav.xml"
+DISPLAY_CONFIG = "/dls_sw/i23/software/aithre/aithre_display.configuration"
 
 PREFIX = "LA18L"
 
@@ -13,3 +18,13 @@ def goniometer() -> Goniometer:
 @device_factory()
 def robot() -> LaserRobot:
     return LaserRobot("robot", f"{PREFIX}-MO-ROBOT-01:")
+
+
+@device_factory()
+def oav(params: OAVConfigBeamCentre | None = None) -> OAVBeamCentreFile:
+    return OAVBeamCentreFile(
+        prefix=f"{PREFIX}-DI-OAV-01:",
+        config=params or OAVConfigBeamCentre(ZOOM_PARAMS_FILE, DISPLAY_CONFIG),
+        name="oav",
+        zoom_controller=NullZoomController(),
+    )

dodal/beamlines/b16.py

@@ -0,0 +1,65 @@
+from pathlib import Path
+
+from ophyd_async.epics.adcore import (
+    AreaDetector,
+)
+from ophyd_async.epics.motor import Motor
+
+from dodal.common.beamlines.beamline_utils import (
+    device_factory,
+    set_path_provider,
+)
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.common.visit import RemoteDirectoryServiceClient, StaticVisitPathProvider
+from dodal.devices.b16.detector import (
+    software_triggered_tiff_area_detector,
+)
+from dodal.devices.motors import XYZPositioner
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("b16")
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+set_path_provider(
+    StaticVisitPathProvider(
+        BL,
+        Path("/dls/b16/data/2025/cm40635-3/bluesky"),
+        client=RemoteDirectoryServiceClient("http://b16-control:8088/api"),
+    )
+)
+
+
+@device_factory()
+def attol1() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-EA-ECC-03:ACT0")
+
+
+@device_factory()
+def attol2() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-EA-ECC-03:ACT1")
+
+
+@device_factory()
+def attol3() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-EA-ECC-03:ACT2")
+
+
+@device_factory()
+def attorot1() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-EA-ECC-02:ACT2")
+
+
+@device_factory()
+def fds2() -> AreaDetector:
+    prefix = f"{PREFIX.beamline_prefix}-EA-FDS-02:"
+    return software_triggered_tiff_area_detector(prefix)
+
+
+@device_factory()
+def sim_stage() -> XYZPositioner:
+    return XYZPositioner(
+        f"{PREFIX.beamline_prefix}-MO-SIM-01:", "sim_stage", infix=("M1", "M2", "M3")
+    )

dodal/beamlines/b18.py

@@ -0,0 +1,38 @@
+from pathlib import Path
+
+from dodal.common.beamlines.beamline_utils import (
+    device_factory,
+    set_path_provider,
+)
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.common.visit import (
+    LocalDirectoryServiceClient,
+    StaticVisitPathProvider,
+)
+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("b18")
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+# Currently we must hard-code the visit, determining the visit at runtime requires
+# infrastructure that is still WIP.
+# Communication with GDA is also WIP so for now we determine an arbitrary scan number
+# locally and write the commissioning directory. The scan number is not guaranteed to
+# be unique and the data is at risk - this configuration is for testing only.
+set_path_provider(
+    StaticVisitPathProvider(
+        BL,
+        Path("/dls/b18/data/2025/cm40637-3/bluesky"),
+        client=LocalDirectoryServiceClient(),
+    )
+)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()

dodal/beamlines/i10.py

@@ -1,19 +1,17 @@
-from pathlib import Path
+"""
+note:
+    I10 has two insertion devices one up(idu) and one down stream(idd).
+    It is worth noting that the downstream device is slightly longer,
+    so it can reach Mn edge for linear arbitrary.
+    idd == id1,    idu == id2.
+"""
 
-from dodal.common.beamlines.beamline_utils import device_factory, device_instantiation
+from dodal.common.beamlines.beamline_utils import device_factory
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
-from dodal.devices.apple2_undulator import (
-    UndulatorGap,
-    UndulatorJawPhase,
-    UndulatorPhaseAxes,
-)
 from dodal.devices.current_amplifiers import CurrentAmpDet
 from dodal.devices.i10.diagnostics import I10Diagnostic, I10Diagnostic5ADet
 from dodal.devices.i10.i10_apple2 import (
-    I10Apple2,
-    I10Apple2PGM,
-    I10Apple2Pol,
-    LinearArbitraryAngle,
+    I10Id,
 )
 from dodal.devices.i10.i10_setting_data import I10Grating
 from dodal.devices.i10.mirrors import PiezoMirror
@@ -37,238 +35,48 @@ set_utils_beamline(BL)
 PREFIX = BeamlinePrefix(BL)
 
 
-LOOK_UPTABLE_DIR = "/dls_sw/i10/software/gda/workspace_git/gda-diamond.git/configurations/i10-shared/lookupTables/"
-"""
-I10 has two insertion devices one up(idu) and one down stream(idd).
-It is worth noting that the down stream device is slightly longer,
- so it can reach Mn edge for linear arbitrary.
- idd == id1
- and
- idu == id2.
-"""
-
-
-def idd_gap(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> UndulatorGap:
-    return device_instantiation(
-        device_factory=UndulatorGap,
-        name="idd_gap",
-        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
-        wait=wait_for_connection,
-        fake=fake_with_ophyd_sim,
-        bl_prefix=False,
-    )
-
-
-def idd_phase_axes(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> UndulatorPhaseAxes:
-    return device_instantiation(
-        device_factory=UndulatorPhaseAxes,
-        name="idd_phase_axes",
-        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
-        top_outer="RPQ1",
-        top_inner="RPQ2",
-        btm_inner="RPQ3",
-        btm_outer="RPQ4",
-        wait=wait_for_connection,
-        fake=fake_with_ophyd_sim,
-        bl_prefix=False,
-    )
-
-
-def idd_jaw(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> UndulatorJawPhase:
-    return device_instantiation(
-        device_factory=UndulatorJawPhase,
-        name="idd_jaw",
-        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
-        move_pv="RPQ1",
-        wait=wait_for_connection,
-        fake=fake_with_ophyd_sim,
-        bl_prefix=False,
-    )
-
-
-def idu_gap(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> UndulatorGap:
-    return device_instantiation(
-        device_factory=UndulatorGap,
-        name="idu_gap",
-        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-21:",
-        wait=wait_for_connection,
-        fake=fake_with_ophyd_sim,
-        bl_prefix=False,
-    )
-
-
-def idu_phase_axes(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> UndulatorPhaseAxes:
-    return device_instantiation(
-        device_factory=UndulatorPhaseAxes,
-        name="idu_phase_axes",
-        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-21:",
-        top_outer="RPQ1",
-        top_inner="RPQ2",
-        btm_inner="RPQ3",
-        btm_outer="RPQ4",
-        wait=wait_for_connection,
-        fake=fake_with_ophyd_sim,
-        bl_prefix=False,
-    )
-
-
-def idu_jaw(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> UndulatorJawPhase:
-    return device_instantiation(
-        device_factory=UndulatorJawPhase,
-        name="idu_jaw",
-        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-21:",
-        move_pv="RPQ1",
-        wait=wait_for_connection,
-        fake=fake_with_ophyd_sim,
-        bl_prefix=False,
-    )
+LOOK_UPTABLE_DIR = "/dls_sw/i10/software/blueapi/scratch/i10-config/lookupTables/"
 
 
-def pgm(wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False) -> PGM:
-    return device_instantiation(
-        device_factory=PGM,
-        name="pgm",
-        prefix="-OP-PGM-01:",
+@device_factory()
+def pgm() -> PGM:
+    "I10 Plane Grating Monochromator, it can change energy via pgm.energy.set(<energy>)"
+    return PGM(
+        prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:",
         grating=I10Grating,
         gratingPv="NLINES2",
-        wait=wait_for_connection,
-        fake=fake_with_ophyd_sim,
-    )
-
-
-def idu_gap_phase(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> I10Apple2:
-    return device_instantiation(
-        device_factory=I10Apple2,
-        id_gap=idu_gap(wait_for_connection, fake_with_ophyd_sim),
-        id_phase=idu_phase_axes(wait_for_connection, fake_with_ophyd_sim),
-        id_jaw_phase=idu_jaw(wait_for_connection, fake_with_ophyd_sim),
-        energy_gap_table_path=Path(
-            LOOK_UPTABLE_DIR + "IDEnergy2GapCalibrations.csv",
-        ),
-        energy_phase_table_path=Path(
-            LOOK_UPTABLE_DIR + "IDEnergy2PhaseCalibrations.csv",
-        ),
-        source=("Source", "idu"),
-        name="idu_gap_phase",
-        prefix="",
-        wait=wait_for_connection,
-        fake=fake_with_ophyd_sim,
     )
 
 
-def idd_gap_phase(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> I10Apple2:
-    return device_instantiation(
-        device_factory=I10Apple2,
-        id_gap=idd_gap(wait_for_connection, fake_with_ophyd_sim),
-        id_phase=idd_phase_axes(wait_for_connection, fake_with_ophyd_sim),
-        id_jaw_phase=idd_jaw(wait_for_connection, fake_with_ophyd_sim),
-        energy_gap_table_path=Path(
-            LOOK_UPTABLE_DIR + "IDEnergy2GapCalibrations.csv",
-        ),
-        energy_phase_table_path=Path(
-            LOOK_UPTABLE_DIR + "IDEnergy2PhaseCalibrations.csv",
-        ),
+@device_factory()
+def idd() -> I10Id:
+    """i10 downstream insertion device:
+    id.energy.set(<energy>) to change beamline energy.
+    id.energy.energy_offset.set(<off_set>) to change id energy offset relative to pgm.
+    id.pol.set(<polarisation>) to change polarisation.
+    id.laa.set(<linear polarisation angle>) to change polarisation angle, must be in LA mode.
+    """
+    return I10Id(
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
+        pgm=pgm(),
+        look_up_table_dir=LOOK_UPTABLE_DIR,
         source=("Source", "idd"),
-        name="idd_gap_phase",
-        prefix="",
-        wait=wait_for_connection,
-        fake=fake_with_ophyd_sim,
     )
 
 
-def idu_pol(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> I10Apple2Pol:
-    return device_instantiation(
-        device_factory=I10Apple2Pol,
-        prefix="",
-        id=idu_gap_phase(wait_for_connection, fake_with_ophyd_sim),
-        name="idu_pol",
-        wait=wait_for_connection,
-        fake=fake_with_ophyd_sim,
-    )
-
-
-def idd_pol(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> I10Apple2Pol:
-    return device_instantiation(
-        device_factory=I10Apple2Pol,
-        prefix="",
-        id=idd_gap_phase(wait_for_connection, fake_with_ophyd_sim),
-        name="idd_pol",
-        wait=wait_for_connection,
-        fake=fake_with_ophyd_sim,
-    )
-
-
-def idu(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> I10Apple2PGM:
-    return device_instantiation(
-        device_factory=I10Apple2PGM,
-        prefix="",
-        id=idu_gap_phase(wait_for_connection, fake_with_ophyd_sim),
-        pgm=pgm(wait_for_connection, fake_with_ophyd_sim),
-        name="idu",
-        wait=wait_for_connection,
-        fake=fake_with_ophyd_sim,
-    )
-
-
-def idd(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> I10Apple2PGM:
-    return device_instantiation(
-        device_factory=I10Apple2PGM,
-        prefix="",
-        id=idd_gap_phase(wait_for_connection, fake_with_ophyd_sim),
-        pgm=pgm(wait_for_connection, fake_with_ophyd_sim),
-        name="idd",
-        wait=wait_for_connection,
-        fake=fake_with_ophyd_sim,
-    )
-
-
-def idu_la_angle(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> LinearArbitraryAngle:
-    return device_instantiation(
-        device_factory=LinearArbitraryAngle,
-        prefix="",
-        id=idu(wait_for_connection, fake_with_ophyd_sim),
-        name="idu_la_angle",
-        wait=wait_for_connection,
-        fake=fake_with_ophyd_sim,
-    )
-
-
-def idd_la_angle(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> LinearArbitraryAngle:
-    return device_instantiation(
-        device_factory=LinearArbitraryAngle,
-        prefix="",
-        id=idu(wait_for_connection, fake_with_ophyd_sim),
-        name="idd_la_angle",
-        wait=wait_for_connection,
-        fake=fake_with_ophyd_sim,
+@device_factory()
+def idu() -> I10Id:
+    """i10 upstream insertion device:
+    id.energy.set(<energy>) to change beamline energy.
+    id.energy.energy_offset.set(<off_set>) to change id energy offset relative to pgm.
+    id.pol.set(<polarisation>) to change polarisation.
+    id.laa.set(<linear polarisation angle>) to change polarisation angle, must be in LA mode.
+    """
+    return I10Id(
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-21:",
+        pgm=pgm(),
+        look_up_table_dir=LOOK_UPTABLE_DIR,
+        source=("Source", "idu"),
     )
 
 
@@ -342,7 +150,7 @@ def pa_stage() -> PaStage:
 
 
 @device_factory()
-def simple_stage() -> XYZPositioner:
+def sample_stage() -> XYZPositioner:
     return XYZPositioner(prefix="ME01D-MO-CRYO-01:")