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

Scan result in data json

Browse source
This commit is contained in:
jaknapper 2025-05-13 13:00:04 +01:00
parent 9734bba23b
commit 1952e05284
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -186,12 +186,10 @@ class SmartScanThing(Thing):
# record starting position so we can return there # record starting position so we can return there
self._starting_position = self._stage.position self._starting_position = self._stage.position
self._run_scan() self._run_scan()
self._update_scan_data_json()
except Exception as e: except Exception as e:
# If _scan_data is set then scan started # If _scan_data is set then scan started
if self._scan_data is not None: if self._scan_data is not None:
self._return_to_starting_position() self._return_to_starting_position()
self._update_scan_data_json()
if not isinstance(e, NotEnoughFreeSpaceError): if not isinstance(e, NotEnoughFreeSpaceError):
# Don't stich if drive is full (already logged) # Don't stich if drive is full (already logged)
self._perform_final_stitch() self._perform_final_stitch()
@ -476,10 +474,13 @@ class SmartScanThing(Thing):
json.dump(data, f, ensure_ascii=False, indent=4) json.dump(data, f, ensure_ascii=False, indent=4)
@_scan_running @_scan_running
def _update_scan_data_json(self): def _update_scan_data_json(self, scan_result: str):
""" """
Update scan data as a JSON file in the scan folder, with Update scan data as a JSON file in the scan folder, with
data only known at the end of the scan. data only known at the end of the scan.
Takes scan_result, a string that is either "success",
"cancelled by user", or the error that ended the scan.
""" """
# Should this be a method of the scan_data dataclass? # Should this be a method of the scan_data dataclass?
current_time = datetime.now().replace(microsecond=0) current_time = datetime.now().replace(microsecond=0)
@ -492,11 +493,10 @@ class SmartScanThing(Thing):
outputs = { outputs = {
"image_count": self._scan_images_taken, "image_count": self._scan_images_taken,
"duration": str(duration), "duration": str(duration),
"scan_result": scan_result,
} }
scan_data_fname = os.path.join( scan_data_fname = os.path.join(self._ongoing_scan_images_dir, "scan_data.json")
self._ongoing_scan_images_dir, "scan_data.json"
)
with open(scan_data_fname, encoding="utf-8") as f: with open(scan_data_fname, encoding="utf-8") as f:
data = json.load(f) data = json.load(f)
@ -540,12 +540,15 @@ class SmartScanThing(Thing):
# This is the main loop of the scan! # This is the main loop of the scan!
self._main_scan_loop() self._main_scan_loop()
self._update_scan_data_json(scan_result="success")
except InvocationCancelledError: except InvocationCancelledError:
scan_successful = False scan_successful = False
self._scan_logger.info("Stopping scan because it was cancelled.") self._scan_logger.info("Stopping scan because it was cancelled.")
self._update_scan_data_json(scan_result="cancelled by user")
except NotEnoughFreeSpaceError as e: except NotEnoughFreeSpaceError as e:
scan_successful = False scan_successful = False
self._update_scan_data_json(scan_result=str(e))
self._scan_logger.error( self._scan_logger.error(
f"Stopping scan to avoid filling up the disk: {e}", f"Stopping scan to avoid filling up the disk: {e}",
exc_info=e, exc_info=e,