From 5a959bf36498ae42587d1b0d3221e62044941fef Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Fri, 13 Nov 2026 23:28:29 +0100 Subject: [PATCH] rugnux live: the merge's numbers at the scaling checkpoint, not after the model work A rotation run published its space group, resolution, ISa and shell table only when the whole run was over, so the live page showed dashes through molecular replacement and refinement although the merge had long been made. RugnuxObserver gets OnMerge, called on the pass that makes the result once its merge is made (before the "Analyses" step); the rotation receiver publishes the headline and the shell table there, and again at the end as before (with the model's R-free by shell, and a model can still change the hand). The API descriptions say so; the generated clients carry the new words only. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01HVeDQsU5a8AJUdJPgWevAK --- broker/gen/model/Rugnux_live_status.h | 8 ++--- broker/jfjoch_api.yaml | 9 +++--- broker/redoc-static.html | 2 +- docs/python_client/docs/RugnuxLiveShell.md | 2 +- docs/python_client/docs/RugnuxLiveStatus.md | 8 ++--- frontend/src/client/types.gen.ts | 9 +++--- receiver/JFJochReceiverRugnuxRotation.cpp | 35 +++++++++++++-------- rugnux/Rugnux.h | 4 +++ rugnux/RugnuxScaleMerge.cpp | 2 ++ 9 files changed, 48 insertions(+), 31 deletions(-) diff --git a/broker/gen/model/Rugnux_live_status.h b/broker/gen/model/Rugnux_live_status.h index 4bb87eb98..790a8be63 100644 --- a/broker/gen/model/Rugnux_live_status.h +++ b/broker/gen/model/Rugnux_live_status.h @@ -113,7 +113,7 @@ public: bool shellsMergeIsSet() const; void unsetShells_merge(); /// - /// Merging statistics by resolution shell of the latest merge, coarse to fine, as the shell table of `_report.txt`. Rotation: once the run is over; serial: at each provisional merge and at the end. `overall` is the same table's \"Overall\" row (whole-merge completeness, multiplicity, I/sigma, CC1/2, R_meas or R_split, CCref, and the R-free of the final model - refined where rugnux refined it, as `model.refinement.r_free`, else as placed, as `model.r_free`), present with `shells`. + /// Merging statistics by resolution shell of the latest merge, coarse to fine, as the shell table of `_report.txt`. Rotation: once the collection is scaled and merged (before the model work), again at the end; serial: at each provisional merge and at the end. `overall` is the same table's \"Overall\" row (whole-merge completeness, multiplicity, I/sigma, CC1/2, R_meas or R_split, CCref, and the R-free of the final model - refined where rugnux refined it, as `model.refinement.r_free`, else as placed, as `model.r_free`), present with `shells`. /// std::vector getShells() const; void setShells(std::vector const& value); @@ -141,21 +141,21 @@ public: bool frameRangesIsSet() const; void unsetFrame_ranges(); /// - /// Space group of the result (the summary's \"Space group\" row); absent until the run is over + /// Space group of the result (the summary's \"Space group\" row); absent until the collection is scaled and merged /// std::string getSpaceGroup() const; void setSpaceGroup(std::string const& value); bool spaceGroupIsSet() const; void unsetSpace_group(); /// - /// High-resolution limit of the merge, in Angstrom; absent until the run is over, or without a merge + /// High-resolution limit of the merge, in Angstrom; absent until the collection is scaled and merged, or without a merge /// double getDMin() const; void setDMin(double const value); bool dMinIsSet() const; void unsetD_min(); /// - /// ISa of the error model; absent until the run is over, or where it was not determined + /// ISa of the error model; absent until the collection is scaled and merged, or where it was not determined /// double getIsa() const; void setIsa(double const value); diff --git a/broker/jfjoch_api.yaml b/broker/jfjoch_api.yaml index a7464ef6e..39ebc40c0 100644 --- a/broker/jfjoch_api.yaml +++ b/broker/jfjoch_api.yaml @@ -3344,7 +3344,8 @@ components: type: array description: | Merging statistics by resolution shell of the latest merge, coarse to fine, as the shell table of - `_report.txt`. Rotation: once the run is over; serial: at each provisional merge and at the end. + `_report.txt`. Rotation: once the collection is scaled and merged (before the model work), again at + the end; serial: at each provisional merge and at the end. `overall` is the same table's "Overall" row (whole-merge completeness, multiplicity, I/sigma, CC1/2, R_meas or R_split, CCref, and the R-free of the final model - refined where rugnux refined it, as `model.refinement.r_free`, else as placed, as `model.r_free`), present with `shells`. @@ -3371,15 +3372,15 @@ components: $ref: '#/components/schemas/rugnux_live_frame_range' space_group: type: string - description: Space group of the result (the summary's "Space group" row); absent until the run is over + description: Space group of the result (the summary's "Space group" row); absent until the collection is scaled and merged d_min: type: number format: double - description: High-resolution limit of the merge, in Angstrom; absent until the run is over, or without a merge + description: High-resolution limit of the merge, in Angstrom; absent until the collection is scaled and merged, or without a merge isa: type: number format: double - description: ISa of the error model; absent until the run is over, or where it was not determined + description: ISa of the error model; absent until the collection is scaled and merged, or where it was not determined probe: type: string description: Answer of the early lattice probe on the first 60 degrees; empty until it answers, and the run's own lattice once the run has indexed diff --git a/broker/redoc-static.html b/broker/redoc-static.html index 016f2833b..8c3a392f3 100644 --- a/broker/redoc-static.html +++ b/broker/redoc-static.html @@ -1157,7 +1157,7 @@ then image might be replaced in the buffer between calling /images and /image.cb