Thomas Ales
aa06fa1460
A multi-angle scan runs for hours, but every angle was referenced against
one background captured before the first row of the first angle. That
reference has drifted by the last angle, and comparing angles — the whole
point of a multi-angle scan — was comparing each one against a noise floor
measured at whichever angle came first.
Every angle now captures its own. Before each angle's rows, the operator is
prompted to switch the Genesis laser off, the engine averages a fresh CH1
record, and the operator switches it back on. The data block therefore reads
[background][scan][background][scan] …, one pair per angle.
Format v7 (scan) and v11 (SAW check) carry the background inside the data
block, one length-prefixed block ahead of each angle's rows; the single
block that sat between the preambles and the data is gone. Per-angle offsets
now come from a walk of the data block at parse time rather than arithmetic
over the geometry table, and an angle whose background is not fully on disk
is the frontier — nothing of it was written yet.
v6/v10 files still read: SrasFile hands their one background to every angle,
so readers never branch on the version. Nothing writes them, and a resume
refuses them, since a re-acquired angle writes a block the old layout has no
room for. A resumed v7 angle rewrites its background in place, and the
engine checks the new block fits the room the file has before writing it —
anything else would shift every row behind it.
Two fixes made along the way:
* QtScanController never accepted file_version, so every scan launched
from the app raised TypeError at construction.
* angle_status() left its cursor parked at the frontier, so every angle
past it reported the frontier's own data_offset — which handed a resumed
scan the same write position for several angles. Two recorded offsets in
tests/golden/sras_expected.json are corrected accordingly.
The v6 goldens stay as parser fixtures; the writer is now locked against
bytes the test lays out from scan_format.md itself.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
102 lines
3.8 KiB
Python
102 lines
3.8 KiB
Python
"""Qt bridge over the headless ScanEngine.
|
|
|
|
Exposes exactly the signal surface the old in-GUI ScanWorker had, so window
|
|
code connects to it unchanged, and adapts prompts/progress to Qt. The
|
|
engine itself stays Qt-free and reusable by any other front end.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import threading
|
|
import traceback
|
|
|
|
from PyQt6.QtCore import QObject, pyqtSignal, pyqtSlot
|
|
|
|
from core.scan_engine import ScanAborted, ScanCallbacks, ScanEngine
|
|
from core.sras_format import VERSION
|
|
|
|
|
|
class QtScanController(QObject):
|
|
"""Runs a ScanEngine on the caller's QThread and republishes its events.
|
|
|
|
Move this to a QThread and connect `started` → `run`, exactly like the
|
|
previous ScanWorker.
|
|
"""
|
|
|
|
started = pyqtSignal()
|
|
completed = pyqtSignal()
|
|
dc_bias_updated = pyqtSignal(int, object) # row index, per-frame DC means
|
|
failed = pyqtSignal(str)
|
|
row_started = pyqtSignal(int, int, int, int) # row, n_rows, angle_idx, n_angles
|
|
row_done = pyqtSignal(int, int, int, int)
|
|
status_msg = pyqtSignal(str)
|
|
user_prompt = pyqtSignal(str, str) # title, message
|
|
paused_changed = pyqtSignal(bool) # True while paused at a row boundary
|
|
|
|
def __init__(self, stage, scope, rotator, plan, out_path,
|
|
resume=None, on_scan_active=None, burst_mode=False,
|
|
strict_rows=False, file_version=VERSION):
|
|
super().__init__()
|
|
self._prompt_event = threading.Event()
|
|
self._on_scan_active = on_scan_active
|
|
|
|
callbacks = ScanCallbacks(
|
|
on_status=self.status_msg.emit,
|
|
on_started=self.started.emit,
|
|
on_row_started=self.row_started.emit,
|
|
on_row_done=self.row_done.emit,
|
|
on_dc_bias=self.dc_bias_updated.emit,
|
|
on_paused_changed=self.paused_changed.emit,
|
|
prompt=self._blocking_prompt,
|
|
)
|
|
self._engine = ScanEngine(stage, scope, rotator, plan, out_path,
|
|
resume=resume, callbacks=callbacks,
|
|
burst_mode=burst_mode,
|
|
strict_rows=strict_rows,
|
|
file_version=file_version)
|
|
|
|
# ── Engine control (called from the GUI thread) ───────────────────────────
|
|
|
|
def abort(self):
|
|
self._engine.abort()
|
|
self._prompt_event.set() # release a scan parked on a prompt
|
|
|
|
def pause(self):
|
|
self._engine.pause()
|
|
|
|
def resume(self):
|
|
self._engine.resume()
|
|
|
|
def acknowledge_prompt(self):
|
|
"""Called from the GUI thread when the operator dismisses a prompt."""
|
|
self._prompt_event.set()
|
|
|
|
# ── Callback plumbing ─────────────────────────────────────────────────────
|
|
|
|
def _blocking_prompt(self, title: str, message: str):
|
|
"""Ask the GUI thread, then block the scan thread until answered.
|
|
|
|
Polls rather than waiting forever so an abort during a prompt takes
|
|
effect immediately instead of deadlocking the scan thread.
|
|
"""
|
|
self._prompt_event.clear()
|
|
self.user_prompt.emit(title, message)
|
|
while not self._prompt_event.wait(0.2):
|
|
if self._engine.aborted:
|
|
return
|
|
|
|
@pyqtSlot()
|
|
def run(self):
|
|
if self._on_scan_active is not None:
|
|
self._on_scan_active(True)
|
|
try:
|
|
self._engine.run()
|
|
self.completed.emit()
|
|
except ScanAborted as exc:
|
|
self.failed.emit(str(exc))
|
|
except Exception as exc:
|
|
traceback.print_exc()
|
|
self.failed.emit(str(exc))
|
|
finally:
|
|
if self._on_scan_active is not None:
|
|
self._on_scan_active(False)
|