From 007df87bd216371dd554fcf653b2cc7f3db909dc Mon Sep 17 00:00:00 2001
From: x12sa <x12sa@psi.ch>
Date: Thu, 27 Nov 2025 10:46:20 +0100
Subject: [PATCH] minor changes from the beamline

---
 csaxs_bec/devices/jungfraujoch/eiger.py    | 10 ++++++----
 csaxs_bec/devices/jungfraujoch/eiger_9m.py |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/csaxs_bec/devices/jungfraujoch/eiger.py b/csaxs_bec/devices/jungfraujoch/eiger.py
index 70ee01f..b8319d7 100644
--- a/csaxs_bec/devices/jungfraujoch/eiger.py
+++ b/csaxs_bec/devices/jungfraujoch/eiger.py
@@ -173,9 +173,10 @@ class Eiger(PSIDeviceBase):
 
         # Get available detectors
         available_detectors = self.jfj_client.api.config_select_detector_get(_request_timeout=5)
+        logger.info(f"Available detectors {available_detectors}")
         # Get current detector
         current_detector_name = ""
-        if available_detectors.current_id:
+        if available_detectors.current_id is not None:
             detector_selection = [
                 det.description
                 for det in available_detectors.detectors
@@ -260,7 +261,7 @@ class Eiger(PSIDeviceBase):
             detector_distance_mm=self.detector_distance,
             incident_energy_ke_v=incident_energy,
         )
-        logger.debug(f"Setting data_settings: {yaml.dump(data_settings.to_dict(), indent=4)}")
+        logger.info(f"Setting data_settings: {yaml.dump(data_settings.to_dict(), indent=4)}")
         prep_time = start_time - time.time()
         logger.debug(f"Prepared information for eiger to start acquisition in {prep_time:.2f}s")
         self.jfj_client.wait_for_idle(timeout=10, request_timeout=10)  # Ensure we are in IDLE state
@@ -291,8 +292,9 @@ class Eiger(PSIDeviceBase):
 
         def wait_for_complete():
             start_time = time.time()
-            timeout = 10
-            for _ in range(timeout):
+            timeout = 20
+            for ii in range(timeout):
+                logger.info(f"Running loop with timeout {time.time() - start_time}.")
                 if self.jfj_client.wait_for_idle(timeout=1, request_timeout=10):
                     return
             statistics: MeasurementStatistics = self.jfj_client.api.statistics_data_collection_get(
diff --git a/csaxs_bec/devices/jungfraujoch/eiger_9m.py b/csaxs_bec/devices/jungfraujoch/eiger_9m.py
index f44ca1d..f206103 100644
--- a/csaxs_bec/devices/jungfraujoch/eiger_9m.py
+++ b/csaxs_bec/devices/jungfraujoch/eiger_9m.py
@@ -21,18 +21,18 @@ if TYPE_CHECKING:  # pragma no cover
     from bec_server.device_server.device_server import DeviceManagerDS
 
 EIGER9M_READOUT_TIME_US = 500e-6  # 500 microseconds in s
-DETECTOR_NAME = "EIGER 8.5M (tmp)"  # "EIGER 9M""
+DETECTOR_NAME = "EIGER 9M"  # "EIGER 9M""
 
 
 # pylint:disable=invalid-name
 class Eiger9M(Eiger):
     """
-    Eiger 1.5M specific integration for the in-vaccum Eiger.
+    EIGER 9M specific integration for the in-vaccum Eiger.
 
     The logic implemented here is coupled to the DelayGenerator integration,
     repsonsible for the global triggering of all devices through a single Trigger logic.
     Please check the eiger.py class for more details about the integration of relevant backend
-    services. The detector_name must be set to "EIGER 1.5M:
+    services. The detector_name must be set to "EIGER 9M":
     """
 
     USER_ACCESS = Eiger.USER_ACCESS + []  # Add more user_access methods here.