dls-dodal 1.67.0__tar.gz → 1.68.0__tar.gz

{dls_dodal-1.67.0 → dls_dodal-1.68.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.67.0
+Version: 1.68.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>, Joseph Ware <joseph.ware@diamond.ac.uk>, Oliver Silvester <Oliver.Silvester@diamond.ac.uk>, Noemi Frisina <noemi.frisina@diamond.ac.uk>
 License:                                  Apache License
@@ -231,7 +231,7 @@ Requires-Dist: redis
 Requires-Dist: scanspec>=0.7.3
 Requires-Dist: pyzmq==26.3.0
 Requires-Dist: deepdiff
-Requires-Dist: daq-config-server>=v1.0.0-rc.2
+Requires-Dist: daq-config-server>=v1.0.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"

{dls_dodal-1.67.0 → dls_dodal-1.68.0}/pyproject.toml

@@ -30,7 +30,7 @@ dependencies = [
     "scanspec>=0.7.3",
     "pyzmq==26.3.0",                  # Until we can move to RHEL 8 https://github.com/DiamondLightSource/mx-bluesky/issues/1139
     "deepdiff",
-    "daq-config-server>=v1.0.0-rc.2", # For getting Configuration settings.
+    "daq-config-server>=v1.0.0", # For getting Configuration settings.
 ]
 
 dynamic = ["version"]

{dls_dodal-1.67.0 → dls_dodal-1.68.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.67.0
+Version: 1.68.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>, Joseph Ware <joseph.ware@diamond.ac.uk>, Oliver Silvester <Oliver.Silvester@diamond.ac.uk>, Noemi Frisina <noemi.frisina@diamond.ac.uk>
 License:                                  Apache License
@@ -231,7 +231,7 @@ Requires-Dist: redis
 Requires-Dist: scanspec>=0.7.3
 Requires-Dist: pyzmq==26.3.0
 Requires-Dist: deepdiff
-Requires-Dist: daq-config-server>=v1.0.0-rc.2
+Requires-Dist: daq-config-server>=v1.0.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"

{dls_dodal-1.67.0 → dls_dodal-1.68.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -5,7 +5,6 @@ Dockerfile
 LICENSE
 README.md
 catalog-info.yaml
-conftest.py
 pull_request_template.md
 pyproject.toml
 .devcontainer/devcontainer.json
@@ -122,6 +121,7 @@ src/dodal/beamlines/i11.py
 src/dodal/beamlines/i13_1.py
 src/dodal/beamlines/i15.py
 src/dodal/beamlines/i15_1.py
+src/dodal/beamlines/i16.py
 src/dodal/beamlines/i17.py
 src/dodal/beamlines/i18.py
 src/dodal/beamlines/i19_1.py
@@ -231,26 +231,24 @@ 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/detector.py
-src/dodal/devices/electron_analyser/energy_sources.py
-src/dodal/devices/electron_analyser/enums.py
-src/dodal/devices/electron_analyser/types.py
-src/dodal/devices/electron_analyser/util.py
-src/dodal/devices/electron_analyser/abstract/__init__.py
-src/dodal/devices/electron_analyser/abstract/base_detector.py
-src/dodal/devices/electron_analyser/abstract/base_driver_io.py
-src/dodal/devices/electron_analyser/abstract/base_region.py
-src/dodal/devices/electron_analyser/abstract/types.py
+src/dodal/devices/electron_analyser/base/__init__.py
+src/dodal/devices/electron_analyser/base/base_controller.py
+src/dodal/devices/electron_analyser/base/base_detector.py
+src/dodal/devices/electron_analyser/base/base_driver_io.py
+src/dodal/devices/electron_analyser/base/base_enums.py
+src/dodal/devices/electron_analyser/base/base_region.py
+src/dodal/devices/electron_analyser/base/base_util.py
+src/dodal/devices/electron_analyser/base/energy_sources.py
 src/dodal/devices/electron_analyser/specs/__init__.py
-src/dodal/devices/electron_analyser/specs/detector.py
-src/dodal/devices/electron_analyser/specs/driver_io.py
-src/dodal/devices/electron_analyser/specs/enums.py
-src/dodal/devices/electron_analyser/specs/region.py
+src/dodal/devices/electron_analyser/specs/specs_detector.py
+src/dodal/devices/electron_analyser/specs/specs_driver_io.py
+src/dodal/devices/electron_analyser/specs/specs_enums.py
+src/dodal/devices/electron_analyser/specs/specs_region.py
 src/dodal/devices/electron_analyser/vgscienta/__init__.py
-src/dodal/devices/electron_analyser/vgscienta/detector.py
-src/dodal/devices/electron_analyser/vgscienta/driver_io.py
-src/dodal/devices/electron_analyser/vgscienta/enums.py
-src/dodal/devices/electron_analyser/vgscienta/region.py
+src/dodal/devices/electron_analyser/vgscienta/vgscienta_detector.py
+src/dodal/devices/electron_analyser/vgscienta/vgscienta_driver_io.py
+src/dodal/devices/electron_analyser/vgscienta/vgscienta_enums.py
+src/dodal/devices/electron_analyser/vgscienta/vgscienta_region.py
 src/dodal/devices/i02_1/__init__.py
 src/dodal/devices/i02_1/fast_grid_scan.py
 src/dodal/devices/i02_1/sample_motors.py
@@ -343,6 +341,7 @@ src/dodal/devices/i24/vgonio.py
 src/dodal/devices/insertion_device/__init__.py
 src/dodal/devices/insertion_device/apple2_undulator.py
 src/dodal/devices/insertion_device/energy_motor_lookup.py
+src/dodal/devices/insertion_device/id_enum.py
 src/dodal/devices/insertion_device/lookup_table_models.py
 src/dodal/devices/mx_phase1/__init__.py
 src/dodal/devices/mx_phase1/beamstop.py
@@ -410,6 +409,7 @@ src/dodal/testing/fixtures/utils.py
 src/dodal/testing/fixtures/devices/__init__.py
 src/dodal/testing/fixtures/devices/apple2.py
 system_tests/__init__.py
+system_tests/conftest.py
 system_tests/test_adsim.py
 system_tests/test_cli.py
 system_tests/test_oav_system.py
@@ -501,27 +501,27 @@ tests/devices/detector/test_data/__init__.py
 tests/devices/detector/test_data/test_det_dist_converter.txt
 tests/devices/electron_analyser/__init__.py
 tests/devices/electron_analyser/conftest.py
-tests/devices/electron_analyser/test_detector.py
-tests/devices/electron_analyser/test_energy_sources.py
-tests/devices/electron_analyser/test_util.py
-tests/devices/electron_analyser/abstract/__init__.py
-tests/devices/electron_analyser/abstract/test_base_detector.py
-tests/devices/electron_analyser/abstract/test_base_driver_io.py
-tests/devices/electron_analyser/abstract/test_base_region.py
+tests/devices/electron_analyser/base/__init__.py
+tests/devices/electron_analyser/base/test_base_controller.py
+tests/devices/electron_analyser/base/test_base_detector.py
+tests/devices/electron_analyser/base/test_base_driver_io.py
+tests/devices/electron_analyser/base/test_base_region.py
+tests/devices/electron_analyser/base/test_base_util.py
+tests/devices/electron_analyser/base/test_energy_sources.py
 tests/devices/electron_analyser/helper_util/__init__.py
 tests/devices/electron_analyser/helper_util/assert_func.py
 tests/devices/electron_analyser/helper_util/sequence.py
 tests/devices/electron_analyser/specs/__init__.py
-tests/devices/electron_analyser/specs/test_detector.py
-tests/devices/electron_analyser/specs/test_driver_io.py
-tests/devices/electron_analyser/specs/test_region.py
+tests/devices/electron_analyser/specs/test_specs_detector.py
+tests/devices/electron_analyser/specs/test_specs_driver_io.py
+tests/devices/electron_analyser/specs/test_specs_region.py
 tests/devices/electron_analyser/test_data/__init__.py
 tests/devices/electron_analyser/test_data/specs_sequence.seq
 tests/devices/electron_analyser/test_data/vgscienta_sequence.seq
 tests/devices/electron_analyser/vgscienta/__init__.py
-tests/devices/electron_analyser/vgscienta/test_detector.py
-tests/devices/electron_analyser/vgscienta/test_driver_io.py
-tests/devices/electron_analyser/vgscienta/test_region.py
+tests/devices/electron_analyser/vgscienta/test_vgscienta_detector.py
+tests/devices/electron_analyser/vgscienta/test_vgscienta_driver_io.py
+tests/devices/electron_analyser/vgscienta/test_vgsicenta_region.py
 tests/devices/i02_1/__init__.py
 tests/devices/i02_1/test_fast_grid_scan.py
 tests/devices/i03/__init__.py

{dls_dodal-1.67.0 → dls_dodal-1.68.0}/src/dls_dodal.egg-info/requires.txt

@@ -16,7 +16,7 @@ redis
 scanspec>=0.7.3
 pyzmq==26.3.0
 deepdiff
-daq-config-server>=v1.0.0-rc.2
+daq-config-server>=v1.0.0
 
 [dev]
 black

{dls_dodal-1.67.0 → dls_dodal-1.68.0}/src/dodal/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.67.0'
-__version_tuple__ = version_tuple = (1, 67, 0)
+__version__ = version = '1.68.0'
+__version_tuple__ = version_tuple = (1, 68, 0)
 
-__commit_id__ = commit_id = 'gdfd2eada3'
+__commit_id__ = commit_id = 'gf919ae5e3'

{dls_dodal-1.67.0 → dls_dodal-1.68.0}/src/dodal/beamlines/b07.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.b07 import Grating, LensMode, PsuMode
-from dodal.devices.electron_analyser import EnergySource
+from dodal.devices.electron_analyser.base import EnergySource
 from dodal.devices.electron_analyser.specs import SpecsDetector
 from dodal.devices.pgm import PlaneGratingMonochromator
 from dodal.devices.synchrotron import Synchrotron

{dls_dodal-1.67.0 → dls_dodal-1.68.0}/src/dodal/beamlines/b07_1.py

@@ -6,7 +6,7 @@ from dodal.devices.b07_1 import (
     Grating,
     LensMode,
 )
-from dodal.devices.electron_analyser import EnergySource
+from dodal.devices.electron_analyser.base import EnergySource
 from dodal.devices.electron_analyser.specs import SpecsDetector
 from dodal.devices.pgm import PlaneGratingMonochromator
 from dodal.devices.synchrotron import Synchrotron

{dls_dodal-1.67.0 → dls_dodal-1.68.0}/src/dodal/beamlines/i05.py

@@ -3,7 +3,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.insertion_device.apple2_undulator import (
+from dodal.devices.insertion_device import (
     Apple2,
     UndulatorGap,
     UndulatorLockedPhaseAxes,

{dls_dodal-1.67.0 → dls_dodal-1.68.0}/src/dodal/beamlines/i06.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.insertion_device.apple2_undulator import (
+from dodal.devices.insertion_device import (
     Apple2,
     UndulatorGap,
     UndulatorLockedPhaseAxes,

{dls_dodal-1.67.0 → dls_dodal-1.68.0}/src/dodal/beamlines/i09.py

@@ -7,7 +7,7 @@ from dodal.devices.common_dcm import (
     PitchAndRollCrystal,
     StationaryCrystal,
 )
-from dodal.devices.electron_analyser import DualEnergySource
+from dodal.devices.electron_analyser.base import DualEnergySource
 from dodal.devices.electron_analyser.vgscienta import VGScientaDetector
 from dodal.devices.i09 import Grating, LensMode, PassEnergy, PsuMode
 from dodal.devices.pgm import PlaneGratingMonochromator

{dls_dodal-1.67.0 → dls_dodal-1.68.0}/src/dodal/beamlines/i09_1.py

@@ -7,7 +7,7 @@ from dodal.devices.common_dcm import (
     PitchAndRollCrystal,
     StationaryCrystal,
 )
-from dodal.devices.electron_analyser import EnergySource
+from dodal.devices.electron_analyser.base import EnergySource
 from dodal.devices.electron_analyser.specs import SpecsDetector
 from dodal.devices.i09_1 import LensMode, PsuMode
 from dodal.devices.i09_1_shared.hard_energy import HardEnergy, HardInsertionDeviceEnergy

{dls_dodal-1.67.0 → dls_dodal-1.68.0}/src/dodal/beamlines/i09_2.py

@@ -10,10 +10,10 @@ from dodal.devices.i09.enums import Grating
 from dodal.devices.i09_2_shared.i09_apple2 import (
     J09_GAP_POLY_DEG_COLUMNS,
     J09_PHASE_POLY_DEG_COLUMNS,
-    J09Apple2Controller,
 )
-from dodal.devices.insertion_device.apple2_undulator import (
+from dodal.devices.insertion_device import (
     Apple2,
+    Apple2EnforceLHMoveController,
     BeamEnergy,
     InsertionDeviceEnergy,
     InsertionDevicePolarisation,
@@ -79,9 +79,9 @@ def jid() -> Apple2:
 
 
 @device_factory()
-def jid_controller() -> J09Apple2Controller:
+def jid_controller() -> Apple2EnforceLHMoveController:
     """J09 insertion device controller."""
-    return J09Apple2Controller(
+    return Apple2EnforceLHMoveController(
         apple2=jid(),
         gap_energy_motor_lut=ConfigServerEnergyMotorLookup(
             lut_config=LookupTableColumnConfig(poly_deg=J09_GAP_POLY_DEG_COLUMNS),
@@ -93,6 +93,7 @@ def jid_controller() -> J09Apple2Controller:
             config_client=J09_CONF_CLIENT,
             path=Path(LOOK_UPTABLE_DIR, PHASE_LOOKUP_FILE_NAME),
         ),
+        units="keV",
     )
 
 

{dls_dodal-1.67.0 → dls_dodal-1.68.0}/src/dodal/beamlines/i10_optics.py

@@ -26,7 +26,7 @@ from dodal.devices.i10.i10_apple2 import (
 
 # Imports taken from i10 while we work out how to deal with split end stations
 from dodal.devices.i10.i10_setting_data import I10Grating
-from dodal.devices.insertion_device.apple2_undulator import (
+from dodal.devices.insertion_device import (
     BeamEnergy,
     InsertionDeviceEnergy,
     InsertionDevicePolarisation,

dls_dodal-1.68.0/src/dodal/beamlines/i16.py

@@ -0,0 +1,23 @@
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.device_manager import DeviceManager
+from dodal.devices.undulator import UndulatorInMm, UndulatorOrder
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("i16")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+PREFIX = BeamlinePrefix(BL)
+
+
+devices = DeviceManager()
+
+
+@devices.factory()
+def id() -> UndulatorInMm:
+    return UndulatorInMm(prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:")
+
+
+@devices.factory()
+def harmonic() -> UndulatorOrder:
+    return UndulatorOrder()

{dls_dodal-1.67.0 → dls_dodal-1.68.0}/src/dodal/beamlines/i17.py

@@ -8,7 +8,7 @@ from dodal.common.beamlines.beamline_utils import (
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.devices.i17.i17_apple2 import I17Apple2Controller
-from dodal.devices.insertion_device.apple2_undulator import (
+from dodal.devices.insertion_device import (
     Apple2,
     Apple2Controller,
     BeamEnergy,

dls_dodal-1.68.0/src/dodal/beamlines/i21.py

@@ -0,0 +1,116 @@
+from pathlib import Path
+
+from daq_config_server.client import ConfigServer
+
+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.i21 import (
+    Grating,
+)
+from dodal.devices.insertion_device import (
+    Apple2,
+    Apple2EnforceLHMoveController,
+    BeamEnergy,
+    InsertionDeviceEnergy,
+    InsertionDevicePolarisation,
+    UndulatorGap,
+    UndulatorPhaseAxes,
+)
+from dodal.devices.insertion_device.energy_motor_lookup import (
+    ConfigServerEnergyMotorLookup,
+)
+from dodal.devices.insertion_device.lookup_table_models import LookupTableColumnConfig
+from dodal.devices.pgm import PlaneGratingMonochromator
+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("i21")
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+I21_PHASE_POLY_DEG_COLUMNS = ["b"]
+I21_GRATING_COLUMNS = "Grating"
+
+I21_CONF_CLIENT = ConfigServer(url="https://daq-config.diamond.ac.uk")
+LOOK_UPTABLE_DIR = "/dls_sw/i21/software/gda/workspace_git/gda-diamond.git/configurations/i21-config/lookupTables/"
+GAP_LOOKUP_FILE_NAME = "IDEnergy2GapCalibrations.csv"
+PHASE_LOOKUP_FILE_NAME = "IDEnergy2PhaseCalibrations.csv"
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def pgm() -> PlaneGratingMonochromator:
+    return PlaneGratingMonochromator(
+        prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:",
+        grating=Grating,
+    )
+
+
+@device_factory()
+def id_gap() -> UndulatorGap:
+    return UndulatorGap(prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:")
+
+
+@device_factory()
+def id_phase() -> UndulatorPhaseAxes:
+    return UndulatorPhaseAxes(
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
+        top_outer="PUO",
+        top_inner="PUI",
+        btm_inner="PLI",
+        btm_outer="PLO",
+    )
+
+
+@device_factory()
+def id() -> Apple2:
+    """I21 insertion device."""
+    return Apple2(
+        id_gap=id_gap(),
+        id_phase=id_phase(),
+    )
+
+
+@device_factory()
+def id_controller() -> Apple2EnforceLHMoveController:
+    """i21 insertion device controller."""
+    return Apple2EnforceLHMoveController(
+        apple2=id(),
+        gap_energy_motor_lut=ConfigServerEnergyMotorLookup(
+            lut_config=LookupTableColumnConfig(grating=I21_GRATING_COLUMNS),
+            config_client=I21_CONF_CLIENT,
+            path=Path(LOOK_UPTABLE_DIR, GAP_LOOKUP_FILE_NAME),
+        ),
+        phase_energy_motor_lut=ConfigServerEnergyMotorLookup(
+            lut_config=LookupTableColumnConfig(
+                grating=I21_GRATING_COLUMNS, poly_deg=I21_PHASE_POLY_DEG_COLUMNS
+            ),
+            config_client=I21_CONF_CLIENT,
+            path=Path(LOOK_UPTABLE_DIR, GAP_LOOKUP_FILE_NAME),
+        ),
+        units="eV",
+    )
+
+
+@device_factory()
+def id_energy() -> InsertionDeviceEnergy:
+    return InsertionDeviceEnergy(id_controller=id_controller())
+
+
+@device_factory()
+def id_polarisation() -> InsertionDevicePolarisation:
+    return InsertionDevicePolarisation(id_controller=id_controller())
+
+
+@device_factory()
+def energy_jid() -> BeamEnergy:
+    """Beam energy."""
+    return BeamEnergy(id_energy=id_energy(), mono=pgm().energy)

{dls_dodal-1.67.0 → dls_dodal-1.68.0}/src/dodal/beamlines/p60.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.electron_analyser import DualEnergySource
+from dodal.devices.electron_analyser.base import DualEnergySource
 from dodal.devices.electron_analyser.vgscienta import VGScientaDetector
 from dodal.devices.p60 import (
     LabXraySource,

{dls_dodal-1.67.0 → dls_dodal-1.68.0}/src/dodal/devices/eiger.py

@@ -1,11 +1,10 @@
-# type: ignore # Eiger will soon be ophyd-async https://github.com/DiamondLightSource/dodal/issues/700
 from dataclasses import dataclass
 from enum import Enum
 
 from bluesky.protocols import Stageable
 from ophyd import Component, Device, EpicsSignalRO, Signal
 from ophyd.areadetector.cam import EigerDetectorCam
-from ophyd.status import AndStatus, Status, StatusBase
+from ophyd.status import AndStatus, Status, StatusBase, SubscriptionStatus
 
 from dodal.devices.detector import DetectorParams, TriggerMode
 from dodal.devices.eiger_odin import EigerOdin
@@ -123,7 +122,7 @@ class EigerDetector(Device, Stageable):
             LOGGER.info("Waiting for arming to finish")
             self.arming_status.wait(self.timeouts.arming_timeout)
 
-    def stage(self):
+    def stage(self):  # pyright: ignore[reportIncompatibleMethodOverride]
         self.wait_on_arming_if_started()
         if not self.is_armed():
             LOGGER.info("Eiger not armed, arming")
@@ -132,6 +131,7 @@ class EigerDetector(Device, Stageable):
 
     def stop_odin_when_all_frames_collected(self):
         LOGGER.info("Waiting on all frames")
+        assert self.detector_params
         try:
             await_value(
                 self.odin.file_writer.num_captured,
@@ -141,7 +141,7 @@ class EigerDetector(Device, Stageable):
             LOGGER.info("Stopping Odin")
             self.odin.stop().wait(self.timeouts.odin_stop_timeout)
 
-    def unstage(self) -> bool:
+    def unstage(self) -> bool:  # pyright: ignore[reportIncompatibleMethodOverride]
         assert self.detector_params is not None
         try:
             self.disarming_status = Status()
@@ -166,7 +166,7 @@ class EigerDetector(Device, Stageable):
         self.disarming_status.set_finished()
         return status_ok
 
-    def stop(self, *args):
+    def stop(self, *args):  # pyright: ignore[reportIncompatibleMethodOverride]
         """Emergency stop the device, mainly used to clean up after error."""
         LOGGER.info("Eiger stop() called - cleaning up...")
         if self.disarming_status and not self.disarming_status.done:
@@ -241,7 +241,8 @@ class EigerDetector(Device, Stageable):
             1, timeout=self.timeouts.general_status_timeout
         )
         status &= self.cam.image_mode.set(
-            self.cam.ImageMode.MULTIPLE, timeout=self.timeouts.general_status_timeout
+            self.cam.ImageMode.MULTIPLE,  # pyright: ignore[reportAttributeAccessIssue]
+            timeout=self.timeouts.general_status_timeout,
         )
         status &= self.cam.trigger_mode.set(
             InternalEigerTriggerMode.EXTERNAL_SERIES.value,
@@ -315,7 +316,7 @@ class EigerDetector(Device, Stageable):
                 this tolerance it is not set again. Defaults to 0.1eV.
         """
 
-        current_energy = self.cam.photon_energy.get()
+        current_energy = float(self.cam.photon_energy.get())
         if abs(current_energy - energy) > tolerance:
             LOGGER.info(f"Setting detector threshold to {energy}")
             return self.cam.photon_energy.set(
@@ -398,7 +399,7 @@ class EigerDetector(Device, Stageable):
     def disarm_detector(self):
         self.cam.acquire.set(0).wait(self.timeouts.general_status_timeout)
 
-    def wait_for_stale_params(self) -> Status:
+    def wait_for_stale_params(self) -> SubscriptionStatus:
         LOGGER.info("Eiger arming: Waiting for stale params...")
         return await_value(self.stale_params, 0, 60)
 
@@ -412,6 +413,11 @@ class EigerDetector(Device, Stageable):
         detector_params: DetectorParams = self.detector_params
         if detector_params.use_roi_mode:
             functions_to_do_arm.append(self.enable_roi_mode)
+        threshold_energy = (
+            detector_params.expected_energy_ev
+            if detector_params.expected_energy_ev
+            else float(self.cam.photon_energy.get())
+        )
 
         arming_sequence_funcs = [
             # If a beam dump occurs after arming the eiger but prior to eiger staging,
@@ -419,7 +425,7 @@ class EigerDetector(Device, Stageable):
             # if this previously completed successfully we must reset the odin first
             self.odin.stop,
             lambda: self.change_dev_shm(detector_params.enable_dev_shm),
-            lambda: self.set_detector_threshold(detector_params.expected_energy_ev),
+            lambda: self.set_detector_threshold(threshold_energy),
             self.set_cam_pvs,
             self.set_odin_number_of_frame_chunks,
             self.set_odin_pvs,

dls_dodal-1.68.0/src/dodal/devices/electron_analyser/base/__init__.py

@@ -0,0 +1,58 @@
+from .base_controller import (
+    ElectronAnalyserController,
+    GenericElectronAnalyserController,
+)
+from .base_detector import (
+    BaseElectronAnalyserDetector,
+    ElectronAnalyserDetector,
+    ElectronAnalyserRegionDetector,
+    GenericBaseElectronAnalyserDetector,
+    GenericElectronAnalyserDetector,
+    GenericElectronAnalyserRegionDetector,
+)
+from .base_driver_io import (
+    AbstractAnalyserDriverIO,
+    GenericAnalyserDriverIO,
+    TAbstractAnalyserDriverIO,
+)
+from .base_enums import EnergyMode, SelectedSource
+from .base_region import (
+    AbstractBaseRegion,
+    AbstractBaseSequence,
+    GenericRegion,
+    GenericSequence,
+    TAbstractBaseRegion,
+    TAbstractBaseSequence,
+    TAcquisitionMode,
+    TLensMode,
+)
+from .base_util import to_binding_energy, to_kinetic_energy
+from .energy_sources import DualEnergySource, EnergySource
+
+__all__ = [
+    "ElectronAnalyserController",
+    "GenericElectronAnalyserController",
+    "BaseElectronAnalyserDetector",
+    "ElectronAnalyserDetector",
+    "ElectronAnalyserRegionDetector",
+    "GenericBaseElectronAnalyserDetector",
+    "GenericElectronAnalyserDetector",
+    "GenericElectronAnalyserRegionDetector",
+    "AbstractAnalyserDriverIO",
+    "GenericAnalyserDriverIO",
+    "TAbstractAnalyserDriverIO",
+    "EnergyMode",
+    "SelectedSource",
+    "AbstractBaseRegion",
+    "AbstractBaseSequence",
+    "GenericRegion",
+    "GenericSequence",
+    "TAbstractBaseRegion",
+    "TAbstractBaseSequence",
+    "TAcquisitionMode",
+    "TLensMode",
+    "to_binding_energy",
+    "to_kinetic_energy",
+    "DualEnergySource",
+    "EnergySource",
+]