dls-dodal 1.33.0__py3-none-any.whl → 1.35.0__py3-none-any.whl

dodal/devices/zebra.py

@@ -9,10 +9,12 @@ from ophyd_async.core import (
     DeviceVector,
     SignalRW,
     StandardReadable,
+    StrictEnum,
     observe_value,
 )
-from ophyd_async.epics.signal import epics_signal_r, epics_signal_rw
+from ophyd_async.epics.core import epics_signal_r, epics_signal_rw
 
+# These constants refer to I03's Zebra. See https://github.com/DiamondLightSource/dodal/issues/772
 # Sources
 DISCONNECT = 0
 IN1_TTL = 1
@@ -39,22 +41,24 @@ TTL_PANDA = 4
 
 # The AND gate that controls the automatic shutter
 AUTO_SHUTTER_GATE = 2
-# The input that triggers the automatic shutter
-AUTO_SHUTTER_INPUT = 1
 
+# The first two inputs of the auto shutter gate.
+AUTO_SHUTTER_INPUT_1 = 1
+AUTO_SHUTTER_INPUT_2 = 2
 
-class ArmSource(str, Enum):
+
+class ArmSource(StrictEnum):
     SOFT = "Soft"
     EXTERNAL = "External"
 
 
-class TrigSource(str, Enum):
+class TrigSource(StrictEnum):
     POSITION = "Position"
     TIME = "Time"
     EXTERNAL = "External"
 
 
-class EncEnum(str, Enum):
+class EncEnum(StrictEnum):
     Enc1 = "Enc1"
     Enc2 = "Enc2"
     Enc3 = "Enc3"
@@ -76,7 +80,7 @@ class I24Axes:
     VGON_YH = EncEnum.Enc4
 
 
-class RotationDirection(str, Enum):
+class RotationDirection(StrictEnum):
     POSITIVE = "Positive"
     NEGATIVE = "Negative"
 
@@ -90,7 +94,7 @@ class ArmDemand(Enum):
     DISARM = 0
 
 
-class SoftInState(str, Enum):
+class SoftInState(StrictEnum):
     YES = "Yes"
     NO = "No"
 

dodal/devices/zebra_controlled_shutter.py

@@ -1,21 +1,20 @@
-from enum import Enum
-
 from bluesky.protocols import Movable
 from ophyd_async.core import (
     DEFAULT_TIMEOUT,
     AsyncStatus,
     StandardReadable,
+    StrictEnum,
     wait_for_value,
 )
-from ophyd_async.epics.signal import epics_signal_r, epics_signal_rw, epics_signal_w
+from ophyd_async.epics.core import epics_signal_r, epics_signal_rw, epics_signal_w
 
 
-class ZebraShutterState(str, Enum):
+class ZebraShutterState(StrictEnum):
     CLOSE = "Close"
     OPEN = "Open"
 
 
-class ZebraShutterControl(str, Enum):
+class ZebraShutterControl(StrictEnum):
     MANUAL = "Manual"
     AUTO = "Auto"
 
@@ -26,7 +25,7 @@ class ZebraShutter(StandardReadable, Movable):
     Internally in the zebra there are two AND gates, one for manual control and one for
     automatic control. A soft input (aliased to control_mode) will switch between
     which of these AND gates to use. For the manual gate the shutter is then controlled
-    by a different soft input (aliased to _manual_position_setpoint). Both these AND
+    by a different soft input (aliased to manual_position_setpoint). Both these AND
     gates then feed into an OR gate, which then feeds to the shutter."""
 
     def __init__(self, prefix: str, name: str):

dodal/devices/zocalo/__init__.py

@@ -4,14 +4,14 @@ from dodal.devices.zocalo.zocalo_results import (
     NoZocaloSubscription,
     XrcResult,
     ZocaloResults,
-    get_processing_result,
+    get_full_processing_results,
 )
 
 __all__ = [
     "ZocaloResults",
     "XrcResult",
     "ZocaloTrigger",
-    "get_processing_result",
+    "get_full_processing_results",
     "ZOCALO_READING_PLAN_NAME",
     "NoResultsFromZocalo",
     "NoZocaloSubscription",

dodal/devices/zocalo/zocalo_constants.py

@@ -0,0 +1,3 @@
+from dodal.utils import is_test_mode
+
+ZOCALO_ENV = "dev_bluesky" if is_test_mode() else "bluesky"

dodal/devices/zocalo/zocalo_interaction.py

@@ -7,6 +7,7 @@ from dataclasses import dataclass
 import zocalo.configuration
 from workflows.transport import lookup
 
+from dodal.devices.zocalo.zocalo_constants import ZOCALO_ENV
 from dodal.log import LOGGER
 
 
@@ -56,7 +57,7 @@ class ZocaloTrigger:
 
     see https://github.com/DiamondLightSource/dodal/wiki/How-to-Interact-with-Zocalo"""
 
-    def __init__(self, environment: str = "artemis"):
+    def __init__(self, environment: str = ZOCALO_ENV):
         self.zocalo_environment: str = environment
 
     def _send_to_zocalo(self, parameters: dict):

dodal/devices/zocalo/zocalo_results.py

@@ -1,7 +1,7 @@
 import asyncio
-from collections import OrderedDict
 from collections.abc import Generator, Sequence
 from enum import Enum
+from inspect import get_annotations
 from queue import Empty, Queue
 from typing import Any, TypedDict
 
@@ -9,17 +9,19 @@ import bluesky.plan_stubs as bps
 import numpy as np
 import workflows.recipe
 import workflows.transport
-from bluesky.protocols import Descriptor, Triggerable
+from bluesky.protocols import Triggerable
+from bluesky.utils import Msg
 from deepdiff import DeepDiff
 from numpy.typing import NDArray
 from ophyd_async.core import (
     AsyncStatus,
-    HintedSignal,
     StandardReadable,
+    StandardReadableFormat,
     soft_signal_r_and_setter,
 )
 from workflows.transport.common_transport import CommonTransport
 
+from dodal.devices.zocalo.zocalo_constants import ZOCALO_ENV
 from dodal.devices.zocalo.zocalo_interaction import _get_zocalo_connection
 from dodal.log import LOGGER
 
@@ -51,7 +53,7 @@ ZOCALO_STAGE_GROUP = "clear zocalo queue"
 
 
 class XrcResult(TypedDict):
-    centre_of_mass: list[int]
+    centre_of_mass: list[float]
     max_voxel: list[int]
     max_count: int
     n_voxels: int
@@ -114,7 +116,7 @@ class ZocaloResults(StandardReadable, Triggerable):
     def __init__(
         self,
         name: str = "zocalo",
-        zocalo_environment: str = "dev_artemis",
+        zocalo_environment: str = ZOCALO_ENV,
         channel: str = "xrc.i03",
         sort_key: str = DEFAULT_SORT_KEY.value,
         timeout_s: float = DEFAULT_TIMEOUT,
@@ -130,14 +132,23 @@ class ZocaloResults(StandardReadable, Triggerable):
         self.transport: CommonTransport | None = None
         self.use_cpu_and_gpu = use_cpu_and_gpu
 
-        self.results, self._results_setter = soft_signal_r_and_setter(
-            list[XrcResult], name="results"
+        self.centre_of_mass, self._com_setter = soft_signal_r_and_setter(
+            NDArray[np.uint64], name="centre_of_mass"
         )
-        self.centres_of_mass, self._com_setter = soft_signal_r_and_setter(
-            NDArray[np.uint64], name="centres_of_mass"
+        self.bounding_box, self._bounding_box_setter = soft_signal_r_and_setter(
+            NDArray[np.uint64], name="bounding_box"
         )
-        self.bbox_sizes, self._bbox_setter = soft_signal_r_and_setter(
-            NDArray[np.uint64], "bbox_sizes", self.name
+        self.max_voxel, self._max_voxel_setter = soft_signal_r_and_setter(
+            NDArray[np.uint64], name="max_voxel"
+        )
+        self.max_count, self._max_count_setter = soft_signal_r_and_setter(
+            NDArray[np.uint64], name="max_count"
+        )
+        self.n_voxels, self._n_voxels_setter = soft_signal_r_and_setter(
+            NDArray[np.uint64], name="n_voxels"
+        )
+        self.total_count, self._total_count_setter = soft_signal_r_and_setter(
+            NDArray[np.uint64], name="total_count"
         )
         self.ispyb_dcid, self._ispyb_dcid_setter = soft_signal_r_and_setter(
             int, name="ispyb_dcid"
@@ -147,22 +158,27 @@ class ZocaloResults(StandardReadable, Triggerable):
         )
         self.add_readables(
             [
-                self.results,
-                self.centres_of_mass,
-                self.bbox_sizes,
+                self.max_voxel,
+                self.max_count,
+                self.n_voxels,
+                self.total_count,
+                self.centre_of_mass,
+                self.bounding_box,
                 self.ispyb_dcid,
                 self.ispyb_dcgid,
             ],
-            wrapper=HintedSignal,
+            format=StandardReadableFormat.HINTED_SIGNAL,
         )
         super().__init__(name)
 
     async def _put_results(self, results: Sequence[XrcResult], recipe_parameters):
-        self._results_setter(list(results))
         centres_of_mass = np.array([r["centre_of_mass"] for r in results])
-        bbox_sizes = np.array([bbox_size(r) for r in results])
         self._com_setter(centres_of_mass)
-        self._bbox_setter(bbox_sizes)
+        self._bounding_box_setter(np.array([r["bounding_box"] for r in results]))
+        self._max_voxel_setter(np.array([r["max_voxel"] for r in results]))
+        self._max_count_setter(np.array([r["max_count"] for r in results]))
+        self._n_voxels_setter(np.array([r["n_voxels"] for r in results]))
+        self._total_count_setter(np.array([r["total_count"] for r in results]))
         self._ispyb_dcid_setter(recipe_parameters["dcid"])
         self._ispyb_dcgid_setter(recipe_parameters["dcgid"])
 
@@ -229,16 +245,19 @@ class ZocaloResults(StandardReadable, Triggerable):
                     source_of_second_results = source_from_results(
                         raw_results_two_sources[1]
                     )
-
-                    # Compare results from both sources and warn if they aren't the same
-                    differences_str = get_dict_differences(
-                        raw_results_two_sources[0]["results"][0],
-                        source_of_first_results,
-                        raw_results_two_sources[1]["results"][0],
-                        source_of_second_results,
-                    )
-                    if differences_str:
-                        LOGGER.warning(differences_str)
+                    first_results = raw_results_two_sources[0]["results"]
+                    second_results = raw_results_two_sources[1]["results"]
+
+                    if first_results and second_results:
+                        # Compare results from both sources and warn if they aren't the same
+                        differences_str = get_dict_differences(
+                            first_results[0],
+                            source_of_first_results,
+                            second_results[0],
+                            source_of_second_results,
+                        )
+                        if differences_str:
+                            LOGGER.warning(differences_str)
 
                     # Always use CPU results
                     raw_results = (
@@ -283,48 +302,6 @@ class ZocaloResults(StandardReadable, Triggerable):
         finally:
             self._kickoff_run = False
 
-    async def describe(self) -> dict[str, Descriptor]:
-        zocalo_array_type: Descriptor = {
-            "source": f"zocalo_service:{self.zocalo_environment}",
-            "dtype": "array",
-            "shape": [-1, 3],
-        }
-        zocalo_int_type: Descriptor = {
-            "source": f"zocalo_service:{self.zocalo_environment}",
-            "dtype": "integer",
-            "shape": [0],
-        }
-        return OrderedDict(
-            [
-                (
-                    self._name + "-results",
-                    {
-                        "source": f"zocalo_service:{self.zocalo_environment}",
-                        "dtype": "array",
-                        "shape": [
-                            -1,
-                        ],  # TODO describe properly - see https://github.com/DiamondLightSource/dodal/issues/253
-                    },
-                ),
-                (
-                    self._name + "-centres_of_mass",
-                    zocalo_array_type,
-                ),
-                (
-                    self._name + "-bbox_sizes",
-                    zocalo_array_type,
-                ),
-                (
-                    self._name + "-ispyb_dcid",
-                    zocalo_int_type,
-                ),
-                (
-                    self._name + "-ispyb_dcgid",
-                    zocalo_int_type,
-                ),
-            ],
-        )
-
     def _subscribe_to_results(self):
         self.transport = _get_zocalo_connection(self.zocalo_environment)
 
@@ -361,23 +338,62 @@ class ZocaloResults(StandardReadable, Triggerable):
         )
 
 
-def get_processing_result(
+def _corrected_xrc_result(uncorrected: XrcResult) -> XrcResult:
+    corrected = XrcResult(**uncorrected)
+    corrected["centre_of_mass"] = [
+        coord - 0.5 for coord in uncorrected["centre_of_mass"]
+    ]
+    return corrected
+
+
+def get_full_processing_results(
     zocalo: ZocaloResults,
-) -> Generator[Any, Any, tuple[np.ndarray, np.ndarray] | tuple[None, None]]:
-    """A minimal plan which will extract the top ranked xray centre and crystal bounding
-    box size from the zocalo results. Returns (None, None) if no crystals were found."""
-
-    LOGGER.info("Getting zocalo processing results.")
-    centres_of_mass = yield from bps.rd(zocalo.centres_of_mass, default_value=[])  # type: ignore
-    LOGGER.debug(f"Centres of mass: {centres_of_mass}")
-    centre_of_mass = (
-        None
-        if len(centres_of_mass) == 0  # type: ignore
-        else centres_of_mass[0] - np.array([0.5, 0.5, 0.5])  # type: ignore
-    )
-    LOGGER.debug(f"Adjusted top centring result: {centre_of_mass}")
-    bbox_sizes = yield from bps.rd(zocalo.bbox_sizes, default_value=[])  # type: ignore
-    LOGGER.debug(f"Bounding box sizes: {centres_of_mass}")
-    bbox_size = None if len(bbox_sizes) == 0 else bbox_sizes[0]  # type: ignore
-    LOGGER.debug(f"Top bbox size: {bbox_size}")
-    return centre_of_mass, bbox_size
+) -> Generator[Msg, Any, Sequence[XrcResult]]:
+    """A plan that will return the raw zocalo results, ranked in descending order according to the sort key.
+    Returns empty list in the event no results found."""
+    LOGGER.info("Retrieving raw zocalo processing results")
+    com = yield from bps.rd(zocalo.centre_of_mass, default_value=[])  # type: ignore
+    max_voxel = yield from bps.rd(zocalo.max_voxel, default_value=[])  # type: ignore
+    max_count = yield from bps.rd(zocalo.max_count, default_value=[])  # type: ignore
+    n_voxels = yield from bps.rd(zocalo.n_voxels, default_value=[])  # type: ignore
+    total_count = yield from bps.rd(zocalo.total_count, default_value=[])  # type: ignore
+    bounding_box = yield from bps.rd(zocalo.bounding_box, default_value=[])  # type: ignore
+    return [
+        _corrected_xrc_result(
+            XrcResult(
+                centre_of_mass=com.tolist(),
+                max_voxel=mv.tolist(),
+                max_count=int(mc),
+                n_voxels=int(n),
+                total_count=int(tc),
+                bounding_box=bb.tolist(),
+            )
+        )
+        for com, mv, mc, n, tc, bb in zip(
+            com, max_voxel, max_count, n_voxels, total_count, bounding_box, strict=True
+        )
+    ]
+
+
+def get_processing_results_from_event(
+    device_name: str, doc: dict
+) -> Sequence[XrcResult]:
+    """
+    Decode an event document into the corresponding x-ray centring results
+
+    Args:
+    doc         A bluesky event document containing the signals read from the ZocaloResults
+    device_name The device name prefix to prepend to the document keys
+
+    Returns:
+        The list of XrcResults decoded from the event document
+    """
+    results_keys = get_annotations(XrcResult).keys()
+    results_dict = {k: doc["data"][f"{device_name}-{k}"] for k in results_keys}
+    results_values = [results_dict[k].tolist() for k in results_keys]
+
+    def create_result(*argv):
+        kwargs = dict(zip(results_keys, argv, strict=False))
+        return XrcResult(**kwargs)
+
+    return list(map(create_result, *results_values))

dodal/plans/data_session_metadata.py

@@ -1,9 +1,9 @@
 from bluesky import plan_stubs as bps
 from bluesky import preprocessors as bpp
-from bluesky.utils import make_decorator
+from bluesky.utils import MsgGenerator, make_decorator
 
 from dodal.common.beamlines import beamline_utils
-from dodal.common.types import MsgGenerator, UpdatingPathProvider
+from dodal.common.types import UpdatingPathProvider
 
 DATA_SESSION = "data_session"
 DATA_GROUPS = "data_groups"

dodal/plans/motor_util_plans.py

@@ -1,21 +1,21 @@
 import uuid
 from collections.abc import Generator
-from typing import Any, TypeVar
+from typing import Any, TypeVar, cast
 
 from bluesky import plan_stubs as bps
 from bluesky.preprocessors import finalize_wrapper, pchain
-from bluesky.utils import Msg, make_decorator
+from bluesky.utils import Msg, MsgGenerator, make_decorator
 from ophyd_async.core import Device
 from ophyd_async.epics.motor import Motor
 
-from dodal.common import MsgGenerator
+from dodal.utils import MovableReadable
 
-AnyDevice = TypeVar("AnyDevice", bound=Device)
+MovableReadableDevice = TypeVar("MovableReadableDevice", bound=MovableReadable)
 
 
 class MoveTooLarge(Exception):
     def __init__(
-        self, axis: Device, maximum_move: float, position: float, *args: object
+        self, axis: MovableReadable, maximum_move: float, position: float, *args: object
     ) -> None:
         self.axis = axis
         self.maximum_move = maximum_move
@@ -24,10 +24,10 @@ class MoveTooLarge(Exception):
 
 
 def _check_and_cache_values(
-    devices_and_positions: dict[AnyDevice, float],
+    devices_and_positions: dict[MovableReadableDevice, float],
     smallest_move: float,
     maximum_move: float,
-) -> Generator[Msg, Any, dict[AnyDevice, float]]:
+) -> Generator[Msg, Any, dict[MovableReadableDevice, 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
@@ -51,7 +51,9 @@ def home_and_reset_wrapper(
     wait_for_all: bool = True,
 ) -> MsgGenerator:
     home_positions = {
-        axis: 0.0 for _, axis in device.children() if isinstance(axis, Motor)
+        cast(MovableReadable, 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
@@ -60,7 +62,7 @@ def home_and_reset_wrapper(
 
 def move_and_reset_wrapper(
     plan: MsgGenerator,
-    device_and_positions: dict[AnyDevice, float],
+    device_and_positions: dict[MovableReadable, float],
     smallest_move: float,
     maximum_move: float,
     group: str | None = None,

dodal/utils.py

@@ -13,8 +13,10 @@ from os import environ
 from types import ModuleType
 from typing import (
     Any,
+    Protocol,
     TypeGuard,
     TypeVar,
+    runtime_checkable,
 )
 
 from bluesky.protocols import (
@@ -62,6 +64,11 @@ BLUESKY_PROTOCOLS = [
     Triggerable,
 ]
 
+
+@runtime_checkable
+class MovableReadable(Movable, Readable, Protocol): ...
+
+
 AnyDevice: TypeAlias = OphydV1Device | OphydV2Device
 V1DeviceFactory: TypeAlias = Callable[..., OphydV1Device]
 V2DeviceFactory: TypeAlias = Callable[..., OphydV2Device]
@@ -72,6 +79,10 @@ def get_beamline_name(default: str) -> str:
     return environ.get("BEAMLINE") or default
 
 
+def is_test_mode() -> bool:
+    return environ.get("DODAL_TEST_MODE") == "true"
+
+
 def get_hostname() -> str:
     return socket.gethostname().split(".")[0]
 

dls_dodal-1.33.0.dist-info/RECORD

@@ -1,136 +0,0 @@
-dodal/__init__.py,sha256=v-rRiDOgZ3sQSMQKq0vgUQZvpeOkoHFXissAx6Ktg84,61
-dodal/__main__.py,sha256=kP2S2RPitnOWpNGokjZ1Yq-1umOtp5sNOZk2B3tBPLM,111
-dodal/_version.py,sha256=LSm0nkFA2tiEbj_K2UaSqjWn-14u8icXCZ6ghuRODjM,413
-dodal/adsim.py,sha256=OW2dcS7ciD4Yq9WFw4PN_c5Bwccrmu7R-zr-u6ZCbQM,497
-dodal/cli.py,sha256=_crmaHchxphSW8eEJB58_XZIeK82aiUv9bV7tpz-LpA,2122
-dodal/log.py,sha256=0to7CRsbzbgVfAAfKRAMhsaUuKqF2-7CGdQc-z8Uhno,9499
-dodal/utils.py,sha256=zlHPQjJOYeEvdC-UHPRvuTZaLt4hG6o9x2Vm4eHFBDU,11851
-dodal/beamline_specific_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/beamline_specific_utils/i03.py,sha256=eM6ZWZzpL0JYNBff8LhOnwFoZTJ5PDCY2XWI7ZKdtFY,276
-dodal/beamlines/README.md,sha256=K9MkL_GomxlsoTB7Mz-_dJA5NNSbmCfMiutchGg3C8o,404
-dodal/beamlines/__init__.py,sha256=CD0Dz2H1adLsqY4H3-_QxTdODPZD6mquMfsep5W5s0Q,3076
-dodal/beamlines/b01_1.py,sha256=nH1CzeGXc9kAZBxISsuQF33On9FuWkwFriGKfU8Qs5g,2176
-dodal/beamlines/i03.py,sha256=8Lra4u1kLjWUoboxuSx6Po92OymRaKaJjM9ERr9zeUI,17004
-dodal/beamlines/i04.py,sha256=pRVNIBaUn3oIgbxInCgBUwLqHtPirxf0fKfTfx4RcJ8,13877
-dodal/beamlines/i04_1.py,sha256=KDxSUQNhIs_NFiRaLY-Jiory0DeN7Y0ErvGuoTrwCDU,4731
-dodal/beamlines/i13_1.py,sha256=csXHrdwUh4sXTmb4X6ZiiSS_XxRkNShsVoBMxYI6rG0,1833
-dodal/beamlines/i20_1.py,sha256=MaPgONHqpoZuBtkiKEzYtViJnKBM2_ekeP4OdbmuXHE,1158
-dodal/beamlines/i22.py,sha256=YWTz2PjOMTEO7n3QRfrCerIEUMHd6JTHsd2dYe_4F7c,9915
-dodal/beamlines/i23.py,sha256=2j5qLoqE_hg9ETHqNkOVu7LLkVB8qalgXeORnVYKN_I,1075
-dodal/beamlines/i24.py,sha256=1XVCNWbzowQB6CWpJGSLp9Ih0zypktIzHxb64h-Xj6Y,6583
-dodal/beamlines/p38.py,sha256=mCDjRVpY6AIFIAAYCWe-jGABHadFwfJB7poa-dGMU6s,7940
-dodal/beamlines/p45.py,sha256=N4SDTIFok3uMqb37higZHMr3xRjxItsT4ib_KacKKAE,2935
-dodal/beamlines/p99.py,sha256=mHMYi1M_jgSB9SrOPadxvPuMrxG8LmJOYtU0Iw6fnIQ,1708
-dodal/beamlines/training_rig.py,sha256=yagMEQruA1iTOeQCNpux-6xOtkBuB-hhGvAJwQ5c9bg,1846
-dodal/common/__init__.py,sha256=ZC4ICKUDB0BDxRaVy8nmqclVmDBne-dPtk6UJsoFq6I,258
-dodal/common/coordination.py,sha256=OxIjDiO1-9A9KESRPFtzwkvvQlavbgA5RHemlbubBPg,1168
-dodal/common/maths.py,sha256=K9x7iL3xXLtWYTV-xlFHDNSTIL9a2UP3Ws7wr6Dm2rQ,1803
-dodal/common/signal_utils.py,sha256=OsVJFntyTOHVEjhw27ZSp1e8SpKR2BhqdY1kzG6sago,1774
-dodal/common/types.py,sha256=r7Oxcw4lIGi-mvBWc1TF4LDB45q7N4IawNgOMhPohK8,621
-dodal/common/udc_directory_provider.py,sha256=H-9f6uSVGuA8jyiErPi8ikCw1JDrhRAJv-qPpN-HwJk,2379
-dodal/common/visit.py,sha256=2UbbCmgOjZWSCxFzE9RYiTJhA_IoVOegma-Jv-PJqps,5787
-dodal/common/beamlines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/common/beamlines/beamline_parameters.py,sha256=oIPHooqu5vTAwfqZutsKbzwdi9nvFF8568Mz7jrK5rI,3618
-dodal/common/beamlines/beamline_utils.py,sha256=rL-XgqAbaZF2FJDFj8OHSbvzCxSwzCUGMfTUWT5qOXs,4422
-dodal/common/beamlines/device_helpers.py,sha256=s79js7no9k8JMfG7NvdmFomSP5m5VDQ6th_Hsbx1znA,939
-dodal/devices/CTAB.py,sha256=MoExneblYUHg9Va8vAVx_p_Vw_HnqbhkzxxrX7Ic_wo,2000
-dodal/devices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/adsim.py,sha256=dMU0TKIuiODHYFHQOH4_5UvB8iJtaJEtjqaEDGjcU-w,311
-dodal/devices/aperture.py,sha256=BLaroQ3n8yd7uZyacJ3KvDWZH8yhA_sJc8b49QMKg9o,585
-dodal/devices/aperturescatterguard.py,sha256=KW4ERvfMpUadixJlzCVU6oRvLqLm6pFvsldruplAHc4,8404
-dodal/devices/attenuator.py,sha256=viK1iccNekX6ZvR_ZmSwj5JdM1j2B8pcTg8qWDdmzhQ,2584
-dodal/devices/backlight.py,sha256=mOnptopsVOsT8JUIX_siDRgJ73CQPz_bm0Eb7oA81wc,1607
-dodal/devices/cryostream.py,sha256=CpNA2HGhN_PXkL9eqH_yAPsDxyOLIiehlUxEoNmXJVg,668
-dodal/devices/dcm.py,sha256=eZNMGjLM56Ll0siU14XomB77W_grLIdxIrMOQNmYFG8,1609
-dodal/devices/eiger.py,sha256=sR-Fr97Y0lzzq57fFOUTwUZw5E7asoj36A1JR1QUkLI,13985
-dodal/devices/eiger_odin.py,sha256=tDpEhOUY02YManYAMRI3TwSDDa3uITBxI0JHevaK7Rk,7010
-dodal/devices/fast_grid_scan.py,sha256=WQGeKR-82fbnY4zUD_MQBsQyJgyIiuRpJK5nn_mfR1E,11969
-dodal/devices/fluorescence_detector_motion.py,sha256=5IcyaVHXa9TXLFlLB0tfpQ1_ThgIRJNaFNw_uj6ahCA,501
-dodal/devices/flux.py,sha256=RtPStHw7Mad0igVKntKWVZfuZn2clokVJqH14HLix6M,198
-dodal/devices/focusing_mirror.py,sha256=-jq2uqBfDjSgRVrV3-sqswPAND72cagBUQVvzd04diw,5901
-dodal/devices/hutch_shutter.py,sha256=_-hR3SJHM05YHV_fEtc0VYOLamYnpVGDE56AwJGJS48,3320
-dodal/devices/ipin.py,sha256=qsf8E3xrJYNDwzsacNLCCp3gaqsadqmN1b-Fvou8y8k,420
-dodal/devices/linkam3.py,sha256=3oYwPtaKSPvLKEat8m7tuhE4Wizz8mg8HMrEWPCYxn0,3820
-dodal/devices/logging_ophyd_device.py,sha256=dUVE-XhWA56WUXez0mrc4sf322CXY3MVLreTycO5j_A,668
-dodal/devices/motors.py,sha256=dYa9T6FDMTbr8GvTb-lXtk3v4QEqAWRuGmHIO20fazQ,1039
-dodal/devices/p45.py,sha256=jzBW2fGRhIbGzSRs5Fgupxro6aqE611n1RTcrTTG-yY,1047
-dodal/devices/robot.py,sha256=yzRq-77fVrlhxaIqeORJLGkDHzGgLrHsFYTxmkG-b0w,5343
-dodal/devices/s4_slit_gaps.py,sha256=j3kgF9WfGFaU9xdUuiAh-QqI5u_vhiAftaDVINt91SM,243
-dodal/devices/scatterguard.py,sha256=jx03in9QgaThWxD4t1S8_Llent2kWrn_hThJ9KkUWTk,330
-dodal/devices/scintillator.py,sha256=PlD6cnJ39PTB_e7QrRspPliLYE4kL_K7ziJURzuxgdA,365
-dodal/devices/slits.py,sha256=uOyVmbgeygiP6e5Z9t5zMPXLuVEWFfYg9GB3ZU76Tug,600
-dodal/devices/smargon.py,sha256=hX-tCftKumxk67eS5-_gQRmYOrjSyQ4s3mMJsTRuvCk,4706
-dodal/devices/status.py,sha256=hVrJS1yooQo6PRumRACoIEh-SKBUKxvBlQl-MtLFUMQ,327
-dodal/devices/synchrotron.py,sha256=QtTufJA_fCaBawHougSc7nxwu240oX46_y0P-4qIW8o,1960
-dodal/devices/tetramm.py,sha256=EgtaExJBZWZC6lWgUEg0RcWQYmSKwRm20KjTZyhCjBk,8439
-dodal/devices/thawer.py,sha256=Gq-3f__KJUM6_Ds9OVxpZ5jC447HywJxQGXen6L33Lk,1616
-dodal/devices/turbo_slit.py,sha256=B6SPXqviMnG-U4PnUF1BdTO0LBKmTuwAUKRbxMiNJXo,1125
-dodal/devices/undulator.py,sha256=udwAodxYM9XgtsQGH2PDBA6ehtel5dAFkjsK13nKp6Q,5160
-dodal/devices/undulator_dcm.py,sha256=5hn3UZeu4CYXmfUVSdIxjrcIpStgeA1S744p0iIFp4I,2725
-dodal/devices/webcam.py,sha256=EqdzUBov5wMCULzzkfnCfD-5TQMZFQLp-2nlDHezmPs,2332
-dodal/devices/xbpm_feedback.py,sha256=-1wbnahJ_oSljQR0Sjiwn3mytVP-VwsAy0a_YPjPM0Y,1168
-dodal/devices/zebra.py,sha256=iTHkKv8EP-gkr0Cl2gR9yxt2qTHT2Q4etS67Rshf83k,9327
-dodal/devices/zebra_controlled_shutter.py,sha256=w2ISASJ_sb3dbQGi63Yuj3ymTkjX73aSl_ZTYs8TyaI,1860
-dodal/devices/areadetector/__init__.py,sha256=8IwLxuZMW0MOJpJp_ZDdlaE20hrtsH_PXWGaKgMiYs4,240
-dodal/devices/areadetector/adaravis.py,sha256=Cqw_Mzrp_zODFxQ2LZBJzHp_DsZ6_dAITkZz8gYz_0w,3797
-dodal/devices/areadetector/adsim.py,sha256=cIc9PRbKnftBk7Ut8d8CU_TVrin8EwcKHObP2n9VxWM,1876
-dodal/devices/areadetector/adutils.py,sha256=4axFR3wtn-K-sjMVJyfTcu-8g35odf2cY8mTKv1gS-o,3093
-dodal/devices/areadetector/plugins/MJPG.py,sha256=XztHFB1e7qHeZORYxvPgHfDMfkpXGKvfQYmej_hGVVc,4934
-dodal/devices/detector/__init__.py,sha256=-RdACL3tzc3lLArWOoGNje48UUlv2fElOmGOz9yOuO0,317
-dodal/devices/detector/det_dim_constants.py,sha256=LNrVMd0DbFEcnyNFmXosCP-VYaZ71Ajuv6inwo4Mg3U,2299
-dodal/devices/detector/det_dist_to_beam_converter.py,sha256=7keoqZYfvgayePVx97lHYpcFRTJnQOfAk_PYP4EZTZQ,1951
-dodal/devices/detector/det_resolution.py,sha256=aQkKp24LpRGiwzPAQM3wLVa4ANw32HdrKc2kftHfKQA,3253
-dodal/devices/detector/detector.py,sha256=syzkl52kGaMINXCXEviFuYPbgNatm5tioVPDmjgro8s,4768
-dodal/devices/detector/detector_motion.py,sha256=LjHNi9FcDSZoriQYrFde8fEmwCGccFgSHPtcxivix4g,1628
-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=YXf4iH4-dNTfm0NPUgrbn1iLP24id4pR8xLsvLc_iWg,6290
-dodal/devices/i22/fswitch.py,sha256=AlyZ_RdbXoMHrG2-sddNOUyLl3vkBdduXVnFL_rMgLo,3046
-dodal/devices/i22/nxsas.py,sha256=a8oJXl5uhkh9zcb9rSZmVooU-SplzzO3EsAaHJZRfrQ,6086
-dodal/devices/i24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/i24/aperture.py,sha256=bbT4ts5jfrjrOxG199RGDxIYmzVyv1k0ZlZcmS6kEzU,849
-dodal/devices/i24/beamstop.py,sha256=GpqSaHlyZfcUfaCgvQRjhDgNdGsrOwV_NqG9JLfcusY,1233
-dodal/devices/i24/dcm.py,sha256=nP2qymTy5TrOu078XOY7h1TEwVfcgli5lTyxmwsG4O8,1990
-dodal/devices/i24/dual_backlight.py,sha256=Th-RKr28aFxE8LCT_mdN9KkRIVw0BHLGKkI0ienfRZU,2049
-dodal/devices/i24/i24_detector_motion.py,sha256=_HgdsZqFYY0tKqUgMzViHaPEUFXL3WlXXioGvDehRUw,364
-dodal/devices/i24/i24_vgonio.py,sha256=Igqs7687z6lyhGVeJEDtDmPachYxU48MUH2BF0RpK9Q,461
-dodal/devices/i24/pmac.py,sha256=qug40tz00vjvmQox3W6GrEcorriEeGkNyP5m4u5CVHo,7201
-dodal/devices/oav/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/oav/grid_overlay.py,sha256=kYs4sCvmo7yG75HQtptuI8jPzM7dR4fSqnOGL0D5j6g,5338
-dodal/devices/oav/microns_for_zoom_levels.json,sha256=kJTkbu2v6_Ccc_cDy7FRTX-gRhXxfYskjVqwBCZIqCQ,1209
-dodal/devices/oav/oav_calculations.py,sha256=wt71vFcyQrr98FvX8oyUM2n5vmKi3K7PyOTuWp0gq5w,1665
-dodal/devices/oav/oav_detector.py,sha256=ZlVzFo01hYi2qITMP6k6TbTE9-7c8veMDoDcTiyU6kc,3178
-dodal/devices/oav/oav_errors.py,sha256=cc4mGnaTiAc5WIlOt_BIYOc7CRSkrCdnBaavfAJ0pXY,754
-dodal/devices/oav/oav_parameters.py,sha256=rI0kRl8B-N2mw91yYf1lEQVn0hkBQCPU7jvljr5ZNpk,8235
-dodal/devices/oav/oav_to_redis_forwarder.py,sha256=3I8Vk1Qx04aVftXb7VVkHUVHweGGUyuLFdmaasmb_Qk,4606
-dodal/devices/oav/utils.py,sha256=OyE4h4eq_jg9bEq5DfcjCU-wfSJifO2-PIsrDbsa0NE,3020
-dodal/devices/oav/pin_image_recognition/__init__.py,sha256=l5IsWMDZDw3-jk0DkGpiw_BzqyfVYRonlfX6Je1ZPR0,6446
-dodal/devices/oav/pin_image_recognition/manual_test.py,sha256=h1Rto6ZDCB3jWhjSy9N8ECxRN583iYDJr9LxrTJ8kfE,903
-dodal/devices/oav/pin_image_recognition/utils.py,sha256=L9ypluYqeOFoS7gQuws-vTNc8LqaKl2ZIDNeQ2JaNpg,8592
-dodal/devices/p99/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/p99/sample_stage.py,sha256=kvwKCDUmXqcoXfIbAENtqm3Hi2cHP7dZIPQgQT6hsXw,1140
-dodal/devices/training_rig/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/training_rig/sample_stage.py,sha256=jktTp837ij8wor5LidE3AajCk95L7DebJotMlO7QwTE,355
-dodal/devices/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/util/adjuster_plans.py,sha256=g4HTpji3XhIhpWvyDLyCYYLGOSE7uNpDeQHfh8259hE,878
-dodal/devices/util/epics_util.py,sha256=R0_I9HEZ2l19BZaTpevPqT3p3kp5GZCfmNNmnXGfdsc,4689
-dodal/devices/util/lookup_tables.py,sha256=FxT2fiIjDJNOqUf_pcW0fKJmwhOUZiF8UGTFz6hWf5g,2132
-dodal/devices/util/motor_utils.py,sha256=pNY-aUk9LxaIWeDr5rpMS6udiB9j19wcCXkNDLp1uA0,257
-dodal/devices/util/save_panda.py,sha256=PHFlkerBhkkU0-o5dNEdi2P95_jD9Lk8yYgaqn9R97o,2538
-dodal/devices/util/test_utils.py,sha256=VrSFFGLNKOcCAsWFMZOxwhng3wGR5kV8NqqnKfj8Vuw,562
-dodal/devices/xspress3/xspress3.py,sha256=JTx3ppAc8GwV9K-Gfqo81iGYH_L-ONyFWiPRs9XUs-w,4661
-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=y8YKMaVwfsRPBofHGGLYmYsd4QwMvm7JIPEo6wrN_Xo,3493
-dodal/devices/zocalo/zocalo_results.py,sha256=MStx8iK--ITff-rT3AQu_RHnqKqNGLJDVyV3ewBwaKE,14316
-dodal/parameters/experiment_parameter_base.py,sha256=O7JamfuJ5cYHkPf9tsHJPqn-OMHTAGouigvM1cDFehE,313
-dodal/plans/check_topup.py,sha256=3gyLHfHNQBCgEWuAg4QE-ONx7y2Do1vVv5HP8ss0Z1I,5371
-dodal/plans/data_session_metadata.py,sha256=urexZ3mA0K6VWxVW3MlrcsB1Tyi09tFvpKBlaVil7TQ,1567
-dodal/plans/motor_util_plans.py,sha256=JT1K4DBB66MrzNqimxFgiL6mRsj11fF7xZXOz0udEeo,4522
-dls_dodal-1.33.0.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-dls_dodal-1.33.0.dist-info/METADATA,sha256=wwy8R9Z3KMfUP7WOcWSZVk7EdoYqRSPXREOqroAGALo,16574
-dls_dodal-1.33.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-dls_dodal-1.33.0.dist-info/entry_points.txt,sha256=bycw_EKUzup_rxfCetOwcauXV4kLln_OPpPT8jEnr-I,94
-dls_dodal-1.33.0.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
-dls_dodal-1.33.0.dist-info/RECORD,,