Implement concrete analyser classes for beamlines to remove generics

src/dodal/beamlines/b07.py

@@ -1,14 +1,8 @@
 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 import (
-    B07SampleManipulator52B,
-    Grating,
-    LensMode,
-    PsuMode,
-)
+from dodal.devices.beamlines.b07 import B07SampleManipulator52B, Grating, Specs2DCMOS
 from dodal.devices.electron_analyser.base import EnergySource
-from dodal.devices.electron_analyser.specs import SpecsDetector
 from dodal.devices.motors import XYZPolarStage
 from dodal.devices.pgm import PlaneGratingMonochromator
 from dodal.log import set_beamline as set_log_beamline
@@ -39,13 +33,8 @@ def energy_source(pgm: PlaneGratingMonochromator) -> EnergySource:
 # CAM:IMAGE will fail to connect outside the beamline network,
 # see https://github.com/DiamondLightSource/dodal/issues/1852
 @devices.factory()
-def analyser(energy_source: EnergySource) -> SpecsDetector[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=energy_source,
-    )
+def analyser(energy_source: EnergySource) -> Specs2DCMOS:
+    return Specs2DCMOS(f"{B_PREFIX.beamline_prefix}-EA-DET-01:CAM:", energy_source)
 
 
 @devices.factory()

src/dodal/beamlines/b07_1.py

@@ -1,14 +1,12 @@
 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 import PsuMode
 from dodal.devices.beamlines.b07_1 import (
     ChannelCutMonochromator,
     Grating,
-    LensMode,
+    SpecsPhoibos,
 )
 from dodal.devices.electron_analyser.base import EnergySource
-from dodal.devices.electron_analyser.specs import SpecsDetector
 from dodal.devices.motors import XYZPolarAzimuthStage
 from dodal.devices.pgm import PlaneGratingMonochromator
 from dodal.log import set_beamline as set_log_beamline
@@ -44,11 +42,9 @@ def energy_source(pgm: PlaneGratingMonochromator) -> EnergySource:
 # CAM:IMAGE will fail to connect outside the beamline network,
 # see https://github.com/DiamondLightSource/dodal/issues/1852
 @devices.factory()
-def analyser(energy_source: EnergySource) -> SpecsDetector[LensMode, PsuMode]:
-    return SpecsDetector[LensMode, PsuMode](
+def analyser(energy_source: EnergySource) -> SpecsPhoibos:
+    return SpecsPhoibos(
         prefix=f"{C_PREFIX.beamline_prefix}-EA-DET-01:CAM:",
-        lens_mode_type=LensMode,
-        psu_mode_type=PsuMode,
         energy_source=energy_source,
     )
 

src/dodal/beamlines/i09.py

@@ -4,10 +4,9 @@
 from dodal.beamlines.i09_2_shared import devices as i09_2_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.enums import LensMode, PassEnergy, PsuMode
+from dodal.devices.beamlines.i09 import EW4000
 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.fast_shutter import DualFastShutter, GenericFastShutter
 from dodal.devices.motors import XYZPolarAzimuthStage
 from dodal.devices.pgm import PlaneGratingMonochromator
@@ -80,18 +79,15 @@ def dual_fast_shutter(
 # see https://github.com/DiamondLightSource/dodal/issues/1852
 @devices.factory()
 def ew4000(
-    dual_fast_shutter: DualFastShutter,
     dual_energy_source: DualEnergySource,
+    dual_fast_shutter: DualFastShutter,
     source_selector: SourceSelector,
-) -> VGScientaDetector[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,
-        shutter=dual_fast_shutter,
-        source_selector=source_selector,
+) -> EW4000:
+    return EW4000(
+        f"{I_PREFIX.beamline_prefix}-EA-DET-01:CAM:",
+        dual_energy_source,
+        dual_fast_shutter,
+        source_selector,
     )
 
 

src/dodal/beamlines/i09_1.py

@@ -1,10 +1,9 @@
 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.beamlines.i09_1 import SpecsPhoibos225
 from dodal.devices.common_dcm import DoubleCrystalMonochromatorWithDSpacing
 from dodal.devices.electron_analyser.base import EnergySource
-from dodal.devices.electron_analyser.specs import SpecsDetector
 from dodal.devices.motors import XYZPolarAzimuthTiltStage
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.temperture_controller import Lakeshore336
@@ -33,13 +32,8 @@ def energy_source(dcm: DoubleCrystalMonochromatorWithDSpacing) -> EnergySource:
 # CAM:IMAGE will fail to connect outside the beamline network,
 # see https://github.com/DiamondLightSource/dodal/issues/1852
 @devices.factory()
-def analyser(energy_source: EnergySource) -> SpecsDetector[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=energy_source,
-    )
+def analyser(energy_source: EnergySource) -> SpecsPhoibos225:
+    return SpecsPhoibos225(f"{PREFIX.beamline_prefix}-EA-DET-02:CAM:", energy_source)
 
 
 @devices.factory()

src/dodal/beamlines/p60.py

@@ -1,14 +1,7 @@
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.device_manager import DeviceManager
-from dodal.devices.beamlines.p60 import (
-    LabXraySource,
-    LabXraySourceReadable,
-    LensMode,
-    PassEnergy,
-    PsuMode,
-)
+from dodal.devices.beamlines.p60 import R4000, LabXraySource, LabXraySourceReadable
 from dodal.devices.electron_analyser.base import DualEnergySource
-from dodal.devices.electron_analyser.vgscienta import 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
@@ -18,13 +11,13 @@
 be on the beamline network to access them so a remote `dodal connect p60` will fail.
 """
 
-devices = DeviceManager()
-
 BL = get_beamline_name("p60")
 PREFIX = BeamlinePrefix(BL)
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
+devices = DeviceManager()
+
 
 @devices.factory()
 def source_selector() -> SourceSelector:
@@ -42,7 +35,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,
@@ -57,13 +50,5 @@ 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,
-) -> VGScientaDetector[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,
-    )
+def r4000(dual_energy_source: DualEnergySource) -> R4000:
+    return R4000(f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:", dual_energy_source)

src/dodal/devices/beamlines/b07/__init__.py

@@ -1,4 +1,20 @@
+from .analyser import (
+    B07ElectronAnalyserController,
+    B07SpecsAnalyserDriverIO,
+    B07SpecsRegion,
+    B07SpecsSequence,
+    Specs2DCMOS,
+)
 from .b07_motors import B07SampleManipulator52B
-from .enums import Grating, LensMode, PsuMode
+from .enums import Grating, LensMode
 
-__all__ = ["B07SampleManipulator52B", "Grating", "LensMode", "PsuMode"]
+__all__ = [
+    "B07ElectronAnalyserController",
+    "B07SpecsAnalyserDriverIO",
+    "B07SpecsRegion",
+    "B07SpecsSequence",
+    "Specs2DCMOS",
+    "B07SampleManipulator52B",
+    "Grating",
+    "LensMode",
+]

src/dodal/devices/beamlines/b07/analyser.py

@@ -0,0 +1,39 @@
+from dodal.devices.beamlines.b07.enums import LensMode
+from dodal.devices.beamlines.b07_shared.enums import PsuMode
+from dodal.devices.electron_analyser.base.base_controller import (
+    ElectronAnalyserController,
+)
+from dodal.devices.electron_analyser.base.base_detector import ElectronAnalyserDetector
+from dodal.devices.electron_analyser.base.energy_sources import EnergySource
+from dodal.devices.electron_analyser.specs import (
+    SpecsAnalyserDriverIO,
+    SpecsRegion,
+    SpecsSequence,
+)
+from dodal.devices.fast_shutter import FastShutter
+
+B07SpecsRegion = SpecsRegion[LensMode, PsuMode]
+B07SpecsSequence = SpecsSequence[LensMode, PsuMode]
+
+
+class B07SpecsAnalyserDriverIO(SpecsAnalyserDriverIO):
+    def __init__(self, prefix: str, name: str = ""):
+        super().__init__(prefix, LensMode, PsuMode, name)
+
+
+B07ElectronAnalyserController = ElectronAnalyserController[
+    B07SpecsAnalyserDriverIO, B07SpecsRegion
+]
+
+
+class Specs2DCMOS(ElectronAnalyserDetector[B07SpecsAnalyserDriverIO, B07SpecsRegion]):
+    def __init__(
+        self,
+        prefix: str,
+        energy_source: EnergySource,
+        shutter: FastShutter | None = None,
+        name: str = "",
+    ):
+        drv = B07SpecsAnalyserDriverIO(prefix)
+        controller = B07ElectronAnalyserController(drv, energy_source, shutter)
+        super().__init__(controller, name)

src/dodal/devices/beamlines/b07/enums.py

@@ -25,15 +25,3 @@ class LensMode(SupersetEnum):
     # option if disconnected. Once it is connected, "Not connected" is replaced with the
     # options above. This is also why this must be a SupersetEnum.
     NOT_CONNECTED = "Not connected"
-
-
-class PsuMode(SupersetEnum):
-    V3500 = "3.5kV"
-    V1500 = "1.5kV"
-    V400 = "400V"
-    V100 = "100V"
-    V10 = "10V"
-    # This is connected to the device separately and will only have "Not connected" as
-    # option if disconnected. Once it is connected, "Not connected" is replaced with the
-    # options above. This is also why this must be a SupersetEnum.
-    NOT_CONNECTED = "Not connected"

src/dodal/devices/beamlines/b07_1/__init__.py

@@ -1,10 +1,22 @@
-from dodal.devices.beamlines.b07_1.ccmc import (
+from .analyser import (
+    B071ElectronAnalyserController,
+    B071SpecsAnalyserDriverIO,
+    B071SpecsRegion,
+    B071SpecsSequence,
+    SpecsPhoibos,
+)
+from .ccmc import (
     ChannelCutMonochromator,
     ChannelCutMonochromatorPositions,
 )
-from dodal.devices.beamlines.b07_1.enums import Grating, LensMode
+from .enums import Grating, LensMode
 
 __all__ = [
+    "B071ElectronAnalyserController",
+    "B071SpecsAnalyserDriverIO",
+    "B071SpecsRegion",
+    "B071SpecsSequence",
+    "SpecsPhoibos",
     "Grating",
     "LensMode",
     "ChannelCutMonochromator",

src/dodal/devices/beamlines/b07_1/analyser.py

@@ -0,0 +1,41 @@
+from dodal.devices.beamlines.b07_1.enums import LensMode
+from dodal.devices.beamlines.b07_shared.enums import PsuMode
+from dodal.devices.electron_analyser.base.base_controller import (
+    ElectronAnalyserController,
+)
+from dodal.devices.electron_analyser.base.base_detector import ElectronAnalyserDetector
+from dodal.devices.electron_analyser.base.energy_sources import EnergySource
+from dodal.devices.electron_analyser.specs import (
+    SpecsAnalyserDriverIO,
+    SpecsRegion,
+    SpecsSequence,
+)
+from dodal.devices.fast_shutter import FastShutter
+
+B071SpecsRegion = SpecsRegion[LensMode, PsuMode]
+B071SpecsSequence = SpecsSequence[LensMode, PsuMode]
+
+
+class B071SpecsAnalyserDriverIO(SpecsAnalyserDriverIO):
+    def __init__(self, prefix: str, name: str = ""):
+        super().__init__(prefix, LensMode, PsuMode, name)
+
+
+B071ElectronAnalyserController = ElectronAnalyserController[
+    B071SpecsAnalyserDriverIO, B071SpecsRegion
+]
+
+
+class SpecsPhoibos(
+    ElectronAnalyserDetector[B071SpecsAnalyserDriverIO, B071SpecsRegion]
+):
+    def __init__(
+        self,
+        prefix: str,
+        energy_source: EnergySource,
+        shutter: FastShutter | None = None,
+        name: str = "",
+    ):
+        drv = B071SpecsAnalyserDriverIO(prefix)
+        controller = B071ElectronAnalyserController(drv, energy_source, shutter)
+        super().__init__(controller, name)

src/dodal/devices/beamlines/b07_shared/__init__.py

@@ -0,0 +1,3 @@
+from .enums import PsuMode
+
+__all__ = ["PsuMode"]

src/dodal/devices/beamlines/b07_shared/enums.py

@@ -0,0 +1,13 @@
+from ophyd_async.core import SupersetEnum
+
+
+class PsuMode(SupersetEnum):
+    V3500 = "3.5kV"
+    V1500 = "1.5kV"
+    V400 = "400V"
+    V100 = "100V"
+    V10 = "10V"
+    # This is connected to the device separately and will only have "Not connected" as
+    # option if disconnected. Once it is connected, "Not connected" is replaced with the
+    # options above. This is also why this must be a SupersetEnum.
+    NOT_CONNECTED = "Not connected"

src/dodal/devices/beamlines/i09/__init__.py

@@ -1,3 +1,20 @@
-from dodal.devices.beamlines.i09.enums import Grating, LensMode, PassEnergy, PsuMode
+from .analyser import (
+    EW4000,
+    I09ElectronAnalyserController,
+    I09VGScientaAnalyserDriverIO,
+    I09VGScientaRegion,
+    I09VGScientaSequence,
+)
+from .enums import Grating, LensMode, PassEnergy, PsuMode
 
-__all__ = ["Grating", "LensMode", "PsuMode", "PassEnergy"]
+__all__ = [
+    "EW4000",
+    "I09ElectronAnalyserController",
+    "I09VGScientaAnalyserDriverIO",
+    "I09VGScientaRegion",
+    "I09VGScientaSequence",
+    "Grating",
+    "LensMode",
+    "PsuMode",
+    "PassEnergy",
+]