dls-dodal 1.50.0__py3-none-any.whl → 1.52.0__py3-none-any.whl

dodal/beamlines/b21.py

@@ -0,0 +1,148 @@
+from pathlib import Path  # noqa
+from ophyd_async.fastcs.panda import HDFPanda
+from ophyd_async.epics.adaravis import AravisDetector
+from dodal.devices.i22.nxsas import NXSasMetadataHolder, NXSasOAV
+from dodal.common.beamlines.device_helpers import CAM_SUFFIX, HDF5_SUFFIX
+
+
+from dodal.common.beamlines.beamline_utils import (
+    device_factory,
+    get_path_provider,
+    set_path_provider,
+)
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.common.visit import RemoteDirectoryServiceClient, StaticVisitPathProvider
+from ophyd_async.fastcs.eiger import EigerDetector
+
+
+from dodal.devices.linkam3 import Linkam3
+from dodal.devices.slits import Slits
+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("b21")
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+# Currently we must hard-code the visit, determining the visit at runtime requires
+# infrastructure that is still WIP.
+# Communication with GDA is also WIP so for now we determine an arbitrary scan number
+# locally and write the commissioning directory. The scan number is not guaranteed to
+# be unique and the data is at risk - this configuration is for testing only.
+set_path_provider(
+    StaticVisitPathProvider(
+        BL,
+        Path("/dls/b21/data/2025/cm40642-3/bluesky"),
+        client=RemoteDirectoryServiceClient(f"http://{BL}-control:8088/api"),
+    )
+)
+
+
+@device_factory(skip=True)
+def saxs() -> EigerDetector:
+    return EigerDetector(
+        prefix=PREFIX.beamline_prefix,
+        path_provider=get_path_provider(),
+        drv_suffix="-EA-EIGER-01:",
+        hdf_suffix="-EA-EIGER-01:OD:",
+        # odin_nodes=1, # TODO: https://github.com/bluesky/ophyd-async/issues/923
+    )
+
+
+@device_factory(skip=True)
+def waxs() -> EigerDetector:
+    return EigerDetector(
+        prefix=PREFIX.beamline_prefix,
+        path_provider=get_path_provider(),
+        drv_suffix="-EA-EIGER-02:",
+        hdf_suffix="-EA-EIGER-02:OD:",
+        # odin_nodes=1, # TODO: https://github.com/bluesky/ophyd-async/issues/923
+    )
+
+
+@device_factory()
+def panda1() -> HDFPanda:
+    return HDFPanda(
+        prefix=f"{PREFIX.beamline_prefix}-MO-PANDA-01:",
+        path_provider=get_path_provider(),
+    )
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def slits_1() -> Slits:
+    return Slits(prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-01:")
+
+
+@device_factory()
+def slits_2() -> Slits:
+    return Slits(prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-02:")
+
+
+@device_factory()
+def slits_3() -> Slits:
+    return Slits(prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-03:")
+
+
+"""
+Slits 4 was removed from B21 after the camera length was fixed, it is not used anymore.
+"""
+
+
+@device_factory()
+def slits_5() -> Slits:
+    return Slits(prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-05:")
+
+
+@device_factory()
+def slits_6() -> Slits:
+    return Slits(prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-06:")
+
+
+@device_factory()
+def slits_7() -> Slits:
+    """
+    Compact JJ slits device is used for B21 slits 7. PV's operate in same way
+    but physically different to other slits, and uses X:GAP nomenclature.
+    """
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-07:",
+        x_gap="X:GAP",
+        y_gap="Y:GAP",
+        x_centre="X:CENTRE",
+        y_centre="Y:CENTRE",
+    )
+
+
+@device_factory()
+def wbscam() -> AravisDetector:
+    metadata_holder = NXSasMetadataHolder(
+        x_pixel_size=(1292, "pixels"),  # Double check this figure
+        y_pixel_size=(964, "pixels"),
+        description="Manta_G-125B",
+        distance=(-1.0, "m"),
+    )
+    return NXSasOAV(
+        prefix=f"{PREFIX.beamline_prefix}-RS-ABSB-02:CAM:",
+        drv_suffix=CAM_SUFFIX,
+        fileio_suffix=HDF5_SUFFIX,
+        path_provider=get_path_provider(),
+        metadata_holder=metadata_holder,
+    )
+
+
+@device_factory(skip=True)
+def linkam() -> Linkam3:
+    return Linkam3(prefix=f"{PREFIX.beamline_prefix}-EA-HPLC-01:")
+
+
+# TODO: https://github.com/DiamondLightSource/dodal/issues/1286
+# def dmm() -> DMM: #b21 uses a dmm so
+#     return DMM()

dodal/beamlines/i03.py

@@ -28,7 +28,7 @@ from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, MirrorVolta
 from dodal.devices.i03 import Beamstop
 from dodal.devices.i03.dcm import DCM
 from dodal.devices.i03.undulator_dcm import UndulatorDCM
-from dodal.devices.motors import XYZPositioner
+from dodal.devices.motors import XYZStage
 from dodal.devices.oav.oav_detector import OAVBeamCentreFile
 from dodal.devices.oav.oav_parameters import OAVConfigBeamCentre
 from dodal.devices.oav.pin_image_recognition import PinTipDetection
@@ -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()
@@ -368,10 +371,7 @@ def zocalo() -> ZocaloResults:
     """Get the i03 ZocaloResults 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 ZocaloResults(
-        name="zocalo",
-        prefix=PREFIX.beamline_prefix,
-    )
+    return ZocaloResults(name="zocalo", prefix=PREFIX.beamline_prefix, use_gpu=True)
 
 
 @device_factory()
@@ -409,11 +409,11 @@ def thawer() -> Thawer:
 
 
 @device_factory()
-def lower_gonio() -> XYZPositioner:
+def lower_gonio() -> XYZStage:
     """Get the i03 lower gonio 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 XYZPositioner(
+    return XYZStage(
         f"{PREFIX.beamline_prefix}-MO-GONP-01:",
         "lower_gonio",
     )
@@ -451,11 +451,9 @@ def qbpm() -> QBPM:
     )
 
 
-@device_factory(
-    skip=True
-)  # Skipping as not yet on the beamline, see https://jira.diamond.ac.uk/browse/I03-894
+@device_factory()
 def baton() -> Baton:
     """Get the i03 baton 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 Baton(f"{PREFIX.beamline_prefix}:")
+    return Baton(f"{PREFIX.beamline_prefix}-CS-BATON-01:")

dodal/beamlines/i04.py

@@ -22,7 +22,7 @@ from dodal.devices.i04.constants import RedisConstants
 from dodal.devices.i04.murko_results import MurkoResultsDevice
 from dodal.devices.i04.transfocator import Transfocator
 from dodal.devices.ipin import IPin
-from dodal.devices.motors import XYZPositioner
+from dodal.devices.motors import XYZStage
 from dodal.devices.mx_phase1.beamstop import Beamstop
 from dodal.devices.oav.oav_detector import OAVBeamCentrePV
 from dodal.devices.oav.oav_parameters import OAVConfig
@@ -77,22 +77,22 @@ def smargon() -> Smargon:
 
 
 @device_factory()
-def gonio_positioner() -> XYZPositioner:
+def gonio_positioner() -> XYZStage:
     """Get the i04 lower_gonio_stages device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i04, it will return the existing object.
     """
-    return XYZPositioner(
+    return XYZStage(
         f"{PREFIX.beamline_prefix}-MO-GONIO-01:",
         "lower_gonio_stages",
     )
 
 
 @device_factory()
-def sample_delivery_system() -> XYZPositioner:
+def sample_delivery_system() -> XYZStage:
     """Get the i04 sample_delivery_system device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i04, it will return the existing object.
     """
-    return XYZPositioner(
+    return XYZStage(
         f"{PREFIX.beamline_prefix}-MO-SDE-01:",
         "sample_delivery_system",
     )
@@ -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,
     )
 
 

dodal/beamlines/i09.py

@@ -3,6 +3,8 @@ 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, Grating, LensMode
+from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
@@ -19,5 +21,26 @@ def synchrotron() -> Synchrotron:
 
 
 @device_factory()
-def analyser_driver() -> VGScientaAnalyserDriverIO:
-    return VGScientaAnalyserDriverIO(prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:")
+def pgm() -> PGM:
+    return PGM(
+        prefix=f"{BeamlinePrefix(BL, suffix='J').beamline_prefix}-MO-PGM-01:",
+        grating=Grating,
+    )
+
+
+@device_factory()
+def dcm() -> DCM:
+    return DCM(prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01:")
+
+
+@device_factory()
+def analyser_driver() -> VGScientaAnalyserDriverIO[LensMode]:
+    energy_sources = {
+        "source1": pgm().energy.user_readback,
+        "source2": dcm().energy_in_ev,
+    }
+    return VGScientaAnalyserDriverIO[LensMode](
+        prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
+        lens_mode_type=LensMode,
+        energy_sources=energy_sources,
+    )

dodal/beamlines/i09_1.py

@@ -3,6 +3,8 @@ 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
@@ -19,5 +21,14 @@ def synchrotron() -> Synchrotron:
 
 
 @device_factory()
-def analyser_driver() -> SpecsAnalyserDriverIO:
-    return SpecsAnalyserDriverIO(prefix=f"{PREFIX.beamline_prefix}-EA-DET-02:CAM:")
+def dcm() -> DCM:
+    return DCM(prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01:")
+
+
+@device_factory()
+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},
+    )

dodal/beamlines/i09_2.py

@@ -0,0 +1,24 @@
+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.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
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("i09-2")
+PREFIX = BeamlinePrefix(BL, suffix="J")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def pgm() -> PGM:
+    return PGM(prefix=f"{PREFIX.beamline_prefix}-MO-PGM-01:", grating=Grating)

dodal/beamlines/i10.py

@@ -20,11 +20,10 @@ from dodal.devices.i10.rasor.rasor_motors import (
     DetSlits,
     Diffractometer,
     PaStage,
-    PinHole,
 )
 from dodal.devices.i10.rasor.rasor_scaler_cards import RasorScalerCard1
 from dodal.devices.i10.slits import I10Slits, I10SlitsDrainCurrent
-from dodal.devices.motors import XYZPositioner
+from dodal.devices.motors import XYStage, XYZStage
 from dodal.devices.pgm import PGM
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
@@ -130,8 +129,8 @@ def d5a_det() -> I10Diagnostic5ADet:
 
 
 @device_factory()
-def pin_hole() -> PinHole:
-    return PinHole(prefix="ME01D-EA-PINH-01:")
+def pin_hole() -> XYStage:
+    return XYStage(prefix="ME01D-EA-PINH-01:")
 
 
 @device_factory()
@@ -150,8 +149,8 @@ def pa_stage() -> PaStage:
 
 
 @device_factory()
-def sample_stage() -> XYZPositioner:
-    return XYZPositioner(prefix="ME01D-MO-CRYO-01:")
+def sample_stage() -> XYZStage:
+    return XYZStage(prefix="ME01D-MO-CRYO-01:")
 
 
 @device_factory()

dodal/beamlines/i13_1.py

@@ -10,7 +10,7 @@ from dodal.common.beamlines.beamline_utils import (
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
 from dodal.devices.i13_1.merlin import Merlin
-from dodal.devices.motors import XYZPositioner
+from dodal.devices.motors import XYZStage
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -29,13 +29,13 @@ set_path_provider(
 
 
 @device_factory()
-def sample_xyz_stage() -> XYZPositioner:
-    return XYZPositioner(prefix=f"{PREFIX}-MO-PI-02:")
+def sample_xyz_stage() -> XYZStage:
+    return XYZStage(prefix=f"{PREFIX}-MO-PI-02:")
 
 
 @device_factory()
-def sample_xyz_lab_fa_stage() -> XYZPositioner:
-    return XYZPositioner(prefix=f"{PREFIX}-MO-PI-02:FIXANG:")
+def sample_xyz_lab_fa_stage() -> XYZStage:
+    return XYZStage(prefix=f"{PREFIX}-MO-PI-02:FIXANG:")
 
 
 @device_factory()

dodal/beamlines/i18.py

@@ -15,8 +15,7 @@ from dodal.common.visit import (
 from dodal.devices.common_dcm import BaseDCM, PitchAndRollCrystal, RollCrystal
 from dodal.devices.i18.diode import Diode
 from dodal.devices.i18.KBMirror import KBMirror
-from dodal.devices.i18.table import Table
-from dodal.devices.i18.thor_labs_stage import ThorLabsStage
+from dodal.devices.motors import XYStage, XYZThetaStage
 from dodal.devices.slits import Slits
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.tetramm import TetrammDetector
@@ -118,10 +117,10 @@ def d7_diode() -> Diode:
 
 
 @device_factory()
-def main_table() -> Table:
-    return Table(f"{PREFIX.beamline_prefix}-MO-TABLE-01:")
+def main_table() -> XYZThetaStage:
+    return XYZThetaStage(f"{PREFIX.beamline_prefix}-MO-TABLE-01:")
 
 
 @device_factory()
-def thor_labs_stage() -> ThorLabsStage:
-    return ThorLabsStage(f"{PREFIX.beamline_prefix}-MO-TABLE-02:")
+def thor_labs_stage() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-MO-TABLE-02:")

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
 
@@ -22,6 +23,7 @@ from dodal.devices.i22.dcm import DCM
 from dodal.devices.i22.fswitch import FSwitch
 from dodal.devices.i22.nxsas import NXSasMetadataHolder, NXSasOAV, NXSasPilatus
 from dodal.devices.linkam3 import Linkam3
+from dodal.devices.motors import XYPitchStage
 from dodal.devices.slits import Slits
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.tetramm import TetrammDetector
@@ -100,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:"
+            )
+        },
     )
 
 
@@ -109,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:"
+            )
+        },
     )
 
 
@@ -136,7 +148,7 @@ def bimorph_hfm() -> BimorphMirror:
 @device_factory()
 def bimorph_vfm() -> BimorphMirror:
     return BimorphMirror(
-        prefix=f"{PREFIX.beamline_prefix}-OP-KBM-01:G1:", number_of_channels=16
+        prefix=f"{PREFIX.beamline_prefix}-OP-KBM-01:G1:", number_of_channels=32
     )
 
 
@@ -264,3 +276,8 @@ def linkam() -> Linkam3:
 def ppump() -> WatsonMarlow323Pump:
     """Sample Environment Peristaltic Pump"""
     return WatsonMarlow323Pump(f"{PREFIX.beamline_prefix}-EA-PUMP-01:")
+
+
+@device_factory()
+def base_top() -> XYPitchStage:
+    return XYPitchStage(f"{PREFIX.beamline_prefix}-MO-STABL-01:")

dodal/beamlines/i24.py

@@ -11,10 +11,10 @@ from dodal.devices.i24.beamstop import Beamstop
 from dodal.devices.i24.dcm import DCM
 from dodal.devices.i24.dual_backlight import DualBacklight
 from dodal.devices.i24.focus_mirrors import FocusMirrorsMode
-from dodal.devices.i24.i24_detector_motion import DetectorMotion
 from dodal.devices.i24.pilatus_metadata import PilatusMetadata
 from dodal.devices.i24.pmac import PMAC
 from dodal.devices.i24.vgonio import VerticalGoniometer
+from dodal.devices.motors import YZStage
 from dodal.devices.oav.oav_detector import OAVBeamCentreFile
 from dodal.devices.oav.oav_parameters import OAVConfigBeamCentre
 from dodal.devices.zebra.zebra import Zebra
@@ -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)
 
@@ -89,11 +89,11 @@ def backlight() -> DualBacklight:
 
 
 @device_factory()
-def detector_motion() -> DetectorMotion:
+def detector_motion() -> YZStage:
     """Get the i24 detector motion device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i24, it will return the existing object.
     """
-    return DetectorMotion(
+    return YZStage(
         name="detector_motion",
         prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:",
     )
@@ -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:",

dodal/beamlines/p45.py

@@ -11,7 +11,8 @@ from dodal.common.beamlines.beamline_utils import (
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.common.beamlines.device_helpers import DET_SUFFIX, HDF5_SUFFIX
 from dodal.common.visit import StaticVisitPathProvider
-from dodal.devices.p45 import Choppers, TomoStageWithStretchAndSkew
+from dodal.devices.motors import XYStage
+from dodal.devices.p45 import TomoStageWithStretchAndSkew
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -34,8 +35,8 @@ def sample() -> TomoStageWithStretchAndSkew:
 
 
 @device_factory()
-def choppers() -> Choppers:
-    return Choppers(f"{PREFIX.beamline_prefix}-MO-CHOP-01:")
+def choppers() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-MO-CHOP-01:")
 
 
 # Disconnected

dodal/beamlines/p60.py

@@ -3,6 +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, LensMode
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -13,5 +14,23 @@ set_utils_beamline(BL)
 
 
 @device_factory()
-def analyser_driver() -> VGScientaAnalyserDriverIO:
-    return VGScientaAnalyserDriverIO(prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:")
+def al_kalpha_source() -> LabXraySourceReadable:
+    return LabXraySourceReadable(LabXraySource.AL_KALPHA)
+
+
+@device_factory()
+def mg_kalpha_source() -> LabXraySourceReadable:
+    return LabXraySourceReadable(LabXraySource.MG_KALPHA)
+
+
+@device_factory()
+def analyser_driver() -> VGScientaAnalyserDriverIO[LensMode]:
+    energy_sources = {
+        "source1": al_kalpha_source().energy_ev,
+        "source2": mg_kalpha_source().energy_ev,
+    }
+    return VGScientaAnalyserDriverIO[LensMode](
+        prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
+        lens_mode_type=LensMode,
+        energy_sources=energy_sources,
+    )

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,
@@ -15,7 +16,7 @@ from dodal.common.visit import (
 )
 from dodal.devices.attenuator.filter import FilterMotor
 from dodal.devices.attenuator.filter_selections import P99FilterSelections
-from dodal.devices.motors import XYZPositioner
+from dodal.devices.motors import XYZStage
 from dodal.devices.p99.andor2_point import Andor2Point
 from dodal.devices.p99.sample_stage import SampleAngleStage
 from dodal.log import set_beamline as set_log_beamline
@@ -38,13 +39,13 @@ def filter() -> FilterMotor:
 
 
 @device_factory()
-def sample_stage() -> XYZPositioner:
-    return XYZPositioner(f"{PREFIX.beamline_prefix}-MO-STAGE-02:")
+def sample_stage() -> XYZStage:
+    return XYZStage(f"{PREFIX.beamline_prefix}-MO-STAGE-02:")
 
 
 @device_factory()
-def lab_stage() -> XYZPositioner:
-    return XYZPositioner(f"{PREFIX.beamline_prefix}-MO-STAGE-02:LAB:")
+def lab_stage() -> XYZStage:
+    return XYZStage(f"{PREFIX.beamline_prefix}-MO-STAGE-02:LAB:")
 
 
 set_path_provider(
@@ -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(),
+    )

dodal/beamlines/training_rig.py

@@ -14,7 +14,7 @@ from dodal.common.visit import (
     LocalDirectoryServiceClient,
     StaticVisitPathProvider,
 )
-from dodal.devices.training_rig.sample_stage import TrainingRigSampleStage
+from dodal.devices.motors import XThetaStage
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -45,8 +45,8 @@ set_path_provider(
 
 
 @device_factory()
-def sample_stage() -> TrainingRigSampleStage:
-    return TrainingRigSampleStage(f"{PREFIX.beamline_prefix}-MO-MAP-01:STAGE:")
+def sample_stage() -> XThetaStage:
+    return XThetaStage(f"{PREFIX.beamline_prefix}-MO-MAP-01:STAGE:")
 
 
 @device_factory()

dodal/common/beamlines/beamline_utils.py

@@ -33,12 +33,15 @@ def set_beamline(beamline: str):
 
 def clear_devices():
     global ACTIVE_DEVICES
-    for d in list(ACTIVE_DEVICES):
-        del ACTIVE_DEVICES[d]
+    for name in list(ACTIVE_DEVICES):
+        clear_device(name)
 
 
 def clear_device(name: str):
     global ACTIVE_DEVICES
+    device = ACTIVE_DEVICES[name]
+    if isinstance(device, OphydV1Device):
+        device.destroy()
     del ACTIVE_DEVICES[name]