bec: check current energy added
This commit is contained in:
@@ -385,12 +385,14 @@ class BECClientWorker:
|
||||
additonal_text=[f"New dcm_pitch position: {self.dev.dcm_pitch.position:5f}"]
|
||||
)
|
||||
|
||||
def __get_current_energy(self):
|
||||
def check_current_energy(self):
|
||||
"""Get the current energy from the BEC in eV"""
|
||||
return get_current_energy()
|
||||
energy_ev = get_current_energy()
|
||||
energy_kev = energy_ev / 1000
|
||||
return energy_kev
|
||||
|
||||
def change_energy(self, value: float | int, plot: bool = False):
|
||||
current_energy = self.__get_current_energy()
|
||||
current_energy = self.check_current_energy()
|
||||
logger.info(f"Current energy: {current_energy:.1f} eV")
|
||||
logger.info(f"Change energy requested: from {current_energy:.1f} to {value:.1f} eV")
|
||||
try:
|
||||
@@ -403,8 +405,8 @@ class BECClientWorker:
|
||||
tags=["energy_change"]
|
||||
)
|
||||
|
||||
if abs(value - self.__get_current_energy()) > 1:
|
||||
logger.warning(f"Energy change may have failed, current energy: {self.__get_current_energy()} eV")
|
||||
if abs(value - self.check_current_energy()) > 1:
|
||||
logger.warning(f"Energy change may have failed, current energy: {self.check_current_energy()} eV")
|
||||
|
||||
self.scilog_msg(
|
||||
message=f"Moved from {current_energy:.1f} eV to {value:.1f} eV",
|
||||
@@ -415,7 +417,7 @@ class BECClientWorker:
|
||||
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.__get_current_energy():.1f} eV"]
|
||||
f"New current energy: {self.check_current_energy():.1f} eV"]
|
||||
)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user