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

Removed settings, fixed saving issue and refactored

Browse source
This commit is contained in:
Chish36 2026-05-14 15:58:26 +01:00
parent 03dc0a065f
commit 5c128c1467
1 changed files with 7 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/openflexure_microscope_server/things/stage_measure.py
View file

@ -19,7 +19,7 @@ import time
from copy import copy from copy import copy
from datetime import datetime from datetime import datetime
from threading import Lock from threading import Lock
from typing import Any, Literal, Mapping, Optional, Self, overload from typing import Any, Literal, Mapping, Optional, overload
import numpy as np import numpy as np
@ -133,14 +133,6 @@ class RangeofMotionThing(OFMThing):
default=None, readonly=True default=None, readonly=True
) )
csm_matrix: Optional[list[list[float]]] = lt.setting(default=None, readonly=True)
stage_coords: Optional[Any] = lt.setting(default=None, readonly=True)
correlations: Optional[Any] = lt.setting(default=None, readonly=True)
time: Optional[float] = lt.setting(default=None, readonly=True)
def __init__(self, thing_server_interface: lt.ThingServerInterface) -> None: def __init__(self, thing_server_interface: lt.ThingServerInterface) -> None:
"""Initialise and create the lock.""" """Initialise and create the lock."""
super().__init__(thing_server_interface) super().__init__(thing_server_interface)
@ -148,11 +140,6 @@ class RangeofMotionThing(OFMThing):
self._stream_resolution: Optional[tuple[int, int]] = None self._stream_resolution: Optional[tuple[int, int]] = None
self._rom_data = RomDataTracker() self._rom_data = RomDataTracker()
def __enter__(self) -> Self:
"""Open hardware connection when the Thing context manager is opened."""
super().__enter__()
return self
@lt.action @lt.action
def perform_rom_test(self) -> Mapping[str, Any]: def perform_rom_test(self) -> Mapping[str, Any]:
"""Measures the range of motion of the stage across the x and y axes. """Measures the range of motion of the stage across the x and y axes.
@ -204,20 +191,19 @@ class RangeofMotionThing(OFMThing):
) )
data = { data = {
"calibrated_range": [step_range[0], step_range[1]], "calibrated_range": [step_range[0], step_range[1]],
"stage_coords": self.stage_coords, "stage_coords": stage_dic,
"correlations": self.correlations, "correlations": cor_dic,
"csm_matrix": self._csm.image_to_stage_displacement_matrix, "csm_matrix": self._csm.image_to_stage_displacement_matrix,
"time": self.time, "time": total_time,
} }
if not os.path.exists(self.data_dir): if not os.path.exists(self.data_dir):
os.makedirs(self.data_dir) os.makedirs(self.data_dir)
timestamp = datetime.now().strftime("%Y_%m_%d_%H_%M")
datafile_path = os.path.join(self.data_dir, f"rom_data_{timestamp}.json")
with open( with open(
os.path.join( datafile_path,
self.data_dir,
f"rom_data_{datetime.now().strftime('%Y_%m_%d_%H_%M')}.json",
),
"w", "w",
encoding="utf-8", encoding="utf-8",
) as f: ) as f: