bec/csaxs_bec
0
0
Fork 2
Code Issues 17 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

fix cont_grid scan

Browse Source
This commit is contained in:
appel_c
2026-06-23 13:04:33 +02:00
parent 57b42fc1d1
commit 6614be50d9
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
csaxs_bec/devices/epics/delay_generator_csaxs/ddg_1.py
+16 -15
View File
@@ -599,23 +599,24 @@ class DDG1(PSIDeviceBase, DelayGeneratorCSAXS):
# an acquisition regularly with a WaitTimeoutError, the timeout can be increased but it should
# be investigated why the EPICS interface is slow to respond.
try:
current_time = time.time()
while time.time() - current_time < 3 and mcs.acquiring.get() != ACQUIRING.ACQUIRING:
time.sleep(0.1)
logger.warning(
f"MCS card is not in acquiring state, current state: {mcs.acquiring.get()}"
)
if mcs.acquiring.get() != ACQUIRING.ACQUIRING:
logger.warning(
f"MCS card is not in acquiring state, current state: {mcs.acquiring.get()}"
)
status_mcs.wait(timeout=3)
# current_time = time.time()
# while time.time() - current_time < 3 and mcs.acquiring.get() != ACQUIRING.ACQUIRING:
# time.sleep(0.1)
# logger.warning(
# f"MCS card is not in acquiring state, current state: {mcs.acquiring.get()}"
# )
# if mcs.acquiring.get() != ACQUIRING.ACQUIRING:
# logger.error(
# f"MCS card is not finishing after 3s, current state: {mcs.acquiring.get()}, waiting another 3s for its return to ACQUIRING state. If this happens regularly, please check the EPICS interface and the MCS card logic."
# )
status_mcs.wait(timeout=3)
except Exception as exc:
logger.warning(f"MCS did not go to Acquiring within 3s. Retrying erase_start {exc}")
mcs.erase_start.put(1)
status_mcs.wait(timeout=3)
status = TransitionStatus(mcs.acquiring, [ACQUIRING.ACQUIRING, ACQUIRING.DONE])
logger.debug(f"Finished preparing mcs card {time.time()-start_time}")
raise exc
# mcs.erase_start.put(1)
# status_mcs.wait(timeout=3)
status = CompareStatus(mcs.acquiring, ACQUIRING.DONE)
logger.info(f"Finished preparing mcs card {time.time()-start_time}")
# Send trigger
self.trigger_shot.put(1, use_complete=True)
csaxs_bec/scans/scans_v4/cont_grid.py
+1 -1
View File
@@ -272,7 +272,7 @@ class ContGrid(ScanBase):
status_motor.wait()
status_mcs.wait()
mcs_aquiring_status = self.mcs.get_transition_status(
signal="acquiring", transition=[1, 0]
signal_name="acquiring", transition=[1, 0]
)
self.at_each_point(