dls-dodal 1.44.0__tar.gz → 1.45.0__tar.gz

{dls_dodal-1.44.0 → dls_dodal-1.45.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.44.0
+Version: 1.45.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License

{dls_dodal-1.44.0 → dls_dodal-1.45.0}/docs/reference/device-standards.rst

@@ -13,8 +13,8 @@ Where to put devices
 Dodal is written with the philosophy that Ophyd devices should be assumed to be as generic as possible. I.e. you 
 should think about where to place them in the following order:
 
-#. A device that could be used at any facility, e.g. a generic ``EpicsMotor`` or a commercial product with a 
-   standard IOC, should go in https://github.com/bluesky/ophyd-epics-devices
+#. A device that could be used at any facility, e.g. a generic ``Motor`` or a commercial product with a 
+   standard IOC, should go in https://github.com/bluesky/ophyd-async
 #. A device that may be on any beamline should go in the top level of the ``devices`` folder. If it is a quite 
    complex device (e.g. multiple files) it should have a folder of its own e.g. ``oav``
 #. A device that is very specific to a particular beamline should go in the ``devices/ixx`` folder

{dls_dodal-1.44.0 → dls_dodal-1.45.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.44.0
+Version: 1.45.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License

{dls_dodal-1.44.0 → dls_dodal-1.45.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -92,9 +92,13 @@ src/dodal/beamlines/__init__.py
 src/dodal/beamlines/adsim.py
 src/dodal/beamlines/aithre.py
 src/dodal/beamlines/b01_1.py
+src/dodal/beamlines/b07.py
+src/dodal/beamlines/b07_1.py
 src/dodal/beamlines/i02_1.py
 src/dodal/beamlines/i03.py
 src/dodal/beamlines/i04.py
+src/dodal/beamlines/i09.py
+src/dodal/beamlines/i09_1.py
 src/dodal/beamlines/i10.py
 src/dodal/beamlines/i13_1.py
 src/dodal/beamlines/i18.py
@@ -107,6 +111,7 @@ src/dodal/beamlines/i23.py
 src/dodal/beamlines/i24.py
 src/dodal/beamlines/p38.py
 src/dodal/beamlines/p45.py
+src/dodal/beamlines/p60.py
 src/dodal/beamlines/p99.py
 src/dodal/beamlines/training_rig.py
 src/dodal/common/__init__.py
@@ -184,14 +189,16 @@ src/dodal/devices/detector/det_resolution.py
 src/dodal/devices/detector/detector.py
 src/dodal/devices/detector/detector_motion.py
 src/dodal/devices/electron_analyser/__init__.py
-src/dodal/devices/electron_analyser/base_region.py
-src/dodal/devices/electron_analyser/specs/__init__.py
-src/dodal/devices/electron_analyser/specs/specs_region.py
-src/dodal/devices/electron_analyser/vgscienta/__init__.py
-src/dodal/devices/electron_analyser/vgscienta/vgscienta_region.py
+src/dodal/devices/electron_analyser/abstract_analyser_io.py
+src/dodal/devices/electron_analyser/abstract_region.py
+src/dodal/devices/electron_analyser/specs_analyser_io.py
+src/dodal/devices/electron_analyser/specs_region.py
+src/dodal/devices/electron_analyser/vgscienta_analyser_io.py
+src/dodal/devices/electron_analyser/vgscienta_region.py
 src/dodal/devices/i03/__init__.py
 src/dodal/devices/i03/beamstop.py
 src/dodal/devices/i04/transfocator.py
+src/dodal/devices/i10/diagnostics.py
 src/dodal/devices/i10/i10_apple2.py
 src/dodal/devices/i10/i10_setting_data.py
 src/dodal/devices/i10/mirrors.py
@@ -208,6 +215,7 @@ src/dodal/devices/i18/table.py
 src/dodal/devices/i18/thor_labs_stage.py
 src/dodal/devices/i19/__init__.py
 src/dodal/devices/i19/beamstop.py
+src/dodal/devices/i19/blueapi_device.py
 src/dodal/devices/i19/hutch_access.py
 src/dodal/devices/i19/shutter.py
 src/dodal/devices/i20_1/__init__.py
@@ -246,7 +254,6 @@ src/dodal/devices/util/__init__.py
 src/dodal/devices/util/adjuster_plans.py
 src/dodal/devices/util/epics_util.py
 src/dodal/devices/util/lookup_tables.py
-src/dodal/devices/util/motor_utils.py
 src/dodal/devices/util/test_utils.py
 src/dodal/devices/xspress3/xspress3.py
 src/dodal/devices/xspress3/xspress3_channel.py
@@ -264,6 +271,8 @@ src/dodal/plan_stubs/check_topup.py
 src/dodal/plan_stubs/data_session.py
 src/dodal/plan_stubs/motor_utils.py
 src/dodal/plan_stubs/wrapped.py
+src/dodal/plan_stubs/electron_analyser/__init__.py
+src/dodal/plan_stubs/electron_analyser/configure_controller.py
 src/dodal/plans/__init__.py
 src/dodal/plans/save_panda.py
 src/dodal/plans/scanspec.py
@@ -320,6 +329,7 @@ tests/devices/i03/__init__.py
 tests/devices/i03/test_beamstop.py
 tests/devices/i04/__init__.py
 tests/devices/i04/test_transfocator.py
+tests/devices/i10/test_diagnostic.py
 tests/devices/i10/test_i10Apple2.py
 tests/devices/i10/lookupTables/IDEnergy2GapCalibrations.csv
 tests/devices/i10/lookupTables/IDEnergy2PhaseCalibrations.csv
@@ -361,6 +371,7 @@ tests/devices/unit_tests/test_jCameraManZoomLevels.xml
 tests/devices/unit_tests/test_linkam3.py
 tests/devices/unit_tests/test_lookup_table.txt
 tests/devices/unit_tests/test_lookup_table_2.txt
+tests/devices/unit_tests/test_motors.py
 tests/devices/unit_tests/test_odin.py
 tests/devices/unit_tests/test_pressure_jump_cell.py
 tests/devices/unit_tests/test_qbpm.py
@@ -370,6 +381,7 @@ tests/devices/unit_tests/test_status.py
 tests/devices/unit_tests/test_synchrotron.py
 tests/devices/unit_tests/test_tetramm.py
 tests/devices/unit_tests/test_thawer.py
+tests/devices/unit_tests/test_turbo_slit.py
 tests/devices/unit_tests/test_undulator.py
 tests/devices/unit_tests/test_undulator_dcm.py
 tests/devices/unit_tests/test_utils.py
@@ -387,9 +399,14 @@ tests/devices/unit_tests/current_amplifier/test_sr570.py
 tests/devices/unit_tests/detector/test_det_dim_constants.py
 tests/devices/unit_tests/detector/test_det_resolution.py
 tests/devices/unit_tests/detector/test_detector.py
+tests/devices/unit_tests/electron_analyser/__init__.py
+tests/devices/unit_tests/electron_analyser/conftest.py
+tests/devices/unit_tests/electron_analyser/test_base_analayser_io.py
+tests/devices/unit_tests/electron_analyser/test_specs_analyser_io.py
 tests/devices/unit_tests/electron_analyser/test_specs_region.py
+tests/devices/unit_tests/electron_analyser/test_util.py
+tests/devices/unit_tests/electron_analyser/test_vgscienta_analyser_io.py
 tests/devices/unit_tests/electron_analyser/test_vgscienta_region.py
-tests/devices/unit_tests/electron_analyser/utils.py
 tests/devices/unit_tests/i24/__init__.py
 tests/devices/unit_tests/i24/test_dual_backlight.py
 tests/devices/unit_tests/i24/test_focus_mirrors.py

{dls_dodal-1.44.0 → dls_dodal-1.45.0}/src/dodal/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.44.0'
-__version_tuple__ = version_tuple = (1, 44, 0)
+__version__ = version = '1.45.0'
+__version_tuple__ = version_tuple = (1, 45, 0)

{dls_dodal-1.44.0 → dls_dodal-1.45.0}/src/dodal/beamlines/__init__.py

@@ -9,6 +9,8 @@ from pathlib import Path
 # module name. Add any new beamlines whose name differs from their module name to this
 # dictionary, which maps ${BEAMLINE} to dodal.beamlines.<MODULE NAME>
 _BEAMLINE_NAME_OVERRIDES = {
+    "b07-1": "b07_1",
+    "i09-1": "i09_1",
     "i13-1": "i13_1",
     "i20-1": "i20_1",
     "i19-1": "i19_1",

dls_dodal-1.45.0/src/dodal/beamlines/b07.py

@@ -0,0 +1,27 @@
+from dodal.common.beamlines.beamline_utils import (
+    device_factory,
+)
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.devices.electron_analyser.specs_analyser_io import (
+    SpecsAnalyserDriverIO,
+)
+from dodal.devices.synchrotron import Synchrotron
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("b07")
+PREFIX = BeamlinePrefix(BL, suffix="B")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def analyser_driver() -> SpecsAnalyserDriverIO:
+    return SpecsAnalyserDriverIO(
+        name="analyser_driver", prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:"
+    )

dls_dodal-1.45.0/src/dodal/beamlines/b07_1.py

@@ -0,0 +1,25 @@
+from dodal.common.beamlines.beamline_utils import (
+    device_factory,
+)
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.devices.electron_analyser.specs_analyser_io import (
+    SpecsAnalyserDriverIO,
+)
+from dodal.devices.synchrotron import Synchrotron
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("b07-1")
+PREFIX = BeamlinePrefix(BL, suffix="C")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def analyser_driver() -> SpecsAnalyserDriverIO:
+    return SpecsAnalyserDriverIO(prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:")

dls_dodal-1.45.0/src/dodal/beamlines/i09.py

@@ -0,0 +1,25 @@
+from dodal.common.beamlines.beamline_utils import (
+    device_factory,
+)
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.devices.electron_analyser.vgscienta_analyser_io import (
+    VGScientaAnalyserDriverIO,
+)
+from dodal.devices.synchrotron import Synchrotron
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("i09")
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def analyser_driver() -> VGScientaAnalyserDriverIO:
+    return VGScientaAnalyserDriverIO(prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:")

dls_dodal-1.45.0/src/dodal/beamlines/i09_1.py

@@ -0,0 +1,25 @@
+from dodal.common.beamlines.beamline_utils import (
+    device_factory,
+)
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.devices.electron_analyser.specs_analyser_io import (
+    SpecsAnalyserDriverIO,
+)
+from dodal.devices.synchrotron import Synchrotron
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("i09-1")
+PREFIX = BeamlinePrefix(BL, suffix="I")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def analyser_driver() -> SpecsAnalyserDriverIO:
+    return SpecsAnalyserDriverIO(prefix=f"{PREFIX.beamline_prefix}-EA-DET-02:CAM:")

{dls_dodal-1.44.0 → dls_dodal-1.45.0}/src/dodal/beamlines/i10.py

@@ -8,6 +8,7 @@ from dodal.devices.apple2_undulator import (
     UndulatorPhaseAxes,
 )
 from dodal.devices.current_amplifiers import CurrentAmpDet
+from dodal.devices.i10.diagnostics import I10Diagnostic, I10Diagnostic5ADet
 from dodal.devices.i10.i10_apple2 import (
     I10Apple2,
     I10Apple2PGM,
@@ -24,10 +25,9 @@ from dodal.devices.i10.rasor.rasor_motors import (
     PinHole,
 )
 from dodal.devices.i10.rasor.rasor_scaler_cards import RasorScalerCard1
-from dodal.devices.i10.slits import I10PrimarySlits, I10Slits
+from dodal.devices.i10.slits import I10Slits, I10SlitsDrainCurrent
 from dodal.devices.motors import XYZPositioner
 from dodal.devices.pgm import PGM
-from dodal.devices.slits import MinimalSlits
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -272,6 +272,9 @@ def idd_la_angle(
     )
 
 
+"""Mirrors"""
+
+
 @device_factory()
 def first_mirror() -> PiezoMirror:
     return PiezoMirror(prefix=f"{PREFIX.beamline_prefix}-OP-COL-01:")
@@ -283,58 +286,39 @@ def switching_mirror() -> PiezoMirror:
 
 
 @device_factory()
-def slit_1() -> I10PrimarySlits:
-    return I10PrimarySlits(
-        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-01:",
-    )
+def focusing_mirror() -> PiezoMirror:
+    return PiezoMirror(prefix=f"{PREFIX.beamline_prefix}-OP-FOCS-01:")
 
 
-@device_factory()
-def slit_2() -> I10Slits:
-    return I10Slits(
-        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-02:",
-    )
+"""Optic slits"""
 
 
 @device_factory()
-def slit_3() -> I10Slits:
-    return I10Slits(
-        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-03:",
-    )
-
-
-"""Rasor devices"""
+def slits() -> I10Slits:
+    return I10Slits(prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-")
 
 
 @device_factory()
-def focusing_mirror() -> PiezoMirror:
-    return PiezoMirror(prefix=f"{PREFIX.beamline_prefix}-OP-FOCS-01:")
+def slits_current() -> I10SlitsDrainCurrent:
+    return I10SlitsDrainCurrent(prefix=f"{PREFIX.beamline_prefix}-")
 
 
-@device_factory()
-def slit_4() -> MinimalSlits:
-    return MinimalSlits(
-        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-04:",
-        x_gap="XSIZE",
-        y_gap="YSIZE",
-    )
+"""Diagnostics"""
 
 
 @device_factory()
-def slit_5() -> I10Slits:
-    return I10Slits(
-        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-05:",
+def diagnostics() -> I10Diagnostic:
+    return I10Diagnostic(
+        prefix=f"{PREFIX.beamline_prefix}-DI-",
     )
 
 
 @device_factory()
-def slit_6() -> I10Slits:
-    return I10Slits(
-        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-06:",
-    )
+def d5a_det() -> I10Diagnostic5ADet:
+    return I10Diagnostic5ADet(prefix=f"{PREFIX.beamline_prefix}-DI-")
 
 
-"Rasor devices"
+"""Rasor devices"""
 
 
 @device_factory()

{dls_dodal-1.44.0 → dls_dodal-1.45.0}/src/dodal/beamlines/i19_1.py

@@ -5,7 +5,8 @@ from dodal.common.beamlines.beamline_utils import (
     set_beamline as set_utils_beamline,
 )
 from dodal.devices.i19.beamstop import BeamStop
-from dodal.devices.i19.shutter import AccessControlledShutter, HutchState
+from dodal.devices.i19.blueapi_device import HutchState
+from dodal.devices.i19.shutter import AccessControlledShutter
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.oav_parameters import OAVConfig
 from dodal.devices.synchrotron import Synchrotron

{dls_dodal-1.44.0 → dls_dodal-1.45.0}/src/dodal/beamlines/i19_2.py

@@ -5,7 +5,8 @@ from dodal.common.beamlines.beamline_utils import (
     set_beamline as set_utils_beamline,
 )
 from dodal.devices.i19.beamstop import BeamStop
-from dodal.devices.i19.shutter import AccessControlledShutter, HutchState
+from dodal.devices.i19.blueapi_device import HutchState
+from dodal.devices.i19.shutter import AccessControlledShutter
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.zebra.zebra import Zebra
 from dodal.devices.zebra.zebra_constants_mapping import (

{dls_dodal-1.44.0 → dls_dodal-1.45.0}/src/dodal/beamlines/i20_1.py

@@ -32,7 +32,8 @@ set_path_provider(
 )
 
 
-@device_factory()
+# NOTE this is mock as we cannot move items on the beamline until we get sign-off to do so
+@device_factory(mock=True)
 def turbo_slit() -> TurboSlit:
     """
     turboslit for selecting energy from the polychromator

{dls_dodal-1.44.0 → dls_dodal-1.45.0}/src/dodal/beamlines/i23.py

@@ -1,5 +1,6 @@
 from dodal.common.beamlines.beamline_utils import device_factory
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.devices.motors import SixAxisGonio
 from dodal.devices.oav.pin_image_recognition import PinTipDetection
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name, get_hostname
@@ -28,3 +29,12 @@ def oav_pin_tip_detection() -> PinTipDetection:
         f"{PREFIX.beamline_prefix}-DI-OAV-01:",
         "pin_tip_detection",
     )
+
+
+@device_factory()
+def gonio() -> SixAxisGonio:
+    """Get the i23 goniometer"""
+
+    return SixAxisGonio(
+        f"{PREFIX.beamline_prefix}-MO-GONIO-01:",
+    )

dls_dodal-1.45.0/src/dodal/beamlines/p60.py

@@ -0,0 +1,21 @@
+from dodal.common.beamlines.beamline_utils import (
+    device_factory,
+)
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.devices.electron_analyser.vgscienta_analyser_io import (
+    VGScientaAnalyserDriverIO,
+)
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("p60")
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def analyser_driver() -> VGScientaAnalyserDriverIO:
+    return VGScientaAnalyserDriverIO(
+        name="analyser_driver", prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:"
+    )

{dls_dodal-1.44.0 → dls_dodal-1.45.0}/src/dodal/common/visit.py

@@ -3,8 +3,7 @@ from pathlib import Path
 from typing import Literal
 
 from aiohttp import ClientSession
-from event_model import RunStart
-from ophyd_async.core import FilenameProvider, PathInfo, PathProvider
+from ophyd_async.core import FilenameProvider, PathInfo
 from pydantic import BaseModel
 
 from dodal.common.types import UpdatingPathProvider
@@ -151,42 +150,3 @@ class StaticVisitPathProvider(UpdatingPathProvider):
         return PathInfo(
             directory_path=self._root, filename=self._filename_provider(device_name)
         )
-
-
-DEFAULT_TEMPLATE = "{device_name}-{instrument}-{scan_id}"
-
-
-class StartDocumentPathProvider(PathProvider):
-    """A PathProvider that sources from metadata in a RunStart document.
-
-    This uses metadata from a RunStart document to determine file names and data session
-    directories. The file naming defaults to "{device_name}-{instrument}-{scan_id}", so
-    the file name is incremented by scan number. A template can be included in the
-    StartDocument to allow for custom naming conventions.
-
-    """
-
-    def __init__(self) -> None:
-        self._doc = {}
-
-    def update_run(self, name: str, start_doc: RunStart) -> None:
-        """Cache a start document.
-
-        This can be plugged into the run engine's subscribe method.
-        """
-        if name == "start":
-            self._doc = start_doc
-
-    def __call__(self, device_name: str | None = None) -> PathInfo:
-        """Returns the directory path and filename for a given data_session.
-
-        The default template for file naming is: "{device_name}-{instrument}-{scan_id}"
-        however, this can be changed by providing a template in the start document. For
-        example: "template": "custom-{device_name}--{scan_id}".
-
-        If you do not provide a data_session_directory it will default to "/tmp".
-        """
-        template = self._doc.get("template", DEFAULT_TEMPLATE)
-        sub_path = template.format_map(self._doc | {"device_name": device_name})
-        data_session_directory = Path(self._doc.get("data_session_directory", "/tmp"))
-        return PathInfo(directory_path=data_session_directory, filename=sub_path)

{dls_dodal-1.44.0 → dls_dodal-1.45.0}/src/dodal/devices/detector/det_dist_to_beam_converter.py

@@ -1,6 +1,9 @@
 from enum import Enum
 
-from numpy import interp, loadtxt
+from dodal.devices.util.lookup_tables import (
+    linear_extrapolation_lut,
+    parse_lookup_table,
+)
 
 
 class Axis(Enum):
@@ -11,12 +14,20 @@ class Axis(Enum):
 class DetectorDistanceToBeamXYConverter:
     def __init__(self, lookup_file: str):
         self.lookup_file: str = lookup_file
-        self.lookup_table_values: list = self.parse_table()
+        lookup_table_columns: list = parse_lookup_table(self.lookup_file)
+        self._d_to_x = linear_extrapolation_lut(
+            lookup_table_columns[0], lookup_table_columns[1]
+        )
+        self._d_to_y = linear_extrapolation_lut(
+            lookup_table_columns[0], lookup_table_columns[2]
+        )
 
     def get_beam_xy_from_det_dist(self, det_dist_mm: float, beam_axis: Axis) -> float:
-        beam_axis_values = self.lookup_table_values[beam_axis.value]
-        det_dist_array = self.lookup_table_values[0]
-        return float(interp(det_dist_mm, det_dist_array, beam_axis_values))
+        return (
+            self._d_to_x(det_dist_mm)
+            if beam_axis == Axis.X_AXIS
+            else self._d_to_y(det_dist_mm)
+        )
 
     def get_beam_axis_pixels(
         self,
@@ -41,21 +52,3 @@ class DetectorDistanceToBeamXYConverter:
         return self.get_beam_axis_pixels(
             det_distance, image_size_pixels, det_dim, Axis.X_AXIS
         )
-
-    def reload_lookup_table(self):
-        self.lookup_table_values = self.parse_table()
-
-    def parse_table(self) -> list:
-        rows = loadtxt(self.lookup_file, delimiter=" ", comments=["#", "Units"])
-        columns = list(zip(*rows, strict=False))
-
-        return columns
-
-    def __eq__(self, other):
-        if not isinstance(other, DetectorDistanceToBeamXYConverter):
-            return NotImplemented
-        if self.lookup_file != other.lookup_file:
-            return False
-        if self.lookup_table_values != other.lookup_table_values:
-            return False
-        return True

{dls_dodal-1.44.0 → dls_dodal-1.45.0}/src/dodal/devices/detector/detector.py

@@ -1,4 +1,5 @@
 from enum import Enum, auto
+from functools import cached_property
 from pathlib import Path
 
 from pydantic import BaseModel, Field, field_serializer, field_validator
@@ -49,7 +50,7 @@ class DetectorParams(BaseModel):
         False  # Remove in https://github.com/DiamondLightSource/hyperion/issues/1395
     )
 
-    @property
+    @cached_property
     def beam_xy_converter(self) -> DetectorDistanceToBeamXYConverter:
         return DetectorDistanceToBeamXYConverter(self.det_dist_to_beam_converter_path)
 

dls_dodal-1.45.0/src/dodal/devices/electron_analyser/abstract_analyser_io.py

@@ -0,0 +1,47 @@
+from abc import ABC, abstractmethod
+from typing import TypeVar
+
+from ophyd_async.core import StandardReadable
+from ophyd_async.epics.core import epics_signal_rw
+
+from dodal.devices.electron_analyser.abstract_region import EnergyMode
+
+
+class AbstractAnalyserDriverIO(ABC, StandardReadable):
+    """
+    Generic device to configure electron analyser with new region settings.
+    Electron analysers should inherit from this class for further specialisation.
+    """
+
+    def __init__(self, prefix: str, name: str = "") -> None:
+        with self.add_children_as_readables():
+            self.low_energy = epics_signal_rw(float, prefix + "LOW_ENERGY")
+            self.high_energy = epics_signal_rw(float, prefix + "HIGH_ENERGY")
+            self.slices = epics_signal_rw(int, prefix + "SLICES")
+            self.lens_mode = epics_signal_rw(str, prefix + "LENS_MODE")
+            self.pass_energy = epics_signal_rw(
+                self.pass_energy_type, prefix + "PASS_ENERGY"
+            )
+            self.energy_step = epics_signal_rw(float, prefix + "STEP_SIZE")
+            self.iterations = epics_signal_rw(int, prefix + "NumExposures")
+            self.acquisition_mode = epics_signal_rw(str, prefix + "ACQ_MODE")
+
+        super().__init__(name)
+
+    def to_kinetic_energy(
+        self, value: float, excitation_energy: float, mode: EnergyMode
+    ) -> float:
+        return excitation_energy - value if mode == EnergyMode.BINDING else value
+
+    @property
+    @abstractmethod
+    def pass_energy_type(self) -> type:
+        """
+        Return the type the pass_energy should be. Each one is unfortunately different
+        for the underlying analyser software and cannot be changed on epics side.
+        """
+
+
+TAbstractAnalyserDriverIO = TypeVar(
+    "TAbstractAnalyserDriverIO", bound=AbstractAnalyserDriverIO
+)