mx/AareDAQ
0
1
Fork 0
Code Issues 52 Pull Requests 1 Actions Packages Projects Releases 65 Wiki Activity

bec_motors differ in some cases between beamline,s only a problem for logging/scilog messages

Browse Source
This commit is contained in:
appleb_m
2026-06-24 15:30:05 +02:00
committed by appleb_m
parent c1edacc9c3
commit 7e78433974
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/aare/devices/bec_worker.py
+18 -7
View File
@@ -377,12 +377,16 @@ class BECClientWorker:
mono_pitch_scan(plot)
except Exception as e:
self._raise_bec_error(e, operation="mono_pitch_scan", tags=["mono_pitch_scan"])
if self.beamline is MXBeamline.X06DA:
addtional_text = [f"New dcm_pitch position: {self.dev.dcm_pitch.position:5f}"]
else:
addtional_text = [f"New dcm_theta2 position: {self.dev.dccm_theta2.position:5f}"]
self.scilog_msg(
message="Mono pitch scan completed",
bold=True,
color="green",
tags=["mono_pitch_scan"],
additonal_text=[f"New dcm_pitch position: {self.dev.dcm_pitch.position:5f}"]
additonal_text=addtional_text
)
def check_current_energy(self):
@@ -407,17 +411,24 @@ class BECClientWorker:
if abs(value - self.check_current_energy()) > 1:
logger.warning(f"Energy change may have failed, current energy: {self.check_current_energy()} eV")
if beamline is MXBeamline.X10SA:
additonal_text = [f"New dcm_bragg position: {self.dev.dcm_bragg.position:4g} mrad",
f"New dcm_pitch position: {self.dev.dcm_pitch.position:4g} ",
f"Previous energy: {current_energy:.1f} eV ",
f"Requested energy: {value:.1f} eV ",
f"New current energy: {self.check_current_energy():.1f} eV"]
else:
additonal_text = [f"New dccm_theta1 position: {self.dev.dccm_theta1.position:4g} mrad",
f"New dccm_theta2 position: {self.dev.dccm_theta2.position:4g} mrad",
f"Previous energy: {current_energy:.1f} eV ",
f"Requested energy: {value:.1f} eV ",
f"New current energy: {self.check_current_energy():.1f} eV"]
self.scilog_msg(
message=f"Moved from {current_energy:.1f} eV to {value:.1f} eV",
bold=True,
color="green",
tags=["energy_change"],
additonal_text=[f"New dcm_bragg position: {self.dev.dcm_bragg.position:4g} mrad",
f"New dcm_pitch position: {self.dev.dcm_pitch.position:4g} ",
f"Previous energy: {current_energy:.1f} eV ",
f"Requested energy: {value:.1f} eV ",
f"New current energy: {self.check_current_energy():.1f} eV"]
additonal_text=additonal_text
)