dls-dodal 1.30.0__tar.gz → 1.31.0__tar.gz

{dls_dodal-1.30.0 → dls_dodal-1.31.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dls-dodal
-Version: 1.30.0
+Version: 1.31.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -216,15 +216,15 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async<0.4.0
+Requires-Dist: ophyd-async>=0.5.2
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
 Requires-Dist: pillow
-Requires-Dist: zocalo<1.0.0,>=0.32.0
+Requires-Dist: zocalo>=1.0.0
 Requires-Dist: requests
 Requires-Dist: graypy
-Requires-Dist: pydantic
+Requires-Dist: pydantic>=2.0
 Requires-Dist: opencv-python-headless
 Requires-Dist: aioca
 Requires-Dist: p4p

{dls_dodal-1.30.0 → dls_dodal-1.31.0}/pyproject.toml

@@ -15,15 +15,15 @@ description = "Ophyd devices and other utils that could be used across DLS beaml
 dependencies = [
     "click",
     "ophyd",
-    "ophyd-async<0.4.0",      # Need to pin to <0.4.0 as this requires pydantic>2.0 see https://github.com/DiamondLightSource/dodal/issues/679
+    "ophyd-async>=0.5.2",
     "bluesky",
     "pyepics",
     "dataclasses-json",
     "pillow",
-    "zocalo>=0.32.0,<1.0.0",  # TODO remove pin against <1.0.0, see #679
+    "zocalo>=1.0.0",
     "requests",
     "graypy",
-    "pydantic",
+    "pydantic>=2.0",
     "opencv-python-headless", # For pin-tip detection.
     "aioca",                  # Required for CA support with ophyd-async.
     "p4p",                    # Required for PVA support with ophyd-async.
@@ -110,6 +110,8 @@ filterwarnings = [
     "ignore:dep_util is Deprecated. Use functions from setuptools instead.:DeprecationWarning",
     # Ignore deprecation warning from zocalo
     "ignore:.*pkg_resources.*:DeprecationWarning",
+    # Ignore deprecation warning from setuptools_dso (remove when https://github.com/epics-base/setuptools_dso/issues/36 is released)
+    "ignore::DeprecationWarning:wheel",
 ]
 # Doctest python code in docs, python code in src docstrings, test functions in tests
 testpaths = "docs src tests"

{dls_dodal-1.30.0 → dls_dodal-1.31.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dls-dodal
-Version: 1.30.0
+Version: 1.31.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -216,15 +216,15 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async<0.4.0
+Requires-Dist: ophyd-async>=0.5.2
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
 Requires-Dist: pillow
-Requires-Dist: zocalo<1.0.0,>=0.32.0
+Requires-Dist: zocalo>=1.0.0
 Requires-Dist: requests
 Requires-Dist: graypy
-Requires-Dist: pydantic
+Requires-Dist: pydantic>=2.0
 Requires-Dist: opencv-python-headless
 Requires-Dist: aioca
 Requires-Dist: p4p

{dls_dodal-1.30.0 → dls_dodal-1.31.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -93,6 +93,7 @@ src/dodal/beamlines/i24.py
 src/dodal/beamlines/p38.py
 src/dodal/beamlines/p45.py
 src/dodal/beamlines/p99.py
+src/dodal/beamlines/training_rig.py
 src/dodal/common/__init__.py
 src/dodal/common/coordination.py
 src/dodal/common/maths.py
@@ -110,7 +111,6 @@ src/dodal/devices/aperture.py
 src/dodal/devices/aperturescatterguard.py
 src/dodal/devices/attenuator.py
 src/dodal/devices/backlight.py
-src/dodal/devices/beamstop.py
 src/dodal/devices/cryostream.py
 src/dodal/devices/dcm.py
 src/dodal/devices/eiger.py
@@ -181,6 +181,8 @@ src/dodal/devices/oav/pin_image_recognition/manual_test.py
 src/dodal/devices/oav/pin_image_recognition/utils.py
 src/dodal/devices/p99/__init__.py
 src/dodal/devices/p99/sample_stage.py
+src/dodal/devices/training_rig/__init__.py
+src/dodal/devices/training_rig/sample_stage.py
 src/dodal/devices/util/__init__.py
 src/dodal/devices/util/adjuster_plans.py
 src/dodal/devices/util/epics_util.py
@@ -217,6 +219,7 @@ tests/common/__init__.py
 tests/common/test_coordination.py
 tests/common/test_maths.py
 tests/common/test_udc_directory_provider.py
+tests/common/test_visit.py
 tests/common/beamlines/__init__.py
 tests/common/beamlines/test_beamline_parameters.py
 tests/common/beamlines/test_beamline_utils.py
@@ -233,12 +236,14 @@ tests/devices/system_tests/test_aperturescatterguard_system.py
 tests/devices/system_tests/test_eiger_system.py
 tests/devices/system_tests/test_gridscan_system.py
 tests/devices/system_tests/test_oav_system.py
+tests/devices/system_tests/test_oav_to_redis_system.py
 tests/devices/system_tests/test_slit_gaps_system.py
 tests/devices/system_tests/test_smargon_system.py
 tests/devices/system_tests/test_synchrotron_system.py
 tests/devices/system_tests/test_undulator_system.py
 tests/devices/system_tests/test_zebra_system.py
 tests/devices/system_tests/test_zocalo_results.py
+tests/devices/training_rig/test_sample_stage.py
 tests/devices/unit_tests/__init__.py
 tests/devices/unit_tests/conftest.py
 tests/devices/unit_tests/test_OAVCentring.json
@@ -314,6 +319,8 @@ tests/test_data/test_beamline_dcm_roll_converter_non_monotonic.txt
 tests/test_data/test_beamline_dcm_roll_converter_reversed.txt
 tests/test_data/test_beamline_parameters.txt
 tests/test_data/test_det_dist_converter.txt
+tests/test_data/topup_long_delay.txt
+tests/test_data/topup_short_params.txt
 tests/unit_tests/__init__.py
 tests/unit_tests/test_cli.py
 tests/unit_tests/test_log.py

{dls_dodal-1.30.0 → dls_dodal-1.31.0}/src/dls_dodal.egg-info/requires.txt

@@ -1,14 +1,14 @@
 click
 ophyd
-ophyd-async<0.4.0
+ophyd-async>=0.5.2
 bluesky
 pyepics
 dataclasses-json
 pillow
-zocalo<1.0.0,>=0.32.0
+zocalo>=1.0.0
 requests
 graypy
-pydantic
+pydantic>=2.0
 opencv-python-headless
 aioca
 p4p

{dls_dodal-1.30.0 → dls_dodal-1.31.0}/src/dodal/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.30.0'
-__version_tuple__ = version_tuple = (1, 30, 0)
+__version__ = version = '1.31.0'
+__version_tuple__ = version_tuple = (1, 31, 0)

{dls_dodal-1.30.0 → dls_dodal-1.31.0}/src/dodal/beamline_specific_utils/i03.py

@@ -1,7 +1,5 @@
 from dataclasses import dataclass
 
-from dodal.devices.aperturescatterguard import SingleAperturePosition
-
 I03_BEAM_HEIGHT_UM = 20
 
 
@@ -11,6 +9,5 @@ class BeamSize:
     y_um: float | None
 
 
-def beam_size_from_aperture(position: SingleAperturePosition):
-    aperture_size = position.radius_microns
+def beam_size_from_aperture(aperture_size: float | None):
     return BeamSize(aperture_size, I03_BEAM_HEIGHT_UM if aperture_size else None)

{dls_dodal-1.30.0 → dls_dodal-1.31.0}/src/dodal/beamlines/__init__.py

@@ -13,6 +13,10 @@ _BEAMLINE_NAME_OVERRIDES = {
     "i13-1": "i13_1",
     "i20-1": "i20_1",
     "s03": "i03",
+    "p46": "training_rig",
+    "p47": "training_rig",
+    "p48": "training_rig",
+    "p49": "training_rig",
 }
 
 

{dls_dodal-1.30.0 → dls_dodal-1.31.0}/src/dodal/beamlines/i03.py

@@ -1,17 +1,17 @@
-from ophyd_async.panda import HDFPanda
+from ophyd_async.fastcs.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_parameters import get_beamline_parameters
 from dodal.common.beamlines.beamline_utils import (
     device_instantiation,
-    get_directory_provider,
-    set_directory_provider,
+    get_path_provider,
+    set_path_provider,
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
-from dodal.common.udc_directory_provider import PandASubdirectoryProvider
+from dodal.common.udc_directory_provider import PandASubpathProvider
 from dodal.devices.aperturescatterguard import (
+    AperturePosition,
     ApertureScatterguard,
     load_positions_from_beamline_parameters,
-    load_tolerances_from_beamline_params,
 )
 from dodal.devices.attenuator import Attenuator
 from dodal.devices.backlight import Backlight
@@ -52,7 +52,7 @@ BL = get_beamline_name("s03")
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
-set_directory_provider(PandASubdirectoryProvider())
+set_path_provider(PandASubpathProvider())
 
 
 def aperture_scatterguard(
@@ -71,7 +71,7 @@ def aperture_scatterguard(
         wait=wait_for_connection,
         fake=fake_with_ophyd_sim,
         loaded_positions=load_positions_from_beamline_parameters(params),
-        tolerances=load_tolerances_from_beamline_params(params),
+        tolerances=AperturePosition.tolerances_from_gda_params(params),
     )
 
 
@@ -378,7 +378,7 @@ def panda(
         "-EA-PANDA-01:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 

{dls_dodal-1.30.0 → dls_dodal-1.31.0}/src/dodal/beamlines/i04.py

@@ -2,13 +2,12 @@ from dodal.common.beamlines.beamline_parameters import get_beamline_parameters
 from dodal.common.beamlines.beamline_utils import device_instantiation
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.devices.aperturescatterguard import (
+    AperturePosition,
     ApertureScatterguard,
     load_positions_from_beamline_parameters,
-    load_tolerances_from_beamline_params,
 )
 from dodal.devices.attenuator import Attenuator
 from dodal.devices.backlight import Backlight
-from dodal.devices.beamstop import BeamStop
 from dodal.devices.dcm import DCM
 from dodal.devices.detector import DetectorParams
 from dodal.devices.detector.detector_motion import DetectorMotion
@@ -107,14 +106,14 @@ def ipin(wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False) ->
 
 def beamstop(
     wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> BeamStop:
+) -> XYZPositioner:
     """Get the i04 beamstop 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 device_instantiation(
-        BeamStop,
+        XYZPositioner,
         "beamstop",
-        "",
+        "-MO-BS-01:",
         wait_for_connection,
         fake_with_ophyd_sim,
     )
@@ -237,7 +236,7 @@ def aperture_scatterguard(
         wait=wait_for_connection,
         fake=fake_with_ophyd_sim,
         loaded_positions=load_positions_from_beamline_parameters(params),
-        tolerances=load_tolerances_from_beamline_params(params),
+        tolerances=AperturePosition.tolerances_from_gda_params(params),
     )
 
 
@@ -411,9 +410,11 @@ def oav_to_redis_forwarder(
     """
     return device_instantiation(
         OAVToRedisForwarder,
-        "oav_to_redis",
-        "",
+        "oav_to_redis_forwarder",
+        "-DI-OAV-01:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        params=OAVConfigParams(ZOOM_PARAMS_FILE, DISPLAY_CONFIG),
+        redis_host=REDIS_HOST,
+        redis_password=REDIS_PASSWORD,
+        redis_db=7,
     )

{dls_dodal-1.30.0 → dls_dodal-1.31.0}/src/dodal/beamlines/i13_1.py

@@ -1,14 +1,14 @@
 from pathlib import Path
 
-from ophyd_async.epics.areadetector.aravis import AravisDetector
+from ophyd_async.epics.adaravis import AravisDetector
 
 from dodal.common.beamlines.beamline_utils import (
     device_instantiation,
-    get_directory_provider,
-    set_directory_provider,
+    get_path_provider,
+    set_path_provider,
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
-from dodal.common.visit import StaticVisitDirectoryProvider
+from dodal.common.visit import StaticVisitPathProvider
 from dodal.devices.motors import XYZPositioner
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import get_beamline_name
@@ -16,8 +16,8 @@ from dodal.utils import get_beamline_name
 BL = get_beamline_name("i13-1")
 set_log_beamline(BL)
 set_utils_beamline(BL)
-set_directory_provider(
-    StaticVisitDirectoryProvider(
+set_path_provider(
+    StaticVisitPathProvider(
         BL,
         Path("/data/2024/cm37257-4/"),  # latest commissioning visit
     )
@@ -60,7 +60,7 @@ def side_camera(
         bl_prefix=False,
         drv_suffix="CAM:",
         hdf_suffix="HDF5:",
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
         wait=wait_for_connection,
         fake=fake_with_ophyd_sim,
     )

{dls_dodal-1.30.0 → dls_dodal-1.31.0}/src/dodal/beamlines/i22.py

@@ -1,16 +1,17 @@
 from pathlib import Path
 
-from ophyd_async.epics.areadetector import AravisDetector, PilatusDetector
-from ophyd_async.panda import HDFPanda
+from ophyd_async.epics.adaravis import AravisDetector
+from ophyd_async.epics.adpilatus import PilatusDetector
+from ophyd_async.fastcs.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_utils import (
     device_instantiation,
-    get_directory_provider,
-    set_directory_provider,
+    get_path_provider,
+    set_path_provider,
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.common.beamlines.device_helpers import numbered_slits
-from dodal.common.visit import DirectoryServiceClient, StaticVisitDirectoryProvider
+from dodal.common.visit import RemoteDirectoryServiceClient, StaticVisitPathProvider
 from dodal.devices.focusing_mirror import FocusingMirror
 from dodal.devices.i22.dcm import CrystalMetadata, DoubleCrystalMonochromator
 from dodal.devices.i22.fswitch import FSwitch
@@ -32,11 +33,11 @@ set_utils_beamline(BL)
 # 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_directory_provider(
-    StaticVisitDirectoryProvider(
+set_path_provider(
+    StaticVisitPathProvider(
         BL,
         Path("/dls/i22/data/2024/cm37271-2/bluesky"),
-        client=DirectoryServiceClient("http://i22-control:8088/api"),
+        client=RemoteDirectoryServiceClient("http://i22-control:8088/api"),
     )
 )
 
@@ -61,7 +62,7 @@ def saxs(
             sensor_thickness=(0.45, "mm"),
             distance=(4711.833684146172, "mm"),
         ),
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -97,7 +98,7 @@ def waxs(
             sensor_thickness=(0.45, "mm"),
             distance=(175.4199417092314, "mm"),
         ),
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -112,7 +113,7 @@ def i0(
         wait_for_connection,
         fake_with_ophyd_sim,
         type="Cividec Diamond XBPM",
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -127,7 +128,7 @@ def it(
         wait_for_connection,
         fake_with_ophyd_sim,
         type="PIN Diode",
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -234,7 +235,6 @@ def slits_3(
     )
 
 
-@skip_device()
 def slits_4(
     wait_for_connection: bool = True,
     fake_with_ophyd_sim: bool = False,
@@ -296,7 +296,7 @@ def panda1(
         "-EA-PANDA-01:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -311,7 +311,7 @@ def panda2(
         "-EA-PANDA-02:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -326,7 +326,7 @@ def panda3(
         "-EA-PANDA-03:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -341,7 +341,7 @@ def panda4(
         "-EA-PANDA-04:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -362,7 +362,7 @@ def oav(
             description="AVT Mako G-507B",
             distance=(-1.0, "m"),
         ),
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 

{dls_dodal-1.30.0 → dls_dodal-1.31.0}/src/dodal/beamlines/p38.py

@@ -1,16 +1,16 @@
 from pathlib import Path
 
-from ophyd_async.epics.areadetector import AravisDetector
-from ophyd_async.panda import HDFPanda
+from ophyd_async.epics.adaravis import AravisDetector
+from ophyd_async.fastcs.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_utils import (
     device_instantiation,
-    get_directory_provider,
-    set_directory_provider,
+    get_path_provider,
+    set_path_provider,
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.common.beamlines.device_helpers import numbered_slits
-from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitDirectoryProvider
+from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
 from dodal.devices.focusing_mirror import FocusingMirror
 from dodal.devices.i22.dcm import CrystalMetadata, DoubleCrystalMonochromator
 from dodal.devices.i22.fswitch import FSwitch
@@ -30,8 +30,8 @@ set_utils_beamline(BL)
 # 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_directory_provider(
-    StaticVisitDirectoryProvider(
+set_path_provider(
+    StaticVisitPathProvider(
         BL,
         Path("/dls/p38/data/2024/cm37282-2/bluesky"),
         client=LocalDirectoryServiceClient(),
@@ -50,7 +50,7 @@ def d3(
         fake_with_ophyd_sim,
         drv_suffix="DET:",
         hdf_suffix="HDF5:",
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -67,7 +67,7 @@ def d11(
         fake_with_ophyd_sim,
         drv_suffix="DET:",
         hdf_suffix="HDF5:",
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -82,7 +82,7 @@ def d12(
         fake_with_ophyd_sim,
         drv_suffix="DET:",
         hdf_suffix="HDF5:",
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -96,7 +96,7 @@ def i0(
         "-EA-XBPM-01:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -273,7 +273,7 @@ def panda1(
         "-EA-PANDA-01:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -288,7 +288,7 @@ def panda2(
         "-EA-PANDA-02:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -303,7 +303,7 @@ def panda3(
         "-EA-PANDA-03:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 

{dls_dodal-1.30.0 → dls_dodal-1.31.0}/src/dodal/beamlines/p45.py

@@ -1,15 +1,15 @@
 from pathlib import Path
 
-from ophyd_async.epics.areadetector import AravisDetector
-from ophyd_async.panda import HDFPanda
+from ophyd_async.epics.adaravis import AravisDetector
+from ophyd_async.fastcs.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_utils import (
     device_instantiation,
-    get_directory_provider,
-    set_directory_provider,
+    get_path_provider,
+    set_path_provider,
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
-from dodal.common.visit import StaticVisitDirectoryProvider
+from dodal.common.visit import StaticVisitPathProvider
 from dodal.devices.p45 import Choppers, TomoStageWithStretchAndSkew
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import get_beamline_name, skip_device
@@ -17,8 +17,8 @@ from dodal.utils import get_beamline_name, skip_device
 BL = get_beamline_name("p45")
 set_log_beamline(BL)
 set_utils_beamline(BL)
-set_directory_provider(
-    StaticVisitDirectoryProvider(
+set_path_provider(
+    StaticVisitPathProvider(
         BL,
         Path("/data/2024/cm37283-2/"),  # latest commissioning visit
     )
@@ -62,7 +62,7 @@ def det(
         fake_with_ophyd_sim,
         drv_suffix="DET:",
         hdf_suffix="HDF5:",
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -79,7 +79,7 @@ def diff(
         fake_with_ophyd_sim,
         drv_suffix="DET:",
         hdf_suffix="HDF5:",
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -97,7 +97,7 @@ def panda1(
         "-MO-PANDA-01:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -112,5 +112,5 @@ def panda2(
         "-MO-PANDA-02:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )