[ehb54/ultrascan3] 1b77e0: P(r) load: keep the headerless first line's error ...
Branch: refs/heads/somo-dev Home: https://github.com/ehb54/ultrascan3 Commit: 1b77e0299620f2b0bf5f4a46a017c748279888e6 https://github.com/ehb54/ultrascan3/commit/1b77e0299620f2b0bf5f4a46a017c7482... Author: ehb54 <brookes@uthscsa.edu> Date: 2026-09-06 (Sun, 06 Sep 2026) Changed paths: M us_somo/develop/include/us_hydrodyn_saxs.h M us_somo/develop/src/us_hydrodyn_saxs_loads.cpp M us_somo/develop/src/us_hydrodyn_saxs_pr.cpp Log Message: ----------- P(r) load: keep the headerless first line's error column, report bad SDs load_pr() parses a numeric first line as headerless data in a special case that pushed only r and pr, dropping the third column. The main read loop does push it, so an N-line file ended with pr.size() == N and pr_error.size() == N - 1; the size-mismatch guard then discarded every error value. Any headerless three-column P(r) file lost its SDs. Each data line now pushes an error entry plus a presence flag, so the two arrays cannot fall out of step and the reason a point has no error is kept. The mismatch guard is replaced by check_pr_error(), which classifies every point as having no error value or a zero/negative one -- P(r) needs a positive SD everywhere, since a zero divides by zero in weighted fitting and breaks the plot -- and names the offending r values instead of only the file. Where some but not all points are unusable and neither gui_script nor batch mode is active, it offers to remove all the errors (as before), set the bad ones to the smallest positive error in the file, or take a typed value. Script and batch runs still just drop them, now with the detail logged. Note: GNOM writes a zero error at both P(r) endpoints. pop_last already drops the r = Dmax point, so GNOM files will now report the r = 0 one and offer the repair rather than passing a zero SD downstream. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Commit: cc232183dd51b9543bde775d399382acc9e1f6f7 https://github.com/ehb54/ultrascan3/commit/cc232183dd51b9543bde775d399382acc... Author: ehb54 <brookes@uthscsa.edu> Date: 2026-09-06 (Sun, 06 Sep 2026) Changed paths: M us_somo/develop/include/us_hydrodyn_saxs.h M us_somo/develop/src/us_hydrodyn_saxs.cpp M us_somo/develop/src/us_hydrodyn_saxs_pr.cpp M us_somo/develop/src/us_hydrodyn_script.cpp Log Message: ----------- Add a sas gui_script command, and stop a scripted P(r) load hanging Nothing in gui_script could drive the SAS window. saxs_options exists, but it operates on the main window's computation options, so no script could open the SAS Functions window or load a curve into it. That also left the P(r) error repair added for ehb54/ultrascan-tickets#1049 reachable only by hand: under gui_script or batch, check_pr_error() cannot prompt, so it always fell back to dropping every error value. Adds a "sas" command block, following the existing "dad" pattern: sas open sas pr_errors remove | minimum | <positive value> sas load_pr <file> [<file> ...] sas pr_errors sets what check_pr_error() applies when it cannot ask. The default stays "remove", so scripts written before the repair existed are unaffected. Named sas rather than saxs: the window titles itself "SAS Functions", the script layer's own error strings already call it the SAS window, it handles SANS as well as SAXS, and saxs would read as a sibling of the unrelated saxs_options. load_pr() is a private slot and US_Hydrodyn is not a friend of US_Hydrodyn_Saxs, so this goes through small public script_load_pr() / script_set_pr_errors() entry points, the same shape as US_Hydrodyn_Dad::script_load(). load_pr() is silent when a file will not open, so the readability checks live in the wrapper where the script can be told what went wrong. Two supporting fixes this turned up: - editor_msg() only reaches the GUI text window, so a scripted run applied the policy and reported nothing. check_pr_error() now routes its messages through a reporter that also writes to QTextStream( stdout ) when there is nobody at the keyboard. - get_mw() answers an unknown molecular weight by opening a modal dialog inside a "while ( mw <= 0.0 )" loop. Under gui_script nobody can close it, so any scripted P(r) load hung forever in QDialog::exec(). It now reports and returns "none" instead; plot_one_pr() already treats -1 as none and turns normalisation off. This is pre-existing and would have hit any sas command that plots. Verified headless against the built binary: a clean 143 point file loads with no report; the same file with the first line's SD zeroed reports "1 of 143 points have a zero or negative error value, at r = 0", which is only reachable if that first line's error is now stored; a file with one missing column and one zero SD reports both r values and then honours remove, minimum and an explicit value; and an invalid pr_errors argument fails the script with rc 255. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Commit: e6a6899d829db4488a30b01d3e540251b6aa8141 https://github.com/ehb54/ultrascan3/commit/e6a6899d829db4488a30b01d3e540251b... Author: emre brookes <ehb54@users.noreply.github.com> Date: 2026-09-14 (Mon, 14 Sep 2026) Changed paths: M us_somo/develop/include/us_hydrodyn_saxs.h M us_somo/develop/src/us_hydrodyn_saxs.cpp M us_somo/develop/src/us_hydrodyn_saxs_pr.cpp M us_somo/develop/src/us_hydrodyn_script.cpp Log Message: ----------- Merge pull request #553 from ehb54/ehb54-issue-1053 Add a sas gui_script command to drive the SAS window and script the P(r) error policy Commit: 65288d8f50561aed076eedb9d826329e3969a018 https://github.com/ehb54/ultrascan3/commit/65288d8f50561aed076eedb9d826329e3... Author: emre brookes <ehb54@users.noreply.github.com> Date: 2026-09-14 (Mon, 14 Sep 2026) Changed paths: M us_somo/develop/include/us_hydrodyn_saxs.h M us_somo/develop/src/us_hydrodyn_saxs.cpp M us_somo/develop/src/us_hydrodyn_saxs_loads.cpp M us_somo/develop/src/us_hydrodyn_saxs_pr.cpp M us_somo/develop/src/us_hydrodyn_script.cpp Log Message: ----------- Merge pull request #552 from ehb54/ehb54-issue-1050 P(r) load: keep the headerless first line's error column, report and offer to repair bad SDs Compare: https://github.com/ehb54/ultrascan3/compare/108479e26ca8...65288d8f5056 To unsubscribe from these emails, change your notification settings at https://github.com/ehb54/ultrascan3/settings/notifications
participants (1)
-
emre brookes