From 7e7843397481bf5d38ef83eabeb422e08aa1c2e3 Mon Sep 17 00:00:00 2001 From: appleb_m Date: Mon, 22 Jun 2026 10:39:55 +0200 Subject: [PATCH] bec_motors differ in some cases between beamline,s only a problem for logging/scilog messages --- src/aare/devices/bec_worker.py | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/src/aare/devices/bec_worker.py b/src/aare/devices/bec_worker.py index 93905a7c..4152b382 100644 --- a/src/aare/devices/bec_worker.py +++ b/src/aare/devices/bec_worker.py @@ -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 )