tests/test_stored_cache.py exercised two features that were never built, so six of its tests had been failing on main. Both are now implemented. Pad-factor caching. A padded view could not use a stored FFT cache at all: the store was pad 1 by definition and cached_rf_image rejected any n_fft outright, so a user working at a pad factor got nothing from batch-computing a file. CACH tail v3 records the pad the images were resolved at, cache_file computes at a requested pad, and the batch actions pass the viewer's own pad down — while still refusing a store resolved at a different pad, since a padded FFT interpolates between the natural bins and so resolves genuinely different peak frequencies. v1/v2 tails read as pad 1 and keep working. Stored-cache dispatch. _refresh_display only ever consulted this window's in-session dicts, so after a batch every angle change still queued a worker and a progress popup for an image already on disk — the exact cost the batch was run to avoid. It now checks the file's own DC/FFT blocks first, asking with allow_dc_recompute=False so the GUI thread never touches I/O. When the stored cache genuinely cannot serve the view, the scan info panel says why rather than leaving the silent recompute a mystery. Two bugs surfaced on the way: - The angle spinbox was wired on editingFinished, which QAbstractSpinBox emits only on Return or focus-out — never on a step. Clicking its arrows, the ordinary way to walk a scan, moved the number and left the image behind. Now valueChanged with keyboard tracking off, which fires on a step and once on commit, but not per keystroke mid-typing. Every existing GUI test called _on_view_changed() by hand and so could not have caught this; two new tests pin it and fail against the old wiring. - A plain "fft" batch over a file previously cached with fft_rowavg carried the old row_avg_n forward, labelling raw images as row-averaged. It now writes row_avg_n=0 explicitly. Verified: 111 passed (was 103 passed / 6 failed), and tools/check_equivalence.py is byte-identical to the pre-change baseline. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
22 KiB
sras-viewer design notes
Rationale that outgrew code comments. Each section is referenced by a short pointer comment at the relevant definition, so the code stays scannable and the reasoning stays findable.
Memory budget and row chunking (sras_compute.py)
DC images are computed over row chunks so the float32 working buffers for one chunk stay under a memory budget. A fixed row count (the original design) works fine for small legacy scans but is catastrophic for a v6 scan with a large per-angle frame/sample count — e.g. a 7500-frame × 2500-sample angle needs ~2.4 GB for a single 32-row chunk.
With chunks running concurrently the budget has to cover all live chunks at
once. On a large scan chunk_rows is already clamped to its floor of one row
(one row alone is ~75 MB of float32 at 7507×2500), so shrinking the per-chunk
size cannot buy more concurrency — the worker count must be derived from the
budget instead: _plan_chunks picks the worker count first and sizes the
chunk to it. Sizing the chunk first is the trap: a single chunk would always
consume the whole budget and leave room for exactly one worker, precisely on
the large scans that need concurrency most.
The 1024 MB default (SRAS_MEM_BUDGET_MB) is the measured knee on a 16-core
machine against a 7507-frame × 2500-sample angle: 512 MB left ~20% of the
speedup on the table, and 1536+ MB cost ~0.4 GB more resident memory for no
further gain.
A caller that itself runs several computations concurrently (angle-level
parallelism, plan_angle_level) must pass both max_workers=1 and its
share of the budget. Capping the workers alone is not enough: the chunk would
still be sized against the whole budget, and N concurrent callers would each
allocate all of it.
FFT peak search: block-parallel zoom refinement (sras_compute.py)
The displayed RF value per pixel is the argmax of the zero-padded power spectrum of that pixel's CH1 waveform. At the pad factor of 40 needed for mapping resolution, materialising padded spectra is hopeless: ~9 GB per scan row, which is what used to collapse the old row-chunk planner to one worker and make synthesis single-threaded.
_peak_bins_zoom never materialises the padded spectrum:
- a coarse rfft at
next_fast_len(2*spf)— 2× oversampled, so the padded power spectrum (a trig polynomial of degree spf−1) cannot hide its global max between coarse samples; - every coarse bin within
_ZOOM_CAND_RATIO(0.7) of its row's coarse max becomes a refinement candidate. Quarter-natural-bin scalloping at the 2× grid can understate a peak's power by at most ~19%, so 0.7 keeps a wide margin. The DC-adjacent window is always refined too: the coarse DC bin is zeroed for suppression, which would otherwise blind the scan to fine bins closer to DC than the first coarse sample (where the leakage skirt of an un-subtracted offset peaks); - each candidate window (±
_ZOOM_HALFWIDTH= 0.75 coarse spacings; every fine bin lies within 0.5 spacings of its nearest coarse bin) is evaluated on the exactn_fftgrid by one small complex gemm, with np.argmax's lowest-bin tie-break preserved across windows.
The selected bin is bit-identical to the full padded argmax — enforced by
tests/test_compute.py::test_zoom_identity, a fuzz test over adversarial
spectra, and the golden-hash harness (tools/check_equivalence.py), whose
baseline was captured on the old full-padded path.
Work fans out over a persistent thread pool in _FFT_BLOCK = 512-waveform
tasks: smaller blocks serialise on GIL-held numpy dispatch, larger ones lose
cache residency and task granularity (measured on a 16-core machine, where
this path runs ~35× faster than the old serial padded transform at pad 40).
pyFFTW runs through per-thread builders plans (FFTW_MEASURE, wisdom
persisted under ~/.cache/sras-viewer/), and threadpoolctl clamps BLAS to
one thread under the pool so the refinement gemm cannot oversubscribe.
compute_rf_image(exact=True) (or SRAS_FFT_EXACT=1) keeps the reference
full-padded path for audits.
Row-averaged FFT: same-row, distance-weighted SNR cleanup (sras_compute.py)
compute_rf_image's row_avg_n parameter averages each pixel's CH1
waveform with its up-to-n same-row neighbors before the FFT peak search, to
improve SNR on noisy scans. Never crosses rows: pixel pitch is strongly
anisotropic and varies by scan (5 µm × 50 µm on a typical scan, but as
stretched as 5 µm × 1 mm on others), so a physically meaningful "neighbor"
set can't be a fixed-shape 2-D window — but the X pitch within one row is
a single file-wide constant (SrasFile.pixel_x_mm), so restricting to the
row axis sidesteps the anisotropy question entirely rather than solving it
with an elliptical or physically-scaled 2-D kernel.
_row_average_weights is a Gaussian in pixel-index distance, not physical
mm distance — deliberately: within one row those are the same function up
to a fixed scale factor (pixel_x_mm is constant along a row), so the
kernel itself needs no pitch at all. pixel_x_mm is used for real exactly
once, in the GUI's options dialog, to show the window's physical width —
not in the kernel math, where it would only ever cancel out.
_row_average_waveforms is a masked/renormalized convolution (two
correlate1d calls, numerator and denominator, divided) rather than a
single fixed-normalized convolution, because a masked neighbor must
contribute zero weight, not a zero-amplitude sample at full weight — the
latter would bias every average near a masked run or a row's own edge
toward zero. The same two-correlation trick handles row-edge truncation for
free: mode="constant", cval=0.0 zero-pads both the numerator and the
denominator beyond a row's own ends, so the output renormalizes by whatever
weight sum actually landed inside the row, no separate edge case.
Background subtraction stays exactly where it already was (subtracted once
from the fully-assembled waves buffer) rather than being threaded into the
per-neighbor gather. This is exact, not an approximation: because
_row_average_waveforms's denominator is always the actual sum of
included, valid weights (never a fixed total), Σwᵢ·(rawᵢ−bg) / Σwᵢ
distributes to avg − bg·(Σwᵢ/Σwᵢ) = avg − bg regardless of which or how
many neighbors were included — subtracting background from the averaged
waveform is identical to subtracting it from every neighbor first, for any
window, at any row edge, with any number of masked-out neighbors.
No cross-row halo is needed: compute_rf_image's chunk loop already splits
on rows only, and read_row already reads one row's complete
(n_frames, spf) slice at a time — averaging happens entirely inside that
one row's own frame axis, so a chunk boundary (which falls between rows)
can never truncate a window. Only a row's own start/end can, and that's the
same edge case the masked convolution already handles.
The averaging step doubles the live per-row scratch memory (a full-width
(n_frames, spf) buffer on top of the existing compacted waves buffer),
so compute_rf_image halves its byte budget when row_avg_n > 0 before
_plan_fft_rows/the exact-path sizing runs — see "Memory budget and row
chunking" above. On the largest real scans _plan_chunks is already
clamped to its floor of one row regardless, so this costs no concurrency
where it matters most; it mainly protects moderate-sized scans from an
unexpected regression.
Persistence: cached_rf_image (the extracted fast-path check) requires
sras.precomputed_row_avg_n == row_avg_n exactly, so a raw request can
never be silently served a row-averaged cache or vice versa, and a request
at one window size can never be served a cache at another — see
scan_format.md's Cache Tail / CACH tail version history sections for the
on-disk row_avg_n field this depends on.
Serving a stored cache: provenance, not just presence
A stored peak_freq_mhz image is only interchangeable with a live compute
for the exact settings it was computed under. Three of them are baked
irreversibly into the numbers — background subtraction, row-averaging window,
and zero-padding — so all three are recorded in the SFFT block and checked
by cached_rf_image before it hands the image back. Getting this wrong is
not a slow display, it is a wrong display, which is why the check is a
single predicate in one place rather than spread across callers.
Padding is the subtlest of the three, because a padded FFT looks like it
should be a refinement of the unpadded one. It isn't: zero-padding
interpolates between the natural bins, so it resolves a different peak
frequency for the same waveform. precomputed_pad_factor exists so a padded
view can be served from a cache computed at its pad while still refusing
one computed at any other, including pad 1. Before it existed the store was
pad 1 by definition and any n_fft was rejected outright — correct, but it
meant a user working at a pad factor got nothing at all from batch-computing
a file, which is most of the point of the feature. pad_factor_for maps an
n_fft request onto the integer factor a store could have recorded, and
returns 0 for a request that is not a whole multiple of samples_per_frame
— unmatchable by construction, since only integer factors are representable.
The batch actions therefore have to cache at the viewer's current pad
factor, not a fixed one: a cache stored at a pad nobody is viewing at is
dead weight. When the two do diverge (the user changes the pad after
batching), _cache_mismatch_notes says so in the scan info panel, because
the symptom otherwise is just "the file I pre-computed got slow again" with
no visible cause.
Two caches, in cost order
_refresh_display consults this window's in-session _fft_cache/_dc_cache
dicts first, then the open file's stored v5/v7 blocks, and only then
dispatches a ComputeWorker. The second tier is what makes a batch-computed
file worth having; without it every angle change queued a worker and a
progress popup for an image already sitting on disk — precisely the cost the
batch was run to avoid. (The stored image was reachable before, but only
from inside ComputeWorker, i.e. after paying for the thread and the popup.)
The file tier asks with allow_dc_recompute=False. If applying the DC4 mask
would mean reading a whole CH4 channel, it declines rather than blocking the
GUI thread, and the fall-through worker reaches the same stored image via
compute_rf_image and pays for the mask off-thread. So the GUI thread never
does I/O, and the slow path is still a fast path.
Angle alignment coordinate frames (sras_compute.py)
Alignment puts every angle's images onto one shared, zero-padded pixel grid using a rigid transform only — rotation + translation, never scale.
Angle 0 (the reference) is the sole coordinate authority: it is the only
angle whose stage XY (x_start_mm / y_positions_mm) is ever read, and the
shared canvas is literally an extension of angle 0's own pixel grid, so the
aligned view carries angle 0's real X/Y axes. Every other angle is placed
purely by content — its rotation and translation come from cross-correlating
its CH4 image against angle 0's (register_angle_to_reference) — and its own
stage XY is deliberately never consulted. That is not an oversight: the
rotation stage moves the sample relative to the scan window, so where a
window sat in stage coordinates says nothing about where the sample is, and
an earlier design that pivoted each angle on a signal-weighted centroid of
its own window put every angle on a ~20 mm circle around the optical center
instead of stacking them into one shape.
Only two coordinate frames exist:
- local mm — one angle's own physical frame: origin at the center of its own pixel array, x along +column, y along +row, scaled by that angle's own pitches. Carries no stage position whatsoever.
- ref mm — the reference angle's local mm. A registration result
(rotation_deg, shift_mm)is exactly the rigid map from an angle's local mm to ref mm:q = R(rotation_deg) @ l + shift_mm. Stage coordinates re-enter once, at the very end, when the canvas origin is converted to angle 0's stage mm (AlignmentResult.canvas_origin_mm).
Rotation is done in mm, never on raw pixel indices: the x pitch
(SrasFile.pixel_x_mm, 5 µm on a real scan) and the y/row pitch (50 µm)
differ by 10×, so rotating the raw index grid would shear the image — an
unwanted anisotropic scale. Registration runs on a resampled isotropic grid
for the same reason, and every affine maps shared-grid index → mm → undo
rotation/shift → that angle's own local mm → that angle's own raw index,
matching the output→input convention scipy.ndimage.affine_transform wants.
Cropping the canvas is index translation, not a second transform
crop_alignment_result restricts an AlignmentResult to a rectangular window
of its canvas by folding the crop into each angle's existing affine rather than
composing a new one. From _affine_out_to_src, matrix = D @ Rinv @ A_out
depends only on the pitches and the rotation, and A_out @ [row0, col0] is
exactly the mm displacement of the new origin, so
matrix @ [r', c'] + (offset + matrix @ [row0, col0])
== matrix @ [r' + row0, c' + col0] + offset
identically. matrix is untouched and offset — which already absorbs the
origin — absorbs the crop too.
Two things follow, and both are relied on. apply_alignment, reproject_mask
and the aligned exporter all work on a cropped result with no special-casing:
resampling a cropped result is exactly a slice of resampling the full one
(tests/test_align_export.py::test_crop_is_a_window_of_the_full_canvas asserts
bit equality). And because the crop offset is a whole number of canvas pixels,
canvas_for_params' snap invariant — the reference angle lands on integer
canvas pixels — survives the crop, which is what keeps the reference exportable
as a verbatim block.
Aligned export (sras_align_export.py)
write_aligned_sras bakes an alignment into a new v6 file: every angle
resampled onto the cropped shared canvas, so all of them end up with identical
geometry and the file opens already aligned. It is the only place in the
codebase that resamples waveform data — sras_edit_scans and sras_average
copy waveform bytes verbatim — which is why it is its own top-level module
rather than part of sras_format (scoped to the versioned binary spec, per the
sidecar section's own rule) or sras_compute (imported by every
multiprocessing child).
Nearest neighbour, never interpolation. Each output pixel gets exactly one
source pixel's three waveforms, verbatim. Averaging two neighbouring CH1
packets would synthesise a waveform the instrument never measured, whose FFT
peak is the peak of neither — meaningless for a technique whose entire output is
that peak frequency. The cost is that some source pixels are duplicated and
others dropped, which is the same trade apply_alignment's order=0 already
makes for the display.
The rounding rule is floor(x + 0.5), not np.rint. scipy.ndimage's
order=0 rounds halves away from zero while np.rint rounds them to even. The
canvas is snapped to the reference's own pixel grid, so an angle whose row pitch
differs from the reference's lands on exact half-integers across whole rows —
this is the common case, not a corner case. Getting it wrong shifts those rows
by one source pixel relative to what the Aligned View drew.
Out-of-bounds is tested on the fractional coordinate, not the rounded index.
scipy's mode="constant" writes cval wherever the coordinate leaves the
range of sample centres, [0, n-1] — a coordinate of −0.4 rounds to a
perfectly valid index 0 and is still padding. Testing the rounded index instead
puts a one-pixel rim of real data everywhere the preview shows padding.
...but with a tolerance (_EDGE_TOL). The affine is built from a chain of
mm-space multiplications, so an exactly-integer transform comes out a few times
1e-13 off: the reference angle's offset is -20 - 7e-15, not -20. A bare
>= 0.0 therefore rejects that angle's entire first row, and <= n-1 its last
column — for the reference angle, whose whole job is to pass through as an
exact integer crop. The tolerance is ~7 orders of magnitude above that noise and
~7 below the half-pixel scale at which a rounding decision means anything, so it
can only ever change pixels whose scipy answer was itself decided by noise.
Padding is the per-channel ADC code nearest 0 mV, not 0. Zero ADC decodes to
(0 - yoff) * ymult + yzero, which on real calibration is around +100 mV —
above any sensible CH4 mask threshold, so a zero fill would paint a solid
rectangle of "valid" pixels around the sample and corrupt every DC image and ROI
statistic downstream.
Source rows are served from sliding in-RAM bands (_SourceReader). A
rotated angle maps one output row to a diagonal across the source array, so
the pixels of a single output row come from hundreds of different source rows —
~1.4 MB each on a full-size scan. Indexing a memmap pixel-by-pixel in output
order re-faults nearly the whole angle per output row: terabytes of paging for a
gigabyte of data. Reading a contiguous band per output chunk, with the band
advancing monotonically, costs roughly 2× the source size in total reads.
Writes go to .part and are os.replaced into position. Not politeness: a
truncated .sras is not detectably broken, because _parse_v6 drops incomplete
trailing angle blocks and opens what is left as an aborted scan. A half-written
export left in place would silently look like a real file with fewer angles.
The Angle Table is carried over unchanged. Alignment removes the spatial
rotation of the sample; it does not change which acoustic propagation direction
each angle measured, and that direction is the scientific content of a
multi-angle scan. Zeroing the table would make the export self-consistent for
re-registration and useless for anisotropy work. The consequence is that
re-registering an export needs seed_deg=0.0 to put 0° inside the coarse sweep,
since nominal_delta_deg is still non-zero — which is exactly what the seed
parameter exists for.
Alignment wizard (sras_viewer/align_wizard.py)
A QWizard rather than another dialog because the three steps are genuinely
sequential and the last one is destructive: correlate, choose a crop, write a
file. It replaces both former Fusion actions, so it also absorbs the old
ManualAlignmentDialog's by-eye nudge editor — otherwise a scan the search
cannot fit would have no fallback at all.
Shared state lives on the wizard object, not in registerField: the pages pass
numpy arrays, ManualAngleParams and an AlignmentResult between them, none of
which are scalar widget properties.
IndependentPages is deliberately left off. With it set Qt never calls
cleanupPage, and cleanupPage is how the ROI page discards a crop when the
user goes back to re-correlate — a crop is indexed in canvas pixels, and a new
rotation means a different canvas, so stale indices would silently be
reinterpreted against the wrong grid. geometry_generation is the belt-and-
braces check for the same hazard.
The mask-stack preview shares the final canvas's origin and uses a pitch that is an integer multiple of it, unlike the old manual dialog's padded, unsnapped preview canvas. That is what lets the crop page convert a rectangle drawn in millimetres into an exact integer window of the real canvas, with no second coordinate frame to reconcile.
"Fit to full overlap" uses largest_rect_at_least, a largest-rectangle sweep,
not a bounding box of the fully-covered pixels. The full-overlap region of
several rotated scans is roughly a disc, and its bounding box has corners no
angle covers — offering that as the crop would hand the user the padding they
were trying to avoid.
Every background launch follows the two rules _run_worker's docstring
establishes: disable the trigger before the call (so a re-entrant click cannot
start a second thread over the first), and never ignore the returned bool.
Progress is an inline QProgressBar on the page rather than a QProgressDialog
— a window-modal popup over a wizard both looks wrong and reintroduces the
event-loop pumping hazard that ordering exists to avoid. reject() refuses to
close while a job is in flight, since the running worker's signals are connected
to bound methods of the pages Qt would be deleting.
Manual-alignment sidecar (sras_compute.py)
<name>.sras.align.json lives next to the scan file. The code lives in
sras_compute, not sras_format: sras_format is scoped to the versioned
binary .sras spec itself (see scan_format.md), while a manual alignment is
a viewer-computed derived artifact, analogous in kind to AlignmentResult
— so it belongs with the alignment math it serialises. json + pathlib are
stdlib, so this adds no dependency to a module whose load-bearing constraint
is staying free of Qt/matplotlib for cheap multiprocessing-child imports.
Schema history
The stored rotation_deg/shift_mm are meaningless without the frame they
were measured in, so _SIDECAR_SCHEMA_VERSION is bumped whenever that frame
changes. Each bump makes older files describe a different (and, for the bugs
each bump fixed, actively wrong) transform than the same numbers would today;
loading one unchanged would silently reproduce the very "scans show up
everywhere" symptom the bump fixed — so older sidecars are treated as absent
rather than migrated.
- 1 → 2 — pivot moved from the scan-window bbox center to a content-derived centroid, and the rotation sign convention was corrected.
- 2 → 3 — the content centroid was abandoned entirely: rotation is now
about each angle's own array center, mapped onto the reference's array
center, with
shift_mmin the reference's local mm frame. No angle but the reference contributes stage coordinates any more.