bec/csaxs_bec
0
0
Fork 2
Code Issues 17 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

fix(eiger): fix eiger integration for 1.5M with proper calibration files on JFJ server

Browse Source
This commit is contained in:
x12sa
2026-06-30 14:31:36 +02:00
committed by holler
co-authored by holler
parent bf3235da0f
commit 032b42e851
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
csaxs_bec/devices/jungfraujoch/eiger.py
+18 -22
View File
@@ -275,22 +275,21 @@ class Eiger(PSIDeviceBase):
self.scan_parameters = fetch_scan_info(self.scan_info)
# TODO Reactivate
# try:
# incident_energy = self._get_beam_energy(self.device_manager)
# if self._incident_energy is None:
# self._incident_energy = round(float(incident_energy), 3)
# elif not np.isclose(
# self._incident_energy, incident_energy, atol=0.1
# ): # 0.1 keV tolerance
# logger.warning(
# f"Incident energy changed from {self._incident_energy} keV to {incident_energy} keV for device {self.name}. "
# )
# self._incident_energy = round(float(incident_energy), 3)
# except Exception as e:
# 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
try:
incident_energy = self._get_beam_energy(self.device_manager)
if self._incident_energy is None:
self._incident_energy = round(float(incident_energy), 3)
elif not np.isclose(
self._incident_energy, incident_energy, atol=0.1
): # 0.1 keV tolerance
logger.warning(
f"Incident energy changed from {self._incident_energy} keV to {incident_energy} keV for device {self.name}. "
)
self._incident_energy = round(float(incident_energy), 3)
except Exception as e:
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)
logger.info(f"Device {self.name} uses incident energy of {self._incident_energy} keV.")
@@ -449,9 +448,6 @@ class Eiger(PSIDeviceBase):
Returns:
float: The beam energy in keV.
"""
if hasattr(device_manager, "devices") and hasattr(device_manager.devices, "ccm_energy"):
energy = device_manager.devices.ccm_energy.read()[
device_manager.devices.ccm_energy.name
]["value"]
return energy
return device_manager.devices.ccm_energy.read()[device_manager.devices.ccm_energy.name][
"value"
]