dls-dodal 1.29.4__py3-none-any.whl → 1.31.0__py3-none-any.whl

dodal/plans/data_session_metadata.py

@@ -1,29 +1,28 @@
 from bluesky import plan_stubs as bps
 from bluesky import preprocessors as bpp
 from bluesky.utils import make_decorator
-from ophyd_async.core import DirectoryInfo
 
 from dodal.common.beamlines import beamline_utils
-from dodal.common.types import MsgGenerator, UpdatingDirectoryProvider
+from dodal.common.types import MsgGenerator, UpdatingPathProvider
 
 DATA_SESSION = "data_session"
 DATA_GROUPS = "data_groups"
 
 
 def attach_data_session_metadata_wrapper(
-    plan: MsgGenerator, provider: UpdatingDirectoryProvider | None = None
+    plan: MsgGenerator, provider: UpdatingPathProvider | None = None
 ) -> MsgGenerator:
     """
     Attach data session metadata to the runs within a plan and make it correlate
-    with an ophyd-async DirectoryProvider.
+    with an ophyd-async PathProvider.
 
-    This updates the directory provider (which in turn makes a call to to a service
+    This updates the path provider (which in turn makes a call to to a service
     to figure out which scan number we are using for such a scan), and ensures the
     start document contains the correct data session.
 
     Args:
         plan: The plan to preprocess
-        provider: The directory provider that participating detectors are aware of.
+        provider: The path provider that participating detectors are aware of.
 
     Returns:
         MsgGenerator: A plan
@@ -32,12 +31,12 @@ def attach_data_session_metadata_wrapper(
         Iterator[Msg]: Plan messages
     """
     if provider is None:
-        provider = beamline_utils.get_directory_provider()
+        provider = beamline_utils.get_path_provider()
     yield from bps.wait_for([provider.update])
-    directory_info: DirectoryInfo = provider()
+    ress = yield from bps.wait_for([provider.data_session])
+    data_session = ress[0].result()
     # https://github.com/DiamondLightSource/dodal/issues/452
     # As part of 452, write each dataCollection into their own folder, then can use resource_dir directly
-    data_session = directory_info.prefix.removesuffix("-")
     yield from bpp.inject_md_wrapper(plan, md={DATA_SESSION: data_session})
 
 

dodal/plans/motor_util_plans.py

@@ -0,0 +1,117 @@
+import uuid
+from collections.abc import Generator
+from typing import Any, TypeVar
+
+from bluesky import plan_stubs as bps
+from bluesky.preprocessors import finalize_wrapper, pchain
+from bluesky.utils import Msg, make_decorator
+from ophyd_async.core import Device
+from ophyd_async.epics.motor import Motor
+
+from dodal.common import MsgGenerator
+
+AnyDevice = TypeVar("AnyDevice", bound=Device)
+
+
+class MoveTooLarge(Exception):
+    def __init__(
+        self, axis: Device, maximum_move: float, position: float, *args: object
+    ) -> None:
+        self.axis = axis
+        self.maximum_move = maximum_move
+        self.position = position
+        super().__init__(*args)
+
+
+def _check_and_cache_values(
+    devices_and_positions: dict[AnyDevice, float],
+    smallest_move: float,
+    maximum_move: float,
+) -> Generator[Msg, Any, dict[AnyDevice, float]]:
+    """Caches the positions of all Motors on specified device if they are within
+    smallest_move of home_position. Throws MoveTooLarge if they are outside maximum_move
+    of the home_position
+    """
+    positions = {}
+    for axis, new_position in devices_and_positions.items():
+        position = yield from bps.rd(axis)
+        if abs(position - new_position) > maximum_move:
+            raise MoveTooLarge(axis, maximum_move, position)
+        if abs(position - new_position) > smallest_move:
+            positions[axis] = position
+    return positions
+
+
+def home_and_reset_wrapper(
+    plan: MsgGenerator,
+    device: Device,
+    smallest_move: float,
+    maximum_move: float,
+    group: str | None = None,
+    wait_for_all: bool = True,
+) -> MsgGenerator:
+    home_positions = {
+        axis: 0.0 for _, axis in device.children() if isinstance(axis, Motor)
+    }
+    return move_and_reset_wrapper(
+        plan, home_positions, smallest_move, maximum_move, group, wait_for_all
+    )
+
+
+def move_and_reset_wrapper(
+    plan: MsgGenerator,
+    device_and_positions: dict[AnyDevice, float],
+    smallest_move: float,
+    maximum_move: float,
+    group: str | None = None,
+    wait_for_all: bool = True,
+) -> MsgGenerator:
+    """Wrapper that does the following:
+       1. Caches the positions of all Motors on device
+       2. Throws a MoveTooLarge exception if any positions are maximum_move away from home_position
+       2. Moves any motor that is more than smallest_move away from the home_position to home_position
+       3. Runs the specified plan
+       4. Moves all motors back to their cached positions
+
+    Args:
+        plan (Callable[[], MsgGenerator]): The plan to move between homing and returning to the cache
+        device (Device): The device to move. All Motors in the device will be cached and moved
+        smallest_move (float): The smallest move that we care about doing the home and cache for.
+                               Useful for not wearing out motors if you have large tolerances
+        maximum_move (float): If any Motor starts this far from the home an exception is raised
+                              and no moves occur
+        home_position (float): The position to move every motor to after caching
+        group (str, optional): If set the home move will be done using the home-{group}
+                               group and the reset to cache done using reset-{group}
+        wait_for_all (bool, optional): If true the home and reset to cache will be waited
+                                       on. If false it is left up to the caller to wait on
+                                       them. Defaults to True.
+    """
+    initial_positions = yield from _check_and_cache_values(
+        device_and_positions, smallest_move, maximum_move
+    )
+
+    def move_to_home():
+        home_group = f"home-{group if group else str(uuid.uuid4())[:6]}"
+        for axis, position in device_and_positions.items():
+            if axis in initial_positions.keys():
+                yield from bps.abs_set(axis, position, group=home_group)
+        if wait_for_all:
+            yield from bps.wait(home_group)
+
+    def return_to_initial_position():
+        reset_group = f"reset-{group if group else str(uuid.uuid4())[:6]}"
+        for axis, position in initial_positions.items():
+            yield from bps.abs_set(axis, position, group=reset_group)
+        if wait_for_all:
+            yield from bps.wait(reset_group)
+
+    return (
+        yield from finalize_wrapper(
+            pchain(move_to_home(), plan),
+            return_to_initial_position(),
+        )
+    )
+
+
+home_and_reset_decorator = make_decorator(home_and_reset_wrapper)

dodal/utils.py

@@ -4,6 +4,7 @@ import os
 import re
 import socket
 import string
+from collections.abc import Callable, Iterable, Mapping
 from dataclasses import dataclass
 from functools import wraps
 from importlib import import_module
@@ -12,13 +13,6 @@ from os import environ
 from types import ModuleType
 from typing import (
     Any,
-    Callable,
-    Dict,
-    Iterable,
-    List,
-    Mapping,
-    Tuple,
-    Type,
     TypeVar,
 )
 
@@ -46,7 +40,7 @@ import dodal.log
 try:
     from typing import TypeAlias
 except ImportError:
-    from typing_extensions import TypeAlias
+    from typing import TypeAlias
 
 
 #: Protocols defining interface to hardware
@@ -108,9 +102,35 @@ def skip_device(precondition=lambda: True):
     return decorator
 
 
+def make_device(
+    module: str | ModuleType,
+    device_name: str,
+    **kwargs,
+) -> dict[str, AnyDevice]:
+    """Make a single named device and its dependencies from the given beamline module.
+
+    Args:
+        module (str | ModuleType): The module to make devices from.
+        device_name: Name of the device to construct
+        **kwargs: Arguments passed on to every device factory
+
+    Returns:
+        dict[str, AnyDevice]: A dict mapping device names to the constructed devices
+    """
+    if isinstance(module, str):
+        module = import_module(module)
+
+    device_collector = {}
+    factories = collect_factories(module)
+    device_collector[device_name] = _make_one_device(
+        module, device_name, device_collector, factories, **kwargs
+    )
+    return device_collector
+
+
 def make_all_devices(
     module: str | ModuleType | None = None, include_skipped: bool = False, **kwargs
-) -> Tuple[Dict[str, AnyDevice], Dict[str, Exception]]:
+) -> tuple[dict[str, AnyDevice], dict[str, Exception]]:
     """Makes all devices in the given beamline module.
 
     In cases of device interdependencies it ensures a device is created before any which
@@ -129,7 +149,7 @@ def make_all_devices(
     if isinstance(module, str) or module is None:
         module = import_module(module or __name__)
     factories = collect_factories(module, include_skipped)
-    devices: Tuple[Dict[str, AnyDevice], Dict[str, Exception]] = invoke_factories(
+    devices: tuple[dict[str, AnyDevice], dict[str, Exception]] = invoke_factories(
         factories, **kwargs
     )
 
@@ -139,7 +159,7 @@ def make_all_devices(
 def invoke_factories(
     factories: Mapping[str, AnyDeviceFactory],
     **kwargs,
-) -> Tuple[Dict[str, AnyDevice], Dict[str, Exception]]:
+) -> tuple[dict[str, AnyDevice], dict[str, Exception]]:
     """Call device factory functions in the correct order to resolve dependencies.
     Inspect function signatures to work out dependencies and execute functions in
     correct order.
@@ -259,15 +279,13 @@ def is_any_device_factory(func: Callable) -> bool:
     return is_v1_device_factory(func) or is_v2_device_factory(func)
 
 
-def is_v2_device_type(obj: Type[Any]) -> bool:
-    return inspect.isclass(obj) and issubclass(obj, OphydV2Device)
+def is_v2_device_type(obj: type[Any]) -> bool:
+    return inspect.isclass(obj) and isinstance(obj, OphydV2Device)
 
 
-def is_v1_device_type(obj: Type[Any]) -> bool:
+def is_v1_device_type(obj: type[Any]) -> bool:
     is_class = inspect.isclass(obj)
-    follows_protocols = any(
-        (isinstance(obj, protocol) for protocol in BLUESKY_PROTOCOLS)
-    )
+    follows_protocols = any(isinstance(obj, protocol) for protocol in BLUESKY_PROTOCOLS)
     return is_class and follows_protocols and not is_v2_device_type(obj)
 
 
@@ -292,13 +310,11 @@ def get_beamline_based_on_environment_variable() -> ModuleType:
         or any(c not in valid_characters for c in beamline)
     ):
         raise ValueError(
-            "Invalid BEAMLINE variable - module name is not a permissible python module name, got '{}'".format(
-                beamline
-            )
+            f"Invalid BEAMLINE variable - module name is not a permissible python module name, got '{beamline}'"
         )
 
     try:
-        return importlib.import_module("dodal.beamlines.{}".format(beamline))
+        return importlib.import_module(f"dodal.beamlines.{beamline}")
     except ImportError as e:
         raise ValueError(
             f"Failed to import beamline-specific dodal module 'dodal.beamlines.{beamline}'."
@@ -306,7 +322,7 @@ def get_beamline_based_on_environment_variable() -> ModuleType:
         ) from e
 
 
-def _find_next_run_number_from_files(file_names: List[str]) -> int:
+def _find_next_run_number_from_files(file_names: list[str]) -> int:
     valid_numbers = []
 
     for file_name in file_names:
@@ -336,3 +352,30 @@ def get_run_number(directory: str, prefix: str = "") -> int:
         return 1
     else:
         return _find_next_run_number_from_files(nexus_file_names)
+
+
+def _make_one_device(
+    module: ModuleType,
+    device_name: str,
+    devices: dict[str, AnyDevice],
+    factories: dict[str, AnyDeviceFactory],
+    **kwargs,
+) -> AnyDevice:
+    factory = factories.get(device_name)
+    if not factory:
+        raise ValueError(f"Unable to find factory for {device_name}")
+
+    dependencies = list(extract_dependencies(factories, device_name))
+    for dependency_name in dependencies:
+        if dependency_name not in devices:
+            try:
+                devices[dependency_name] = _make_one_device(
+                    module, dependency_name, devices, factories, **kwargs
+                )
+            except Exception as e:
+                raise RuntimeError(
+                    f"Unable to construct device {dependency_name}"
+                ) from e
+
+    params = {name: devices[name] for name in dependencies}
+    return factory(**params, **kwargs)

dls_dodal-1.29.4.dist-info/RECORD

@@ -1,125 +0,0 @@
-dodal/__init__.py,sha256=y-VRpfiX-Lm5nchB9N0VfMy_6dwFqVxpSn5SiAQql9I,114
-dodal/__main__.py,sha256=kP2S2RPitnOWpNGokjZ1Yq-1umOtp5sNOZk2B3tBPLM,111
-dodal/_version.py,sha256=dGQcJRhmSkKpwrkZVgo13Sd0AVHTIBb9i0csee9mzMo,413
-dodal/adsim.py,sha256=OW2dcS7ciD4Yq9WFw4PN_c5Bwccrmu7R-zr-u6ZCbQM,497
-dodal/cli.py,sha256=z0UBESrNrq6Kq4rttp4uHcwS1fnOnRkKBRDHSriPpGY,2058
-dodal/log.py,sha256=dfo1rfYrGG8oIm2HkNxaa_ldVs4vJKtgWSoKe1Z_Xno,8533
-dodal/utils.py,sha256=SFDmUOLtxLe5OdNdVgS_EftNpX0ihxduBwq6tufw8s4,10174
-dodal/beamline_specific_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/beamline_specific_utils/i03.py,sha256=Ixe1anFQl-kwRJubmQx28TIW4Zw8qDxpElNNNapWQHI,396
-dodal/beamlines/README.md,sha256=K9MkL_GomxlsoTB7Mz-_dJA5NNSbmCfMiutchGg3C8o,404
-dodal/beamlines/__init__.py,sha256=U0dQYFEUloCdQOs24zyfpPTncJXOO4cDcfHSevVOAw4,2890
-dodal/beamlines/i03.py,sha256=J-4GawTxAhrYDQZh87n11L9ehTgObEQ1Lz2PueXCWbc,16892
-dodal/beamlines/i04.py,sha256=JOyNcUnC3wva4no2MHKp6b8gOKAcQXL_c4cBo7oneVs,13034
-dodal/beamlines/i04_1.py,sha256=KDxSUQNhIs_NFiRaLY-Jiory0DeN7Y0ErvGuoTrwCDU,4731
-dodal/beamlines/i20_1.py,sha256=MaPgONHqpoZuBtkiKEzYtViJnKBM2_ekeP4OdbmuXHE,1158
-dodal/beamlines/i22.py,sha256=3VFdA4Wc7O40-64lwUtUBIN23fH4JVNbLKJ1JLjy9as,9870
-dodal/beamlines/i23.py,sha256=2j5qLoqE_hg9ETHqNkOVu7LLkVB8qalgXeORnVYKN_I,1075
-dodal/beamlines/i24.py,sha256=tPSrWArwRd0fb59HyHFRGR1FdscM7t9_hNPk0edhh4o,6583
-dodal/beamlines/p38.py,sha256=TC78u4GwEnj6X0r5cnHhqNdBbbDRnh8lY8pEucBZjEU,8006
-dodal/beamlines/p45.py,sha256=TNIkC-SBfj0ayZtlLLXW9xCSi5CzJkO8XpAMIo8fjao,2957
-dodal/common/__init__.py,sha256=ZC4ICKUDB0BDxRaVy8nmqclVmDBne-dPtk6UJsoFq6I,258
-dodal/common/coordination.py,sha256=OxIjDiO1-9A9KESRPFtzwkvvQlavbgA5RHemlbubBPg,1168
-dodal/common/maths.py,sha256=JRSBhbMzwlicKp1_Bsfu9gA79JJA_Dgq9EpbExFH65M,1829
-dodal/common/types.py,sha256=M0gZs9F7--gREF8VYJn-Y1Mt9mIEgp1aLY3oUpUkSno,546
-dodal/common/udc_directory_provider.py,sha256=zNlt_VgdAlyBtVN7neTHk_0tWBbI4pPUL7q9WQOzXvo,1260
-dodal/common/visit.py,sha256=MhrFbLptMG0Wvd2nHubBwQ44qAzoP4Bf4_z_-wO8rh0,6063
-dodal/common/beamlines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/common/beamlines/beamline_parameters.py,sha256=N22dtDLw3Hlo7EUmGxe4qFGcu7OnldwCz_mU7yK2rd0,3577
-dodal/common/beamlines/beamline_utils.py,sha256=AgmH9wpnFQ4DHAA7_Yo0COa2piX2ksFxukFt2_600kA,4488
-dodal/common/beamlines/device_helpers.py,sha256=s79js7no9k8JMfG7NvdmFomSP5m5VDQ6th_Hsbx1znA,939
-dodal/devices/CTAB.py,sha256=_MfL_KH4uDPxq_RuHFEZ9HVXOpUnQb5be3csoz9DdAs,1630
-dodal/devices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/adsim.py,sha256=dMU0TKIuiODHYFHQOH4_5UvB8iJtaJEtjqaEDGjcU-w,311
-dodal/devices/aperture.py,sha256=0MtTzKMDZ5DVAz0DE0kXI0M76VCp0y9vFsrMggEMpxk,586
-dodal/devices/aperturescatterguard.py,sha256=2JJsEPJGJHrI0ztv1cSaP7H5T6qdzDfUcN-VEQ39B8o,11012
-dodal/devices/attenuator.py,sha256=viK1iccNekX6ZvR_ZmSwj5JdM1j2B8pcTg8qWDdmzhQ,2584
-dodal/devices/backlight.py,sha256=vsNGZB4C_mVMafllvJlOTghsfv6UqALMKUMLXu3WZ5k,1115
-dodal/devices/beamstop.py,sha256=8L3qhlk-3ZBOp10xK1i8qZqYTGOXX1mVF1MgXoN0dfg,215
-dodal/devices/cryostream.py,sha256=6MU4rXIOL33C-8F3DVfAtv0ZnwiysTtawjkeePd5IrQ,332
-dodal/devices/dcm.py,sha256=vfyGYDzfSwTiNqlzkfNjkrL-Q1hNVSgJddvJ5Un_lvg,1610
-dodal/devices/eiger.py,sha256=HpZIZ6Y8iffo9GxmuFJmnyRCa5Tl0BKSKU2_wVccHDo,14069
-dodal/devices/eiger_odin.py,sha256=zKNu5OaIQ9HkflfxKCi87Yr1kEG2gXfxzj0KPv0XzCk,6960
-dodal/devices/fast_grid_scan.py,sha256=BEj96j78r60JPPJoOMP-XXG-_9yURFTuu-pp2LcqQmY,12452
-dodal/devices/fluorescence_detector_motion.py,sha256=RrXfPmJzWnAjcjp9u0AnJEfjvWPMKburVTySB2hxYbw,181
-dodal/devices/flux.py,sha256=RtPStHw7Mad0igVKntKWVZfuZn2clokVJqH14HLix6M,198
-dodal/devices/focusing_mirror.py,sha256=v6TPglvmHiv9H05Lssv1LY5Nr9RBHQISLzL4SJ_QIbk,5890
-dodal/devices/hutch_shutter.py,sha256=nZ3gRbYIVJsXLlpZMWT4UEYUFFQP1MwMe8Oy304QsqE,3360
-dodal/devices/ipin.py,sha256=OGMXwAE4KDDonZRPFkUmR9Vsk6X4Ox-hEvPT5drP-mQ,208
-dodal/devices/linkam3.py,sha256=TPhiQ1D9i_HIlKHAlfnVfX7H6aPOAeXPEJLdmvwdKWQ,3776
-dodal/devices/logging_ophyd_device.py,sha256=xw4lbyqq5_ehESGterVEfubJsBiJTWvBp5b9k62gSkg,666
-dodal/devices/motors.py,sha256=16ID2jFJ35h6ZrFp76nJG_oQg6uDrupgcbvcbmjlc7c,300
-dodal/devices/p45.py,sha256=jzBW2fGRhIbGzSRs5Fgupxro6aqE611n1RTcrTTG-yY,1047
-dodal/devices/qbpm1.py,sha256=OY7-WbdxMiLGUK8Z57ezwqSXbHxoPP-y3GvBgj9kgMA,220
-dodal/devices/robot.py,sha256=5WQ9kF5m8xhHhipBycsycDV0-_2IBNBkcwuSWP-9-1I,4337
-dodal/devices/s4_slit_gaps.py,sha256=j3kgF9WfGFaU9xdUuiAh-QqI5u_vhiAftaDVINt91SM,243
-dodal/devices/scatterguard.py,sha256=0qnvhoo3RjLsrxVgIoDJpryqunlgMVgaTsoyKRC2g4Y,331
-dodal/devices/scintillator.py,sha256=4Dej1a6HRom9GRwTDsaTKGfvloP20POUqIeHqsI8-R8,184
-dodal/devices/slits.py,sha256=URru9VN2N19KqeUPDZaBmyKYn0_JJiE0Vko4sZpfsl8,601
-dodal/devices/smargon.py,sha256=Ds8QFqK3ljbTxalqkQ6clpArj4u4hu9d4vrt97Fzdf4,4693
-dodal/devices/status.py,sha256=TuUGidZ4Ar-WCRc_sX0wn58DmL6brj1pMr8rNF5Z6VU,1198
-dodal/devices/synchrotron.py,sha256=QtTufJA_fCaBawHougSc7nxwu240oX46_y0P-4qIW8o,1960
-dodal/devices/tetramm.py,sha256=XriN-zBFVnHxhnTbphSPIZcxEbdWBTbw2g_ulUBl4bw,8538
-dodal/devices/thawer.py,sha256=hIdZOzCNloY7CtSvdE2gk4vCMMoOtaIA4dPH_k0OwFg,1527
-dodal/devices/turbo_slit.py,sha256=W3ZRIqDhq4iMhr5GcIiWvl2U1GaPtGanqkL7upQOZTY,1132
-dodal/devices/undulator.py,sha256=kn84MQpuBHtQj7H7HeBoAYKXu5buGKvTgs3tf2gdEdw,2074
-dodal/devices/undulator_dcm.py,sha256=TC9fO55r1YIG_88PPbGGtzfjcRJcaoC2ny51JiDOEX4,5199
-dodal/devices/webcam.py,sha256=dvNWJ6hHQR7BUsMRC9TH4XiCCofVhlgZ8HYfVCvd2og,1367
-dodal/devices/xbpm_feedback.py,sha256=8QHYKHo9ksZo30olbFM-tHpCHcJRFozgHKVJijv3Gck,1986
-dodal/devices/zebra.py,sha256=9Zkq5I3-gcP6qfDBnPEAtFU4QJ-VJyp7cHvB79ZfLHk,9186
-dodal/devices/zebra_controlled_shutter.py,sha256=MqX4KE6w0FliZRDBltswcLCNSsp6vQrD_iBY640IljI,1094
-dodal/devices/areadetector/__init__.py,sha256=8IwLxuZMW0MOJpJp_ZDdlaE20hrtsH_PXWGaKgMiYs4,240
-dodal/devices/areadetector/adaravis.py,sha256=pwbmmnakarjhD59XoyAIXJdakS-nqDG09Xmwq17AVw4,3787
-dodal/devices/areadetector/adsim.py,sha256=3U7kS93RM3Xeh-XWKjeuw5jXbIGWAbrs59LfxtvB7OU,1907
-dodal/devices/areadetector/adutils.py,sha256=JIx1_sYlehpLtEXcwOEuzVoMplsLdKVW7OWv5eiJqgE,2576
-dodal/devices/areadetector/plugins/MJPG.py,sha256=2ISGUg9JxJYzEH640WUIsvFwKolSTywkTyPy9wz6f_k,4064
-dodal/devices/detector/__init__.py,sha256=XEwjopgTtBq93RRuFthVVVI9DT1jUvpOJzWOHantJpU,104
-dodal/devices/detector/det_dim_constants.py,sha256=MZ4w2nsTKzj4eN7yGsSs1pqKWIuU4vc6UzcSll02uWg,2305
-dodal/devices/detector/det_dist_to_beam_converter.py,sha256=f6JFp-eEB2v8NzZg27UrN0VDP5CMjRnaPU6BTA7_n_s,1937
-dodal/devices/detector/det_resolution.py,sha256=aQkKp24LpRGiwzPAQM3wLVa4ANw32HdrKc2kftHfKQA,3253
-dodal/devices/detector/detector.py,sha256=7IYhndhT9CYCft0MrN1mAnopHqKYbaCRPRGLic76srw,4740
-dodal/devices/detector/detector_motion.py,sha256=REREva2kyPcIzOZmahN9rT0jDSuUbV0qUDl4IcBnutA,1221
-dodal/devices/i03/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/i04/transfocator.py,sha256=uieByXIj0JRbmvMB_om5NOAEbEJkzfkCD24bl2aEo1g,3154
-dodal/devices/i20_1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/i22/dcm.py,sha256=Kzyd_qFg8KVhRsgfTQVOpghESE8yIOgACKa0Fv9NaZI,6270
-dodal/devices/i22/fswitch.py,sha256=AdYtnkCBuhivyJGZqelg_7sjB2pHN7vl1JTtlO4vHo4,3061
-dodal/devices/i22/nxsas.py,sha256=ky7v9UZ1UQFsm5hI0wD9OXG-fTKFLj2wJjB7wADxKpw,5655
-dodal/devices/i24/I24_detector_motion.py,sha256=Joqr1orgeNvRS7n01bjaO-4Yu4obb8fnKaWHQfjPX14,365
-dodal/devices/i24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/i24/aperture.py,sha256=kKfHli5oKp-j-qZhZoXTRK81SAUNyhpI6VRvtw0SkZA,850
-dodal/devices/i24/beamstop.py,sha256=28hQowTvgN5Zw38tkDh32h2ceyN-2GE8bAaGPvDOt5U,1234
-dodal/devices/i24/dcm.py,sha256=Hx5pQ-SHEQ_bLCOnpQYDm6-t-it7nNDmUvopGyiGA2w,1991
-dodal/devices/i24/dual_backlight.py,sha256=Th-RKr28aFxE8LCT_mdN9KkRIVw0BHLGKkI0ienfRZU,2049
-dodal/devices/i24/i24_vgonio.py,sha256=Igqs7687z6lyhGVeJEDtDmPachYxU48MUH2BF0RpK9Q,461
-dodal/devices/i24/pmac.py,sha256=pN54myYvzqPl7iW0Vsp59J1EiV_gtn0xQGwbsKJpiYE,3876
-dodal/devices/oav/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/oav/grid_overlay.py,sha256=FRtjcFd420XY8MEQ9sWedL0i4pK-KUJOSxh2C5zM3PA,5232
-dodal/devices/oav/microns_for_zoom_levels.json,sha256=5PA71RzldFTp0eTUGPmov0MjxHe583mzvfor5f3thXI,1208
-dodal/devices/oav/oav_calculations.py,sha256=wt71vFcyQrr98FvX8oyUM2n5vmKi3K7PyOTuWp0gq5w,1665
-dodal/devices/oav/oav_detector.py,sha256=PlRIuMYSk46o6Aywel9tMZYh1WzMaBhfn3_GWqCas7w,3681
-dodal/devices/oav/oav_errors.py,sha256=cc4mGnaTiAc5WIlOt_BIYOc7CRSkrCdnBaavfAJ0pXY,754
-dodal/devices/oav/oav_parameters.py,sha256=4XybkhKeG7IEjPRfx0PVM9KNenuyN0rAGWBZG7H3zvQ,7941
-dodal/devices/oav/utils.py,sha256=BkTk0aTqqhIHCZInhcUAYjCRPxumPOlTg9m21skncTc,3018
-dodal/devices/oav/pin_image_recognition/__init__.py,sha256=Eve6oY9EYGOSw1x-N--xjgyIEzbZE7TTwGR-Q2NZprQ,6441
-dodal/devices/oav/pin_image_recognition/manual_test.py,sha256=h1Rto6ZDCB3jWhjSy9N8ECxRN583iYDJr9LxrTJ8kfE,903
-dodal/devices/oav/pin_image_recognition/utils.py,sha256=-7-Zs-331UVTq_AZrfdF-zwZdmMn7eitTkBSqnBrxnk,8620
-dodal/devices/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/util/adjuster_plans.py,sha256=2AYaywQP_LbA2KJ6Op3cok8GoRtj696utrSSDfaJtBY,875
-dodal/devices/util/epics_util.py,sha256=4AOGqYjF0ITzs4c7PTZZnHge81Zheg4gZbFonVW7Lko,4728
-dodal/devices/util/lookup_tables.py,sha256=Up-0BlARt79TIEM76SkDyn9LtTFLxPUcaEPZv6D6bws,2141
-dodal/devices/util/motor_utils.py,sha256=pNY-aUk9LxaIWeDr5rpMS6udiB9j19wcCXkNDLp1uA0,257
-dodal/devices/xspress3/xspress3.py,sha256=29elzI3JtceryKeMWXhcP9nWl0tlSdnTZhltCitet6A,4668
-dodal/devices/xspress3/xspress3_channel.py,sha256=yJRwseLmtkW2Vv6GB8sLdOFuBn3e4c9Q8fgPacMgl5w,1638
-dodal/devices/zocalo/__init__.py,sha256=oPhjFB39yf2NWkGD-MMcPFnnOVZ_RtdyBt2OLYn-Xa4,505
-dodal/devices/zocalo/zocalo_interaction.py,sha256=B6TBTDwUlluksLTwC4TiEEgfFzWLOmwgG8xM5Xd4Wik,3132
-dodal/devices/zocalo/zocalo_results.py,sha256=U4Vk4OF-eL8w0BR-fbw3k4jyRo6G3Ywaf8NMAkjr4Hs,9658
-dodal/parameters/experiment_parameter_base.py,sha256=O7JamfuJ5cYHkPf9tsHJPqn-OMHTAGouigvM1cDFehE,313
-dodal/plans/check_topup.py,sha256=Pj6Eu8fa6nvoW4awrMxvzE_ftpLfYz8bN0QDLRw0Yuk,2989
-dodal/plans/data_session_metadata.py,sha256=QNx9rb1EfGBHb21eFekIi7KjNhC0PL-SVKBCggDuNeg,1650
-dls_dodal-1.29.4.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-dls_dodal-1.29.4.dist-info/METADATA,sha256=biJK1f1BESw8LgPh4Rl0GrxC9cMJ2WCYxP5NqGPBzak,16950
-dls_dodal-1.29.4.dist-info/WHEEL,sha256=-oYQCr74JF3a37z2nRlQays_SX2MqOANoqVjBBAP2yE,91
-dls_dodal-1.29.4.dist-info/entry_points.txt,sha256=wpzz9FsTiYxI8OBwLKX9V9ResLwThBSmtRMcPwII0FA,46
-dls_dodal-1.29.4.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
-dls_dodal-1.29.4.dist-info/RECORD,,

dls_dodal-1.29.4.dist-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-dodal = dodal.__main__:main

dodal/devices/beamstop.py

@@ -1,8 +0,0 @@
-from ophyd import Component as Cpt
-from ophyd import Device, EpicsMotor
-
-
-class BeamStop(Device):
-    x = Cpt(EpicsMotor, "-MO-BS-01:X")
-    y = Cpt(EpicsMotor, "-MO-BS-01:Y")
-    z = Cpt(EpicsMotor, "-MO-BS-01:Z")

dodal/devices/qbpm1.py

@@ -1,8 +0,0 @@
-from ophyd import Component as Cpt
-from ophyd import Device, EpicsSignalRO, Kind
-
-
-class QBPM1(Device):
-    """Quadrant Beam Position Monitor"""
-
-    intensity = Cpt(EpicsSignalRO, "-DI-QBPM-01:INTEN", kind=Kind.normal)