AreaDetector for electron analysers

src/dodal/beamlines/b07.py

@@ -1,3 +1,5 @@
+from ophyd_async.epics.adcore import ADAcquireLogic
+
 from dodal.beamlines.b07_shared import devices as b07_shared_devices
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.device_manager import DeviceManager
@@ -7,7 +9,11 @@
     LensMode,
 )
 from dodal.devices.beamlines.b07_shared import PsuMode
-from dodal.devices.electron_analyser.specs import SpecsDetector
+from dodal.devices.electron_analyser.base import (
+    ElectronAnalayserTriggerLogic,
+    RegionLogic,
+)
+from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO, SpecsDetector
 from dodal.devices.hutch_shutter import (
     EXP_SHUTTER_2_INFIX,
     HutchShutter,
@@ -47,15 +53,16 @@ def pgm() -> PlaneGratingMonochromator:
     )
 
 
-# CAM:IMAGE will fail to connect outside the beamline network,
-# see https://github.com/DiamondLightSource/dodal/issues/1852
 @devices.factory()
 def analyser(pgm: PlaneGratingMonochromator) -> SpecsDetector[LensMode, PsuMode]:
+    prefix = f"{B_PREFIX.beamline_prefix}-EA-DET-02:CAM:"
+    driver = SpecsAnalyserDriverIO(prefix, LensMode, PsuMode)
     return SpecsDetector[LensMode, PsuMode](
-        prefix=f"{B_PREFIX.beamline_prefix}-EA-DET-01:CAM:",
-        lens_mode_type=LensMode,
-        psu_mode_type=PsuMode,
-        energy_source=pgm.energy.user_readback,
+        prefix,
+        driver,
+        acquire_logic=ADAcquireLogic(driver),
+        trigger_logic=ElectronAnalayserTriggerLogic(driver),
+        region_logic=RegionLogic(driver, pgm.energy.user_readback),
     )
 
 

src/dodal/beamlines/b07_1.py

@@ -1,13 +1,16 @@
+from ophyd_async.epics.adcore import ADAcquireLogic
+
 from dodal.beamlines.b07_shared import devices as b07_shared_devices
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.device_manager import DeviceManager
-from dodal.devices.beamlines.b07_1 import (
-    ChannelCutMonochromator,
-    Grating,
-    LensMode,
-)
+from dodal.devices.beamlines.b07 import Grating, LensMode
+from dodal.devices.beamlines.b07_1 import ChannelCutMonochromator, Grating, LensMode
 from dodal.devices.beamlines.b07_shared import PsuMode
-from dodal.devices.electron_analyser.specs import SpecsDetector
+from dodal.devices.electron_analyser.base import (
+    ElectronAnalayserTriggerLogic,
+    RegionLogic,
+)
+from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO, SpecsDetector
 from dodal.devices.hutch_shutter import HutchShutter
 from dodal.devices.motors import XYZAzimuthPolarStage
 from dodal.devices.pgm import PlaneGratingMonochromator
@@ -41,15 +44,16 @@ def ccmc() -> ChannelCutMonochromator:
     return ChannelCutMonochromator(prefix=f"{C_PREFIX.beamline_prefix}-OP-CCM-01:")
 
 
-# CAM:IMAGE will fail to connect outside the beamline network,
-# see https://github.com/DiamondLightSource/dodal/issues/1852
 @devices.factory()
 def analyser(pgm: PlaneGratingMonochromator) -> SpecsDetector[LensMode, PsuMode]:
+    prefix = f"{C_PREFIX.beamline_prefix}-EA-DET-01:CAM:"
+    driver = SpecsAnalyserDriverIO(prefix, LensMode, PsuMode)
     return SpecsDetector[LensMode, PsuMode](
-        prefix=f"{C_PREFIX.beamline_prefix}-EA-DET-01:CAM:",
-        lens_mode_type=LensMode,
-        psu_mode_type=PsuMode,
-        energy_source=pgm.energy.user_readback,
+        prefix,
+        driver,
+        acquire_logic=ADAcquireLogic(driver),
+        trigger_logic=ElectronAnalayserTriggerLogic(driver),
+        region_logic=RegionLogic(driver, pgm.energy.user_readback),
     )
 
 

src/dodal/beamlines/i05.py

@@ -1,11 +1,18 @@
+from ophyd_async.epics.adcore import ADAcquireLogic
+
 from dodal.beamlines.i05_shared import devices as i05_shared_devices
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.device_manager import DeviceManager
 from dodal.devices.beamlines.i05 import I05Goniometer
 from dodal.devices.beamlines.i05_shared import LensMode, M4M5Mirror, PassEnergy
 from dodal.devices.common_mirror import XYZSwitchingMirror
+from dodal.devices.electron_analyser.base import (
+    ElectronAnalayserTriggerLogic,
+    RegionLogic,
+)
 from dodal.devices.electron_analyser.mbs import (
     EntranceSlitInformationDevice,
+    MbsAnalyserDriverIO,
     MbsDetector,
 )
 from dodal.devices.hutch_shutter import HutchShutter
@@ -62,11 +69,14 @@ def analyser_slits() -> EntranceSlitInformationDevice:
 def analyser(
     pgm: PlaneGratingMonochromator, analyser_slits: EntranceSlitInformationDevice
 ) -> MbsDetector[LensMode, PassEnergy]:
+    prefix = f"{PREFIX.beamline_prefix}-EA-DET-02:CAM:"
+    driver = MbsAnalyserDriverIO(prefix, LensMode, PassEnergy)
     return MbsDetector[LensMode, PassEnergy](
-        prefix=f"{PREFIX.beamline_prefix}-EA-DET-02:CAM:",
-        lens_mode_type=LensMode,
-        pass_energy_type=PassEnergy,
-        energy_source=pgm.energy.user_readback,
+        prefix,
+        driver,
+        acquire_logic=ADAcquireLogic(driver),
+        trigger_logic=ElectronAnalayserTriggerLogic(driver),
+        region_logic=RegionLogic(driver, pgm.energy.user_readback),
         config_sigs=(
             analyser_slits.direction,
             analyser_slits.size,

src/dodal/beamlines/i05_1.py

@@ -1,11 +1,18 @@
+from ophyd_async.epics.adcore import ADAcquireLogic
+
 from dodal.beamlines.i05_shared import devices as i05_shared_devices
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.device_manager import DeviceManager
 from dodal.devices.beamlines.i05_1 import XYZAzimuthPolarDefocusStage
 from dodal.devices.beamlines.i05_shared import LensMode, Mj7j8Mirror, PassEnergy
 from dodal.devices.common_mirror import XYZPiezoSwitchingMirror
+from dodal.devices.electron_analyser.base import (
+    ElectronAnalayserTriggerLogic,
+    RegionLogic,
+)
 from dodal.devices.electron_analyser.mbs import (
     EntranceSlitInformationDevice,
+    MbsAnalyserDriverIO,
     MbsDetector,
 )
 from dodal.devices.hutch_shutter import HutchShutter
@@ -52,11 +59,14 @@ def analyser_slits() -> EntranceSlitInformationDevice:
 def analyser(
     pgm: PlaneGratingMonochromator, analyser_slits: EntranceSlitInformationDevice
 ) -> MbsDetector[LensMode, PassEnergy]:
+    prefix = f"{PREFIX.beamline_prefix}-EA-DET-04:CAM:"
+    driver = MbsAnalyserDriverIO(prefix, LensMode, PassEnergy)
     return MbsDetector[LensMode, PassEnergy](
-        prefix=f"{PREFIX.beamline_prefix}-EA-DET-04:CAM:",
-        lens_mode_type=LensMode,
-        pass_energy_type=PassEnergy,
-        energy_source=pgm.energy.user_readback,
+        prefix,
+        driver,
+        acquire_logic=ADAcquireLogic(driver),
+        trigger_logic=ElectronAnalayserTriggerLogic(driver),
+        region_logic=RegionLogic(driver, pgm.energy.user_readback),
         config_sigs=(
             analyser_slits.direction,
             analyser_slits.size,

src/dodal/beamlines/i09.py

@@ -1,4 +1,4 @@
-from ophyd_async.core import InOut, SignalRW
+from ophyd_async.core import InOut, SignalRW, soft_signal_rw
 from ophyd_async.epics.core import epics_signal_rw
 
 from dodal.beamlines.i09_1_shared import devices as i09_1_shared_devices
@@ -13,8 +13,16 @@
 )
 from dodal.devices.beamlines.i09.scaler import ScalerController
 from dodal.devices.common_dcm import DoubleCrystalMonochromatorWithDSpacing
-from dodal.devices.electron_analyser.base import DualEnergySource
-from dodal.devices.electron_analyser.vgscienta import VGScientaDetector
+from dodal.devices.electron_analyser.base import (
+    DualEnergySource,
+    ElectronAnalayserTriggerLogic,
+    RegionLogic,
+    ShutterCoordinatorADAcquireLogic,
+)
+from dodal.devices.electron_analyser.vgscienta import (
+    VGScientaAnalyserDriverIO,
+    VGScientaDetector,
+)
 from dodal.devices.fast_shutter import DualFastShutter, FastShutter
 from dodal.devices.hutch_shutter import EXP_SHUTTER_2_INFIX, HutchShutter
 from dodal.devices.motors import XYZAzimuthPolarStage
@@ -106,22 +114,28 @@ def dual_fast_shutter(
     return DualFastShutter[InOut](fsi1, fsj1, source_selector.selected_source)
 
 
-# CAM:IMAGE will fail to connect outside the beamline network,
-# see https://github.com/DiamondLightSource/dodal/issues/1852
+@devices.factory()
+def ew4000_close_shutter_when_idle() -> SignalRW[bool]:
+    return soft_signal_rw(bool, initial_value=True)
+
+
 @devices.factory()
 def ew4000(
     dual_fast_shutter: DualFastShutter,
     dual_energy_source: DualEnergySource,
     source_selector: SourceSelector,
+    ew4000_close_shutter_when_idle: SignalRW[bool],
 ) -> VGScientaDetector[LensMode, PsuMode, PassEnergy]:
+    prefix = f"{I_PREFIX.beamline_prefix}-EA-DET-01:CAM:"
+    driver = VGScientaAnalyserDriverIO(prefix, LensMode, PsuMode, PassEnergy)
     return VGScientaDetector[LensMode, PsuMode, PassEnergy](
-        prefix=f"{I_PREFIX.beamline_prefix}-EA-DET-01:CAM:",
-        lens_mode_type=LensMode,
-        psu_mode_type=PsuMode,
-        pass_energy_type=PassEnergy,
-        energy_source=dual_energy_source.energy,
-        shutter=dual_fast_shutter,
-        source_selector=source_selector,
+        prefix,
+        driver,
+        acquire_logic=ShutterCoordinatorADAcquireLogic(
+            driver, dual_fast_shutter, ew4000_close_shutter_when_idle
+        ),
+        trigger_logic=ElectronAnalayserTriggerLogic(driver),
+        region_logic=RegionLogic(driver, dual_energy_source.energy, source_selector),
     )
 
 

src/dodal/beamlines/i09_1.py

@@ -1,9 +1,15 @@
+from ophyd_async.epics.adcore import ADAcquireLogic
+
 from dodal.beamlines.i09_1_shared import devices as i09_1_shared_devices
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.device_manager import DeviceManager
 from dodal.devices.beamlines.i09_1 import LensMode, PsuMode
 from dodal.devices.common_dcm import DoubleCrystalMonochromatorWithDSpacing
-from dodal.devices.electron_analyser.specs import SpecsDetector
+from dodal.devices.electron_analyser.base import (
+    ElectronAnalayserTriggerLogic,
+    RegionLogic,
+)
+from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO, SpecsDetector
 from dodal.devices.motors import XYZAzimuthTiltPolarStage
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.temperture_controller import Lakeshore336
@@ -24,17 +30,18 @@ def synchrotron() -> Synchrotron:
     return Synchrotron()
 
 
-# CAM:IMAGE will fail to connect outside the beamline network,
-# see https://github.com/DiamondLightSource/dodal/issues/1852
 @devices.factory()
 def analyser(
     dcm: DoubleCrystalMonochromatorWithDSpacing,
 ) -> SpecsDetector[LensMode, PsuMode]:
+    prefix = f"{PREFIX.beamline_prefix}-EA-DET-02:CAM:"
+    driver = SpecsAnalyserDriverIO(prefix, LensMode, PsuMode)
     return SpecsDetector[LensMode, PsuMode](
-        prefix=f"{PREFIX.beamline_prefix}-EA-DET-02:CAM:",
-        lens_mode_type=LensMode,
-        psu_mode_type=PsuMode,
-        energy_source=dcm.energy_in_eV,
+        prefix,
+        driver,
+        acquire_logic=ADAcquireLogic(driver),
+        trigger_logic=ElectronAnalayserTriggerLogic(driver),
+        region_logic=RegionLogic(driver, dcm.energy_in_eV),
     )
 
 

src/dodal/beamlines/p60.py

@@ -1,14 +1,24 @@
+from ophyd_async.epics.adcore import ADAcquireLogic
+
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.device_manager import DeviceManager
+from dodal.devices.beamlines.i09 import LensMode, PassEnergy, PsuMode
 from dodal.devices.beamlines.p60 import (
     LabXraySource,
     LabXraySourceReadable,
     LensMode,
     PassEnergy,
     PsuMode,
 )
-from dodal.devices.electron_analyser.base import DualEnergySource
-from dodal.devices.electron_analyser.vgscienta import VGScientaDetector
+from dodal.devices.electron_analyser.base import (
+    DualEnergySource,
+    ElectronAnalayserTriggerLogic,
+    RegionLogic,
+)
+from dodal.devices.electron_analyser.vgscienta import (
+    VGScientaAnalyserDriverIO,
+    VGScientaDetector,
+)
 from dodal.devices.selectable_source import SourceSelector
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
@@ -42,7 +52,7 @@ def mg_kalpha_source() -> LabXraySourceReadable:
 
 
 @devices.factory()
-def energy_source(
+def dual_energy_source(
     al_kalpha_source: LabXraySourceReadable,
     mg_kalpha_source: LabXraySourceReadable,
     source_selector: SourceSelector,
@@ -54,16 +64,16 @@ def energy_source(
     )
 
 
-# Connect will work again after this work completed
-# https://jira.diamond.ac.uk/browse/P60-13
 @devices.factory()
-def r4000(
-    energy_source: DualEnergySource,
+def ew4000(
+    dual_energy_source: DualEnergySource,
 ) -> VGScientaDetector[LensMode, PsuMode, PassEnergy]:
+    prefix = f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:"
+    driver = VGScientaAnalyserDriverIO(prefix, LensMode, PsuMode, PassEnergy)
     return VGScientaDetector[LensMode, PsuMode, PassEnergy](
-        prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
-        lens_mode_type=LensMode,
-        psu_mode_type=PsuMode,
-        pass_energy_type=PassEnergy,
-        energy_source=energy_source.energy,
+        prefix=prefix,
+        driver=driver,
+        acquire_logic=ADAcquireLogic(driver),
+        trigger_logic=ElectronAnalayserTriggerLogic(driver),
+        region_logic=RegionLogic(driver, dual_energy_source.energy),
     )

src/dodal/devices/cryostream.py

@@ -4,11 +4,7 @@
     StandardReadableFormat,
     StrictEnum,
 )
-from ophyd_async.epics.core import (
-    epics_signal_r,
-    epics_signal_rw,
-    epics_signal_x,
-)
+from ophyd_async.epics.core import epics_signal_r, epics_signal_rw, epics_signal_x
 
 
 class TurboEnum(StrictEnum):

src/dodal/devices/electron_analyser/base/__init__.py

@@ -16,6 +16,11 @@
     TLensMode,
 )
 from .base_util import to_binding_energy, to_kinetic_energy
+from .detector_logic import (
+    ElectronAnalayserTriggerLogic,
+    RegionLogic,
+    ShutterCoordinatorADAcquireLogic,
+)
 from .energy_sources import DualEnergySource
 
 __all__ = [
@@ -35,5 +40,8 @@
     "TLensMode",
     "to_binding_energy",
     "to_kinetic_energy",
+    "ElectronAnalayserTriggerLogic",
+    "RegionLogic",
+    "ShutterCoordinatorADAcquireLogic",
     "DualEnergySource",
 ]