From 6051ca80a4b1baa11385d52da1b445f08f922bb0 Mon Sep 17 00:00:00 2001 From: Oliver Silvester Date: Thu, 19 Feb 2026 16:34:39 +0000 Subject: [PATCH 1/3] Remove test path provider for i24 --- src/dodal/beamlines/i24.py | 10 ---------- .../devices/beamlines/i24/commissioning_jungfrau.py | 6 ++++++ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/dodal/beamlines/i24.py b/src/dodal/beamlines/i24.py index 9a60e2432c..b6c8a1903e 100644 --- a/src/dodal/beamlines/i24.py +++ b/src/dodal/beamlines/i24.py @@ -56,16 +56,6 @@ devices = DeviceManager() -@devices.fixture -@cache -def path_provider() -> PathProvider: - return StaticVisitPathProvider( - BL, - Path("/tmp"), - client=LocalDirectoryServiceClient(), - ) - - @devices.factory() def attenuator() -> EnumFilterAttenuator: return EnumFilterAttenuator( diff --git a/src/dodal/devices/beamlines/i24/commissioning_jungfrau.py b/src/dodal/devices/beamlines/i24/commissioning_jungfrau.py index dd808f8945..5cb0ec4a30 100644 --- a/src/dodal/devices/beamlines/i24/commissioning_jungfrau.py +++ b/src/dodal/devices/beamlines/i24/commissioning_jungfrau.py @@ -12,6 +12,7 @@ StandardReadable, TriggerInfo, observe_value, + soft_signal_r_and_setter, wait_for_value, ) from ophyd_async.epics.core import epics_signal_r, epics_signal_rw, epics_signal_rw_rbv @@ -110,10 +111,15 @@ def __init__( writer_prefix: str, path_provider: PathProvider, name="", + detector_id=124, ): self.drv = JungfrauDriverIO(prefix) writer = JungfrauCommissioningWriter(writer_prefix, path_provider) controller = JungfrauController(self.drv) + self.ispyb_detector_id, _ = soft_signal_r_and_setter( + int, + initial_value=detector_id, + ) super().__init__(controller, writer, name=name) @AsyncStatus.wrap From 89344149e311fa525657bb3fedbd0ca2036368fa Mon Sep 17 00:00:00 2001 From: Oliver Silvester Date: Thu, 19 Feb 2026 16:55:50 +0000 Subject: [PATCH 2/3] linting --- src/dodal/beamlines/i24.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/dodal/beamlines/i24.py b/src/dodal/beamlines/i24.py index b6c8a1903e..dea0b66810 100644 --- a/src/dodal/beamlines/i24.py +++ b/src/dodal/beamlines/i24.py @@ -1,11 +1,8 @@ -from functools import cache -from pathlib import Path from ophyd_async.core import AutoMaxIncrementingPathProvider, PathProvider 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 ( From 2ce4bb42ef4c388fa23e944acb3cc28f2c59144b Mon Sep 17 00:00:00 2001 From: Oliver Silvester Date: Thu, 19 Feb 2026 17:17:39 +0000 Subject: [PATCH 3/3] re-add path provider --- src/dodal/beamlines/i24.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/dodal/beamlines/i24.py b/src/dodal/beamlines/i24.py index dea0b66810..9a60e2432c 100644 --- a/src/dodal/beamlines/i24.py +++ b/src/dodal/beamlines/i24.py @@ -1,8 +1,11 @@ +from functools import cache +from pathlib import Path from ophyd_async.core import AutoMaxIncrementingPathProvider, PathProvider 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 ( @@ -53,6 +56,16 @@ devices = DeviceManager() +@devices.fixture +@cache +def path_provider() -> PathProvider: + return StaticVisitPathProvider( + BL, + Path("/tmp"), + client=LocalDirectoryServiceClient(), + ) + + @devices.factory() def attenuator() -> EnumFilterAttenuator: return EnumFilterAttenuator(