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

Merge branch 'cancel-scan-early-bugfix' into 'v3'

Browse source 
Fix error trying to purge empty scans if current scan has no images

Closes #563

See merge request openflexure/openflexure-microscope-server!398
This commit is contained in:
Joe Knapper 2025-09-26 09:33:21 +00:00
commit 3deb5a4897
2 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -179,6 +179,9 @@ class SmartScanThing(lt.Thing):
# Ensure any PreviewStitcher created cannot be reused.
self._preview_stitcher = None
# Remove any scan folders containing zero images.
self.purge_empty_scans(logger=logger)
@_scan_running
def _check_background_and_csm_set(self) -> None:
"""Before starting a scan, check that background and camera-stage-mapping are set.
@ -386,9 +389,6 @@ class SmartScanThing(lt.Thing):
self._return_to_starting_position()
self._perform_final_stitch()
# Remove any scan folders containing zero images
self.purge_empty_scans(logger=self._scan_logger)
@_scan_running
def _main_scan_loop(self) -> None:
"""Run the main loop of the scan.