dls-dodal 1.52.0__py3-none-any.whl → 1.53.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.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: dls-dodal
3
- Version: 1.52.0
3
+ Version: 1.53.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>
6
6
  License: Apache License
@@ -1,7 +1,7 @@
1
- dls_dodal-1.52.0.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
1
+ dls_dodal-1.53.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=k4ECe4x0D1aLuvOAsB7afSDtXyH_iU-6kRlLtdcNd8M,513
4
+ dodal/_version.py,sha256=trr-1845AsqqsmpqWRbvdKqIrdkAbiJCkpcEQo_yIa8,513
5
5
  dodal/cli.py,sha256=NieWNUgLUxyck1rHoFAPJjX1xXLzHNdQ-s4wvxYFfps,3757
6
6
  dodal/log.py,sha256=Rt5O3hFZfMnJvQueZvgagQuXnPqHrFxhponOvVkpfrk,9871
7
7
  dodal/utils.py,sha256=rqQNalufZPxUPSD2SYuUgWSCpefb8FnqvR6N0t-YcEY,19675
@@ -9,7 +9,7 @@ dodal/beamline_specific_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
9
9
  dodal/beamline_specific_utils/i03.py,sha256=P6Ls4FoVtcacH0RJM3v6ZwwGx27oMppcBdW0la-ohTY,377
10
10
  dodal/beamlines/README.md,sha256=K9MkL_GomxlsoTB7Mz-_dJA5NNSbmCfMiutchGg3C8o,404
11
11
  dodal/beamlines/__init__.py,sha256=lueGFb7cW1kDB_LfFavhrgYdjqGErCwAOk5XoU3BY00,3176
12
- dodal/beamlines/adsim.py,sha256=1RfxzvLkMWCoRnpFQNxnlvoWWGthuJvfHu-IsXv3GeE,1986
12
+ dodal/beamlines/adsim.py,sha256=fxj_P-7PsywdWPjfBAsLoOPiSKtApOKmLWHdQ8xCa3s,2048
13
13
  dodal/beamlines/aithre.py,sha256=QpNIT9RVtlyamJoshAa87Cw5U0QfBNwMBcZVvMlD25s,1037
14
14
  dodal/beamlines/b01_1.py,sha256=ru5a2FJar2rUdA2PDEXpQ1fRZwyzEd5Uf76J5qZMVhY,2922
15
15
  dodal/beamlines/b07.py,sha256=YHqApRUu7yYZTWS9Y7YJpXRBLauMhhil_Rj4he7lLLI,1071
@@ -231,8 +231,8 @@ dodal/plans/verify_undulator_gap.py,sha256=OcDN09-eCoMzsmhKGxvzsH5EapG2zYz0yGCqU
231
231
  dodal/plans/wrapped.py,sha256=BPMw__RcWvk9v5XnhMsi9_k4KsDEbmXogzD2n1ecbUg,2098
232
232
  dodal/plans/preprocessors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
233
233
  dodal/plans/preprocessors/verify_undulator_gap.py,sha256=cBZEGq8TW1jrXFXB00iClQVXSEaE_jP_rHMY9WTgYyY,1813
234
- dls_dodal-1.52.0.dist-info/METADATA,sha256=vs_ZKznKwlZf-Jqw5-D72xP7PWzHnUInwAiLTImGIQs,16834
235
- dls_dodal-1.52.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
236
- dls_dodal-1.52.0.dist-info/entry_points.txt,sha256=bycw_EKUzup_rxfCetOwcauXV4kLln_OPpPT8jEnr-I,94
237
- dls_dodal-1.52.0.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
238
- dls_dodal-1.52.0.dist-info/RECORD,,
234
+ dls_dodal-1.53.0.dist-info/METADATA,sha256=asF0EraK_SPqa14JZiiCSska-l36h_yMHoOEL32tZnk,16834
235
+ dls_dodal-1.53.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
236
+ dls_dodal-1.53.0.dist-info/entry_points.txt,sha256=bycw_EKUzup_rxfCetOwcauXV4kLln_OPpPT8jEnr-I,94
237
+ dls_dodal-1.53.0.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
238
+ dls_dodal-1.53.0.dist-info/RECORD,,
dodal/_version.py CHANGED
@@ -17,5 +17,5 @@ __version__: str
17
17
  __version_tuple__: VERSION_TUPLE
18
18
  version_tuple: VERSION_TUPLE
19
19
 
20
- __version__ = version = '1.52.0'
21
- __version_tuple__ = version_tuple = (1, 52, 0)
20
+ __version__ = version = '1.53.0'
21
+ __version_tuple__ = version_tuple = (1, 53, 0)
dodal/beamlines/adsim.py CHANGED
@@ -1,15 +1,11 @@
1
- from pathlib import Path
2
-
3
1
  from ophyd_async.epics.adsimdetector import SimDetector
4
2
 
5
3
  from dodal.common.beamlines.beamline_utils import (
6
4
  device_factory,
7
5
  get_path_provider,
8
- set_path_provider,
9
6
  )
10
7
  from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
11
8
  from dodal.common.beamlines.device_helpers import DET_SUFFIX, HDF5_SUFFIX
12
- from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
13
9
  from dodal.devices.motors import XThetaStage
14
10
  from dodal.log import set_beamline as set_log_beamline
15
11
  from dodal.utils import BeamlinePrefix
@@ -19,13 +15,6 @@ PREFIX = BeamlinePrefix("t01")
19
15
  set_log_beamline(BL)
20
16
  set_utils_beamline(BL)
21
17
 
22
- set_path_provider(
23
- StaticVisitPathProvider(
24
- BL,
25
- Path("/tmp"),
26
- client=LocalDirectoryServiceClient(),
27
- )
28
- )
29
18
 
30
19
  """
31
20
  Beamline module for use with the simulated AreaDetector and motors.
@@ -47,11 +36,23 @@ How to use the devices in a plan:
47
36
  In an ipython terminal run:
48
37
 
49
38
  ```python
39
+ from pathlib import Path
40
+
50
41
  from bluesky.run_engine import RunEngine
42
+ from ophyd_async.core import StaticPathProvider, UUIDFilenameProvider
51
43
 
52
44
  from dodal.beamlines.adsim import det, stage
45
+ from dodal.common.beamlines.beamline_utils import set_path_provider
53
46
  from dodal.plans import count
54
47
 
48
+
49
+ set_path_provider(
50
+ StaticPathProvider(
51
+ UUIDFilenameProvider(),
52
+ "/tmp", # The directory for `det` to write to- may be mounted as a volume
53
+ )
54
+ )
55
+
55
56
  RE = RunEngine()
56
57
  d = det(connect_immediately=True)
57
58
  s = stage(connect_immediately=True)