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 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01HVeDQsU5a8AJUdJPgWevAK
This commit is contained in:
leonarski_fandClaude Opus 5.5 committed 2026-11-14 07:29:46 +01:00
1 parent 7b8196e770
commit 5a959bf364
9 files changed
+48 -31

No files matched your search

+4 -4
View File
@@ -113,7 +113,7 @@ public:
bool shellsMergeIsSet() const;
void unsetShells_merge();
/// <summary>
/// Merging statistics by resolution shell of the latest merge, coarse to fine, as the shell table of &#x60;_report.txt&#x60;. Rotation: once the run is over; serial: at each provisional merge and at the end. &#x60;overall&#x60; is the same table&#39;s \&quot;Overall\&quot; 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 &#x60;model.refinement.r_free&#x60;, else as placed, as &#x60;model.r_free&#x60;), present with &#x60;shells&#x60;.
/// Merging statistics by resolution shell of the latest merge, coarse to fine, as the shell table of &#x60;_report.txt&#x60;. 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. &#x60;overall&#x60; is the same table&#39;s \&quot;Overall\&quot; 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 &#x60;model.refinement.r_free&#x60;, else as placed, as &#x60;model.r_free&#x60;), present with &#x60;shells&#x60;.
/// </summary>
std::vector<org::openapitools::server::model::Rugnux_live_shell> getShells() const;
void setShells(std::vector<org::openapitools::server::model::Rugnux_live_shell> const& value);
@@ -141,21 +141,21 @@ public:
bool frameRangesIsSet() const;
void unsetFrame_ranges();
/// <summary>
/// Space group of the result (the summary&#39;s \&quot;Space group\&quot; row); absent until the run is over
/// Space group of the result (the summary&#39;s \&quot;Space group\&quot; row); absent until the collection is scaled and merged
/// </summary>
std::string getSpaceGroup() const;
void setSpaceGroup(std::string const& value);
bool spaceGroupIsSet() const;
void unsetSpace_group();
/// <summary>
/// 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
/// </summary>
double getDMin() const;
void setDMin(double const value);
bool dMinIsSet() const;
void unsetD_min();
/// <summary>
/// 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
/// </summary>
double getIsa() const;
void setIsa(double const value);
+5 -4
View File
@@ -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
+1 -1
View File
@@ -1157,7 +1157,7 @@ then image might be replaced in the buffer between calling /images and /image.cb
</div></button></div></div></div><div class="sc-iGgWBj sc-gsFSXq ibAZSi eDeKjd"><div class="sc-ejfMa-d bNUPQg"><button class="sc-EgOXT cFEcOl"><span type="get" class="sc-eZYNyq qGfV http-verb get">get</span><span class="sc-iEXKAA gUNSDu">/version</span><svg class="sc-cwHptR iVFMLx" style="margin-right:-25px" version="1.1" viewBox="0 0 24 24" x="0" xmlns="http://www.w3.org/2000/svg" y="0" aria-hidden="true"><polygon points="17.3 8.3 12 13.6 6.7 8.3 5.3 9.7 12 16.4 18.7 9.7 "></polygon></svg></button><div aria-hidden="true" class="sc-dlWCHZ kWacYr"><div class="sc-hHOBiw cndTNO"><div class="sc-eeDRCY sc-eBMEME gTGgei fbXBig"><p>Test Jungfraujoch system</p>
</div><div tabindex="0" role="button"><div class="sc-kWtpeL gEncxT"><span>http://localhost:5232</span>/version</div></div></div></div></div></div></div></div></div><div class="sc-dExYaf gZbfaQ"></div></div></div>
<script>
const __redoc_state = {"menu":{"activeItemIdx":-1},"spec":{"data":{"openapi":"3.0.3","info":{"title":"Jungfraujoch","description":"API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland).\nJungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU.\nJungfraujoch uses FPGA boards to acquire data at high data rates.\n\n# License Clarification\n\nWhile this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply**\nwhen this file is used solely to generate OpenAPI clients or when implementing applications that\ninteract with the API. Generated client code and applications using this API definition are not\nsubject to the GPL license requirements and may be distributed under terms of your choosing.\n\nThis exception is similar in spirit to the Linux Kernel's approach to userspace API headers and\nthe GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that\nuser programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not\nderivative works of the kernel and are not subject to the terms of the GPL.\n\nThis exception is intended to allow wider use of this API specification without imposing GPL\nrequirements on applications that merely interact with the API, regardless of whether they\ncommunicate through network calls or other mechanisms.\n","version":"1.0.0-rc.186","contact":{"name":"Filip Leonarski (Paul Scherrer Institute)","email":"filip.leonarski@psi.ch"},"license":{"name":"GPL-3.0","url":"https://www.gnu.org/licenses/gpl-3.0.html"}},"servers":[{"url":"http://localhost:5232","description":"Test Jungfraujoch system"}],"components":{"securitySchemes":{"bearerAuth":{"type":"http","scheme":"bearer","description":"Per-dataset secret. `/start` may carry one or more equivalent `tokens`; while the current\ndataset has any, the operations marked with this scheme require `Authorization: Bearer <token>`\nand answer 401 otherwise. A dataset started without `tokens` is not protected and the header is ignored.\n"}},"parameters":{"binning":{"in":"query","name":"binning","required":false,"schema":{"default":1,"type":"integer"},"description":"Binning of frames for the plot (0 = default binning)"},"experimental_coord":{"in":"query","name":"experimental_coord","required":false,"schema":{"type":"boolean","default":false},"description":"If measurement has goniometer axis defined, plot X-axis will represent rotation angle\nIf measurement has grid scan defined, plot X-axis and Y-axis will represent grid position, Z will be used as the final value\nFor still measurement the number is ignored\n"},"azint_unit":{"in":"query","name":"azint_unit","required":false,"schema":{"type":"string","enum":["Q_recipA","d_A","two_theta_deg"],"default":"Q_recipA"},"description":"Unit used for azim int.\n"},"fill_value":{"in":"query","name":"fill","required":false,"schema":{"type":"number","format":"float"},"description":"Fill value for elements that were missed during data collection\n"},"plot_type":{"in":"query","name":"type","required":true,"description":"Type of requested plot","schema":{"type":"string","enum":["bkg_estimate","spindle_blind_fraction","azint","azint_1d","spot_count","spot_count_low_res","spot_count_indexed","spot_count_ice","indexing_rate","indexing_lattice_count","indexing_unit_cell_length","indexing_unit_cell_angle","profile_radius","mosaicity","b_factor","error_pixels","saturated_pixels","image_collection_efficiency","receiver_delay","receiver_free_send_buf","strong_pixels","roi_sum","roi_mean","roi_max_count","roi_pixels","roi_weighted_x","roi_weighted_y","packets_received","max_pixel_value","resolution_estimate","pixel_sum","processing_time","beam_center_x","beam_center_y","integrated_reflections","image_scale_factor","image_scale_cc","compression_ratio","ice_ring_score"]}},"roi":{"in":"query","name":"roi","required":false,"schema":{"type":"string","minLength":1},"description":"Name of ROI for which plot is requested"},"image_id":{"in":"query","name":"id","required":false,"schema":{"type":"integer","format":"int64","default":-1,"minimum":-2},"description":"Image ID in the image buffer. Special values: -1 - last image in the buffer, -2: last indexed image in the buffer"},"saturation":{"in":"query","name":"saturation","required":false,"schema":{"type":"number","format":"float","minimum":-32767,"maximum":32767},"description":"Saturation value to set contrast in the preview image; if not provided, then autocontrast procedure is used"},"background":{"in":"query","name":"background","required":false,"schema":{"type":"number","format":"float","default":0,"minimum":-32767,"maximum":32767},"description":"Background value to set contrast in the preview image"},"show_spots":{"in":"query","name":"show_spots","schema":{"type":"boolean","default":true},"description":"Show spot finding results on the image"},"show_predictions":{"in":"query","name":"show_predictions","schema":Line truncated
const __redoc_state = {"menu":{"activeItemIdx":-1},"spec":{"data":{"openapi":"3.0.3","info":{"title":"Jungfraujoch","description":"API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland).\nJungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU.\nJungfraujoch uses FPGA boards to acquire data at high data rates.\n\n# License Clarification\n\nWhile this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply**\nwhen this file is used solely to generate OpenAPI clients or when implementing applications that\ninteract with the API. Generated client code and applications using this API definition are not\nsubject to the GPL license requirements and may be distributed under terms of your choosing.\n\nThis exception is similar in spirit to the Linux Kernel's approach to userspace API headers and\nthe GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that\nuser programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not\nderivative works of the kernel and are not subject to the terms of the GPL.\n\nThis exception is intended to allow wider use of this API specification without imposing GPL\nrequirements on applications that merely interact with the API, regardless of whether they\ncommunicate through network calls or other mechanisms.\n","version":"1.0.0-rc.186","contact":{"name":"Filip Leonarski (Paul Scherrer Institute)","email":"filip.leonarski@psi.ch"},"license":{"name":"GPL-3.0","url":"https://www.gnu.org/licenses/gpl-3.0.html"}},"servers":[{"url":"http://localhost:5232","description":"Test Jungfraujoch system"}],"components":{"securitySchemes":{"bearerAuth":{"type":"http","scheme":"bearer","description":"Per-dataset secret. `/start` may carry one or more equivalent `tokens`; while the current\ndataset has any, the operations marked with this scheme require `Authorization: Bearer <token>`\nand answer 401 otherwise. A dataset started without `tokens` is not protected and the header is ignored.\n"}},"parameters":{"binning":{"in":"query","name":"binning","required":false,"schema":{"default":1,"type":"integer"},"description":"Binning of frames for the plot (0 = default binning)"},"experimental_coord":{"in":"query","name":"experimental_coord","required":false,"schema":{"type":"boolean","default":false},"description":"If measurement has goniometer axis defined, plot X-axis will represent rotation angle\nIf measurement has grid scan defined, plot X-axis and Y-axis will represent grid position, Z will be used as the final value\nFor still measurement the number is ignored\n"},"azint_unit":{"in":"query","name":"azint_unit","required":false,"schema":{"type":"string","enum":["Q_recipA","d_A","two_theta_deg"],"default":"Q_recipA"},"description":"Unit used for azim int.\n"},"fill_value":{"in":"query","name":"fill","required":false,"schema":{"type":"number","format":"float"},"description":"Fill value for elements that were missed during data collection\n"},"plot_type":{"in":"query","name":"type","required":true,"description":"Type of requested plot","schema":{"type":"string","enum":["bkg_estimate","spindle_blind_fraction","azint","azint_1d","spot_count","spot_count_low_res","spot_count_indexed","spot_count_ice","indexing_rate","indexing_lattice_count","indexing_unit_cell_length","indexing_unit_cell_angle","profile_radius","mosaicity","b_factor","error_pixels","saturated_pixels","image_collection_efficiency","receiver_delay","receiver_free_send_buf","strong_pixels","roi_sum","roi_mean","roi_max_count","roi_pixels","roi_weighted_x","roi_weighted_y","packets_received","max_pixel_value","resolution_estimate","pixel_sum","processing_time","beam_center_x","beam_center_y","integrated_reflections","image_scale_factor","image_scale_cc","compression_ratio","ice_ring_score"]}},"roi":{"in":"query","name":"roi","required":false,"schema":{"type":"string","minLength":1},"description":"Name of ROI for which plot is requested"},"image_id":{"in":"query","name":"id","required":false,"schema":{"type":"integer","format":"int64","default":-1,"minimum":-2},"description":"Image ID in the image buffer. Special values: -1 - last image in the buffer, -2: last indexed image in the buffer"},"saturation":{"in":"query","name":"saturation","required":false,"schema":{"type":"number","format":"float","minimum":-32767,"maximum":32767},"description":"Saturation value to set contrast in the preview image; if not provided, then autocontrast procedure is used"},"background":{"in":"query","name":"background","required":false,"schema":{"type":"number","format":"float","default":0,"minimum":-32767,"maximum":32767},"description":"Background value to set contrast in the preview image"},"show_spots":{"in":"query","name":"show_spots","schema":{"type":"boolean","default":true},"description":"Show spot finding results on the image"},"show_predictions":{"in":"query","name":"show_predictions","schema":Line truncated
var container = document.getElementById('redoc');
Redoc.hydrate(__redoc_state, container);
+1 -1
View File
@@ -17,7 +17,7 @@ Name | Type | Description | Notes
**cc_half** | **float** | CC1/2 of the shell table | [optional]
**cc_ref** | **float** | CC against the reference data, where reference data were given | [optional]
**r_split** | **float** | Serial data only, with every frame whole in one half-set | [optional]
**r_free** | **float** | R-free of the placed model (as given, not refined) over the shell&#39;s free reflections | [optional]
**r_free** | **float** | R-free of the placed model (as given, not refined) over the shell&#39;s free reflections. In &#x60;overall&#x60;, the R-free of the model the run ended with: the refined model&#39;s (&#x60;model.refinement.r_free&#x60;) where rugnux refined it, else the placed model&#39;s (&#x60;model.r_free&#x60;). | [optional]
## Example
+4 -4
View File
@@ -14,13 +14,13 @@ Name | Type | Description | Notes
**model** | [**RugnuxLiveModel**](RugnuxLiveModel.md) | | [optional]
**stills** | [**RugnuxLiveStills**](RugnuxLiveStills.md) | | [optional]
**shells_merge** | **str** | Which merge &#x60;shells&#x60; are of - \&quot;the collection\&quot;, or on serial data a provisional merge such as \&quot;50% of the images (provisional)\&quot;; absent until there is a merge | [optional]
**shells** | [**List[RugnuxLiveShell]**](RugnuxLiveShell.md) | Merging statistics by resolution shell of the latest merge, coarse to fine, as the shell table of &#x60;_report.txt&#x60;. Rotation: once the run is over; serial: at each provisional merge and at the end. &#x60;overall&#x60; is the same table&#39;s \&quot;Overall\&quot; row (whole-merge completeness, multiplicity, I/sigma, CC1/2, R_meas or R_split, CCref, and the overall R-free of the model validated on it), present with &#x60;shells&#x60;. | [optional]
**shells** | [**List[RugnuxLiveShell]**](RugnuxLiveShell.md) | Merging statistics by resolution shell of the latest merge, coarse to fine, as the shell table of &#x60;_report.txt&#x60;. 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. &#x60;overall&#x60; is the same table&#39;s \&quot;Overall\&quot; 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 &#x60;model.refinement.r_free&#x60;, else as placed, as &#x60;model.r_free&#x60;), present with &#x60;shells&#x60;. | [optional]
**overall** | [**RugnuxLiveShell**](RugnuxLiveShell.md) | | [optional]
**frame_scales** | **List[float]** | Rotation, once the run is over: the per-image scale factor of the merge, one entry per image of the collection in its order, 0 where the image got none (not indexed, or rejected). Absent on serial data and until there is a merge. | [optional]
**frame_ranges** | [**List[RugnuxLiveFrameRange]**](RugnuxLiveFrameRange.md) | Rotation, once the run is over: the stretches of the sweep the merge downgraded or rejected, in order; every image outside them is merged at its own weight. Absent on serial data and until there is a merge; empty where the whole sweep was merged. | [optional]
**space_group** | **str** | Space group of the result (the summary&#39;s \&quot;Space group\&quot; row); absent until the run is over | [optional]
**d_min** | **float** | High-resolution limit of the merge, in Angstrom; absent until the run is over, or without a merge | [optional]
**isa** | **float** | ISa of the error model; absent until the run is over, or where it was not determined | [optional]
**space_group** | **str** | Space group of the result (the summary&#39;s \&quot;Space group\&quot; row); absent until the collection is scaled and merged | [optional]
**d_min** | **float** | High-resolution limit of the merge, in Angstrom; absent until the collection is scaled and merged, or without a merge | [optional]
**isa** | **float** | ISa of the error model; absent until the collection is scaled and merged, or where it was not determined | [optional]
**probe** | **str** | Answer of the early lattice probe on the first 60 degrees; empty until it answers, and the run&#39;s own lattice once the run has indexed |
**probe_s** | **float** | When the probe answered (or the run indexed), since the first image | [optional]
**start_to_first_image_s** | **float** | From the START message to the first image; set once the first image arrives | [optional]
+5 -4
View File
@@ -2459,7 +2459,8 @@ export type rugnux_live_status = {
shells_merge?: string;
/**
* 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`.
@@ -2482,15 +2483,15 @@ export type rugnux_live_status = {
*/
frame_ranges?: Array<rugnux_live_frame_range>;
/**
* 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
*/
space_group?: string;
/**
* 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
*/
d_min?: number;
/**
* 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
*/
isa?: number;
/**
+22 -13
View File
@@ -49,6 +49,19 @@ namespace {
}
};
// The headline numbers and the shell table of the merge: the summary's Space group, Resolution and Signal rows,
// with the R-free of the model by shell where one was validated (and refined) on it
void PublishMerge(RugnuxLiveStatus &status, const ProcessResult &result, const MergeStatistics &statistics,
const ModelValidationResult *validation = nullptr, const RefinementResult *refinement = nullptr) {
std::optional<double> d_min, isa;
if (std::isfinite(statistics.overall.d_min))
d_min = statistics.overall.d_min;
if (!statistics.stills && result.error_model_isa_resolved && result.error_model_isa > 0.0)
isa = result.error_model_isa;
status.Headline(result.space_group ? result.space_group->xhm() : "", d_min, isa);
status.Shells("the collection", LiveShells(statistics, validation), LiveOverall(statistics, validation, refinement));
}
// Per-image results of rugnux's canonical pass to the plots and scan result, its steps to the live status. The
// pass runs behind the images, mostly after the last one: the image buffer is told, so that the viewer reads
// the plots again.
@@ -80,6 +93,10 @@ namespace {
if (text.starts_with("lattice "))
status.Lattice("lattice on the sweep: " + text.substr(8));
}
// The merge is made: its numbers go out now, not after the model work; the end publishes them again
void OnMerge(const ProcessResult &result, const MergeStatistics &statistics) override {
PublishMerge(status, result, statistics);
}
};
std::string StateName(RugnuxLiveState state) {
@@ -305,21 +322,13 @@ void JFJochReceiverRugnuxRotation::RugnuxThread() {
live_status.Triage(triage);
if (const auto live_model = LiveModel(result))
live_status.Model(*live_model);
// The numbers the summary's Space group, Resolution and Signal rows give
std::optional<double> d_min, isa;
if (result.has_merge_statistics)
if (std::isfinite(result.merge_statistics.overall.d_min))
d_min = result.merge_statistics.overall.d_min;
if (!result.merge_statistics.stills && result.error_model_isa_resolved && result.error_model_isa > 0.0)
isa = result.error_model_isa;
live_status.Headline(result.space_group ? result.space_group->xhm() : "", d_min, isa);
if (result.has_merge_statistics) {
const ModelValidationResult *validation = result.model_validation ? &*result.model_validation : nullptr;
const RefinementResult *refinement = result.refinement ? &*result.refinement : nullptr;
live_status.Shells("the collection", LiveShells(result.merge_statistics, validation),
LiveOverall(result.merge_statistics, validation, refinement));
PublishMerge(live_status, result, result.merge_statistics,
result.model_validation ? &*result.model_validation : nullptr,
result.refinement ? &*result.refinement : nullptr);
live_status.Frames(result.end_message.image_scale_factor, LiveFrameRanges(result.merge_statistics.sweep_quality));
}
} else
live_status.Headline(result.space_group ? result.space_group->xhm() : "", std::nullopt, std::nullopt);
// For the broker's viewer routes; a copy of the map coefficients, as the end message takes the originals
if (result.outputs && result.outputs->placed_model) {
const RugnuxOutputs &outputs = *result.outputs;
+4
View File
@@ -1222,6 +1222,10 @@ public:
virtual void OnImagePass(bool canonical) {}
virtual void OnStep(const std::string &title) {}
virtual void OnNote(const std::string &text) {}
// The merge of the result is made: its group, axes and resolution are those the data decide (a placed model
// can still change the hand), the analyses and the model work are still to come. Called with the merge's
// statistics, before the "Analyses" step; on the main thread, from the passes that make the result.
virtual void OnMerge(const ProcessResult &result, const MergeStatistics &statistics) {}
};
class Rugnux {
+2
View File
@@ -4172,6 +4172,8 @@ bool Rugnux::ScaleMergeAndSymmetry(PipelineLocals &p) {
result.resolution_fit_A
? fmt::format(" (CC1/2 fall-off at {:.2f} A)", *result.resolution_fit_A)
: std::string()));
if (steps_)
steps_->OnMerge(result, sm.statistics);
Step("Analyses");
}
adoption_mark.Stop();