dls-dodal 1.68.0__py3-none-any.whl → 2.0.0__py3-none-any.whl

dodal/beamlines/i24.py

@@ -1,36 +1,38 @@
-from pathlib import PurePath
+from functools import cache
+from pathlib import Path
 
-from ophyd_async.core import AutoIncrementingPathProvider, StaticFilenameProvider
+from ophyd_async.core import AutoMaxIncrementingPathProvider, PathProvider
 
-from dodal.common.beamlines.beamline_utils import (
-    BL,
-    device_factory,
-)
+from dodal.common.beamlines.beamline_utils import BL
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
+from dodal.device_manager import DeviceManager
 from dodal.devices.attenuator.attenuator import EnumFilterAttenuator
 from dodal.devices.attenuator.filter_selections import (
     I24FilterOneSelections,
     I24FilterTwoSelections,
 )
+from dodal.devices.beamlines.i24.aperture import Aperture
+from dodal.devices.beamlines.i24.beam_center import DetectorBeamCenter
+from dodal.devices.beamlines.i24.beamstop import Beamstop
+from dodal.devices.beamlines.i24.commissioning_jungfrau import CommissioningJungfrau
+from dodal.devices.beamlines.i24.dcm import DCM
+from dodal.devices.beamlines.i24.dual_backlight import DualBacklight
+from dodal.devices.beamlines.i24.focus_mirrors import FocusMirrorsMode
+from dodal.devices.beamlines.i24.pmac import PMAC
+from dodal.devices.beamlines.i24.vgonio import VerticalGoniometer
 from dodal.devices.hutch_shutter import HutchShutter
-from dodal.devices.i24.aperture import Aperture
-from dodal.devices.i24.beam_center import DetectorBeamCenter
-from dodal.devices.i24.beamstop import Beamstop
-from dodal.devices.i24.commissioning_jungfrau import CommissioningJungfrau
-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.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.synchrotron import Synchrotron
 from dodal.devices.zebra.zebra import Zebra
 from dodal.devices.zebra.zebra_constants_mapping import (
     ZebraMapping,
     ZebraSources,
     ZebraTTLOutputs,
 )
+from dodal.devices.zebra.zebra_controlled_shutter import ZebraShutter
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -45,111 +47,67 @@ set_log_beamline(BL)
 set_utils_beamline(BL)
 
 I24_ZEBRA_MAPPING = ZebraMapping(
-    outputs=ZebraTTLOutputs(TTL_EIGER=1, TTL_PILATUS=2, TTL_FAST_SHUTTER=4),
+    outputs=ZebraTTLOutputs(TTL_EIGER=1, TTL_JUNGFRAU=2, TTL_FAST_SHUTTER=4),
     sources=ZebraSources(),
 )
 
 PREFIX = BeamlinePrefix(BL)
 
+devices = DeviceManager()
+
+
+@devices.fixture
+@cache
+def path_provider() -> PathProvider:
+    return StaticVisitPathProvider(
+        BL,
+        Path("/tmp"),
+        client=LocalDirectoryServiceClient(),
+    )
 
-@device_factory()
+
+@devices.factory()
 def attenuator() -> EnumFilterAttenuator:
-    """Get a read-only attenuator device for i24, instantiate it if it hasn't already
-    been. If this is called when already instantiated in i24, it will return the
-    existing object."""
     return EnumFilterAttenuator(
         f"{PREFIX.beamline_prefix}-OP-ATTN-01:",
         filter_selection=(I24FilterOneSelections, I24FilterTwoSelections),
     )
 
 
-@device_factory()
+@devices.factory()
 def aperture() -> Aperture:
-    """Get the i24 aperture 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 Aperture(
-        f"{PREFIX.beamline_prefix}-AL-APTR-01:",
-    )
+    return Aperture(f"{PREFIX.beamline_prefix}-AL-APTR-01:")
 
 
-@device_factory()
+@devices.factory()
 def beamstop() -> Beamstop:
-    """Get the i24 beamstop 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 Beamstop(
-        f"{PREFIX.beamline_prefix}-MO-BS-01:",
-    )
+    return Beamstop(f"{PREFIX.beamline_prefix}-MO-BS-01:")
 
 
-@device_factory()
+@devices.factory()
 def backlight() -> DualBacklight:
-    """Get the i24 backlight 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 DualBacklight(
-        prefix=PREFIX.beamline_prefix,
-    )
+    return DualBacklight(prefix=PREFIX.beamline_prefix)
 
 
-@device_factory()
+@devices.factory()
 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 YZStage(
-        prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:",
-    )
+    return YZStage(prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:")
 
 
-@device_factory()
+@devices.factory()
 def dcm() -> DCM:
-    """Get the i24 DCM 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 DCM(
         prefix=f"{PREFIX.beamline_prefix}-DI-DCM-01:",
         motion_prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01:",
     )
 
 
-# TODO implement ophyd-async eiger see
-# https://github.com/DiamondLightSource/mx-bluesky/issues/62
-# @skip_device(lambda: BL == "s24")
-# def eiger(
-#     wait_for_connection: bool = True,
-#     fake_with_ophyd_sim: bool = False,
-#     params: DetectorParams | None = None,
-# ) -> EigerDetector:
-#     """Get the i24 Eiger device, instantiate it if it hasn't already been.
-#     If this is called when already instantiated, it will return the existing object.
-#     If called with params, will update those params to the Eiger object.
-#     """
-#
-#     def set_params(eiger: EigerDetector):
-#         if params is not None:
-#             eiger.set_detector_parameters(params)
-#
-#     return device_instantiation(
-#         device_factory=EigerDetector,
-#         name="eiger",
-#         prefix="-EA-EIGER-01:",
-#         wait=wait_for_connection,
-#         fake=fake_with_ophyd_sim,
-#         post_create=set_params,
-#     )
-
-
-@device_factory()
+@devices.factory()
 def pmac() -> PMAC:
-    """Get the i24 PMAC 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 PMAC(PREFIX.beamline_prefix)
 
 
-@device_factory()
+@devices.factory()
 def oav() -> OAVBeamCentreFile:
     return OAVBeamCentreFile(
         prefix=f"{PREFIX.beamline_prefix}-DI-OAV-01:",
@@ -157,62 +115,55 @@ def oav() -> OAVBeamCentreFile:
     )
 
 
-@device_factory()
+@devices.factory()
 def vgonio() -> VerticalGoniometer:
-    """Get the i24 vertical goniometer device, instantiate it if it hasn't already been.
-    If this is called when already instantiated, it will return the existing object.
-    """
     return VerticalGoniometer(f"{PREFIX.beamline_prefix}-MO-VGON-01:")
 
 
-@device_factory()
+@devices.factory()
 def zebra() -> Zebra:
-    """Get the i24 zebra 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 Zebra(
         prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-01:",
         mapping=I24_ZEBRA_MAPPING,
     )
 
 
-@device_factory()
+@devices.factory()
 def shutter() -> HutchShutter:
-    """Get the i24 hutch shutter device, instantiate it if it hasn't already been.
-    If this is called when already instantiated, it will return the existing object.
-    """
     return HutchShutter(f"{PREFIX.beamline_prefix}-PS-SHTR-01:")
 
 
-@device_factory()
+@devices.factory()
 def focus_mirrors() -> FocusMirrorsMode:
-    """Get the i24 focus mirror devise to find the beam size."""
     return FocusMirrorsMode(f"{PREFIX.beamline_prefix}-OP-MFM-01:")
 
 
-@device_factory()
+@devices.factory()
 def eiger_beam_center() -> DetectorBeamCenter:
-    """A device for setting/reading the beamcenter from the eiger on i24."""
-    return DetectorBeamCenter(
-        f"{PREFIX.beamline_prefix}-EA-EIGER-01:CAM:",
-        "eiger_bc",
-    )
+    return DetectorBeamCenter(f"{PREFIX.beamline_prefix}-EA-EIGER-01:CAM:", "eiger_bc")
 
 
-@device_factory()
+@devices.factory()
 def commissioning_jungfrau(
-    path_to_dir: str = "/tmp/jf",  # Device factory doesn't allow for required args,
-    filename: str = "jf_output",  # but these should be manually entered when commissioning
+    path_provider: PathProvider,
 ) -> CommissioningJungfrau:
     """Get the commissionning Jungfrau 9M device, which uses a temporary filewriter
     device in place of Odin while the detector is in commissioning.
-    Instantiates the device if it hasn't already been.
-    If this is called when already instantiated, it will return the existing object."""
-
+    """
     return CommissioningJungfrau(
         f"{PREFIX.beamline_prefix}-EA-JFRAU-01:",
         f"{PREFIX.beamline_prefix}-JUNGFRAU-META:FD:",
-        AutoIncrementingPathProvider(
-            StaticFilenameProvider(filename), PurePath(path_to_dir)
-        ),
+        AutoMaxIncrementingPathProvider(path_provider),
+    )
+
+
+@devices.factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@devices.factory()
+def sample_shutter() -> ZebraShutter:
+    return ZebraShutter(
+        f"{PREFIX.beamline_prefix}-EA-SHTR-01:",
     )

dodal/beamlines/k07.py

@@ -1,21 +1,43 @@
+from pathlib import Path
+
+from daq_config_server.client import ConfigServer
 from ophyd_async.core import StrictEnum
 
-from dodal.common.beamlines.beamline_utils import (
-    device_factory,
-)
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.device_manager import DeviceManager
+from dodal.devices.insertion_device import (
+    Apple2,
+    Apple2EnforceLHMoveController,
+    ConfigServerEnergyMotorLookup,
+    InsertionDeviceEnergy,
+    InsertionDevicePolarisation,
+    LookupTableColumnConfig,
+    UndulatorGap,
+    UndulatorPhaseAxes,
+)
 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
 
+devices = DeviceManager()
+
+
+K07_CONF_CLIENT = ConfigServer(url="https://daq-config.diamond.ac.uk")
+
+LOOK_UPTABLE_DIR = "/dls_sw/k07/software/gda/workspace_git/gda-diamond.git/configurations/k07/lookupTables/"
+GAP_LOOKUP_FILE_NAME = "JIDEnergy2GapCalibrations.csv"
+PHASE_LOOKUP_FILE_NAME = "JIDEnergy2PhaseCalibrations.csv"
+K07_GRATING_COLUMNS = "Grating"
+K07_PHASE_POLY_DEG_COLUMNS = ["0th-order"]
+
 BL = get_beamline_name("k07")
 PREFIX = BeamlinePrefix(BL)
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
 
-@device_factory()
+@devices.factory()
 def synchrotron() -> Synchrotron:
     return Synchrotron()
 
@@ -26,9 +48,81 @@ class Grating(StrictEnum):
 
 
 # Grating does not exist yet - this class is a placeholder for when it does
-@device_factory(skip=True)
+@devices.factory(skip=True)
 def pgm() -> PlaneGratingMonochromator:
     return PlaneGratingMonochromator(
         prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:",
         grating=Grating,
     )
+
+
+# Insertion device does not exist yet - these classes are placeholders at the moment.
+@devices.factory(skip=True)
+def id_gap() -> UndulatorGap:
+    return UndulatorGap(
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
+    )
+
+
+# Insertion device does not exist yet - these classes are placeholders at the moment.
+@devices.factory(skip=True)
+def id_phase() -> UndulatorPhaseAxes:
+    return UndulatorPhaseAxes(
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
+        top_outer="RPQ1",
+        top_inner="RPQ2",
+        btm_inner="RPQ3",
+        btm_outer="RPQ4",
+    )
+
+
+# Insertion device does not exist yet - these classes are placeholders at the moment.
+@devices.factory(skip=True)
+def id(
+    id_gap: UndulatorGap, id_phase: UndulatorPhaseAxes
+) -> Apple2[UndulatorPhaseAxes]:
+    """K07 insertion device."""
+    return Apple2[UndulatorPhaseAxes](
+        id_gap=id_gap,
+        id_phase=id_phase,
+    )
+
+
+# Insertion device does not exist yet - temporary use Apple2EnforceLHMoveController
+@devices.factory(skip=True)
+def id_controller(
+    id: Apple2[UndulatorPhaseAxes],
+) -> Apple2EnforceLHMoveController[UndulatorPhaseAxes]:
+    """I21 insertion device controller."""
+    return Apple2EnforceLHMoveController[UndulatorPhaseAxes](
+        apple2=id,
+        gap_energy_motor_lut=ConfigServerEnergyMotorLookup(
+            lut_config=LookupTableColumnConfig(grating=K07_GRATING_COLUMNS),
+            config_client=K07_CONF_CLIENT,
+            path=Path(LOOK_UPTABLE_DIR, GAP_LOOKUP_FILE_NAME),
+        ),
+        phase_energy_motor_lut=ConfigServerEnergyMotorLookup(
+            lut_config=LookupTableColumnConfig(
+                grating=K07_GRATING_COLUMNS, poly_deg=K07_PHASE_POLY_DEG_COLUMNS
+            ),
+            config_client=K07_CONF_CLIENT,
+            path=Path(LOOK_UPTABLE_DIR, GAP_LOOKUP_FILE_NAME),
+        ),
+        units="eV",
+    )
+
+
+# Insertion device does not exist yet - these classes are placeholders at the moment.
+@devices.factory(skip=True)
+def id_energy(
+    id_controller: Apple2EnforceLHMoveController[UndulatorPhaseAxes],
+) -> InsertionDeviceEnergy:
+    return InsertionDeviceEnergy(id_controller)
+
+
+# Insertion device does not exist yet - these classes are placeholders at the moment.
+@devices.factory(skip=True)
+def id_polarisation(
+    id_controller: Apple2EnforceLHMoveController[UndulatorPhaseAxes],
+) -> InsertionDevicePolarisation:
+    return InsertionDevicePolarisation(id_controller)

dodal/beamlines/p38.py

@@ -15,9 +15,9 @@ from dodal.common.crystal_metadata import (
     make_crystal_metadata_from_material,
 )
 from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
+from dodal.devices.beamlines.i22.dcm import DCM
+from dodal.devices.beamlines.i22.fswitch import FSwitch
 from dodal.devices.focusing_mirror import FocusingMirror
-from dodal.devices.i22.dcm import DCM
-from dodal.devices.i22.fswitch import FSwitch
 from dodal.devices.linkam3 import Linkam3
 from dodal.devices.pressure_jump_cell import PressureJumpCell
 from dodal.devices.slits import Slits
@@ -198,7 +198,7 @@ def linkam() -> Linkam3:
 
 @device_factory()
 def ppump() -> WatsonMarlow323Pump:
-    """Peristaltic Pump"""
+    """Peristaltic Pump."""
     return WatsonMarlow323Pump(f"{PREFIX.beamline_prefix}-EA-PUMP-01:")
 
 

dodal/beamlines/p60.py

@@ -1,48 +1,69 @@
-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.base import DualEnergySource
-from dodal.devices.electron_analyser.vgscienta import VGScientaDetector
-from dodal.devices.p60 import (
+from dodal.device_manager import DeviceManager
+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.selectable_source import SourceSelector
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
+"""
+NOTE: Due to p60 not having a CA gateway, PVs are not available remotely and you need to
+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)
 
 
-@device_factory()
+@devices.factory()
+def source_selector() -> SourceSelector:
+    return SourceSelector()
+
+
+@devices.factory()
 def al_kalpha_source() -> LabXraySourceReadable:
     return LabXraySourceReadable(LabXraySource.AL_KALPHA)
 
 
-@device_factory()
+@devices.factory()
 def mg_kalpha_source() -> LabXraySourceReadable:
     return LabXraySourceReadable(LabXraySource.MG_KALPHA)
 
 
-@device_factory()
-def energy_source() -> DualEnergySource:
-    return DualEnergySource(al_kalpha_source().energy_ev, mg_kalpha_source().energy_ev)
+@devices.factory()
+def energy_source(
+    al_kalpha_source: LabXraySourceReadable,
+    mg_kalpha_source: LabXraySourceReadable,
+    source_selector: SourceSelector,
+) -> DualEnergySource:
+    return DualEnergySource(
+        al_kalpha_source.energy_ev,
+        mg_kalpha_source.energy_ev,
+        source_selector.selected_source,
+    )
 
 
 # Connect will work again after this work completed
 # https://jira.diamond.ac.uk/browse/P60-13
-@device_factory()
-def r4000() -> VGScientaDetector[LensMode, PsuMode, PassEnergy]:
+@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(),
+        energy_source=energy_source,
     )

dodal/beamlines/p99.py

@@ -4,7 +4,6 @@ from ophyd_async.epics.adandor import Andor2Detector
 from ophyd_async.fastcs.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_utils import (
-    device_factory,
     get_path_provider,
     set_beamline,
     set_path_provider,
@@ -14,11 +13,12 @@ from dodal.common.visit import (
     LocalDirectoryServiceClient,
     StaticVisitPathProvider,
 )
+from dodal.device_manager import DeviceManager
 from dodal.devices.attenuator.filter import FilterMotor
 from dodal.devices.attenuator.filter_selections import P99FilterSelections
+from dodal.devices.beamlines.p99.andor2_point import Andor2Point
+from dodal.devices.beamlines.p99.sample_stage import SampleAngleStage
 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
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -26,24 +26,25 @@ BL = get_beamline_name("p99")
 PREFIX = BeamlinePrefix(BL)
 set_log_beamline(BL)
 set_beamline(BL)
+devices = DeviceManager()
 
 
-@device_factory()
+@devices.factory()
 def angle_stage() -> SampleAngleStage:
     return SampleAngleStage(f"{PREFIX.beamline_prefix}-MO-STAGE-01:")
 
 
-@device_factory()
+@devices.factory()
 def filter() -> FilterMotor:
     return FilterMotor(f"{PREFIX.beamline_prefix}-MO-STAGE-02:MP:", P99FilterSelections)
 
 
-@device_factory()
+@devices.factory()
 def sample_stage() -> XYZStage:
     return XYZStage(f"{PREFIX.beamline_prefix}-MO-STAGE-02:")
 
 
-@device_factory()
+@devices.factory()
 def lab_stage() -> XYZStage:
     return XYZStage(f"{PREFIX.beamline_prefix}-MO-STAGE-02:LAB:")
 
@@ -57,7 +58,7 @@ set_path_provider(
 )
 
 
-@device_factory()
+@devices.factory()
 def andor2_det() -> Andor2Detector:
     """Andor model:DU897_BV."""
     return Andor2Detector(
@@ -68,10 +69,11 @@ def andor2_det() -> Andor2Detector:
     )
 
 
-@device_factory()
+@devices.factory()
 def andor2_point() -> Andor2Point:
-    """Using the andor2 as if it is a massive point detector, read the meanValue and total after
-    a picture is taken."""
+    """Using the andor2 as if it is a massive point detector, read the meanValue and
+    total after a picture is taken.
+    """
     return Andor2Point(
         prefix=f"{PREFIX.beamline_prefix}-EA-DET-03:",
         drv_suffix=CAM_SUFFIX,
@@ -79,11 +81,10 @@ def andor2_point() -> Andor2Point:
     )
 
 
-@device_factory()
+@devices.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.
+    """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(

dodal/beamlines/training_rig.py

@@ -1,12 +1,13 @@
+from functools import cache
+from pathlib import Path
+
+from ophyd_async.core import PathProvider, StaticPathProvider, UUIDFilenameProvider
 from ophyd_async.epics.adaravis import AravisDetector
 from ophyd_async.fastcs.panda import HDFPanda
 
-from dodal.common.beamlines.beamline_utils import (
-    device_factory,
-    get_path_provider,
-)
 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.device_manager import DeviceManager
 from dodal.devices.motors import XThetaStage
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
@@ -27,25 +28,32 @@ PREFIX = BeamlinePrefix(BL)
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
+devices = DeviceManager()
+
+
+@devices.fixture
+@cache
+def path_provider() -> PathProvider:
+    return StaticPathProvider(UUIDFilenameProvider(), Path("/tmp"))
+
 
-@device_factory()
+@devices.factory()
 def sample_stage() -> XThetaStage:
     return XThetaStage(f"{PREFIX.beamline_prefix}-MO-MAP-01:STAGE:")
 
 
-@device_factory()
-def det() -> AravisDetector:
+@devices.factory()
+def det(path_provider: PathProvider) -> AravisDetector:
     return AravisDetector(
         f"{PREFIX.beamline_prefix}-EA-DET-01:",
-        path_provider=get_path_provider(),
+        path_provider=path_provider,
         drv_suffix=DET_SUFFIX,
         fileio_suffix=HDF5_SUFFIX,
     )
 
 
-@device_factory()
-def panda() -> HDFPanda:
+@devices.factory()
+def panda(path_provider: PathProvider) -> HDFPanda:
     return HDFPanda(
-        prefix=f"{PREFIX.beamline_prefix}-MO-PANDA-01:",
-        path_provider=get_path_provider(),
+        prefix=f"{PREFIX.beamline_prefix}-MO-PANDA-01:", path_provider=path_provider
     )