From b63e3818666557bc882bf5cd99ff0dc445f6c0a1 Mon Sep 17 00:00:00 2001 From: Richard Dixey Date: Mon, 1 Dec 2025 10:40:12 +0000 Subject: [PATCH 1/4] remove nexpi --- src/ophyd_async/fastcs/eiger/_eiger_io.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ophyd_async/fastcs/eiger/_eiger_io.py b/src/ophyd_async/fastcs/eiger/_eiger_io.py index e9c2fb677a..16efa54804 100644 --- a/src/ophyd_async/fastcs/eiger/_eiger_io.py +++ b/src/ophyd_async/fastcs/eiger/_eiger_io.py @@ -29,7 +29,6 @@ class EigerDetectorIO(Device): frame_time: SignalRW[float] nimages: SignalRW[int] ntrigger: SignalRW[int] - nexpi: SignalRW[int] trigger_mode: SignalRW[str] roi_mode: SignalRW[str] photon_energy: SignalRW[float] From 6389c51a98999eee07d86e389520e6a870e0c1b0 Mon Sep 17 00:00:00 2001 From: Richard Dixey <185198552+RJCD-Diamond@users.noreply.github.com> Date: Tue, 9 Dec 2025 17:08:40 +0000 Subject: [PATCH 2/4] Make nexpi optional --- src/ophyd_async/fastcs/eiger/_eiger_io.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ophyd_async/fastcs/eiger/_eiger_io.py b/src/ophyd_async/fastcs/eiger/_eiger_io.py index 16efa54804..f80e07090e 100644 --- a/src/ophyd_async/fastcs/eiger/_eiger_io.py +++ b/src/ophyd_async/fastcs/eiger/_eiger_io.py @@ -28,6 +28,7 @@ class EigerDetectorIO(Device): count_time: SignalRW[float] frame_time: SignalRW[float] nimages: SignalRW[int] + nexpi: Optional[SignalRW[int]] ntrigger: SignalRW[int] trigger_mode: SignalRW[str] roi_mode: SignalRW[str] From 9132eb06a12b5056865192ea06da16d74fd7e907 Mon Sep 17 00:00:00 2001 From: Richard Dixey <185198552+RJCD-Diamond@users.noreply.github.com> Date: Tue, 9 Dec 2025 17:13:26 +0000 Subject: [PATCH 3/4] Add Optional type hint for nexpi attribute --- src/ophyd_async/fastcs/eiger/_eiger_io.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ophyd_async/fastcs/eiger/_eiger_io.py b/src/ophyd_async/fastcs/eiger/_eiger_io.py index f80e07090e..945a615d23 100644 --- a/src/ophyd_async/fastcs/eiger/_eiger_io.py +++ b/src/ophyd_async/fastcs/eiger/_eiger_io.py @@ -1,3 +1,5 @@ +from typing import Optional + from ophyd_async.core import ( Device, SignalR, @@ -28,8 +30,8 @@ class EigerDetectorIO(Device): count_time: SignalRW[float] frame_time: SignalRW[float] nimages: SignalRW[int] - nexpi: Optional[SignalRW[int]] ntrigger: SignalRW[int] + nexpi: Optional[SignalRW[int]] trigger_mode: SignalRW[str] roi_mode: SignalRW[str] photon_energy: SignalRW[float] From 8e671e37eeacc17f3ce794b3f2d3ef7605a8df40 Mon Sep 17 00:00:00 2001 From: Richard Dixey Date: Wed, 10 Dec 2025 10:16:16 +0000 Subject: [PATCH 4/4] remove typing optional and set to None --- src/ophyd_async/fastcs/eiger/_eiger_io.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/ophyd_async/fastcs/eiger/_eiger_io.py b/src/ophyd_async/fastcs/eiger/_eiger_io.py index 945a615d23..35ad7b83f2 100644 --- a/src/ophyd_async/fastcs/eiger/_eiger_io.py +++ b/src/ophyd_async/fastcs/eiger/_eiger_io.py @@ -1,5 +1,3 @@ -from typing import Optional - from ophyd_async.core import ( Device, SignalR, @@ -31,7 +29,7 @@ class EigerDetectorIO(Device): frame_time: SignalRW[float] nimages: SignalRW[int] ntrigger: SignalRW[int] - nexpi: Optional[SignalRW[int]] + nexpi: SignalRW[int] | None trigger_mode: SignalRW[str] roi_mode: SignalRW[str] photon_energy: SignalRW[float]