Fix/scan panel user values #200

Merged

duan_j merged 8 commits from fix/scan-panel-user-values into main 2026-09-08 11:56:57 +02:00

Conversation 1 Commits 8 Files Changed 13

+893 -861

8 Commits

Author	SHA1	Message	Date
duan_jandClaude Fable 5.1	2d0235071c	fix: take the aareDB transmission as the fraction aarecommon >= 0.7 declares ... CI resolves aarecommon 0.7.3, where DataCollectionParameters.transmission is a 0-to-1 fraction that rejects anything above 1.0 (the percent sheets are converted inside AareDB >= 0.83, which main already requires). The divide-by-100 from the earlier 'percentage' fix therefore failed the model test on CI and would have turned 20% into 0.2% at the beamline. Pass the fraction through and pin aarecommon>=0.7.3 so the older int percentage model can no longer be installed; relock. Also satisfy the diff typecheck gate: basedpyright only counts instance variables assigned in __init__, so the Database/User toggle widgets are created there and _build_source_toggle only lays them out. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-08 11:53:26 +02:00
duan_jandClaude Fable 5.1	2df433b33c	feat: show AUTO CENTERING in the sample camera view while a loop centering runs ... /status cannot tell an auto centering from a manual alignment move (both are busy + SampleAlignment, the combo the overlay deliberately hides), so the DAQ worker emits its own auto_centering flag: True while its own /alc/center_loop POST is in flight (the endpoint blocks until done) or while the automation progress reports the Center step running. The sample camera views pass it to build_busy_overlay_style, which paints a purple AUTO CENTERING wave text like the ROBOT MOUNTING/COOLING ones. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-08 11:35:26 +02:00
duan_jandClaude Fable 5.1	2fdb1952b6	fix: put Mount next in the automation row, gated to the Queued view ... The button was parented to the dewar tab but never added to a layout, so Qt painted it at (0, 0) over the TELL sample changer banner. It now sits left of Unmount in the automation row (docked and pop-out), greyed out outside the Queued view like Remove/Clear. A trailing stretch keeps the row's buttons at their natural width instead of sharing the spare space. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-08 11:21:31 +02:00
leonarski_f	5d3972f20c	Merge branch 'main' into fix/scan-panel-user-values	2026-09-08 10:16:03 +02:00
leonarski_fandClaude Opus 5	179d4346ce	revert: drop the ZMQ video change from this branch ... Committed by mistake in daabf83 - the video stream work was explicitly put on hold and does not belong in this branch. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01JHoUkj66jxByS2ypY5h9Mn	2026-09-07 17:00:21 +02:00
leonarski_fandClaude Opus 5	daabf830d7	fix: read the aareDB transmission as the percentage it is ... DataCollectionParameters.transmission is a StrictInt documented as "positive, between 0 and 100" (aareDB's own API description of the spreadsheet payload), while every model that consumes it wants a 0-to-1 fraction. The old "divide by 100 only when above 1.0" guess therefore turned a spreadsheet asking for 1% into a scan at 100% transmission - a hundredfold dose on the sample. A fraction cannot be stored in that column at all: the model rejects 0.2. The mapping test now builds a real DataCollectionParameters instead of a stand-in namespace, so a renamed column fails the test rather than the beamline. That is what let 'totalrange' through. daq.py's spreadsheet_params and get_auto_raster_params still carry both the old column name and the same transmission guess. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01JHoUkj66jxByS2ypY5h9Mn	2026-09-07 16:59:53 +02:00
leonarski_fandClaude Opus 5	85e0609aa4	fix: read the aareDB total angle from the column that exists ... The column is totalangle, not totalrange, so reading it raised AttributeError four times a second in the status loop. Reading a spreadsheet cell now goes through _spreadsheet_float, which treats a missing column, an empty cell and a cell that does not hold a number all as "not set" and logs the column once. aareDB owns these names; the GUI should fall back to its defaults when one moves, not die on the status loop it is read from. Note that the same misspelling is still in daq.py (spreadsheet_params and get_auto_raster_params), where getattr's default hides it: automation has never picked up the total angle from the spreadsheet either. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01JHoUkj66jxByS2ypY5h9Mn	2026-09-07 16:54:16 +02:00
leonarski_fandClaude Opus 5	fd4b9b3122	fix: keep user values in the scan panels across sample mounts ... The panels kept the effective detector distance, resolution and transmission in their own attributes, and a sample change overwrote those from the spreadsheet whatever the Database/User toggle said. The fields went on showing the user's numbers while the scan request carried the database ones, so a value had to be re-entered after every mount. The fields are now the only place a value lives. Each setting is worth, in order: what the user typed while "User values" is selected, what the mounted sample asks for, the panel default - one rule, ScanSettingsPanel ._setting, that each panel spells out a line at a time. Overrides are per setting, so a setting the user did not touch keeps following the sample. Along the way: * DbOverrideLineEdit is gone; the panels use NumberLineEdit directly, and the per-widget database/user bookkeeping is replaced by SampleParameters, the one place that knows the aareDB spreadsheet column names. * The (name, widget, converter) mapping loops with getattr/hasattr are replaced by explicit per-field commit slots. * The omega speed cap no longer drives one field's validator from another field's value: it is a read-out plus a check on the pair at Run time. * _add_row/_add_pair_row build the label/field/unit rows, which also puts the Total angle degree sign on its own row instead of the header above. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01JHoUkj66jxByS2ypY5h9Mn	2026-09-07 16:29:14 +02:00