DAQ: omega check bug fix.

This commit is contained in:
2025-12-04 11:31:21 +01:00
parent 4cb6fc5745
commit 3c6630bbaa
+10 -5
View File
@@ -172,13 +172,18 @@ class AareDAQ:
def omega(self, val: float):
self.__cfg.set_busy(BeamlineStateEnum.SampleAlignment)
self.__saved_box = None
if -720 < val < 720:
self.__devs.aerotech.move(val, wait=True, speed=180.0, direct=True)
self.__cfg.state_busy = False
if -2000 < val < 2000:
try:
self.__devs.aerotech.move(val, wait=True, speed=180.0, direct=True)
self.__cfg.state_busy = False
except Exception as e:
logger.error(f"Omega error: {e}")
self.__cfg.state_busy = False
logger.error("Omega move timed out")
else:
self.__cfg.state_busy = False
logger.error("Omega has to be between -720 and 720 degrees")
raise ValueError("Omega has to be between -720 and 720 degrees (for now)")
logger.error("Omega has to be between -2000 and 2000 degrees")
raise ValueError("Omega has to be between -2000 and 2000 degrees (for now)")
@property
def zoom(self) -> float: