rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move pre_scan and switch stream as late as possible

Browse source
This commit is contained in:
Joe Knapper 2026-03-09 18:53:39 +00:00
parent 85eefcc903
commit b0c9223b04
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/openflexure_microscope_server/things/smart_scan.py
View file

@ -376,11 +376,7 @@ class SmartScanThing(OFMThing):
starting x,y,z position. starting x,y,z position.
""" """
try: try:
self._cam.start_streaming(main_resolution=(3280, 2464))
self._scan_data = self._collect_scan_data(workflow) self._scan_data = self._collect_scan_data(workflow)
workflow.pre_scan_routine(self._scan_data.workflow_settings)
self.ongoing_scan.save_scan_data(self._scan_data)
images_dir = self.ongoing_scan.images_dir images_dir = self.ongoing_scan.images_dir
# Type narrowing # Type narrowing
if images_dir is None: if images_dir is None:
@ -388,6 +384,10 @@ class SmartScanThing(OFMThing):
"Couldn't run scan, images directory was not created." "Couldn't run scan, images directory was not created."
) )
self.ongoing_scan.save_scan_data(self._scan_data)
self._cam.start_streaming(main_resolution=(3280, 2464))
workflow.pre_scan_routine(self._scan_data.workflow_settings)
# If stitching settings are None then this type of scan can't be stitched # If stitching settings are None then this type of scan can't be stitched
if self.scan_data.stitching_settings is not None: if self.scan_data.stitching_settings is not None:
# Settings exist, so create preview stitcher # Settings exist, so create preview stitcher