dls-dodal 1.51.0__tar.gz → 1.52.0__tar.gz

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/.pre-commit-config.yaml

@@ -30,3 +30,8 @@ repos:
         entry: lint-imports
         types: [python]
         require_serial: false
+
+  - repo: https://github.com/thoughtworks/talisman
+    rev: v1.37.0
+    hooks:
+      - id: talisman-commit

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.51.0
+Version: 1.52.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
@@ -215,7 +215,8 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async>=0.10.0a4
+Requires-Dist: ophyd-async>=0.11
+Requires-Dist: epicscorelibs<=7.0.7.99.1.2a1
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/pyproject.toml

@@ -14,7 +14,8 @@ description = "Ophyd devices and other utils that could be used across DLS beaml
 dependencies = [
     "click",
     "ophyd",
-    "ophyd-async>=0.10.0a4",
+    "ophyd-async>=0.11",
+    "epicscorelibs<=7.0.7.99.1.2a1",  # Pending https://github.com/epics-base/epicscorelibs/issues/41
     "bluesky",
     "pyepics",
     "dataclasses-json",

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.51.0
+Version: 1.52.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
@@ -215,7 +215,8 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async>=0.10.0a4
+Requires-Dist: ophyd-async>=0.11
+Requires-Dist: epicscorelibs<=7.0.7.99.1.2a1
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -126,6 +126,7 @@ src/dodal/common/__init__.py
 src/dodal/common/coordination.py
 src/dodal/common/crystal_metadata.py
 src/dodal/common/data_util.py
+src/dodal/common/device_utils.py
 src/dodal/common/maths.py
 src/dodal/common/types.py
 src/dodal/common/udc_directory_provider.py
@@ -182,9 +183,9 @@ src/dodal/devices/attenuator/attenuator.py
 src/dodal/devices/attenuator/filter.py
 src/dodal/devices/attenuator/filter_selections.py
 src/dodal/devices/b07/__init__.py
-src/dodal/devices/b07/grating.py
+src/dodal/devices/b07/enums.py
 src/dodal/devices/b07_1/__init__.py
-src/dodal/devices/b07_1/grating.py
+src/dodal/devices/b07_1/enums.py
 src/dodal/devices/b16/__init__.py
 src/dodal/devices/b16/detector.py
 src/dodal/devices/current_amplifiers/__init__.py
@@ -227,7 +228,9 @@ src/dodal/devices/i04/murko_results.py
 src/dodal/devices/i04/transfocator.py
 src/dodal/devices/i09/__init__.py
 src/dodal/devices/i09/dcm.py
-src/dodal/devices/i09/grating.py
+src/dodal/devices/i09/enums.py
+src/dodal/devices/i09_1/__init__.py
+src/dodal/devices/i09_1/enums.py
 src/dodal/devices/i10/__init__.py
 src/dodal/devices/i10/diagnostics.py
 src/dodal/devices/i10/i10_apple2.py
@@ -276,6 +279,7 @@ src/dodal/devices/oav/snapshots/snapshot.py
 src/dodal/devices/oav/snapshots/snapshot_image_processing.py
 src/dodal/devices/oav/snapshots/snapshot_with_grid.py
 src/dodal/devices/p60/__init__.py
+src/dodal/devices/p60/enums.py
 src/dodal/devices/p60/lab_xray_source.py
 src/dodal/devices/p99/__init__.py
 src/dodal/devices/p99/andor2_point.py
@@ -388,7 +392,6 @@ tests/devices/unit_tests/test_focusing_mirror.py
 tests/devices/unit_tests/test_gridscan.py
 tests/devices/unit_tests/test_hutch_shutter.py
 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

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/src/dls_dodal.egg-info/requires.txt

@@ -1,6 +1,7 @@
 click
 ophyd
-ophyd-async>=0.10.0a4
+ophyd-async>=0.11
+epicscorelibs<=7.0.7.99.1.2a1
 bluesky
 pyepics
 dataclasses-json

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/src/dodal/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.51.0'
-__version_tuple__ = version_tuple = (1, 51, 0)
+__version__ = version = '1.52.0'
+__version_tuple__ = version_tuple = (1, 52, 0)

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/src/dodal/beamlines/b07.py

@@ -2,7 +2,7 @@ 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.b07 import B07BGrating
+from dodal.devices.b07 import Grating, LensMode
 from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
 from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
@@ -22,12 +22,13 @@ def synchrotron() -> Synchrotron:
 
 @device_factory()
 def pgm() -> PGM:
-    return PGM(prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:", grating=B07BGrating)
+    return PGM(prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:", grating=Grating)
 
 
 @device_factory()
-def analyser_driver() -> SpecsAnalyserDriverIO:
-    return SpecsAnalyserDriverIO(
-        f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
-        {"source1": pgm().energy.user_readback},
+def analyser_driver() -> SpecsAnalyserDriverIO[LensMode]:
+    return SpecsAnalyserDriverIO[LensMode](
+        prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
+        lens_mode_type=LensMode,
+        energy_sources={"source1": pgm().energy.user_readback},
     )

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/src/dodal/beamlines/b07_1.py

@@ -2,7 +2,7 @@ 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.b07_1 import B07CGrating
+from dodal.devices.b07_1 import Grating, LensMode
 from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
 from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
@@ -22,12 +22,13 @@ def synchrotron() -> Synchrotron:
 
 @device_factory()
 def pgm() -> PGM:
-    return PGM(prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:", grating=B07CGrating)
+    return PGM(prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:", grating=Grating)
 
 
 @device_factory()
-def analyser_driver() -> SpecsAnalyserDriverIO:
-    return SpecsAnalyserDriverIO(
-        f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
-        {"source1": pgm().energy.user_readback},
+def analyser_driver() -> SpecsAnalyserDriverIO[LensMode]:
+    return SpecsAnalyserDriverIO[LensMode](
+        prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
+        lens_mode_type=LensMode,
+        energy_sources={"source1": pgm().energy.user_readback},
     )

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/src/dodal/beamlines/i03.py

@@ -92,7 +92,10 @@ def attenuator() -> BinaryFilterAttenuator:
     """Get the i03 attenuator device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i03, it will return the existing object.
     """
-    return BinaryFilterAttenuator(f"{PREFIX.beamline_prefix}-EA-ATTN-01:")
+    return BinaryFilterAttenuator(
+        prefix=f"{PREFIX.beamline_prefix}-EA-ATTN-01:",
+        num_filters=16,
+    )
 
 
 @device_factory()

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/src/dodal/beamlines/i04.py

@@ -137,8 +137,8 @@ def attenuator() -> BinaryFilterAttenuator:
     If this is called when already instantiated in i04, it will return the existing object.
     """
     return BinaryFilterAttenuator(
-        f"{PREFIX.beamline_prefix}-EA-ATTN-01:",
-        "attenuator",
+        prefix=f"{PREFIX.beamline_prefix}-EA-ATTN-01:",
+        num_filters=16,
     )
 
 

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/src/dodal/beamlines/i09.py

@@ -3,7 +3,7 @@ from dodal.common.beamlines.beamline_utils import (
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.devices.electron_analyser.vgscienta import VGScientaAnalyserDriverIO
-from dodal.devices.i09 import DCM, I09Grating
+from dodal.devices.i09 import DCM, Grating, LensMode
 from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
@@ -24,7 +24,7 @@ def synchrotron() -> Synchrotron:
 def pgm() -> PGM:
     return PGM(
         prefix=f"{BeamlinePrefix(BL, suffix='J').beamline_prefix}-MO-PGM-01:",
-        grating=I09Grating,
+        grating=Grating,
     )
 
 
@@ -34,11 +34,13 @@ def dcm() -> DCM:
 
 
 @device_factory()
-def analyser_driver() -> VGScientaAnalyserDriverIO:
+def analyser_driver() -> VGScientaAnalyserDriverIO[LensMode]:
     energy_sources = {
         "source1": pgm().energy.user_readback,
         "source2": dcm().energy_in_ev,
     }
-    return VGScientaAnalyserDriverIO(
-        f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:", energy_sources
+    return VGScientaAnalyserDriverIO[LensMode](
+        prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
+        lens_mode_type=LensMode,
+        energy_sources=energy_sources,
     )

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/src/dodal/beamlines/i09_1.py

@@ -4,6 +4,7 @@ from dodal.common.beamlines.beamline_utils import (
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
 from dodal.devices.i09.dcm import DCM
+from dodal.devices.i09_1 import LensMode
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
@@ -25,7 +26,9 @@ def dcm() -> DCM:
 
 
 @device_factory()
-def analyser_driver() -> SpecsAnalyserDriverIO:
-    return SpecsAnalyserDriverIO(
-        f"{PREFIX.beamline_prefix}-EA-DET-02:CAM:", {"source1": dcm().energy_in_ev}
+def analyser_driver() -> SpecsAnalyserDriverIO[LensMode]:
+    return SpecsAnalyserDriverIO[LensMode](
+        prefix=f"{PREFIX.beamline_prefix}-EA-DET-02:CAM:",
+        lens_mode_type=LensMode,
+        energy_sources={"source1": dcm().energy_in_ev},
     )

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/src/dodal/beamlines/i09_2.py

@@ -2,7 +2,7 @@ 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.i09.grating import I09Grating
+from dodal.devices.i09.enums import Grating
 from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
@@ -21,4 +21,4 @@ def synchrotron() -> Synchrotron:
 
 @device_factory()
 def pgm() -> PGM:
-    return PGM(prefix=f"{PREFIX.beamline_prefix}-MO-PGM-01:", grating=I09Grating)
+    return PGM(prefix=f"{PREFIX.beamline_prefix}-MO-PGM-01:", grating=Grating)

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/src/dodal/beamlines/i22.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 
 from ophyd_async.epics.adaravis import AravisDetector
+from ophyd_async.epics.adcore import NDPluginStatsIO
 from ophyd_async.epics.adpilatus import PilatusDetector
 from ophyd_async.fastcs.panda import HDFPanda
 
@@ -101,6 +102,11 @@ def i0() -> TetrammDetector:
         prefix=f"{PREFIX.beamline_prefix}-EA-XBPM-02:",
         path_provider=get_path_provider(),
         type="Cividec Diamond XBPM",
+        plugins={
+            "stats": NDPluginStatsIO(
+                prefix=f"{PREFIX.beamline_prefix}-EA-XBPM-02:SumAll:"
+            )
+        },
     )
 
 
@@ -110,6 +116,11 @@ def it() -> TetrammDetector:
         prefix=f"{PREFIX.beamline_prefix}-EA-TTRM-02:",
         path_provider=get_path_provider(),
         type="PIN Diode",
+        plugins={
+            "stats": NDPluginStatsIO(
+                prefix=f"{PREFIX.beamline_prefix}-EA-TTRM-02:SumAll:"
+            )
+        },
     )
 
 

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/src/dodal/beamlines/i24.py

@@ -32,7 +32,7 @@ ZOOM_PARAMS_FILE = (
 DISPLAY_CONFIG = "/dls_sw/i24/software/gda_versions/var/display.configuration"
 
 
-BL = get_beamline_name("s24")
+BL = get_beamline_name("i24")
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
@@ -149,7 +149,7 @@ def pmac() -> PMAC:
     )
 
 
-@device_factory(skip=BL == "s24")
+@device_factory()
 def oav() -> OAVBeamCentreFile:
     return OAVBeamCentreFile(
         prefix=f"{PREFIX.beamline_prefix}-DI-OAV-01:",

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/src/dodal/beamlines/p60.py

@@ -3,7 +3,7 @@ from dodal.common.beamlines.beamline_utils import (
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.devices.electron_analyser.vgscienta import VGScientaAnalyserDriverIO
-from dodal.devices.p60 import LabXraySource, LabXraySourceReadable
+from dodal.devices.p60 import LabXraySource, LabXraySourceReadable, LensMode
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -24,11 +24,13 @@ def mg_kalpha_source() -> LabXraySourceReadable:
 
 
 @device_factory()
-def analyser_driver() -> VGScientaAnalyserDriverIO:
+def analyser_driver() -> VGScientaAnalyserDriverIO[LensMode]:
     energy_sources = {
         "source1": al_kalpha_source().energy_ev,
         "source2": mg_kalpha_source().energy_ev,
     }
-    return VGScientaAnalyserDriverIO(
-        f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:", energy_sources
+    return VGScientaAnalyserDriverIO[LensMode](
+        prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
+        lens_mode_type=LensMode,
+        energy_sources=energy_sources,
     )

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/src/dodal/beamlines/p99.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 
 from ophyd_async.epics.adandor import Andor2Detector
+from ophyd_async.fastcs.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_utils import (
     device_factory,
@@ -76,3 +77,16 @@ def andor2_point() -> Andor2Point:
         drv_suffix=CAM_SUFFIX,
         read_uncached={"mean": "STAT:MeanValue_RBV", "total": "STAT:Total_RBV"},
     )
+
+
+@device_factory()
+def panda() -> HDFPanda:
+    """
+    The Panda device is connected to two PMAC motors for position comparison under
+     the pcomp[1] and pcomp[2] blocks, which handle positive and negative directions.
+    This setup is used for triggering detectors during a flyscan.
+    """
+    return HDFPanda(
+        f"{PREFIX.beamline_prefix}-MO-PANDA-01:",
+        path_provider=get_path_provider(),
+    )

dls_dodal-1.52.0/src/dodal/common/device_utils.py

@@ -0,0 +1,45 @@
+from asyncio import CancelledError, create_task, sleep
+from contextlib import asynccontextmanager
+
+from dodal.log import LOGGER
+
+
+@asynccontextmanager
+async def periodic_reminder(
+    message: str = "Waiting",
+    schedule: tuple[tuple[int | float, int | None], ...] = (  # seconds, frequency
+        (1, 3),
+        (5, 3),
+        (60, 5),
+        (300, 5),
+        (1800, 5),
+        (3600, None),
+    ),
+):
+    """Periodically logs a message according to a schedule with increasing delays.
+
+    Args:
+        message: The message the user wants to output through logging.
+        schedule: A tuple list of tuples consisting of (int|float, int|None).
+            A sequence of (delay_seconds, count) pairs defining the logging intervals.
+            - delay_seconds is the number of seconds to wait between logs.
+            - count is how many times to log at this interval. If count is None, it logs indefinitely at that delay.
+    """
+
+    async def _log_loop():
+        for delay, count in schedule:
+            n = 0
+            while count is None or n < count:
+                LOGGER.info(message)
+                await sleep(delay)
+                n += 1
+
+    task = create_task(_log_loop())
+    try:
+        yield
+    finally:
+        task.cancel()
+        try:
+            await task
+        except CancelledError:
+            pass

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/src/dodal/devices/attenuator/attenuator.py

@@ -39,10 +39,12 @@ class BinaryFilterAttenuator(ReadOnlyAttenuator, Movable[float]):
     Where desired_transmission is fraction e.g. 0-1. When the actual_transmission is
     read from the device it is also fractional"""
 
-    def __init__(self, prefix: str, name: str = ""):
+    def __init__(self, prefix: str, num_filters: int, name: str = ""):
         self._calculated_filter_states: DeviceVector[SignalR[int]] = DeviceVector(
             {
-                int(digit, 16): epics_signal_r(int, f"{prefix}DEC_TO_BIN.B{digit}")
+                int(digit, num_filters): epics_signal_r(
+                    int, f"{prefix}DEC_TO_BIN.B{digit}"
+                )
                 for digit in string.hexdigits
                 if not digit.islower()
             }
@@ -50,7 +52,7 @@ class BinaryFilterAttenuator(ReadOnlyAttenuator, Movable[float]):
         self._filters_in_position: DeviceVector[SignalR[bool]] = DeviceVector(
             {
                 i - 1: epics_signal_r(bool, f"{prefix}FILTER{i}:INLIM")
-                for i in range(1, 17)
+                for i in range(1, num_filters + 1)
             }
         )
 

dls_dodal-1.52.0/src/dodal/devices/b07/__init__.py

@@ -0,0 +1,3 @@
+from dodal.devices.b07.enums import Grating, LensMode
+
+__all__ = ["Grating", "LensMode"]

dls_dodal-1.52.0/src/dodal/devices/b07/enums.py

@@ -0,0 +1,24 @@
+from ophyd_async.core import StrictEnum, SupersetEnum
+
+
+class Grating(StrictEnum):
+    NI_400 = "400 l/mm Ni"
+    NI_1000 = "1000 l/mm Ni"
+    PT_600 = "BAD 600 l/mm Pt"
+    AU_600 = "600 l/mm Au"
+    NO_GRATING = "No Grating"
+
+
+class LensMode(SupersetEnum):
+    LARGE_AREA = "LargeArea"
+    HIGH_MAGNIFICATION = "HighMagnification"
+    MEDIUM_MAGNIFICATION = "MediumMagnification"
+    LOW_MAGNIFICATION = "LowMagnification"
+    MEDIUM_ANGULAR_DISPERSION = "MediumAngularDispersion"
+    LOW_ANGULAR_DISPERSION = "LowAngularDispersion"
+    HIGH_ANGULAR_DISPERSION = "HighAngularDispersion"
+    WIDE_ANGLE_MODE = "WideAngleMode"
+    MEDIUM_AREA = "MediumArea"
+    SMALL_AREA = "SmallArea"
+    HIGH_MAGNIFICATION2 = "HighMagnification2"
+    NOT_CONNECTED = "Not connected"

dls_dodal-1.52.0/src/dodal/devices/b07_1/__init__.py

@@ -0,0 +1,3 @@
+from dodal.devices.b07_1.enums import Grating, LensMode
+
+__all__ = ["Grating", "LensMode"]

dls_dodal-1.52.0/src/dodal/devices/b07_1/enums.py

@@ -0,0 +1,18 @@
+from ophyd_async.core import StrictEnum, SupersetEnum
+
+
+class Grating(StrictEnum):
+    AU_400 = "400 l/mm Au"
+    AU_600 = "600 l/mm Au"
+    PT_600 = "600 l/mm Pt"
+    AU_1200 = "1200 l/mm Au"
+    ML_1200 = "1200 l/mm ML"
+    NO_GRATING = "No Grating"
+
+
+class LensMode(SupersetEnum):
+    SMALL_AREA = "SmallArea"
+    ANGLE_RESOLVED_MODE_22 = "AngleResolvedMode22"
+    ANGLE_RESOLVED_MODE_30 = "AngleResolvedMode30"
+    LARGE_AREA = "LargeArea"
+    NOT_CONNECTED = "Not connected"

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/src/dodal/devices/electron_analyser/abstract/__init__.py

@@ -8,6 +8,8 @@ from .base_region import (
     AbstractBaseSequence,
     TAbstractBaseRegion,
     TAbstractBaseSequence,
+    TAcquisitionMode,
+    TLensMode,
 )
 
 __all__ = [
@@ -15,6 +17,8 @@ __all__ = [
     "AbstractBaseSequence",
     "TAbstractBaseRegion",
     "TAbstractBaseSequence",
+    "TAcquisitionMode",
+    "TLensMode",
     "AbstractAnalyserDriverIO",
     "AbstractElectronAnalyserDetector",
     "AbstractAnalyserDriverIO",

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/src/dodal/devices/electron_analyser/abstract/base_driver_io.py

@@ -11,7 +11,6 @@ from ophyd_async.core import (
     SignalR,
     StandardReadable,
     StandardReadableFormat,
-    StrictEnum,
     derived_signal_r,
     soft_signal_rw,
 )
@@ -20,6 +19,8 @@ from ophyd_async.epics.core import epics_signal_r, epics_signal_rw
 
 from dodal.devices.electron_analyser.abstract.base_region import (
     TAbstractBaseRegion,
+    TAcquisitionMode,
+    TLensMode,
 )
 from dodal.devices.electron_analyser.enums import EnergyMode
 from dodal.devices.electron_analyser.util import to_binding_energy, to_kinetic_energy
@@ -30,7 +31,7 @@ class AbstractAnalyserDriverIO(
     StandardReadable,
     ADBaseIO,
     Movable[TAbstractBaseRegion],
-    Generic[TAbstractBaseRegion],
+    Generic[TAbstractBaseRegion, TAcquisitionMode, TLensMode],
 ):
     """
     Generic device to configure electron analyser with new region settings.
@@ -40,11 +41,27 @@ class AbstractAnalyserDriverIO(
     def __init__(
         self,
         prefix: str,
-        acquisition_mode_type: type[StrictEnum],
+        acquisition_mode_type: type[TAcquisitionMode],
+        lens_mode_type: type[TLensMode],
         energy_sources: Mapping[str, SignalR[float]],
         name: str = "",
     ) -> None:
+        """
+        Constructor method for setting up electron analyser.
+
+        Args:
+            prefix: Base PV to connect to EPICS for this device.
+            acquisition_mode_type: Enum that determines the available acquisition modes
+                                   for this device.
+            lens_mode_type: Enum that determines the available lens mode for this
+                            device.
+            energy_sources: Map that pairs a source name to an energy value signal
+                            (in eV).
+            name: Name of the device.
+        """
         self.energy_sources = energy_sources
+        self.acquisition_mode_type = acquisition_mode_type
+        self.lens_mode_type = lens_mode_type
 
         with self.add_children_as_readables():
             self.image = epics_signal_r(Array1D[np.float64], prefix + "IMAGE")
@@ -63,7 +80,7 @@ class AbstractAnalyserDriverIO(
             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.lens_mode = epics_signal_rw(lens_mode_type, prefix + "LENS_MODE")
             self.pass_energy = epics_signal_rw(
                 self.pass_energy_type, prefix + "PASS_ENERGY"
             )

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/src/dodal/devices/electron_analyser/abstract/base_region.py

@@ -3,13 +3,11 @@ from abc import ABC
 from collections.abc import Callable
 from typing import Generic, TypeVar
 
-from ophyd_async.core import StrictEnum
+from ophyd_async.core import StrictEnum, SupersetEnum
 from pydantic import BaseModel, Field, model_validator
 
 from dodal.devices.electron_analyser.enums import EnergyMode
 
-TStrictEnum = TypeVar("TStrictEnum", bound=StrictEnum)
-
 
 def java_to_python_case(java_str: str) -> str:
     """
@@ -46,7 +44,18 @@ def energy_mode_validation(data: dict) -> dict:
     return data
 
 
-class AbstractBaseRegion(ABC, JavaToPythonModel, Generic[TStrictEnum]):
+TAcquisitionMode = TypeVar("TAcquisitionMode", bound=StrictEnum)
+# Allow SupersetEnum. Specs analysers can connect to Lens mode separately to the
+# analyser which leaves the enum to either be "Not connected" OR the available enums
+# when connected.
+TLensMode = TypeVar("TLensMode", bound=SupersetEnum | StrictEnum)
+
+
+class AbstractBaseRegion(
+    ABC,
+    JavaToPythonModel,
+    Generic[TAcquisitionMode, TLensMode],
+):
     """
     Generic region model that holds the data. Specialised region models should inherit
     this to extend functionality. All energy units are assumed to be in eV.
@@ -58,9 +67,9 @@ class AbstractBaseRegion(ABC, JavaToPythonModel, Generic[TStrictEnum]):
     iterations: int = 1
     excitation_energy_source: str = "source1"
     # These ones we need subclasses to provide default values
-    lens_mode: str
+    lens_mode: TLensMode
     pass_energy: int
-    acquisition_mode: TStrictEnum
+    acquisition_mode: TAcquisitionMode
     low_energy: float
     high_energy: float
     step_time: float
@@ -83,7 +92,11 @@ class AbstractBaseRegion(ABC, JavaToPythonModel, Generic[TStrictEnum]):
 TAbstractBaseRegion = TypeVar("TAbstractBaseRegion", bound=AbstractBaseRegion)
 
 
-class AbstractBaseSequence(ABC, JavaToPythonModel, Generic[TAbstractBaseRegion]):
+class AbstractBaseSequence(
+    ABC,
+    JavaToPythonModel,
+    Generic[TAbstractBaseRegion, TLensMode],
+):
     """
     Generic sequence model that holds the list of region data. Specialised sequence
     models should inherit this to extend functionality and define type of region to

{dls_dodal-1.51.0 → dls_dodal-1.52.0}/src/dodal/devices/electron_analyser/detector.py

@@ -48,7 +48,7 @@ class ElectronAnalyserRegionDetector(
     async def trigger(self) -> None:
         # Configure region parameters on the driver first before data collection.
         await self.driver.set(self.region)
-        super().trigger()
+        await super().trigger()
 
 
 TElectronAnalyserRegionDetector = TypeVar(