dls-dodal 1.65.0__py3-none-any.whl → 1.66.0__py3-none-any.whl

dodal/plans/verify_undulator_gap.py

@@ -3,12 +3,12 @@ from typing import Protocol, runtime_checkable
 from bluesky import plan_stubs as bps
 
 from dodal.devices.common_dcm import DoubleCrystalMonochromatorBase
-from dodal.devices.undulator import Undulator
+from dodal.devices.undulator import UndulatorInKeV
 
 
 @runtime_checkable
 class CheckUndulatorDevices(Protocol):
-    undulator: Undulator
+    undulator: UndulatorInKeV
     dcm: DoubleCrystalMonochromatorBase
 
 

dodal/beamline_specific_utils/i03.py

@@ -1,17 +0,0 @@
-from dataclasses import dataclass
-
-I03_BEAM_HEIGHT_UM = 20.0
-I03_BEAM_WIDTH_UM = 80.0
-
-
-@dataclass
-class BeamSize:
-    x_um: float | None
-    y_um: float | None
-
-
-def beam_size_from_aperture(aperture_size: float | None):
-    return BeamSize(
-        min(aperture_size, I03_BEAM_WIDTH_UM) if aperture_size else None,
-        I03_BEAM_HEIGHT_UM if aperture_size else None,
-    )

dodal/testing/__init__.py

@@ -1,3 +0,0 @@
-from .setup import patch_all_motors, patch_motor
-
-__all__ = ["patch_motor", "patch_all_motors"]

dodal/testing/setup.py

@@ -1,67 +0,0 @@
-from contextlib import ExitStack
-
-from ophyd_async.core import Device
-from ophyd_async.epics.motor import Motor
-from ophyd_async.testing import (
-    callback_on_mock_put,
-    set_mock_value,
-)
-
-
-def patch_motor(
-    motor: Motor,
-    initial_position: float = 0,
-    deadband: float = 0.001,
-    velocity: float = 3,
-    max_velocity: float = 5,
-    low_limit_travel: float = float("-inf"),
-    high_limit_travel: float = float("inf"),
-):
-    """
-    Patch a mock motor with sensible default values so that it can still be used in
-    tests and plans without running into errors as default values are zero.
-
-    Parameters:
-        motor: The mock motor to set mock values with.
-        initial_position: The default initial position of the motor to be set.
-        deadband: The tolerance between readback value and demand setpoint which the
-                  motor is considered at position.
-        velocity: Requested move speed when the mock motor moves.
-        max_velocity: The maximum allowable velocity that can be set for the motor.
-        low_limit_travel: The lower limit that the motor can move to.
-        high_limit_travel: The higher limit that the motor can move to.
-    """
-    set_mock_value(motor.user_setpoint, initial_position)
-    set_mock_value(motor.user_readback, initial_position)
-    set_mock_value(motor.deadband, deadband)
-    set_mock_value(motor.motor_done_move, 1)
-    set_mock_value(motor.velocity, velocity)
-    set_mock_value(motor.max_velocity, max_velocity)
-    set_mock_value(motor.low_limit_travel, low_limit_travel)
-    set_mock_value(motor.high_limit_travel, high_limit_travel)
-    return callback_on_mock_put(
-        motor.user_setpoint,
-        lambda pos, *args, **kwargs: set_mock_value(motor.user_readback, pos),
-    )
-
-
-def patch_all_motors(parent_device: Device):
-    """
-    Check all children of a device and patch any motors with mock values.
-
-    Parameters:
-        parent_device: The device that hold motor(s) as children.
-    """
-    motors = []
-
-    def recursively_find_motors(device: Device):
-        for _, child_device in device.children():
-            if isinstance(child_device, Motor):
-                motors.append(child_device)
-            recursively_find_motors(child_device)
-
-    recursively_find_motors(parent_device)
-    motor_patch_stack = ExitStack()
-    for motor in motors:
-        motor_patch_stack.enter_context(patch_motor(motor))
-    return motor_patch_stack