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

Remove correlation only stitching, now covered by preview stitch

Browse source
This commit is contained in:
jaknapper 2025-04-14 17:34:11 +01:00 • committed by Joe Knapper
parent 3adc34c30b
commit b8ddab1ed8
1 changed files with 4 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -132,8 +132,6 @@ class SmartScanThing(Thing):
self._stitching_script = path_to_openflexure_stitch self._stitching_script = path_to_openflexure_stitch
self._preview_stitch_popen = None self._preview_stitch_popen = None
self._preview_stitch_popen_lock = threading.Lock() self._preview_stitch_popen_lock = threading.Lock()
self._correlate_popen = None
self._correlate_popen_lock = threading.Lock()
self._scan_lock = threading.Lock() self._scan_lock = threading.Lock()
# Variables set by the scan # Variables set by the scan
@ -472,10 +470,7 @@ class SmartScanThing(Thing):
""" """
if self._scan_images_taken > 3: if self._scan_images_taken > 3:
if not self._preview_stitch_running(): if not self._preview_stitch_running():
self._preview_stitch_start() self._preview_stitch_start(overlap=self._scan_data["overlap"])
if self._scan_data["stitch_automatically"]:
if not self._correlate_running():
self._correlate_start(overlap=self._scan_data["overlap"])
@_scan_running @_scan_running
def _run_scan(self): def _run_scan(self):
@ -708,7 +703,6 @@ class SmartScanThing(Thing):
self._scan_logger.info("Waiting for background processes to finish...") self._scan_logger.info("Waiting for background processes to finish...")
self._preview_stitch_wait() self._preview_stitch_wait()
self._correlate_wait()
try: try:
if self._scan_data["stitch_automatically"]: if self._scan_data["stitch_automatically"]:
self._scan_logger.info("Stitching final image (may take some time)...") self._scan_logger.info("Stitching final image (may take some time)...")
@ -985,7 +979,7 @@ class SmartScanThing(Thing):
raise HTTPException(404, "File not found") raise HTTPException(404, "File not found")
@_scan_running @_scan_running
def _preview_stitch_start(self) -> None: def _preview_stitch_start(self, overlap: float = 0.1) -> None:
"""Start stitching a preview of the scan in a background subprocess """Start stitching a preview of the scan in a background subprocess
@ -1003,6 +997,8 @@ class SmartScanThing(Thing):
self._stitching_script, self._stitching_script,
"--stitching_mode", "--stitching_mode",
"only_stage_stitch", "only_stage_stitch",
"--minimum_overlap",
f"{round(overlap * 0.9, 2)}",
self._ongoing_scan_images_dir, self._ongoing_scan_images_dir,
] ]
) )
@ -1023,38 +1019,7 @@ class SmartScanThing(Thing):
with self._preview_stitch_popen_lock: with self._preview_stitch_popen_lock:
self._preview_stitch_popen.wait() self._preview_stitch_popen.wait()
@_scan_running
def _correlate_start(self, overlap: float = 0.1) -> None:
"""Start stitching a preview of the scan in a subprocess"""
if self._correlate_running():
raise RuntimeError("Only one subprocess is allowed at a time")
with self._correlate_popen_lock:
self._correlate_popen = Popen(
[
self._stitching_script,
"--stitching_mode",
"only_correlate",
"--minimum_overlap",
f"{round(overlap * 0.9, 2)}",
self._ongoing_scan_images_dir,
]
)
@_scan_running
def _correlate_running(self) -> bool:
"""Whether there is a preview stitch running in a subprocess"""
with self._correlate_popen_lock:
if self._correlate_popen is None:
return False
if self._correlate_popen.poll() is None:
return True
return False
@_scan_running
def _correlate_wait(self):
if self._correlate_running():
with self._correlate_popen_lock:
self._correlate_popen.wait()
def run_subprocess( def run_subprocess(
self, self,