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

Reordered cleanup operations for robustness

Browse source 
I now define the variables needed in the finally: block at
the very start, so I can test if they are None.

I've reordered the final move so it can happen as we are awaiting the background processes. I've added exception handling so this won't cause problems with the lock.
This commit is contained in:
Richard Bowman 2024-01-11 16:39:06 +00:00
parent 606ee9bcc2
commit a279831c41
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -374,6 +374,11 @@ class SmartScanThing(Thing):
* `overlap` is the fraction by which images should overlap, i.e. * `overlap` is the fraction by which images should overlap, i.e.
`0.3` means we will move by 70% of the field of view each time. `0.3` means we will move by 70% of the field of view each time.
""" """
# Define these variables so we can use them in the finally: block
# (after testing they are not None)
scan_folder = None
images_folder = None
starting_position = None
self._scan_lock.acquire(timeout=0.1) self._scan_lock.acquire(timeout=0.1)
try: try:
# Before anything else, check that we've got a background set # Before anything else, check that we've got a background set
@ -578,21 +583,26 @@ class SmartScanThing(Thing):
) )
raise e raise e
finally: finally:
try:
logger.info("Returning to starting position.")
if starting_position is not None:
stage.move_absolute(**starting_position, block_cancellation=True)
finally:
self._scan_lock.release()
logger.info("Waiting for background processes to finish...") logger.info("Waiting for background processes to finish...")
self.preview_stitch_wait() self.preview_stitch_wait()
self.correlate_wait() self.correlate_wait()
logger.info("Stitching final image (may take some time)...") logger.info("Stitching final image (may take some time)...")
try: try:
self.stitch_scan(logger, os.path.basename(scan_folder)) if scan_folder:
self.stitch_scan(logger, os.path.basename(scan_folder))
except SubprocessError as e: except SubprocessError as e:
logger.exception(f"Stitching failed: {e}") logger.exception(f"Stitching failed: {e}")
logger.info("Creating zip archive of images (may take some time)...") logger.info("Creating zip archive of images (may take some time)...")
shutil.make_archive( if images_folder and os.path.isdir(images_folder):
os.path.join(scan_folder, "images"), "zip", images_folder shutil.make_archive(
) os.path.join(scan_folder, "images"), "zip", images_folder
logger.info("Returning to starting position.") )
stage.move_absolute(**starting_position, block_cancellation=True)
self._scan_lock.release()
@thing_property @thing_property
def max_range(self) -> int: def max_range(self) -> int: