Build Packages / build:viewer-tgz:cpu (push) Successful in 6m39s
Build Packages / build:viewer-tgz:cuda (push) Successful in 7m32s
Build Packages / build:windows:nocuda (push) Successful in 10s
Build Packages / build:windows:cuda (push) Successful in 11s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 13m2s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 13m6s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 13m56s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 13m51s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 14m2s
Build Packages / build:rpm (rocky8) (push) Successful in 10m47s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 12m22s
Build Packages / XDS test (durin plugin) (push) Successful in 8m15s
Build Packages / Generate python client (push) Successful in 37s
Build Packages / Build documentation (push) Successful in 1m4s
Build Packages / Create release (push) Skipped
Build Packages / build:rpm (ubuntu2204) (push) Successful in 12m37s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 11m59s
Build Packages / build:rpm (rocky9) (push) Successful in 13m13s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 9m20s
Build Packages / XDS test (neggia plugin) (push) Successful in 8m39s
Build Packages / DIALS test (push) Successful in 13m59s
Build Packages / build:windows:nocuda (pull_request) Successful in 16m26s
Build Packages / build:viewer-tgz:cpu (pull_request) Successful in 6m18s
Build Packages / build:windows:cuda (pull_request) Successful in 18m27s
Build Packages / build:viewer-tgz:cuda (pull_request) Successful in 6m46s
Build Packages / build:rpm (rocky8_nocuda) (pull_request) Successful in 10m48s
Build Packages / build:rpm (ubuntu2404_nocuda) (pull_request) Successful in 10m8s
Build Packages / build:rpm (ubuntu2204_nocuda) (pull_request) Successful in 10m49s
Build Packages / build:rpm (rocky9_nocuda) (pull_request) Successful in 11m30s
Build Packages / build:rpm (rocky8_sls9) (pull_request) Successful in 10m27s
Build Packages / build:rpm (rocky9_sls9) (pull_request) Successful in 11m11s
Build Packages / build:rpm (rocky8) (pull_request) Successful in 10m58s
Build Packages / build:rpm (ubuntu2404) (pull_request) Successful in 10m18s
Build Packages / build:rpm (ubuntu2204) (pull_request) Successful in 11m25s
Build Packages / Generate python client (pull_request) Successful in 16s
Build Packages / build:rpm (rocky9) (pull_request) Successful in 12m10s
Build Packages / Create release (pull_request) Skipped
Build Packages / Build documentation (pull_request) Successful in 48s
Build Packages / XDS test (durin plugin) (pull_request) Successful in 8m20s
Build Packages / XDS test (JFJoch plugin) (pull_request) Successful in 7m11s
Build Packages / DIALS test (pull_request) Successful in 12m53s
Build Packages / XDS test (neggia plugin) (pull_request) Successful in 6m10s
Build Packages / Unit tests (push) Successful in 1h15m45s
Build Packages / Unit tests (pull_request) Successful in 59m48s
Merge/report/write to the CC1/2 fall-off instead of the detector edge.
After the final merge, fit a logistic to a fine-binned CC1/2 profile and
cut one shell past cc_target (default 0.30) - generous, DIALS-style. Only
the written MTZ/CIF and the reported shell table are trimmed; scaling, the
3D combine and the error model still run over the full range, and the
per-image _process.h5 keeps full data for re-scaling. The de-novo P1 merge
that feeds the space-group search is never cut (gated on the final merge).
- ScalingSettings: resolution_cutoff {Off,CCHalfLogistic}, resolution_cc_target,
report_shell_count (report shell count is now configurable).
- New ResolutionCutoff.{h,cpp}: ComputeCCHalfLogisticCutoff (fine-bin CC1/2 +
grid/refine logistic fit + one-shell extension + degeneracy/low-res guards).
- Wired into RotationScaleMerge (rotation) and MergeOnTheFly/Rugnux (stills),
plus the rugnux --scale path.
- CLI: --resolution-cutoff cc-logistic|off, --resolution-cc-target,
--resolution-shells. --scaling-high-resolution stays the manual override
(wins and disables the auto-cut).
Validated on the 24-crystal battery: no crashes (incl. Benas/cytC_10/Thau_9);
--resolution-cutoff off is bit-identical to baseline; cutoffs reproduce the
design table within ~0.05 A (lysoC 1.30, Ins_I 1.43, cytC_2 1.68, EcwtCQ244-E3
1.54); good-to-edge datasets (lyso_ref, EP_cs_02-10) correctly keep the full
range.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
246 lines
6.9 KiB
C++
246 lines
6.9 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::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;
|
|
}
|