From 8df72193adddfa73ae9afaeed18a2ee59709c160 Mon Sep 17 00:00:00 2001
From: x12sa <x12sa@psi.ch>
Date: Tue, 23 Jun 2026 14:50:05 +0200
Subject: [PATCH] fix: resolve merge conflict

---
 csaxs_bec/device_configs/bl_detectors.yaml | 28 +++++++++++-----------
 csaxs_bec/device_configs/main.yaml         |  8 +++----
 csaxs_bec/devices/jungfraujoch/eiger.py    |  3 +--
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/csaxs_bec/device_configs/bl_detectors.yaml b/csaxs_bec/device_configs/bl_detectors.yaml
index 14243e7..a7cb3e2 100644
--- a/csaxs_bec/device_configs/bl_detectors.yaml
+++ b/csaxs_bec/device_configs/bl_detectors.yaml
@@ -1,17 +1,6 @@
-# eiger_1_5:
-#   description: Eiger 1.5M in-vacuum detector 
-#   deviceClass: csaxs_bec.devices.jungfraujoch.eiger_1_5m.Eiger1_5M
-#   deviceConfig:
-#     detector_distance: 100
-#     beam_center: [0, 0]
-#   onFailure: raise
-#   enabled: True
-#   readoutPriority: async
-#   softwareTrigger: False
-
-eiger_9:
-  description: Eiger 9M detector 
-  deviceClass: csaxs_bec.devices.jungfraujoch.eiger_9m.Eiger9M
+eiger_1_5:
+  description: Eiger 1.5M in-vacuum detector 
+  deviceClass: csaxs_bec.devices.jungfraujoch.eiger_1_5m.Eiger1_5M
   deviceConfig:
     detector_distance: 2150
     beam_center: [860, 1219]
@@ -20,6 +9,17 @@ eiger_9:
   readoutPriority: async
   softwareTrigger: False
 
+# eiger_9:
+#   description: Eiger 9M detector 
+#   deviceClass: csaxs_bec.devices.jungfraujoch.eiger_9m.Eiger9M
+#   deviceConfig:
+#     detector_distance: 2200
+#     beam_center: [870, 1203]
+#   onFailure: raise
+#   enabled: True
+#   readoutPriority: async
+#   softwareTrigger: False
+
 # ids_cam:
 #   description: IDS camera for live image acquisition
 #   deviceClass: csaxs_bec.devices.ids_cameras.IDSCamera
diff --git a/csaxs_bec/device_configs/main.yaml b/csaxs_bec/device_configs/main.yaml
index 7aef1d2..8f3fb43 100644
--- a/csaxs_bec/device_configs/main.yaml
+++ b/csaxs_bec/device_configs/main.yaml
@@ -19,8 +19,8 @@ detectors:
 #sastt:
 #  - !include ./sastt.yaml
 
-# flomni:
-#  - !include ./ptycho_flomni.yaml
+flomni:
+ - !include ./ptycho_flomni.yaml
 
 #omny:
 #  - !include ./ptycho_omny.yaml
@@ -28,7 +28,7 @@ detectors:
 #lamni:
 #  - !include ./ptycho_lamni.yaml
 
-user setup:
-  - !include ./user_setup.yaml
+# user setup:
+#   - !include ./user_setup.yaml
 
 
diff --git a/csaxs_bec/devices/jungfraujoch/eiger.py b/csaxs_bec/devices/jungfraujoch/eiger.py
index 3708f72..b0cf6ea 100644
--- a/csaxs_bec/devices/jungfraujoch/eiger.py
+++ b/csaxs_bec/devices/jungfraujoch/eiger.py
@@ -290,8 +290,7 @@ class Eiger(PSIDeviceBase):
         #     logger.warning(f"Failed to set up beam energy for {self.name}: {e}")
         #     incident_energy = 12.0  #    default to 12 keV if error occurs
         #     self._incident_energy = round(float(incident_energy), 3)
-
-        self._incident_energy = 12.0  # default to 12 keV if error occurs
+        self._incident_energy = 12.0
 
         logger.info(f"Device {self.name} uses incident energy of {self._incident_energy} keV.")