Files
Jungfraujoch/common/ScalingSettings.cpp
T
leonarski_fandClaude Opus 4.8 f0799f780b
Build Packages / build:windows:nocuda (push) Failing after 1m3s
Build Packages / build:windows:cuda (push) Failing after 31s
Build Packages / build:viewer-tgz:cpu (push) Successful in 8m18s
Build Packages / build:viewer-tgz:cuda (push) Successful in 8m52s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 13m3s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 13m32s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 13m45s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 13m58s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 13m53s
Build Packages / build:windows:nocuda (pull_request) Successful in 14m27s
Build Packages / build:windows:cuda (pull_request) Successful in 16m52s
Build Packages / build:rpm (rocky8) (push) Successful in 11m8s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 12m8s
Build Packages / XDS test (durin plugin) (push) Successful in 9m41s
Build Packages / Generate python client (push) Successful in 26s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 10m53s
Build Packages / Create release (push) Skipped
Build Packages / Build documentation (push) Successful in 1m12s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 12m21s
Build Packages / build:rpm (rocky9) (push) Successful in 12m57s
Build Packages / XDS test (neggia plugin) (push) Successful in 7m46s
Build Packages / DIALS test (push) Successful in 14m21s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 8m28s
Build Packages / build:viewer-tgz:cpu (pull_request) Successful in 6m50s
Build Packages / build:viewer-tgz:cuda (pull_request) Successful in 6m48s
Build Packages / build:rpm (rocky8_nocuda) (pull_request) Successful in 10m44s
Build Packages / build:rpm (ubuntu2404_nocuda) (pull_request) Successful in 9m44s
Build Packages / build:rpm (ubuntu2204_nocuda) (pull_request) Successful in 10m40s
Build Packages / build:rpm (rocky9_nocuda) (pull_request) Successful in 11m17s
Build Packages / build:rpm (rocky8_sls9) (pull_request) Successful in 10m41s
Build Packages / build:rpm (rocky9_sls9) (pull_request) Successful in 11m16s
Build Packages / build:rpm (rocky8) (pull_request) Successful in 10m41s
Build Packages / build:rpm (ubuntu2204) (pull_request) Successful in 11m27s
Build Packages / build:rpm (ubuntu2404) (pull_request) Successful in 11m8s
Build Packages / Generate python client (pull_request) Successful in 12s
Build Packages / build:rpm (rocky9) (pull_request) Successful in 12m40s
Build Packages / Create release (pull_request) Skipped
Build Packages / Build documentation (pull_request) Successful in 47s
Build Packages / XDS test (durin plugin) (pull_request) Successful in 8m29s
Build Packages / XDS test (JFJoch plugin) (pull_request) Successful in 7m14s
Build Packages / DIALS test (pull_request) Successful in 13m0s
Build Packages / XDS test (neggia plugin) (pull_request) Successful in 6m2s
Build Packages / Unit tests (push) Successful in 1h15m35s
Build Packages / Unit tests (pull_request) Successful in 58m13s
rugnux: drop edge-of-sweep truncated fulls + honest R-meas over accepted obs
From a fresh decomposition of the low-resolution-shell R-meas gap vs XDS on the
reference lysozyme rotation crystal (7.6% vs 2.9%), two rot3d scale/merge changes:

- New --min-captured-fraction (default 0.5 for rotation, off otherwise): drop a
  combined full whose rocking curve was captured below this fraction. These
  edge-of-sweep, partiality-extrapolated fulls (sweep start/end) are biased and
  inflate the low-res R-meas. Dropping them lowers low-shell R-meas 7.6->5.5% and
  *improves* external accuracy (CC vs the F-model and vs an independent dataset,
  and the ANODE anomalous S-peak 0.93->0.94x XDS) - unlike --min-partiality, which
  lowers R-meas cosmetically while degrading accuracy. Threaded through
  ScalingSettings and both the GPU and CPU combine.

- R-meas reporting fix: the R_meas re-walk counted observations the merge had
  rejected as outliers (XDS excludes its misfits before its R-factor). The
  accumulate pass now flags each rejected full and the R_meas pass skips it, in
  both the GPU and CPU paths. Merged intensities / ISa / CC1/2 unchanged (verified
  byte-identical external accuracy); low-shell R-meas 7.6->6.5%. No-op when
  --reject-outliers 0.

Combined default rotation low-shell R-meas 7.6->5.1%, ISa 17.2->17.5, external
accuracy equal-or-better than baseline and XDS.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-07-10 20:13:06 +02:00

258 lines
7.3 KiB
C++

// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#include "ScalingSettings.h"
ScalingSettings& ScalingSettings::RefineB(bool input) {
refine_b = input;
return *this;
}
ScalingSettings& ScalingSettings::MergeFriedel(bool input) {
merge_friedel = input;
return *this;
}
ScalingSettings& ScalingSettings::HighResolutionLimit_A(double limit) {
if (limit <= 0.0)
throw JFJochException(JFJochExceptionCategory::InputParameterBelowMin, "High resolution limit must be positive");
high_resolution_limit_A = limit;
return *this;
}
ScalingSettings& ScalingSettings::HighResolutionLimit_A(std::optional<double> limit) {
if (limit.has_value() && limit.value() <= 0.0)
throw JFJochException(JFJochExceptionCategory::InputParameterBelowMin, "High resolution limit must be positive");
high_resolution_limit_A = limit;
return *this;
}
bool ScalingSettings::GetRefineB() const {
return refine_b;
}
bool ScalingSettings::GetMergeFriedel() const {
return merge_friedel;
}
ScalingSettings &ScalingSettings::RefineRotationWedge(bool input) {
refine_wedge = input;
return *this;
}
bool ScalingSettings::GetRefineWedge() const {
return refine_wedge;
}
std::optional<double> ScalingSettings::GetHighResolutionLimit_A() const {
return high_resolution_limit_A;
}
double ScalingSettings::GetMinB() const {
return min_b;
}
double ScalingSettings::GetMaxB() const {
return max_b;
}
double ScalingSettings::GetMinMosaicity() const {
return 0.001;
}
double ScalingSettings::GetMaxMosaicity() const {
return 1.0;
}
double ScalingSettings::GetMinWedge() const {
return 0.001;
}
double ScalingSettings::GetMaxWedge() const {
return 10.0;
}
double ScalingSettings::GetDefaultMosaicity() const {
return 0.1;
}
ScalingSettings &ScalingSettings::RotationWedgeForScaling(std::optional<double> input) {
if (input) {
// TODO: Use fmt
if (input.value() < GetMinWedge() || input.value() > GetMaxWedge())
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
"Wedge for scaling must be between " + std::to_string(GetMinWedge()) +
" and " + std::to_string(GetMaxWedge()));
}
wedge_for_scaling = input;
return *this;
}
std::optional<double> ScalingSettings::GetRotationWedgeForScaling() const {
return wedge_for_scaling;
}
ScalingSettings &ScalingSettings::MinPartiality(double input) {
if (min_partiality < 0.0 || min_partiality > 1.0)
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Min partiality must be between 0 and 1");
min_partiality = input;
return *this;
}
double ScalingSettings::GetMinCCForImage() const {
return min_cc_for_image;
}
ScalingSettings &ScalingSettings::MinCCForImage(double input) {
if (input < 0.0 || input > 1.0)
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Min CC for image must be between 0 and 1");
min_cc_for_image = input;
return *this;
}
double ScalingSettings::GetOutlierRejectNsigma() const {
return outlier_reject_nsigma;
}
ScalingSettings &ScalingSettings::OutlierRejectNsigma(double input) {
outlier_reject_nsigma = input; // <= 0 disables; no upper bound (large = effectively off)
return *this;
}
ScalingSettings &ScalingSettings::ScaleFulls(bool input) {
scale_fulls = input;
return *this;
}
bool ScalingSettings::GetScaleFulls() const {
return scale_fulls;
}
ScalingSettings &ScalingSettings::AbsorptionIter(int input) {
if (input < 0)
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Absorption iterations must be non-negative");
absorption_iter = input;
return *this;
}
int ScalingSettings::GetAbsorptionIter() const {
return absorption_iter;
}
ScalingSettings &ScalingSettings::SmoothGDegrees(double input) {
if (input < 0)
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Smooth-G range must be non-negative");
smooth_g_deg = input;
return *this;
}
double ScalingSettings::GetSmoothGDegrees() const {
return smooth_g_deg;
}
double ScalingSettings::GetMinPartiality() const {
return min_partiality;
}
ScalingSettings &ScalingSettings::ForcedMosaicity(std::optional<double> input) {
if (input.has_value() && (input.value() < GetMinMosaicity() || input.value() > GetMaxMosaicity()))
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
"Forced mosaicity must be between " + std::to_string(GetMinMosaicity()) +
" and " + std::to_string(GetMaxMosaicity()));
forced_mosaicity = input;
return *this;
}
std::optional<double> ScalingSettings::GetForcedMosaicity() const {
return forced_mosaicity;
}
ScalingSettings &ScalingSettings::CaptureUncertaintyCoeff(double input) {
if (input < 0.0)
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
"Capture uncertainty coefficient must be non-negative");
capture_uncertainty_coeff = input;
return *this;
}
double ScalingSettings::GetCaptureUncertaintyCoeff() const {
return capture_uncertainty_coeff;
}
ScalingSettings &ScalingSettings::MinCapturedFraction(double input) {
if (input < 0.0)
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
"Minimum captured fraction must be non-negative");
min_captured_fraction = input;
return *this;
}
double ScalingSettings::GetMinCapturedFraction() const {
return min_captured_fraction;
}
ScalingSettings &ScalingSettings::FileFormat(IntensityFormat input) {
intensity_format = input;
return *this;
}
IntensityFormat ScalingSettings::GetFileFormat() const {
return intensity_format;
}
ScalingSettings &ScalingSettings::RfreeFraction(double input) {
if (input < 0.0 || input > 1.0)
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "R-free fraction must be between 0 and 1");
rfree_fraction = input;
return *this;
}
double ScalingSettings::GetRfreeFraction() const {
return rfree_fraction;
}
ScalingSettings &ScalingSettings::ScalingRegularize(bool input) {
scaling_regularize = input;
return *this;
}
bool ScalingSettings::GetScalingRegularize() const {
return scaling_regularize;
}
ScalingSettings &ScalingSettings::ResolutionCutoff(ResolutionCutoffMethod input) {
resolution_cutoff = input;
return *this;
}
ResolutionCutoffMethod ScalingSettings::GetResolutionCutoff() const {
return resolution_cutoff;
}
ScalingSettings &ScalingSettings::ResolutionCCTarget(double input) {
if (input <= 0.0 || input >= 1.0)
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
"Resolution CC target must be between 0 and 1");
resolution_cc_target = input;
return *this;
}
double ScalingSettings::GetResolutionCCTarget() const {
return resolution_cc_target;
}
ScalingSettings &ScalingSettings::ReportShellCount(int input) {
if (input < 1)
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
"Number of report shells must be at least 1");
report_shell_count = input;
return *this;
}
int ScalingSettings::GetReportShellCount() const {
return report_shell_count;
}