dls-dodal 1.55.0__py3-none-any.whl → 1.56.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {dls_dodal-1.55.0.dist-info → dls_dodal-1.56.0.dist-info}/METADATA +3 -3
- {dls_dodal-1.55.0.dist-info → dls_dodal-1.56.0.dist-info}/RECORD +100 -86
- dodal/_version.py +2 -2
- dodal/beamlines/b01_1.py +6 -13
- dodal/beamlines/b07.py +2 -1
- dodal/beamlines/b07_1.py +2 -1
- dodal/beamlines/b21.py +4 -24
- dodal/beamlines/i03.py +53 -53
- dodal/beamlines/i04.py +16 -38
- dodal/beamlines/i09.py +3 -2
- dodal/beamlines/i09_1.py +2 -1
- dodal/beamlines/i11.py +143 -0
- dodal/beamlines/i19_1.py +1 -0
- dodal/beamlines/i19_2.py +7 -0
- dodal/beamlines/i22.py +2 -2
- dodal/beamlines/i23.py +3 -3
- dodal/beamlines/i24.py +6 -14
- dodal/beamlines/p38.py +1 -0
- dodal/beamlines/p60.py +3 -2
- dodal/cli.py +11 -1
- dodal/common/__init__.py +4 -0
- dodal/common/beamlines/beamline_parameters.py +1 -1
- dodal/common/beamlines/beamline_utils.py +5 -1
- dodal/common/enums.py +19 -0
- dodal/common/watcher_utils.py +83 -0
- dodal/devices/aithre_lasershaping/laser_robot.py +4 -9
- dodal/devices/aperturescatterguard.py +52 -12
- dodal/devices/apple2_undulator.py +0 -1
- dodal/devices/attenuator/attenuator.py +3 -1
- dodal/devices/b16/detector.py +1 -10
- dodal/devices/backlight.py +8 -20
- dodal/devices/bimorph_mirror.py +4 -7
- dodal/devices/collimation_table.py +36 -0
- dodal/devices/controllers.py +21 -0
- dodal/devices/cryostream.py +97 -7
- dodal/devices/current_amplifiers/femto.py +1 -1
- dodal/devices/detector/detector_motion.py +1 -7
- dodal/devices/eiger.py +22 -8
- dodal/devices/eiger_odin.py +2 -0
- dodal/devices/electron_analyser/__init__.py +2 -1
- dodal/devices/electron_analyser/abstract/__init__.py +0 -1
- dodal/devices/electron_analyser/abstract/base_detector.py +3 -25
- dodal/devices/electron_analyser/abstract/base_driver_io.py +18 -9
- dodal/devices/electron_analyser/abstract/base_region.py +34 -3
- dodal/devices/electron_analyser/detector.py +24 -0
- dodal/devices/electron_analyser/enums.py +5 -0
- dodal/devices/electron_analyser/specs/detector.py +2 -1
- dodal/devices/electron_analyser/specs/driver_io.py +21 -26
- dodal/devices/electron_analyser/specs/region.py +1 -1
- dodal/devices/electron_analyser/util.py +20 -0
- dodal/devices/electron_analyser/vgscienta/__init__.py +3 -3
- dodal/devices/electron_analyser/vgscienta/detector.py +2 -1
- dodal/devices/electron_analyser/vgscienta/driver_io.py +24 -32
- dodal/devices/electron_analyser/vgscienta/enums.py +0 -8
- dodal/devices/electron_analyser/vgscienta/region.py +2 -31
- dodal/devices/eurotherm.py +126 -0
- dodal/devices/fluorescence_detector_motion.py +3 -10
- dodal/devices/focusing_mirror.py +1 -1
- dodal/devices/i03/undulator_dcm.py +0 -1
- dodal/devices/i09/enums.py +8 -8
- dodal/devices/i10/diagnostics.py +4 -4
- dodal/devices/i10/i10_apple2.py +3 -6
- dodal/devices/i11/cyberstar_blower.py +34 -0
- dodal/devices/i11/diff_stages.py +55 -0
- dodal/devices/i11/mythen.py +165 -0
- dodal/devices/i11/nx100robot.py +153 -0
- dodal/devices/i11/spinner.py +30 -0
- dodal/devices/i13_1/merlin_controller.py +4 -4
- dodal/devices/i19/diffractometer.py +34 -0
- dodal/devices/i19/shutter.py +11 -1
- dodal/devices/i22/dcm.py +1 -1
- dodal/devices/i22/fswitch.py +3 -12
- dodal/devices/i24/aperture.py +3 -3
- dodal/devices/i24/dcm.py +11 -15
- dodal/devices/i24/dual_backlight.py +11 -12
- dodal/devices/i24/pmac.py +8 -7
- dodal/devices/mx_phase1/beamstop.py +10 -11
- dodal/devices/oav/pin_image_recognition/__init__.py +0 -3
- dodal/devices/p60/enums.py +8 -8
- dodal/devices/p60/lab_xray_source.py +3 -2
- dodal/devices/pressure_jump_cell.py +77 -123
- dodal/devices/scintillator.py +76 -4
- dodal/devices/smargon.py +2 -2
- dodal/devices/synchrotron.py +1 -2
- dodal/devices/tetramm.py +13 -0
- dodal/devices/thawer.py +6 -11
- dodal/devices/undulator.py +3 -8
- dodal/devices/util/epics_util.py +1 -1
- dodal/devices/util/test_utils.py +19 -0
- dodal/devices/watsonmarlow323_pump.py +7 -7
- dodal/devices/xbpm_feedback.py +4 -6
- dodal/devices/xspress3/xspress3.py +0 -5
- dodal/devices/zocalo/zocalo_results.py +1 -3
- dodal/testing/__init__.py +0 -0
- dodal/testing/electron_analyser/__init__.py +6 -0
- dodal/testing/electron_analyser/device_factory.py +59 -0
- dodal/devices/CTAB.py +0 -41
- {dls_dodal-1.55.0.dist-info → dls_dodal-1.56.0.dist-info}/WHEEL +0 -0
- {dls_dodal-1.55.0.dist-info → dls_dodal-1.56.0.dist-info}/entry_points.txt +0 -0
- {dls_dodal-1.55.0.dist-info → dls_dodal-1.56.0.dist-info}/licenses/LICENSE +0 -0
- {dls_dodal-1.55.0.dist-info → dls_dodal-1.56.0.dist-info}/top_level.txt +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: dls-dodal
|
|
3
|
-
Version: 1.
|
|
3
|
+
Version: 1.56.0
|
|
4
4
|
Summary: Ophyd devices and other utils that could be used across DLS beamlines
|
|
5
5
|
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>
|
|
6
6
|
License: Apache License
|
|
@@ -215,8 +215,8 @@ Description-Content-Type: text/markdown
|
|
|
215
215
|
License-File: LICENSE
|
|
216
216
|
Requires-Dist: click
|
|
217
217
|
Requires-Dist: ophyd
|
|
218
|
-
Requires-Dist: ophyd-async[ca,pva]>=0.
|
|
219
|
-
Requires-Dist: bluesky
|
|
218
|
+
Requires-Dist: ophyd-async[ca,pva]>=0.13.0
|
|
219
|
+
Requires-Dist: bluesky==1.14.2
|
|
220
220
|
Requires-Dist: pyepics
|
|
221
221
|
Requires-Dist: dataclasses-json
|
|
222
222
|
Requires-Dist: pillow
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
dls_dodal-1.
|
|
1
|
+
dls_dodal-1.56.0.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
|
|
2
2
|
dodal/__init__.py,sha256=Ksms_WJF8LTkbm38gEpm1jBpGqcQ8NGvmb2ZJlOE1j8,198
|
|
3
3
|
dodal/__main__.py,sha256=kP2S2RPitnOWpNGokjZ1Yq-1umOtp5sNOZk2B3tBPLM,111
|
|
4
|
-
dodal/_version.py,sha256
|
|
5
|
-
dodal/cli.py,sha256=
|
|
4
|
+
dodal/_version.py,sha256=-Q-x6fbTDcv8A0qE6FFdxYCjVSPznhUJwbWxT9so9xg,706
|
|
5
|
+
dodal/cli.py,sha256=yi8dXOp0hqzlg4ZZXCRGU-LpDa_ydaropDjyREWbZ5Y,4152
|
|
6
6
|
dodal/log.py,sha256=Rt5O3hFZfMnJvQueZvgagQuXnPqHrFxhponOvVkpfrk,9871
|
|
7
7
|
dodal/utils.py,sha256=abGitd4FLpLnmckF7lUqOKYUL88r5Ex_NGSVgO4gOf4,19305
|
|
8
8
|
dodal/beamline_specific_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -12,66 +12,71 @@ dodal/beamlines/README.md,sha256=K9MkL_GomxlsoTB7Mz-_dJA5NNSbmCfMiutchGg3C8o,404
|
|
|
12
12
|
dodal/beamlines/__init__.py,sha256=pYP4kWH7h3VYXmjXdgbt27T_q-EA5PIyiaMZc7C49UA,3198
|
|
13
13
|
dodal/beamlines/adsim.py,sha256=fxj_P-7PsywdWPjfBAsLoOPiSKtApOKmLWHdQ8xCa3s,2048
|
|
14
14
|
dodal/beamlines/aithre.py,sha256=IoRO5szytOtdkLLEtwYwLl4TLhMllyG6l9A2G1r7Yic,994
|
|
15
|
-
dodal/beamlines/b01_1.py,sha256=
|
|
16
|
-
dodal/beamlines/b07.py,sha256=
|
|
17
|
-
dodal/beamlines/b07_1.py,sha256=
|
|
15
|
+
dodal/beamlines/b01_1.py,sha256=c82X3HXysBK0s2_JxJkEg1HPXBNewP_OR_DXBU4izzc,2829
|
|
16
|
+
dodal/beamlines/b07.py,sha256=TRJlLFMTMQz7a-ym8s2ZnuomZn_PBr6RAHrr5vAeSXA,1298
|
|
17
|
+
dodal/beamlines/b07_1.py,sha256=LxBQtvyYMhKNkzjrLr_yfxhnWDFHfnV8Fkd4q8W_Gus,1505
|
|
18
18
|
dodal/beamlines/b16.py,sha256=rK00hEj8KLGNkLZr9omAuoMz_DyLN9rK4eUQssETR9E,1703
|
|
19
19
|
dodal/beamlines/b18.py,sha256=ryxrGtcCdwoFgZ8ljWYgr1g9gKvoA7nxkARVxl1IE78,1189
|
|
20
|
-
dodal/beamlines/b21.py,sha256=
|
|
20
|
+
dodal/beamlines/b21.py,sha256=mN21vnOBmnwzG695HuV7P5DkuTtU8joflJI-evOpgwc,3333
|
|
21
21
|
dodal/beamlines/i02_1.py,sha256=d2IyqFMgeaSEyZYm7GMSjTKr7_02SakyC_oARx-XwnY,1204
|
|
22
|
-
dodal/beamlines/i03.py,sha256=
|
|
23
|
-
dodal/beamlines/i04.py,sha256=
|
|
22
|
+
dodal/beamlines/i03.py,sha256=4ZDmWoqHBz1fu0sgMOinQsxBDnH70oeGs78XIrgVMEs,16132
|
|
23
|
+
dodal/beamlines/i04.py,sha256=MhKVuMdbw58YSYbLKaRmkoUHjOykqS10jEWp35d8H3Y,13228
|
|
24
24
|
dodal/beamlines/i05.py,sha256=v4QKd8-neh4Og205oovm6NDRnAU6Oktu1WrxalXsI40,656
|
|
25
25
|
dodal/beamlines/i05_1.py,sha256=R6JFFg8Bj-Izw355mx3mOd4IDvJb5ipB4p7_S0I_4Z0,670
|
|
26
|
-
dodal/beamlines/i09.py,sha256=
|
|
27
|
-
dodal/beamlines/i09_1.py,sha256=
|
|
26
|
+
dodal/beamlines/i09.py,sha256=OrqOcVanJU4F7erRZZDkjLwV8VnLlUzz3LUduaCBgUc,1629
|
|
27
|
+
dodal/beamlines/i09_1.py,sha256=tZPD94nL76Ur2LZ_IAae14oqhbluuhpJRzlIz0L2gQ8,1271
|
|
28
28
|
dodal/beamlines/i09_2.py,sha256=lyYO1rOaIsXNuVOL39Psh-8jQjkhQBXEQMpbXa-Zcw0,713
|
|
29
29
|
dodal/beamlines/i10.py,sha256=0rSWOlIihkDtq7ZZaJ5O2jkMBrteRYjl4Hhqe8EP1Yc,5697
|
|
30
|
+
dodal/beamlines/i11.py,sha256=rjb5iARfbToNzeP-gewYljTu0f__V7bYj3JkJ5bWkGE,4349
|
|
30
31
|
dodal/beamlines/i13_1.py,sha256=VYVqMN8-njy7YSI08gskRccT-K2paRC9edAx0ah-Cwo,1602
|
|
31
32
|
dodal/beamlines/i18.py,sha256=FuU8G-q1piu6BRou-Shj3BQEbNtsF7CUsSIqqkvCKZc,3615
|
|
32
|
-
dodal/beamlines/i19_1.py,sha256=
|
|
33
|
-
dodal/beamlines/i19_2.py,sha256=
|
|
33
|
+
dodal/beamlines/i19_1.py,sha256=tg3eALJTn9p686VFV7GjfUvChGS1mrh8-98uzjdLj_g,2934
|
|
34
|
+
dodal/beamlines/i19_2.py,sha256=xSMS2Vhk_6V5WYyefVo1SWXbC4UUyaqru7JVK8VTg00,2554
|
|
34
35
|
dodal/beamlines/i19_optics.py,sha256=8hdlDAAMgFrhcXrp5xCPZtLUlrDUEC9VwKnnuUAMbbU,1150
|
|
35
36
|
dodal/beamlines/i20_1.py,sha256=Zsr1lsH7ySbOgK7RhMVMWzNWZAV-fuYW0iAjSEJZicY,2625
|
|
36
|
-
dodal/beamlines/i22.py,sha256=
|
|
37
|
-
dodal/beamlines/i23.py,sha256=
|
|
38
|
-
dodal/beamlines/i24.py,sha256=
|
|
37
|
+
dodal/beamlines/i22.py,sha256=VU5gz0q_K1D4zBHb88xnd1nAISAIBZOF6o8_YrGPGck,8103
|
|
38
|
+
dodal/beamlines/i23.py,sha256=ZXvPEiMA4mPbRTXOxvL1NcoVWDg4Deyl8k57cveDg90,3060
|
|
39
|
+
dodal/beamlines/i24.py,sha256=f6SeNbMdxviurfTAnKps8S9NNbDpU7SFzr-J1_c0yn8,6833
|
|
39
40
|
dodal/beamlines/k11.py,sha256=sBOl-MLk7FMo10KFykuK5aLqH1zyW4FnI0XXmtQhUfg,978
|
|
40
|
-
dodal/beamlines/p38.py,sha256=
|
|
41
|
+
dodal/beamlines/p38.py,sha256=lxFGzmQhth0JhOFbTrZd9LEbUgvKmQdMtiHDW6UJgDs,5763
|
|
41
42
|
dodal/beamlines/p45.py,sha256=tQ7EkWfr7o2okK7Prw1C7DNGYdKPU2ofqjm98wu_-G0,2158
|
|
42
|
-
dodal/beamlines/p60.py,sha256=
|
|
43
|
+
dodal/beamlines/p60.py,sha256=EeEfDa9OL0gEXZUw43wXh3GnYRrxc0QeuOKCC3REW7Q,1516
|
|
43
44
|
dodal/beamlines/p99.py,sha256=Rbi9OvmrGIblctOnZxFG_tqqhALLZ9O3ht4mBcb5vU8,2754
|
|
44
45
|
dodal/beamlines/training_rig.py,sha256=0HeZYy4LkI1yU8joz40f241owLGB26CeCk7s8TW98zw,1902
|
|
45
|
-
dodal/common/__init__.py,sha256=
|
|
46
|
+
dodal/common/__init__.py,sha256=0fah9eCiHBBLVhdIqN_pjQIgPtxkAu25-3i4KjHRFM4,386
|
|
46
47
|
dodal/common/coordination.py,sha256=OxIjDiO1-9A9KESRPFtzwkvvQlavbgA5RHemlbubBPg,1168
|
|
47
48
|
dodal/common/crystal_metadata.py,sha256=XGr-X81G9SZvPx5b4nBCH4FOnywyX_zYVy6zwDxIMVM,1926
|
|
48
49
|
dodal/common/data_util.py,sha256=Z2DgxQl3AzTB940e_qYVDIHuu_9vWzpbycjKb62SFus,555
|
|
49
50
|
dodal/common/device_utils.py,sha256=3hWgLmESiF88fho9bCweZpZH6b5fbbuSZGuSEYXxl4E,1345
|
|
51
|
+
dodal/common/enums.py,sha256=Q8RSQBIHTCbhngVUKoznzvwazQ7INsT5NE0BcAgT1U0,404
|
|
50
52
|
dodal/common/maths.py,sha256=K9x7iL3xXLtWYTV-xlFHDNSTIL9a2UP3Ws7wr6Dm2rQ,1803
|
|
51
53
|
dodal/common/types.py,sha256=fkL7UOwDbe3v2_VJ5f1W5RxR98Wx-Ra-LxUZWkNDtls,486
|
|
52
54
|
dodal/common/udc_directory_provider.py,sha256=v5OBaCUwjtQZAsRQUw6LlVL58UvwwDO1l2MKlilXjdk,2403
|
|
53
55
|
dodal/common/visit.py,sha256=BLpr3GrP7Ij95V135hRJLgg7gWtBKXVxyOibWtcO8RE,5782
|
|
56
|
+
dodal/common/watcher_utils.py,sha256=jWtXjr2a2NAcTy8A9OnvtB_hWh3GuuLvWxVWHouSvOs,3168
|
|
54
57
|
dodal/common/beamlines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
55
|
-
dodal/common/beamlines/beamline_parameters.py,sha256=
|
|
56
|
-
dodal/common/beamlines/beamline_utils.py,sha256=
|
|
58
|
+
dodal/common/beamlines/beamline_parameters.py,sha256=nYTy5TDYegvon6iNCxf7Uez3hbdu9GCoLUmJhRO1qhE,2665
|
|
59
|
+
dodal/common/beamlines/beamline_utils.py,sha256=UnDJlRs7p8srjv-peX05jHZBb8J2d2lPSyG9118x560,5286
|
|
57
60
|
dodal/common/beamlines/device_helpers.py,sha256=8sasAIFRDwo6ElHqLrXnpj_v7xcEg-29Zhey_e4r9u8,84
|
|
58
|
-
dodal/devices/CTAB.py,sha256=5_261Ox6NG2cJIzzwnjWz289BG0nZoE0wKOaI5V5jqM,1998
|
|
59
61
|
dodal/devices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
60
62
|
dodal/devices/aperture.py,sha256=S7AoIoQg_kFxaQk7HUMijbm1kYkOEi2csbdj76kp1ys,427
|
|
61
|
-
dodal/devices/aperturescatterguard.py,sha256=
|
|
62
|
-
dodal/devices/apple2_undulator.py,sha256=
|
|
63
|
-
dodal/devices/backlight.py,sha256=
|
|
63
|
+
dodal/devices/aperturescatterguard.py,sha256=FH2oru3DU-I6BwOJOVEgHdFplLKIIknxtEBUBAXZ_WA,13946
|
|
64
|
+
dodal/devices/apple2_undulator.py,sha256=KbAX1GstP01XOm-QpXlyWCJewfxXKKawnoqbsfsksyY,26265
|
|
65
|
+
dodal/devices/backlight.py,sha256=y40kR6N3qSFVLRaGU8CjJJpwv_hq2QALf_85fLQqras,1415
|
|
64
66
|
dodal/devices/baton.py,sha256=BnakfZxx3cIIX6Kxj8-abxn8Z9LaQODhcPbStbD0as4,485
|
|
65
|
-
dodal/devices/bimorph_mirror.py,sha256
|
|
67
|
+
dodal/devices/bimorph_mirror.py,sha256=OGe6aCczG0gVco4OvIRLJVxn2kw5F2QG1e06uqhFLTw,4609
|
|
68
|
+
dodal/devices/collimation_table.py,sha256=64HunSPJH-L2gZdfIj_RYdOlOuwRFEfMHfLHzu4BAKI,1681
|
|
66
69
|
dodal/devices/common_dcm.py,sha256=8QSRE6Z10RQjfL3g4JZhyHRNI_aCKxWlzKSsDgiJHhE,3049
|
|
67
|
-
dodal/devices/
|
|
70
|
+
dodal/devices/controllers.py,sha256=un-12-ts65rKJ4Az6gwnIWIUGvAH6KxAQhZ2u2iJ1O4,542
|
|
71
|
+
dodal/devices/cryostream.py,sha256=2FxCGioEZNMHItsGm_rsnkRnHjwMUIwRMAX_x8odKIw,4678
|
|
68
72
|
dodal/devices/diamond_filter.py,sha256=hySd7HnLdplpPNvBrLddLjO_3LqgD8-99Zr__Sy_GbI,689
|
|
69
|
-
dodal/devices/eiger.py,sha256=
|
|
70
|
-
dodal/devices/eiger_odin.py,sha256=
|
|
73
|
+
dodal/devices/eiger.py,sha256=pkK4EG1fLv6Qon5Ci__ApZKRtVKK8EMqTbM4CLU4duo,16608
|
|
74
|
+
dodal/devices/eiger_odin.py,sha256=1JoqPppTp99IZCiFOXJZB3h62xXRYKZINxTYXdLnT8c,7480
|
|
75
|
+
dodal/devices/eurotherm.py,sha256=rdLldmWYP1PZBckoya6svPy1mDxHYaa1IfMleMPGzD4,3832
|
|
71
76
|
dodal/devices/fast_grid_scan.py,sha256=UpAvlEncAG_toJi6p9iFggmLGeY7PZNfzt6WZiDo51Q,11891
|
|
72
|
-
dodal/devices/fluorescence_detector_motion.py,sha256
|
|
77
|
+
dodal/devices/fluorescence_detector_motion.py,sha256=hJ1M9Zs6Dlw8DDL9APh7yVePlS4tU2hnlySd16hqfwE,346
|
|
73
78
|
dodal/devices/flux.py,sha256=1CDsq9yU2-ho8MfYBl50Tl9ABZwpUBHnV486PQXKNoQ,462
|
|
74
|
-
dodal/devices/focusing_mirror.py,sha256=
|
|
79
|
+
dodal/devices/focusing_mirror.py,sha256=hI8ucIDA57I0oUnhcya-UwHhyJ5Vnc_sQSZ20J4ZhtA,6592
|
|
75
80
|
dodal/devices/hutch_shutter.py,sha256=iY3qWxDr8mDlAvN_BYe2gqpXRM1hlfV3ewdwkwh0_v0,3889
|
|
76
81
|
dodal/devices/ipin.py,sha256=eq5jlKw7WGQi8VLrAWpaAIsZmfiVf-5Q0td_B22H6A4,473
|
|
77
82
|
dodal/devices/linkam3.py,sha256=Lkw7c05XyHEEA83djfVFqz_8HN4kROCRqZwLwvHwRdA,2054
|
|
@@ -79,28 +84,28 @@ dodal/devices/motors.py,sha256=UIc6JZbzYhgT4Vr3DpHqG53_4q391A9-8W_BWHksSG8,6300
|
|
|
79
84
|
dodal/devices/p45.py,sha256=CImflt7ifaOkV20Uip3S8_fde_GlIIhD16y-54ODfHE,1390
|
|
80
85
|
dodal/devices/pgm.py,sha256=92yfr3i4fC92g-HPbbUBrazGs4b9n6CjmJfKxmUrMUY,1157
|
|
81
86
|
dodal/devices/positioner.py,sha256=qf_1uYOI1whS0U5sPA3O3mlZYKrPuW3i0gEKI_q-up0,1289
|
|
82
|
-
dodal/devices/pressure_jump_cell.py,sha256=
|
|
87
|
+
dodal/devices/pressure_jump_cell.py,sha256=YGmllfBya7MryLg3EXS0pzBJDRs_TlgDFxt8TzAwKJQ,8734
|
|
83
88
|
dodal/devices/qbpm.py,sha256=FfrWWAHHtYv3fGRT1qljyPpAwoHJYfbooT9CfKg-oXI,465
|
|
84
89
|
dodal/devices/robot.py,sha256=k4Vkjpd3R-wXWf6YbYC1225sSdjvTrZS54v5v6Qy_EU,7003
|
|
85
90
|
dodal/devices/s4_slit_gaps.py,sha256=4KdarIQoRqX4ry3LUS1Km7fkjUFahA0VuTd2DvYEqQ8,446
|
|
86
|
-
dodal/devices/scintillator.py,sha256=
|
|
91
|
+
dodal/devices/scintillator.py,sha256=JresF8SY_-t1raibzR4f0UoMXnFi-Abh3ywGm2DjhKs,3003
|
|
87
92
|
dodal/devices/slits.py,sha256=b_7ku2sHlzhMHTvWrwiRwee6ufrbxNX9JB_Z0lvk15o,1105
|
|
88
|
-
dodal/devices/smargon.py,sha256=
|
|
93
|
+
dodal/devices/smargon.py,sha256=TC1ye35mDT1gLlrjIe3CcGeE2vEb78Cu7f0DbzUQR8M,5813
|
|
89
94
|
dodal/devices/status.py,sha256=hVrJS1yooQo6PRumRACoIEh-SKBUKxvBlQl-MtLFUMQ,327
|
|
90
|
-
dodal/devices/synchrotron.py,sha256=
|
|
91
|
-
dodal/devices/tetramm.py,sha256=
|
|
92
|
-
dodal/devices/thawer.py,sha256=
|
|
95
|
+
dodal/devices/synchrotron.py,sha256=OHBrTrm4K39XE8BrE9b_Jn_ZfMRyDp9CHCwvmiV-KOc,1989
|
|
96
|
+
dodal/devices/tetramm.py,sha256=qBu2ClXRM4RFO-y4C2pXVKsp5sX4VpOelbVHOAkkUHQ,8936
|
|
97
|
+
dodal/devices/thawer.py,sha256=UtikbirSZZGjcbZEDWO33n5CIsd_dSvmohIS4R65xWg,1571
|
|
93
98
|
dodal/devices/turbo_slit.py,sha256=xhcnhfbdcTYSYozogw6Li4fF4ofoPsc350rEyrRdaNE,1460
|
|
94
|
-
dodal/devices/undulator.py,sha256=
|
|
95
|
-
dodal/devices/watsonmarlow323_pump.py,sha256=
|
|
99
|
+
dodal/devices/undulator.py,sha256=3IRn1iOF1PLOuIzaMpsNLVYx-rGvAnr-PG7C3YupW-w,5266
|
|
100
|
+
dodal/devices/watsonmarlow323_pump.py,sha256=xNwjoxW3NJIDkeDWHfb0A8Yj95_KKRXMD9AghvX-WLk,1337
|
|
96
101
|
dodal/devices/webcam.py,sha256=QUfOwblZr_xUGVqt5cMhTwfyQAL-jhSJ2ORQRNmZBrM,2436
|
|
97
|
-
dodal/devices/xbpm_feedback.py,sha256=
|
|
102
|
+
dodal/devices/xbpm_feedback.py,sha256=Uv_jML9gkMT5OcpUrckzxDmsBmktEwV1lga6USxeRyY,1065
|
|
98
103
|
dodal/devices/aithre_lasershaping/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
99
104
|
dodal/devices/aithre_lasershaping/goniometer.py,sha256=-2ewYMcdzB1DqP9sMpr4L1i4KeTCrGAJfngAt9-eFWw,1005
|
|
100
|
-
dodal/devices/aithre_lasershaping/laser_robot.py,sha256=
|
|
105
|
+
dodal/devices/aithre_lasershaping/laser_robot.py,sha256=vy-I1ASYflFYIUYePhT2l3l7g2iekrIFzLxA0GLmKY8,717
|
|
101
106
|
dodal/devices/areadetector/plugins/CAM.py,sha256=sZzJm5Ez3eWfXZi_EB67wluhZmMQm1UyOc2bJFfzd1U,964
|
|
102
107
|
dodal/devices/areadetector/plugins/MJPG.py,sha256=QTsxCoWbofNpLMGPoOR2hWoM33KyntuLepbF0YmX0KE,3031
|
|
103
|
-
dodal/devices/attenuator/attenuator.py,sha256=
|
|
108
|
+
dodal/devices/attenuator/attenuator.py,sha256=7RFCAZSCUL1hWSLrYrgmalaEIWUhr0fHoDRthAG4yZ0,4104
|
|
104
109
|
dodal/devices/attenuator/filter.py,sha256=ZoPsTWXjllyMtKBdSIFLB7Cbc88rGof5k3ymL13VczE,422
|
|
105
110
|
dodal/devices/attenuator/filter_selections.py,sha256=lcmTprCXgSggp2L6uQ6YU0xLMljXvbspAug-WWKCXks,1410
|
|
106
111
|
dodal/devices/b07/__init__.py,sha256=Zw4VkH-68MLoDveswDpR-lTlzK1-IeNz2W4qtkCO3Hs,109
|
|
@@ -109,11 +114,11 @@ dodal/devices/b07_1/__init__.py,sha256=yInDRarid492g7unaL8zIrWSNpRXhgsj8z7TRTRJf
|
|
|
109
114
|
dodal/devices/b07_1/ccmc.py,sha256=ZjbOjJN3Ckbkp4ZZLE48-j9CGXcfidujgdrSROr6TQM,2554
|
|
110
115
|
dodal/devices/b07_1/enums.py,sha256=TREiXDSAGFRXR3iUkKADYfm-CmhLmlpGHKZUOQ2Z1as,723
|
|
111
116
|
dodal/devices/b16/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
112
|
-
dodal/devices/b16/detector.py,sha256=
|
|
117
|
+
dodal/devices/b16/detector.py,sha256=saI2aFBhT0oTisam5b1mlaMJTRwGT7bHbqPGBP7SDnk,840
|
|
113
118
|
dodal/devices/current_amplifiers/__init__.py,sha256=-MhT-t-GJ83rrvTDBCoWub_NKYkRtu4sEj8-y5XZBP0,782
|
|
114
119
|
dodal/devices/current_amplifiers/current_amplifier.py,sha256=erDVtstLNFVb4wdSqWwRCQX_ifPxOc07x_2Ba_8Y1Wg,2660
|
|
115
120
|
dodal/devices/current_amplifiers/current_amplifier_detector.py,sha256=YKA769KpU1V4GyYF3ckMgE8sXnaJyzRPUbBqIo7UruM,3968
|
|
116
|
-
dodal/devices/current_amplifiers/femto.py,sha256=
|
|
121
|
+
dodal/devices/current_amplifiers/femto.py,sha256=9t7fvRH3lbp1HitIvh3I_lP-tI-ZHabLW7ocEFuXkME,4456
|
|
117
122
|
dodal/devices/current_amplifiers/sr570.py,sha256=rYxMLmMKr3uQkz0l0bebTpLtJzCr3w4hmtJPgY0NBZ0,7550
|
|
118
123
|
dodal/devices/current_amplifiers/struck_scaler_counter.py,sha256=3xTsqOCnLwb8o_YsFGbm0PilOe8HsR4Bz_rRZMDKy-Y,2575
|
|
119
124
|
dodal/devices/detector/__init__.py,sha256=-RdACL3tzc3lLArWOoGNje48UUlv2fElOmGOz9yOuO0,317
|
|
@@ -121,30 +126,30 @@ dodal/devices/detector/det_dim_constants.py,sha256=arBWvzMwybatdSiCMAiwB4Bq1dX-w
|
|
|
121
126
|
dodal/devices/detector/det_dist_to_beam_converter.py,sha256=nSkhiEESyuzdrWoPu6h3C05DnOhCXa6DZd-9vU5JYc0,1625
|
|
122
127
|
dodal/devices/detector/det_resolution.py,sha256=aQkKp24LpRGiwzPAQM3wLVa4ANw32HdrKc2kftHfKQA,3253
|
|
123
128
|
dodal/devices/detector/detector.py,sha256=DqQvlgdjIdKErrZqgM9IH7drc-r6N8nhkFk7KwlgYAk,4815
|
|
124
|
-
dodal/devices/detector/detector_motion.py,sha256=
|
|
125
|
-
dodal/devices/electron_analyser/__init__.py,sha256=
|
|
126
|
-
dodal/devices/electron_analyser/detector.py,sha256=
|
|
127
|
-
dodal/devices/electron_analyser/enums.py,sha256=
|
|
129
|
+
dodal/devices/detector/detector_motion.py,sha256=Ly4nz_AsB-_EDOADMC2u2J0dunpkOMbafVN_dgh3T-E,1389
|
|
130
|
+
dodal/devices/electron_analyser/__init__.py,sha256=UZqOOYZh-eOl_9T9LiiNNG3swXkBLiMwM1XmPeSNXgQ,831
|
|
131
|
+
dodal/devices/electron_analyser/detector.py,sha256=nnZ5bGaZJql-G9JaDK9VqLcsbPXb7hRSSfO1103JbX0,5046
|
|
132
|
+
dodal/devices/electron_analyser/enums.py,sha256=ruSH7LNRhtqMflv7gYxKeAu0uLzZIaoCai7sSTzpvkg,204
|
|
128
133
|
dodal/devices/electron_analyser/types.py,sha256=_kmdSp4E98fsusg5Wg-Hyo25zHYA_pMe_hFW8lKe3tE,1869
|
|
129
|
-
dodal/devices/electron_analyser/util.py,sha256=
|
|
130
|
-
dodal/devices/electron_analyser/abstract/__init__.py,sha256=
|
|
131
|
-
dodal/devices/electron_analyser/abstract/base_detector.py,sha256=
|
|
132
|
-
dodal/devices/electron_analyser/abstract/base_driver_io.py,sha256=
|
|
133
|
-
dodal/devices/electron_analyser/abstract/base_region.py,sha256=
|
|
134
|
+
dodal/devices/electron_analyser/util.py,sha256=ZFQJxxwDPIr43859DPIS9lBuq54phUT3R2f_Rbn-FbU,1235
|
|
135
|
+
dodal/devices/electron_analyser/abstract/__init__.py,sha256=4M9RF4ccXRnkK0zrNzt3vR-8vHgqcPiCl2CPXHSlyxg,620
|
|
136
|
+
dodal/devices/electron_analyser/abstract/base_detector.py,sha256=_jcUSZoHJNwLVI_HLk7DD8vEjZTSN2E3APJS8-Ssjzc,2368
|
|
137
|
+
dodal/devices/electron_analyser/abstract/base_driver_io.py,sha256=AYDASUZI8C9yWbVtZFjMat5SJxa3JZXSY1Fd8bKNxDY,9396
|
|
138
|
+
dodal/devices/electron_analyser/abstract/base_region.py,sha256=DXJkDBJUyD7gi0ZEksXP5Wh1EZvmVbSlOevbZUHrVjU,5056
|
|
134
139
|
dodal/devices/electron_analyser/abstract/types.py,sha256=eoeO7sqlv5RE7AEnyzsxHyuBXlUzOIYdRLWp0EnLyAU,596
|
|
135
140
|
dodal/devices/electron_analyser/specs/__init__.py,sha256=qN57kY6ERUGdrAWhU5m8CBrc0KaqiOGwPL6h2BNm3i0,291
|
|
136
|
-
dodal/devices/electron_analyser/specs/detector.py,sha256=
|
|
137
|
-
dodal/devices/electron_analyser/specs/driver_io.py,sha256=
|
|
141
|
+
dodal/devices/electron_analyser/specs/detector.py,sha256=5LIuaES0jMAetWXzjZCOdRLDd9HLzZHowIyfdlAKk8Y,1185
|
|
142
|
+
dodal/devices/electron_analyser/specs/driver_io.py,sha256=zIFce7opznykIsHrN3a1vfB-NeNOL9dAtcInnYjsLWY,5061
|
|
138
143
|
dodal/devices/electron_analyser/specs/enums.py,sha256=cXPcbIGEN5ZJJt1KeiNJEtZkkcjQ-fz7dBfsU283zYQ,235
|
|
139
|
-
dodal/devices/electron_analyser/specs/region.py,sha256=
|
|
140
|
-
dodal/devices/electron_analyser/vgscienta/__init__.py,sha256=
|
|
141
|
-
dodal/devices/electron_analyser/vgscienta/detector.py,sha256=
|
|
142
|
-
dodal/devices/electron_analyser/vgscienta/driver_io.py,sha256=
|
|
143
|
-
dodal/devices/electron_analyser/vgscienta/enums.py,sha256=
|
|
144
|
-
dodal/devices/electron_analyser/vgscienta/region.py,sha256=
|
|
144
|
+
dodal/devices/electron_analyser/specs/region.py,sha256=P7rwbY72-QGKzC6TeldmP8sTmardpB_-rYx7gPVCMqo,1213
|
|
145
|
+
dodal/devices/electron_analyser/vgscienta/__init__.py,sha256=5ZUJcUkJJ9ruwE0PzCFdA0HyWKrfjxaUBeGAMCC9JH4,357
|
|
146
|
+
dodal/devices/electron_analyser/vgscienta/detector.py,sha256=nqmQSKkZWeJZbFsfwoqvkR2z73RtUIlkcRNTFdqWVV0,1492
|
|
147
|
+
dodal/devices/electron_analyser/vgscienta/driver_io.py,sha256=81zd9ePf3F1PMtlW0mTL4daW-1oBJrTr0h6Tn8nCvf8,4069
|
|
148
|
+
dodal/devices/electron_analyser/vgscienta/enums.py,sha256=3vmX67ExATU8clueVp_mCzw3OUQx799oZMc8gyHtMJE,205
|
|
149
|
+
dodal/devices/electron_analyser/vgscienta/region.py,sha256=6k6Eah6_I74Pi2_a0KfyMYFfwHwJbh1ndqy0fuq5o14,2184
|
|
145
150
|
dodal/devices/i03/__init__.py,sha256=Kvukapy4a5lUQ20qaCqYCJzKNaqJn2DfXP5nKZ_Pec8,118
|
|
146
151
|
dodal/devices/i03/dcm.py,sha256=zDcgxOdMRVOQZBGDsLaIlr7o4UJIK2vehPWHxAxt6VA,2268
|
|
147
|
-
dodal/devices/i03/undulator_dcm.py,sha256=
|
|
152
|
+
dodal/devices/i03/undulator_dcm.py,sha256=L7dr1QcwJ1SiQWkHm0a4yQVJFtPiAJQyDLEXok64Ab8,2857
|
|
148
153
|
dodal/devices/i04/__init__.py,sha256=Kvukapy4a5lUQ20qaCqYCJzKNaqJn2DfXP5nKZ_Pec8,118
|
|
149
154
|
dodal/devices/i04/constants.py,sha256=_Dw28NeXldwRYH-h6YP6OHnyj7h0z4NQs_-RysNby5Q,281
|
|
150
155
|
dodal/devices/i04/murko_results.py,sha256=1vVQKQdBGYAwcX22oQzWYheelIppoTQk5_git563y10,7055
|
|
@@ -153,50 +158,56 @@ dodal/devices/i05/__init__.py,sha256=v0Axsf-vMyLyxcbqS8lljJc0BQ5Tw8yVBTWcO3tG_4g
|
|
|
153
158
|
dodal/devices/i05/enums.py,sha256=9FHBIexkSfZSTHxUnGupravfG9sVriHcrB15jemkQOQ,191
|
|
154
159
|
dodal/devices/i09/__init__.py,sha256=J6l3njc1VGju6d90QR-awx4xRLirNnqiD86QKcq88Z4,180
|
|
155
160
|
dodal/devices/i09/dcm.py,sha256=u0OgfZUE-eFQc-ix7iIfXERZhymAMXHP-Eifu2xWhYA,996
|
|
156
|
-
dodal/devices/i09/enums.py,sha256=
|
|
161
|
+
dodal/devices/i09/enums.py,sha256=Rfs6OgEHSSxcH2UiVmlR_5wLwxDmcHonXds0UDVRfCc,551
|
|
157
162
|
dodal/devices/i09_1/__init__.py,sha256=dTazun87AkMDXh7J8gIZYJxJth0XUs72qahJ-VvhRBI,72
|
|
158
163
|
dodal/devices/i09_1/enums.py,sha256=FwhsvKnEcm9M22U4gcAJi6FE2RaUBZH0jRjNgJUKRqc,1319
|
|
159
164
|
dodal/devices/i10/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
160
|
-
dodal/devices/i10/diagnostics.py,sha256=
|
|
161
|
-
dodal/devices/i10/i10_apple2.py,sha256=
|
|
165
|
+
dodal/devices/i10/diagnostics.py,sha256=iEPScPnjhLX20dD313hBekqM2OmL_WYQN-4yKAMOFWU,5440
|
|
166
|
+
dodal/devices/i10/i10_apple2.py,sha256=NF4k6YFVEQ1WgF-x_J5V1dxh7F-SSATnVQMVsUmP3kI,15209
|
|
162
167
|
dodal/devices/i10/i10_setting_data.py,sha256=69XWgE-YNTiW7C3t67MNcTL5JDDhOo7h-X7DCTpFE5g,164
|
|
163
168
|
dodal/devices/i10/mirrors.py,sha256=Zofd0g2f3YvFi_KIHQE_w4dFZNglhmh--65tRnWLuyY,504
|
|
164
169
|
dodal/devices/i10/slits.py,sha256=jI4wJPVT2vtl4bvabrU9u_v-SdGjOfDLBm0S9GMZC7w,4157
|
|
165
170
|
dodal/devices/i10/rasor/rasor_current_amp.py,sha256=hImaPI3veKiS5YVfYwv-qrQ1AYNBjFVxG_MwTQqtkcc,2368
|
|
166
171
|
dodal/devices/i10/rasor/rasor_motors.py,sha256=yWBxsiVhbdkQzhaK1S-nUq_wVntwHgdf6T8c8f7wHUE,1327
|
|
167
172
|
dodal/devices/i10/rasor/rasor_scaler_cards.py,sha256=sfWJKNx6pq342PEAlmg_Yt_Tijq7mO1XFjcCDtToQiU,467
|
|
173
|
+
dodal/devices/i11/cyberstar_blower.py,sha256=YngbNzNkWVj_LUGEIqo9JRxRQ0PT7zjouj2VljdDlOk,1033
|
|
174
|
+
dodal/devices/i11/diff_stages.py,sha256=3kcBRUvIwaqmoVf9MxY0CvU8LBbX_qaGhqbbYEmOri4,1713
|
|
175
|
+
dodal/devices/i11/mythen.py,sha256=_fi7SAoWfJ34RyfSNXEyG0gwP0ox6_l9RUN9BF6OBUI,5221
|
|
176
|
+
dodal/devices/i11/nx100robot.py,sha256=utycJTnCGV2_miUF00jEJyFcdYqSC4pcvE2fpyg-7Mo,6157
|
|
177
|
+
dodal/devices/i11/spinner.py,sha256=PjumM7QRB7iFUtN4b6xCvxKItYUNX2XLLWDupy5LI_M,932
|
|
168
178
|
dodal/devices/i13_1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
169
179
|
dodal/devices/i13_1/merlin.py,sha256=mgTFSMJftRzLL-HXAUuJkOYxtyA3Rp8YX0L46JCb30Y,1019
|
|
170
|
-
dodal/devices/i13_1/merlin_controller.py,sha256=
|
|
180
|
+
dodal/devices/i13_1/merlin_controller.py,sha256=myfmByOEXyMrlJZfsjOxDHeGQVwZGfsRtzrfSy2001o,1495
|
|
171
181
|
dodal/devices/i18/KBMirror.py,sha256=W4R3TeulSjosUqAFIIznyWzje_Y2AoEf9f8N-NkisYM,710
|
|
172
182
|
dodal/devices/i18/diode.py,sha256=nk5kvn4LsbhczRpCwHOO0_jJTYOz7MP9qm_uvBWuv7c,1468
|
|
173
183
|
dodal/devices/i19/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
174
184
|
dodal/devices/i19/beamstop.py,sha256=JkcvkEmcC3eY3GHrvYNGqv2yDwrfgdpWKVZJWSadWW8,715
|
|
175
185
|
dodal/devices/i19/blueapi_device.py,sha256=Tsl4vsREz7FM2d-kKJK-9tGrYbyKq4SLxnMlEKIM-g8,3966
|
|
186
|
+
dodal/devices/i19/diffractometer.py,sha256=QCEi0Gko6Ja9_ec2vfdazwMspknvX63jcz8hQ2XW1xo,1182
|
|
176
187
|
dodal/devices/i19/hutch_access.py,sha256=hnClUWCL1qTYzuBMmhXX85jiNak7mbYfyHEh54tZ27U,377
|
|
177
|
-
dodal/devices/i19/shutter.py,sha256=
|
|
188
|
+
dodal/devices/i19/shutter.py,sha256=B4KP0Ruc8Ex47OfCskbjYSSu81jz4tK9GC_7pxMIkgI,2140
|
|
178
189
|
dodal/devices/i20_1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
179
|
-
dodal/devices/i22/dcm.py,sha256=
|
|
180
|
-
dodal/devices/i22/fswitch.py,sha256=
|
|
190
|
+
dodal/devices/i22/dcm.py,sha256=s3RU6NxsQxOc_YgMBwR8lhboStI1gCDKbWc5pk22O0M,4489
|
|
191
|
+
dodal/devices/i22/fswitch.py,sha256=kpgegs4Wv_weBSzbrlXLXqXOOZdzTn3X9k5PlEN5F6c,2881
|
|
181
192
|
dodal/devices/i22/nxsas.py,sha256=093GCM2H2LESt28RF-JfxEljJ8QzRPkL1ByXI2XVhoA,6012
|
|
182
193
|
dodal/devices/i24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
183
|
-
dodal/devices/i24/aperture.py,sha256=
|
|
194
|
+
dodal/devices/i24/aperture.py,sha256=dlH_g7OPTBc5QRMd-ADU3_GDTKh668kkMHo4k_JxUcY,770
|
|
184
195
|
dodal/devices/i24/beam_center.py,sha256=m6LWsG9e_lhtPfZ8pc_hoLNyTYQQGGdRNav8J_2scTo,483
|
|
185
196
|
dodal/devices/i24/beamstop.py,sha256=6tbiQLlcTlp4PCPhHJ_mlHtkv0kz5ArQ99zg9rwTnrw,1133
|
|
186
|
-
dodal/devices/i24/dcm.py,sha256=
|
|
187
|
-
dodal/devices/i24/dual_backlight.py,sha256=
|
|
197
|
+
dodal/devices/i24/dcm.py,sha256=l7qbJh2JKL-5ANlMYXDeU5EBYY6mDiLxn7kp_Z9KNaM,1206
|
|
198
|
+
dodal/devices/i24/dual_backlight.py,sha256=N0R7M1mHPRmQ4fks5lGU1wrXjOvcW_ZKIXaRoC8aLDE,2084
|
|
188
199
|
dodal/devices/i24/focus_mirrors.py,sha256=DYiYLpDw8FJ1LYHxLOxE_om5qGfUo2itzskgqhmQZlg,1763
|
|
189
200
|
dodal/devices/i24/pilatus_metadata.py,sha256=I-AR8vd67qf6p0vZnRPTv4aNPN5T4KpSt2Iog4_jvn0,1781
|
|
190
|
-
dodal/devices/i24/pmac.py,sha256
|
|
201
|
+
dodal/devices/i24/pmac.py,sha256=-HYf2HPzaqWvszp4T8TXohdp40-xmKqQq4V0mLvVri8,7028
|
|
191
202
|
dodal/devices/i24/vgonio.py,sha256=sxSmcYZayVJPJz_D_91j9PmNor7Tbl1RGQFRrdtESlw,533
|
|
192
|
-
dodal/devices/mx_phase1/beamstop.py,sha256=
|
|
203
|
+
dodal/devices/mx_phase1/beamstop.py,sha256=GeHLqHVf3XwJSszUHuxZ2JBwQlcDiFs6jVpdHuw7snM,3127
|
|
193
204
|
dodal/devices/oav/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
194
205
|
dodal/devices/oav/oav_calculations.py,sha256=qoaNz4MAdbpu0XHAkWTQ3rebFwsWfa8JA1eerUgISjA,2367
|
|
195
206
|
dodal/devices/oav/oav_detector.py,sha256=DzRm1d1jC52wl7JawvMWiFCaFYdnjO7HT690NzDQIXs,6730
|
|
196
207
|
dodal/devices/oav/oav_parameters.py,sha256=nnlTwrX5F6eMVK6wUz_MU39aLfV_P-_EyklfTQFAjZ4,6856
|
|
197
208
|
dodal/devices/oav/oav_to_redis_forwarder.py,sha256=UAEBWPBiEXrn4AbDeDbjUsM2z0LHhq2coeeHIuom9kE,6265
|
|
198
209
|
dodal/devices/oav/utils.py,sha256=T-xg7J38ritzXwRrKjsWZ7daC_qR7aNhlbkXx75nJ8Q,3188
|
|
199
|
-
dodal/devices/oav/pin_image_recognition/__init__.py,sha256=
|
|
210
|
+
dodal/devices/oav/pin_image_recognition/__init__.py,sha256=ZDqvAk-Nvw_WM00efxfx2aDEoK1T5QydIciqqCCpp7Q,6302
|
|
200
211
|
dodal/devices/oav/pin_image_recognition/manual_test.py,sha256=h1Rto6ZDCB3jWhjSy9N8ECxRN583iYDJr9LxrTJ8kfE,903
|
|
201
212
|
dodal/devices/oav/pin_image_recognition/utils.py,sha256=L9ypluYqeOFoS7gQuws-vTNc8LqaKl2ZIDNeQ2JaNpg,8592
|
|
202
213
|
dodal/devices/oav/snapshots/grid_overlay.py,sha256=CdvCdTKMCiwMwxm2lV28KpcIUSXlscZmWxb73_KKmiI,3694
|
|
@@ -204,17 +215,17 @@ dodal/devices/oav/snapshots/snapshot.py,sha256=VDHYxko97sATMKvD5wClgvN7WQUtUAjcX
|
|
|
204
215
|
dodal/devices/oav/snapshots/snapshot_image_processing.py,sha256=wDxH9WPmB0nsotr49PUpw2Ke4l4RFxirrbpPzOUF9s4,2318
|
|
205
216
|
dodal/devices/oav/snapshots/snapshot_with_grid.py,sha256=KAM7KjF0BzhGxx-MXd4Zc16IBbi1BF8S_VT8T84_2OY,2309
|
|
206
217
|
dodal/devices/p60/__init__.py,sha256=cLrjUaHNJRtRBb1ic_LTlxIi_nH6_hZN8-5gWCt0Q6w,229
|
|
207
|
-
dodal/devices/p60/enums.py,sha256=
|
|
208
|
-
dodal/devices/p60/lab_xray_source.py,sha256=
|
|
218
|
+
dodal/devices/p60/enums.py,sha256=S0dFIG4k1aI995q-SSZYfKYiXRog_SnTTOVHOtP-qug,521
|
|
219
|
+
dodal/devices/p60/lab_xray_source.py,sha256=CrvJYNspp4xgmad_VSUwaMG39L5S8sDRiD2wNrmXjEg,603
|
|
209
220
|
dodal/devices/p99/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
210
221
|
dodal/devices/p99/andor2_point.py,sha256=zBoIou7VVzs-tAq3M29XL2xYV8aYZRKPYCGKRLk7MA0,1417
|
|
211
222
|
dodal/devices/p99/sample_stage.py,sha256=DvHU556Gp0wFiufZiwY3o2W4xmsCL5uSwNnhd8HPAnc,528
|
|
212
223
|
dodal/devices/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
213
224
|
dodal/devices/util/adjuster_plans.py,sha256=c40PFZpXFw0YmJLh9jU4VIb8vRxHyafZlmvprTKAOhM,824
|
|
214
|
-
dodal/devices/util/epics_util.py,sha256=
|
|
225
|
+
dodal/devices/util/epics_util.py,sha256=4useFL8ngsVF08fhOn48BlnO4oh0T4sEKqjdS6mjvG0,4687
|
|
215
226
|
dodal/devices/util/lookup_tables.py,sha256=jH9f_D8JbTSqzL-RKHUWOORLt8lEoNQL3o9HpXE98TY,3476
|
|
216
|
-
dodal/devices/util/test_utils.py,sha256=
|
|
217
|
-
dodal/devices/xspress3/xspress3.py,sha256=
|
|
227
|
+
dodal/devices/util/test_utils.py,sha256=tnKKmSBaHEyx-qTQjoR3COqraRMmTdRJe9s-pWjuTPk,1176
|
|
228
|
+
dodal/devices/xspress3/xspress3.py,sha256=OerapEy-IuK7EFz13B5z0BzBmESVl6pYUlqAWHIwJck,4555
|
|
218
229
|
dodal/devices/xspress3/xspress3_channel.py,sha256=w8tAx2lz5kJ_LeJ_eb_4o--Dtt8MRijsYNgDG6oEIVg,1626
|
|
219
230
|
dodal/devices/zebra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
220
231
|
dodal/devices/zebra/zebra.py,sha256=FvcC4XZ8g8Tfa9LWpns-4_fjkz7187dabFKUSIPX80o,9515
|
|
@@ -223,7 +234,7 @@ dodal/devices/zebra/zebra_controlled_shutter.py,sha256=hrSD1oRW8BY67ub_oggjp6cvh
|
|
|
223
234
|
dodal/devices/zocalo/__init__.py,sha256=W3R09eHAmybP4BcM_gHy6gVAW5_gVSnFq2o3z2iTA7U,478
|
|
224
235
|
dodal/devices/zocalo/zocalo_constants.py,sha256=vu7Xjz7UNEpBUWEEBxDvP4bVFkZIN6NLGfQDpWbCjH8,98
|
|
225
236
|
dodal/devices/zocalo/zocalo_interaction.py,sha256=GFukU9xqagQtVSDg5BrL23jxl1w8wjs4b4NLLqdFfpk,3584
|
|
226
|
-
dodal/devices/zocalo/zocalo_results.py,sha256=
|
|
237
|
+
dodal/devices/zocalo/zocalo_results.py,sha256=8ZYkNB-By47Ag_p68iOq7jK8_P-LAsWPNs0m_DhnVEQ,12639
|
|
227
238
|
dodal/parameters/experiment_parameter_base.py,sha256=O7JamfuJ5cYHkPf9tsHJPqn-OMHTAGouigvM1cDFehE,313
|
|
228
239
|
dodal/plan_stubs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
229
240
|
dodal/plan_stubs/check_topup.py,sha256=3gyLHfHNQBCgEWuAg4QE-ONx7y2Do1vVv5HP8ss0Z1I,5371
|
|
@@ -239,8 +250,11 @@ dodal/plans/verify_undulator_gap.py,sha256=OcDN09-eCoMzsmhKGxvzsH5EapG2zYz0yGCqU
|
|
|
239
250
|
dodal/plans/wrapped.py,sha256=BPMw__RcWvk9v5XnhMsi9_k4KsDEbmXogzD2n1ecbUg,2098
|
|
240
251
|
dodal/plans/preprocessors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
241
252
|
dodal/plans/preprocessors/verify_undulator_gap.py,sha256=cBZEGq8TW1jrXFXB00iClQVXSEaE_jP_rHMY9WTgYyY,1813
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
dls_dodal-1.
|
|
246
|
-
dls_dodal-1.
|
|
253
|
+
dodal/testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
254
|
+
dodal/testing/electron_analyser/__init__.py,sha256=-lc1opD2dCv0x678-J-ApOhHtvEvcslfOQ7E613U8-Y,118
|
|
255
|
+
dodal/testing/electron_analyser/device_factory.py,sha256=tkMY6fW3iI02DTD1XXHi4lH6sjo8RHHZBGDHSuTdmNU,2243
|
|
256
|
+
dls_dodal-1.56.0.dist-info/METADATA,sha256=NqXV5pD4dRmGxYRSjy-i--y0scKO6E0V14rJRehyguw,16928
|
|
257
|
+
dls_dodal-1.56.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
258
|
+
dls_dodal-1.56.0.dist-info/entry_points.txt,sha256=bycw_EKUzup_rxfCetOwcauXV4kLln_OPpPT8jEnr-I,94
|
|
259
|
+
dls_dodal-1.56.0.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
|
|
260
|
+
dls_dodal-1.56.0.dist-info/RECORD,,
|
dodal/_version.py
CHANGED
|
@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
|
|
|
28
28
|
commit_id: COMMIT_ID
|
|
29
29
|
__commit_id__: COMMIT_ID
|
|
30
30
|
|
|
31
|
-
__version__ = version = '1.
|
|
32
|
-
__version_tuple__ = version_tuple = (1,
|
|
31
|
+
__version__ = version = '1.56.0'
|
|
32
|
+
__version_tuple__ = version_tuple = (1, 56, 0)
|
|
33
33
|
|
|
34
34
|
__commit_id__ = commit_id = None
|
dodal/beamlines/b01_1.py
CHANGED
|
@@ -1,16 +1,13 @@
|
|
|
1
|
-
from pathlib import Path
|
|
2
|
-
|
|
3
1
|
from ophyd_async.epics.adaravis import AravisDetector
|
|
2
|
+
from ophyd_async.epics.adcore import NDROIStatIO
|
|
4
3
|
from ophyd_async.fastcs.panda import HDFPanda
|
|
5
4
|
|
|
6
5
|
from dodal.common.beamlines.beamline_utils import (
|
|
7
6
|
device_factory,
|
|
8
7
|
get_path_provider,
|
|
9
|
-
set_path_provider,
|
|
10
8
|
)
|
|
11
9
|
from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
|
|
12
10
|
from dodal.common.beamlines.device_helpers import CAM_SUFFIX, HDF5_SUFFIX
|
|
13
|
-
from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
|
|
14
11
|
from dodal.devices.motors import XYZStage
|
|
15
12
|
from dodal.devices.synchrotron import Synchrotron
|
|
16
13
|
from dodal.log import set_beamline as set_log_beamline
|
|
@@ -21,14 +18,6 @@ PREFIX = BeamlinePrefix(BL)
|
|
|
21
18
|
set_log_beamline(BL)
|
|
22
19
|
set_utils_beamline(BL)
|
|
23
20
|
|
|
24
|
-
set_path_provider(
|
|
25
|
-
StaticVisitPathProvider(
|
|
26
|
-
BL,
|
|
27
|
-
Path("/dls/b01-1/data/2025/cm40661-1/"),
|
|
28
|
-
client=LocalDirectoryServiceClient(),
|
|
29
|
-
)
|
|
30
|
-
)
|
|
31
|
-
|
|
32
21
|
"""
|
|
33
22
|
NOTE: Due to ArgoCD and the k8s cluster configuration those PVs are not available remotely.
|
|
34
23
|
You need to be on the beamline-local network to access them.
|
|
@@ -69,11 +58,15 @@ def spectroscopy_detector() -> AravisDetector:
|
|
|
69
58
|
Returns:
|
|
70
59
|
AravisDetector: The spectroscopy camera device.
|
|
71
60
|
"""
|
|
61
|
+
pv_prefix = f"{PREFIX.beamline_prefix}-DI-DCAM-02:"
|
|
72
62
|
return AravisDetector(
|
|
73
|
-
|
|
63
|
+
pv_prefix,
|
|
74
64
|
path_provider=get_path_provider(),
|
|
75
65
|
drv_suffix=CAM_SUFFIX,
|
|
76
66
|
fileio_suffix=HDF5_SUFFIX,
|
|
67
|
+
plugins={
|
|
68
|
+
"roistat": NDROIStatIO(f"{pv_prefix}ROISTAT:", num_channels=3),
|
|
69
|
+
},
|
|
77
70
|
)
|
|
78
71
|
|
|
79
72
|
|
dodal/beamlines/b07.py
CHANGED
|
@@ -3,6 +3,7 @@ from dodal.common.beamlines.beamline_utils import (
|
|
|
3
3
|
)
|
|
4
4
|
from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
|
|
5
5
|
from dodal.devices.b07 import Grating, LensMode, PsuMode
|
|
6
|
+
from dodal.devices.electron_analyser import SelectedSource
|
|
6
7
|
from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
|
|
7
8
|
from dodal.devices.pgm import PGM
|
|
8
9
|
from dodal.devices.synchrotron import Synchrotron
|
|
@@ -33,5 +34,5 @@ def analyser_driver() -> SpecsAnalyserDriverIO[LensMode, PsuMode]:
|
|
|
33
34
|
prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
|
|
34
35
|
lens_mode_type=LensMode,
|
|
35
36
|
psu_mode_type=PsuMode,
|
|
36
|
-
energy_sources={
|
|
37
|
+
energy_sources={SelectedSource.SOURCE1: pgm().energy.user_readback},
|
|
37
38
|
)
|
dodal/beamlines/b07_1.py
CHANGED
|
@@ -6,6 +6,7 @@ from dodal.devices.b07_1 import (
|
|
|
6
6
|
Grating,
|
|
7
7
|
LensMode,
|
|
8
8
|
)
|
|
9
|
+
from dodal.devices.electron_analyser import SelectedSource
|
|
9
10
|
from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
|
|
10
11
|
from dodal.devices.pgm import PGM
|
|
11
12
|
from dodal.devices.synchrotron import Synchrotron
|
|
@@ -41,5 +42,5 @@ def analyser_driver() -> SpecsAnalyserDriverIO[LensMode, PsuMode]:
|
|
|
41
42
|
prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
|
|
42
43
|
lens_mode_type=LensMode,
|
|
43
44
|
psu_mode_type=PsuMode,
|
|
44
|
-
energy_sources={
|
|
45
|
+
energy_sources={SelectedSource.SOURCE1: pgm().energy.user_readback},
|
|
45
46
|
)
|
dodal/beamlines/b21.py
CHANGED
|
@@ -1,24 +1,17 @@
|
|
|
1
|
-
from pathlib import Path # noqa
|
|
2
|
-
from ophyd_async.fastcs.panda import HDFPanda
|
|
3
1
|
from ophyd_async.epics.adaravis import AravisDetector
|
|
4
|
-
from
|
|
5
|
-
from
|
|
6
|
-
|
|
2
|
+
from ophyd_async.fastcs.eiger import EigerDetector
|
|
3
|
+
from ophyd_async.fastcs.panda import HDFPanda
|
|
7
4
|
|
|
8
5
|
from dodal.common.beamlines.beamline_utils import (
|
|
9
6
|
device_factory,
|
|
10
7
|
get_path_provider,
|
|
11
|
-
set_path_provider,
|
|
12
8
|
)
|
|
13
9
|
from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
|
|
14
|
-
from dodal.common.
|
|
15
|
-
from
|
|
16
|
-
|
|
17
|
-
|
|
10
|
+
from dodal.common.beamlines.device_helpers import CAM_SUFFIX, HDF5_SUFFIX
|
|
11
|
+
from dodal.devices.i22.nxsas import NXSasMetadataHolder, NXSasOAV
|
|
18
12
|
from dodal.devices.linkam3 import Linkam3
|
|
19
13
|
from dodal.devices.slits import Slits
|
|
20
14
|
from dodal.devices.synchrotron import Synchrotron
|
|
21
|
-
|
|
22
15
|
from dodal.log import set_beamline as set_log_beamline
|
|
23
16
|
from dodal.utils import BeamlinePrefix, get_beamline_name
|
|
24
17
|
|
|
@@ -27,19 +20,6 @@ PREFIX = BeamlinePrefix(BL)
|
|
|
27
20
|
set_log_beamline(BL)
|
|
28
21
|
set_utils_beamline(BL)
|
|
29
22
|
|
|
30
|
-
# Currently we must hard-code the visit, determining the visit at runtime requires
|
|
31
|
-
# infrastructure that is still WIP.
|
|
32
|
-
# Communication with GDA is also WIP so for now we determine an arbitrary scan number
|
|
33
|
-
# locally and write the commissioning directory. The scan number is not guaranteed to
|
|
34
|
-
# be unique and the data is at risk - this configuration is for testing only.
|
|
35
|
-
set_path_provider(
|
|
36
|
-
StaticVisitPathProvider(
|
|
37
|
-
BL,
|
|
38
|
-
Path("/dls/b21/data/2025/cm40642-3/bluesky"),
|
|
39
|
-
client=RemoteDirectoryServiceClient(f"http://{BL}-control:8088/api"),
|
|
40
|
-
)
|
|
41
|
-
)
|
|
42
|
-
|
|
43
23
|
|
|
44
24
|
@device_factory()
|
|
45
25
|
def saxs() -> EigerDetector:
|