fix: change how abr posotion is updated
This commit is contained in:
+4
-3
@@ -1821,9 +1821,10 @@ class AareDAQ:
|
||||
self.__cfg.set_busy(BeamlineStateEnum.SampleAlignment)
|
||||
try:
|
||||
self.__cfg.abr_meas_pos = AerotechCoordinate(at_mm=self.__devs.aerotech_pos.at_mm)
|
||||
self.__devs.bec_worker.save_current_aerotech_position()
|
||||
self.__devs.bec_worker.update_to_current_aerotech_position(pos=self.__devs.aerotech_pos)
|
||||
self.__cfg.state_busy = False
|
||||
except Exception:
|
||||
except Exception as e:
|
||||
logger.exception(f"Failed to save abr_meas_pos: {e}")
|
||||
self.__cfg.state_busy = False
|
||||
raise
|
||||
|
||||
@@ -3231,7 +3232,7 @@ class AareDAQ:
|
||||
exp_shutter_open = self.__devs.exp_shutter.state()
|
||||
pss_prohibited = self.__devs.pss.is_prohibited()
|
||||
pss_alarm = self.__devs.pss.alarm_active()
|
||||
flux = self.__devs.full_flux
|
||||
flux = self.__devs.flux
|
||||
samcam_settings = self.__devs.samcam_settings
|
||||
bl = self.__bl
|
||||
transmission = self.__devs.transmission
|
||||
|
||||
Reference in New Issue
Block a user