From b1719db402dfc39646769c4b85d43cde8f4a9c9d Mon Sep 17 00:00:00 2001 From: Shihab Suliman Date: Tue, 21 Jul 2026 09:23:18 +0000 Subject: [PATCH 1/2] chore: minimal changes to get pva transport working --- src/fastcs_eiger/controllers/eiger_controller.py | 2 +- src/fastcs_eiger/controllers/eiger_subsystem_controller.py | 1 + src/fastcs_eiger/controllers/odin/eiger_odin_controller.py | 2 +- src/fastcs_eiger/fastcs-eiger-odin.yaml | 2 +- src/fastcs_eiger/fastcs-eiger.yaml | 2 +- tests/system/test_eiger_introspection.py | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/fastcs_eiger/controllers/eiger_controller.py b/src/fastcs_eiger/controllers/eiger_controller.py index e3cd216..fc5627d 100644 --- a/src/fastcs_eiger/controllers/eiger_controller.py +++ b/src/fastcs_eiger/controllers/eiger_controller.py @@ -38,7 +38,7 @@ class EigerController(Controller): # Internal Attributes stale_parameters = AttrR(Bool()) arm_timeout = AttrRW( - Int(min=1), + Int(min=0), initial_value=3, description="Timeout for arm command", group=COMMAND_GROUP, diff --git a/src/fastcs_eiger/controllers/eiger_subsystem_controller.py b/src/fastcs_eiger/controllers/eiger_subsystem_controller.py index 9b0cf86..b07ac82 100644 --- a/src/fastcs_eiger/controllers/eiger_subsystem_controller.py +++ b/src/fastcs_eiger/controllers/eiger_subsystem_controller.py @@ -39,6 +39,7 @@ # TODO: Is it a bad idea to include these? "test_image_mode", "test_image_value", + "description", # Shadows description field on controllers ] # Parameters that are in the API but missing from keys diff --git a/src/fastcs_eiger/controllers/odin/eiger_odin_controller.py b/src/fastcs_eiger/controllers/odin/eiger_odin_controller.py index 450f266..552989e 100644 --- a/src/fastcs_eiger/controllers/odin/eiger_odin_controller.py +++ b/src/fastcs_eiger/controllers/odin/eiger_odin_controller.py @@ -24,7 +24,7 @@ class EigerOdinController(EigerController): """Eiger controller with Odin sub controller""" start_writing_timeout = AttrRW( - Int(min=1), + Int(min=0), initial_value=5, description="Timeout for start writing command", group=COMMAND_GROUP, diff --git a/src/fastcs_eiger/fastcs-eiger-odin.yaml b/src/fastcs_eiger/fastcs-eiger-odin.yaml index 7b25c31..2bf595d 100644 --- a/src/fastcs_eiger/fastcs-eiger-odin.yaml +++ b/src/fastcs_eiger/fastcs-eiger-odin.yaml @@ -10,7 +10,7 @@ controllers: port: 8888 api_version: "1.8.0" transport: - - epicsca: {} + - epicspva: {} gui: title: "Eiger - EIGER" output_dir: ./opi/ diff --git a/src/fastcs_eiger/fastcs-eiger.yaml b/src/fastcs_eiger/fastcs-eiger.yaml index aa72165..aa001fa 100644 --- a/src/fastcs_eiger/fastcs-eiger.yaml +++ b/src/fastcs_eiger/fastcs-eiger.yaml @@ -7,7 +7,7 @@ controllers: port: 8081 api_version: "1.8.0" transport: - - epicsca: {} + - epicspva: {} gui: title: "Eiger - EIGER" output_dir: ./opi/ diff --git a/tests/system/test_eiger_introspection.py b/tests/system/test_eiger_introspection.py index 07a3862..9eb25c7 100644 --- a/tests/system/test_eiger_introspection.py +++ b/tests/system/test_eiger_introspection.py @@ -77,7 +77,7 @@ async def test_attribute_creation(sim_eiger): detector_attributes = EigerDetectorController._create_attributes( subsystem_parameters["detector"] ) - assert len(detector_attributes) == 76 + assert len(detector_attributes) == 75 monitor_attributes = EigerMonitorController._create_attributes( subsystem_parameters["monitor"] ) From 1a67e1fe8c8c7af5d186d719b10bfd5f24c38fe3 Mon Sep 17 00:00:00 2001 From: Shihab Suliman Date: Tue, 21 Jul 2026 11:20:49 +0000 Subject: [PATCH 2/2] chore: remove description from expected introspected params --- tests/system/parameters.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tests/system/parameters.json b/tests/system/parameters.json index 0e667ba..a8416da 100644 --- a/tests/system/parameters.json +++ b/tests/system/parameters.json @@ -215,15 +215,6 @@ "value_type": "string" } }, - "description": { - "subsystem": "detector", - "mode": "config", - "key": "description", - "response": { - "access_mode": "r", - "value_type": "string" - } - }, "detector_distance": { "subsystem": "detector", "mode": "config",