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

Inputs renamed to data where appropriate

Browse source
This commit is contained in:
jaknapper 2025-05-13 12:45:55 +01:00
parent 845c21c68a
commit 9734bba23b
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -186,12 +186,12 @@ 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_inputs_json() 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_inputs_json() 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()
@ -457,7 +457,7 @@ class SmartScanThing(Thing):
Save scan inputs as a JSON file in the scan folder, to allow Save scan inputs as a JSON file in the scan folder, to allow
the user to review the settings used in the scan the user to review the settings used in the scan
""" """
# This should be a method of the scan_data dataclass # Should this be a method of the scan_data dataclass?
data = { data = {
"scan_name": self._ongoing_scan_name, "scan_name": self._ongoing_scan_name,
@ -470,18 +470,18 @@ class SmartScanThing(Thing):
} }
scan_inputs_fname = os.path.join( scan_inputs_fname = os.path.join(
self._ongoing_scan_images_dir, "scan_inputs.json" self._ongoing_scan_images_dir, "scan_data.json"
) )
with open(scan_inputs_fname, "w", encoding="utf-8") as f: with open(scan_inputs_fname, "w", encoding="utf-8") as f:
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_inputs_json(self): def _update_scan_data_json(self):
""" """
Update scan inputs 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.
""" """
# This should 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)
start_time = datetime.strptime( start_time = datetime.strptime(
self._scan_data["start_time"], "%H_%M_%S-%d_%m_%Y" self._scan_data["start_time"], "%H_%M_%S-%d_%m_%Y"
@ -494,16 +494,16 @@ class SmartScanThing(Thing):
"duration": str(duration), "duration": str(duration),
} }
scan_inputs_fname = os.path.join( scan_data_fname = os.path.join(
self._ongoing_scan_images_dir, "scan_inputs.json" self._ongoing_scan_images_dir, "scan_data.json"
) )
with open(scan_inputs_fname, encoding="utf-8") as f: with open(scan_data_fname, encoding="utf-8") as f:
data = json.load(f) data = json.load(f)
data.update(outputs) data.update(outputs)
with open(scan_inputs_fname, "w", encoding="utf-8") as f: with open(scan_data_fname, "w", encoding="utf-8") as f:
json.dump(data, f, ensure_ascii=False, indent=4) json.dump(data, f, ensure_ascii=False, indent=4)
@_scan_running @_scan_running
@ -1034,7 +1034,7 @@ class SmartScanThing(Thing):
Note that as this is a thing_action it needs the logger passed as Note that as this is a thing_action it needs the logger passed as
a variable if called from another thing action a variable if called from another thing action
""" """
json_fname = "scan_inputs.json" json_fname = "scan_data.json"
images_folder = self.images_dir_for_scan(scan_name=scan_name) images_folder = self.images_dir_for_scan(scan_name=scan_name)
json_fpath = os.path.join(images_folder, json_fname) json_fpath = os.path.join(images_folder, json_fname)