mx/AareDAQ
0
1
Fork 0
Code Issues 52 Pull Requests Actions Packages Projects Releases 74 Wiki Activity

DAQ: __loop_center_sequence: now uses ml_loop_centre_box. If it does not find a target moves on

Browse Source
This commit is contained in:
leonarski_f
2025-09-11 14:50:51 +02:00
parent 6394554334
commit b9b32769ca
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daq/src/aaredaq/daq.py
+13 -4
View File
@@ -829,13 +829,22 @@ class AareDAQ:
gain = int(s.sam_cam_gain)
self.save_screenshot_db(sample_id, f"pre_alc_{sample_id}_{angle}_{s.zoom_value:.0f}_{exp}_{gain}")
self.__devs.aerotech.move(angle, wait=True)
time.sleep(1)
filename = None
exp = int(s.sam_cam_exp * 1000)
gain = int(s.sam_cam_gain)
if sample_id is not None:
filename = f"{sample_id}_{angle}_{s.zoom_value:.0f}_{exp}_{gain}"
if not os.path.exists(f"{sample_id}_{s.zoom_value:.0f}"):
os.mkdir(f"{sample_id}_{s.zoom_value:.0f}")
if not os.path.exists(f"{sample_id}_{s.zoom_value:.0f}_negative"):
os.mkdir(f"{sample_id}_{s.zoom_value:.0f}_negative")
if angle > 0:
filename = f"{sample_id}_{s.zoom_value:.0f}/{sample_id}_{angle}_{s.zoom_value:.0f}_{exp}_{gain}"
else:
filename = f"{sample_id}_{s.zoom_value:.0f}_negative/{sample_id}_{angle}_{s.zoom_value:.0f}_{exp}_{gain}"
self.__devs.smargon.target = self.__loop_center(s, filename)
target = self.__ml_loop_centre_box(sample_id, filename)
if target is None:
continue
self.__devs.smargon.target = target #self.__loop_center(s, filename, iteration=i)
self.__devs.smargon.wait(60)
print(sample_id)
if sample_id is not None: