feat: ship the grid-scan decision to AareDB (GridScanDecision on RasterPayloadModel) #29

Merged

perl_d merged 3 commits from feat/gridscan-decision into main 2026-09-03 12:27:25 +02:00

Conversation 0 Commits 3 Files Changed 5

+159 -41

gotthard_g commented 2026-09-03 11:10:07 +02:00

Owner

Copy Link

Copy Source

Builds on the jfjoch_gridscan_union module: the decision the DAQ takes should be DISPLAYED by AareDB, never recomputed there (two implementations of one analysis drift apart until the UI contradicts the beamline).

• GridScanResult.contour_cells - the (nx, ny) cells of the chosen 50 % blob, populated from the blob mask in analyse. Lets a consumer draw the decision's own footprint over the sample image as vectors, no map recomputation.
• models/gridscan_decision.py - GridScanDecision {contract: 1, algorithm, algorithm_version, thresholds, result} wrapping the analysis result verbatim; the Thresholds dump means every stored decision states its own tuning. Pictures stay excluded from serialization (they ride the image pipeline).
• RasterPayloadModel.decision: GridScanDecision | None = None - optional, so DAQs that have not adopted it remain valid.
• jfjoch-client floor -> >=1.0.0rc166: the embedded ScanResult defines the per-image field contract, and rc166 adds ice (hex ice-ring ratio - the channel Thresholds.ice_ring reads) + latt_count, and rotation_bravais on the scan.
• Tests: decision round-trip on a synthetic scan (contour present + centre inside it, jpegs excluded, thresholds echoed), payload field optional. Full suite: 224 passed.

AareDB side (storage column, ingest, viewer rendering of the stored decision) is prepared against this branch. Rollout: this release -> AareDB -> AareDAQ fills decision after analyse().

Generated with Claude Code

https://claude.ai/code/session_01HiGzkkuiZXei894cnJfgSg

Builds on the jfjoch_gridscan_union module: the decision the DAQ takes should be DISPLAYED by AareDB, never recomputed there (two implementations of one analysis drift apart until the UI contradicts the beamline). - `GridScanResult.contour_cells` - the (nx, ny) cells of the chosen 50 % blob, populated from the blob mask in `analyse`. Lets a consumer draw the decision's own footprint over the sample image as vectors, no map recomputation. - `models/gridscan_decision.py` - `GridScanDecision {contract: 1, algorithm, algorithm_version, thresholds, result}` wrapping the analysis result verbatim; the Thresholds dump means every stored decision states its own tuning. Pictures stay excluded from serialization (they ride the image pipeline). - `RasterPayloadModel.decision: GridScanDecision | None = None` - optional, so DAQs that have not adopted it remain valid. - jfjoch-client floor -> `>=1.0.0rc166`: the embedded ScanResult defines the per-image field contract, and rc166 adds `ice` (hex ice-ring ratio - the channel `Thresholds.ice_ring` reads) + `latt_count`, and `rotation_bravais` on the scan. - Tests: decision round-trip on a synthetic scan (contour present + centre inside it, jpegs excluded, thresholds echoed), payload field optional. Full suite: 224 passed. AareDB side (storage column, ingest, viewer rendering of the stored decision) is prepared against this branch. Rollout: this release -> AareDB -> AareDAQ fills `decision` after `analyse()`. Generated with [Claude Code](https://claude.com/claude-code) https://claude.ai/code/session_01HiGzkkuiZXei894cnJfgSg

gotthard_g added 1 commit 2026-09-03 11:10:07 +02:00

feat(models): ship the grid-scan decision to AareDB ... 626f1f0500

GridScanResult gains contour_cells -- the (nx, ny) cells of the chosen
50 % blob, so consumers can draw the decision's own footprint over the
sample image without recomputing the map. New GridScanDecision wraps
the result verbatim with provenance (algorithm, version, the Thresholds
used) and rides on RasterPayloadModel.decision (optional -- DAQs that
have not adopted it stay valid). jfjoch-client floor moves to
1.0.0rc166: the embedded ScanResult defines the field contract, and
rc166 adds per-image ice + latt_count and rotation_bravais.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01HiGzkkuiZXei894cnJfgSg

gotthard_g changed title from probe to feat: ship the grid-scan decision to AareDB (GridScanDecision on RasterPayloadModel) 2026-09-03 11:10:07 +02:00

perl_d added 1 commit 2026-09-03 12:16:41 +02:00

style: ruff format and fix 113a388e50

perl_d added 1 commit 2026-09-03 12:21:36 +02:00

fix: type checking in tests a400ffc3be

perl_d merged commit a400ffc3be into main 2026-09-03 12:27:25 +02:00

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

bug

Something is not working

duplicate

This issue or pull request already exists

enhancement

New feature

help wanted

Need some help

invalid

Something is wrong

question

More information is needed

wontfix

This won't be fixed

No labels

Milestone

No items

No Milestone

Projects

Clear projects

No projects

Assignees

Clear assignees

buntschu_d (buntschu_d) duan_j (duan_j) glettig_w (glettig_w) gotthard_g (gotthard_g) leonarski_f (leonarski_f) mx-gitea perl_d (perl_d) takaba_k (takaba_k) wang_m (wang_m)

No Assignees

2 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: mx/AareCommon#29