One changeset, developed together in response to a review of this branch, so the files carry several of the changes at once. Full test suite passes (733 cases). Spot finding - Split ImageSpotFinder into Detect() (flag strong pixels - the expensive per-pixel pass) and ExtractSpots() (CCL + min/max-pix + resolution mask), with Run() = both. The per-image min-pix escalation now detects ONCE and repeats only the cheap extraction, instead of re-running the whole finder four times per frame as it did on the default path. It also keeps the winning attempt's spot list rather than re-extracting it, so the frame that is integrated is exactly the frame that was scored - which a GPU re-extract could not guarantee (float atomic ordering). - spot_finding_time_s no longer swallows indexing time, and indexing_time_s now sums every escalation call instead of reporting only the last. Detection limits follow the detector - The azimuthal-integration upper q and the spot-finding high-resolution limit are now std::optional, in the C++ structs AND in the OpenAPI schema, and resolve to the detector's own maximum (DiffractionExperiment::GetDetectorMaxQ_ recipA). Adaptive detection reads a pixel's ring from the azimuthal bins, so a pixel outside that q range could never be strong - the integration range silently bounded what detection could see, regardless of the requested resolution limit. Regenerated the C++ and TypeScript clients; the viewer and the web frontend each gained a "to detector edge" switch. Detection defaults are now per workflow (measured, not assumed) - Stills: adaptive detection, min-pix chosen per image, no resolution clipping. - Rotation: fixed-threshold finder, min-pix 2, 1.5 A limit. On a 33-crystal rotation battery, adaptive detection helped four hard crystals but deterministically broke three (a lost space group, a halved indexing rate, a collapsed merge), and the detector-edge limit cost indexing on a strong rotation set (100.0 -> 96.8%). Each is still overridable by its flag, and --no-adaptive-spots is new. Indexer seed escalation - Stop escalating once a seed's lattice explains >= 90% of the seed spots. Previously any frame with >= 80 spots always paid three indexer calls, online broker included. Merge-consistency filter - --min-image-cc gated on a per-image CC computed BEFORE the stills partiality post-refinement and never refreshed; the refiner now recomputes it, so the reported CC describes the data that are actually merged. - Replaced the per-call cc_mask argument with one MergeOnTheFly flag, so the merge, the error model and MergeStats can no longer disagree about which images are in (the --scale path merged unfiltered while its statistics were filtered). Per-image B-factor refinement (-B) removed - Measured on four serial-stills datasets: it is a no-op where the per-image fit is well conditioned and actively harmful where it is not (CC1/2 -8.1, R_meas +23.2 on the weakest large-cell set, whose fits hit their [-50, 200] bounds on 14-25% of images). It had also been silently DISCARDED since the partiality post-refinement landed - reported but not applied. Rather than fix and keep a knob with no demonstrated benefit, the flag and the whole image_scale_b_factor chain are gone: setting, scaling fit, message field, CBOR, HDF5 write and read-back, per-image plot, OpenAPI enum, viewer column and checkbox, docs. ScaleOnTheFly no longer needs Ceres at all - the fit is a linear IRLS. (The Wilson per-image b_factor is a different quantity and stays.) Stills partiality width now fits both of its components - sigma^2 = gamma0^2 + (gamma_e*d*)^2 instead of a purely angular gamma_e*d* with gamma0 pinned to 0. Fitted per crystal by least squares of dist_ewald^2 on d*^2. The angular-only width is fitted over a d*^2-dense population, so it was pinned by the high-resolution edge and collapsed at low d*: median partiality 0.008 beyond 13 A for reflections that were plainly recorded, 55% of them under the merge's partiality floor, and the survivors divided by those values - which inflated the merged low-resolution intensity scale 3.6x (~ +9 A^2 of apparent B). Measured on 5000 stills: the ramp flattens to 0.89x, no observation is dropped any more (701750 -> 716811), shell-mean CC1/2 and R-free improve slightly. Note CC1/2, R_meas, completeness and a B-refining R-free are all blind to that ramp, which is why it survived earlier validation; the cost is high-resolution R_meas (98.5 -> 101.9 shell-averaged). Removed dead code from add-then-remove churn - Prediction-time "still partiality" (unreachable: no setter), the phantom IndexingSettings::min_indexed_spot_fraction knob (getter, no setter - now the constant it always was), StillsPartialityRefine's caller-less Settings constructor and its reference to a long-gone env var, ProcessImage's unread bool return, an unused include, and a dead viewer overlay hook. Also - Viewer: the magnifier compared a QImage with itself, so its scene rect was set once ever and it could not pan into a larger dataset; the hover tail timer could fire after leaveEvent and resurrect the resolution readout outside the image. - update_version.sh regenerated the frontend lock file BEFORE bumping the version (every release shipped an off-by-one lock), and did git rm/git add on a path that has not existed since the client moved to src/client - with no set -e, both failed silently. - fpga/pcie_driver/postinstall.sh tested "[ ! occurrences > 0 ]", which is a redirect, not a test, so dkms add never ran. - Unit tests for the adaptive-threshold host functions, which had none. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
200 lines
10 KiB
C++
200 lines
10 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <algorithm>
|
|
#include <cmath>
|
|
#include <map>
|
|
#include <random>
|
|
#include <unordered_map>
|
|
#include <vector>
|
|
|
|
#include "../../common/Logger.h"
|
|
#include "../../common/DiffractionExperiment.h"
|
|
#include "../../common/Reflection.h"
|
|
#include "../IntegrationOutcome.h"
|
|
|
|
#include "HKLKey.h"
|
|
|
|
// The error model splits a reflection's variance into a statistical part (a*sigma^2, which averages
|
|
// down with multiplicity) and a systematic part ((b*I)^2 - absorption, beam flicker, partiality,
|
|
// detector non-uniformity - correlated across a reflection's repeats). Inverse-variance merging
|
|
// (sigma = 1/sqrt(sum_w)) wrongly divides BOTH by the multiplicity, so high-multiplicity reflections
|
|
// get an unphysically small merged sigma (merged I/sigma far above ISa). Floor the merged sigma at
|
|
// b*|I| so the systematic term survives the merge and ISa = 1/b stays the asymptotic I/sigma ceiling.
|
|
// error_model_b <= 0 (no active error model) leaves the sigma unchanged.
|
|
inline float SigmaWithSystematicFloor(double inv_variance_sigma, float merged_I, double error_model_b) {
|
|
const auto floor = static_cast<float>(error_model_b * std::abs(static_cast<double>(merged_I)));
|
|
return std::max(static_cast<float>(inv_variance_sigma), floor);
|
|
}
|
|
|
|
struct MergeStatisticsShell {
|
|
float d_min = 0.0f;
|
|
float d_max = 0.0f;
|
|
float mean_one_over_d2 = 0;
|
|
|
|
int total_observations = 0;
|
|
int unique_reflections = 0;
|
|
int possible_unique_reflections = 0;
|
|
|
|
double mean_i_over_sigma = 0.0;
|
|
|
|
double cc_half = 0.0f;
|
|
double cc_ref = NAN;
|
|
|
|
// Redundancy-independent merging R-factor (Diederichs & Karplus 1997), computed over the
|
|
// observations that enter the merge: R_meas = sum_hkl sqrt(n/(n-1)) sum_i|I_i-<I>| / sum I_i.
|
|
double r_meas = NAN;
|
|
|
|
// Anomalous signal-to-noise (XDS "SigAno" / mmCIF pdbx_absDiff_over_sigma_anomalous):
|
|
// <|I(+)-I(-)|> / <sigma(I(+)-I(-))> over acentric reflections measured in both hands. NaN when
|
|
// there is no anomalous split (e.g. Friedel-merged with no mates, or the stills path).
|
|
double abs_diff_over_sigma_anomalous = NAN;
|
|
};
|
|
|
|
struct MergeStatistics {
|
|
std::vector<MergeStatisticsShell> shells;
|
|
MergeStatisticsShell overall;
|
|
|
|
// Dataset-wide isotropic Wilson B-factor estimate (A^2) from the log-linear fit of the shell-mean
|
|
// merged intensity against 1/d^2 (CalcGlobalWilsonB) - the analogue of XDS's "WILSON LINE ... B=".
|
|
// Diagnostic only; not used in scaling. NaN when not determined.
|
|
double wilson_b = NAN;
|
|
double wilson_b_correlation = NAN;
|
|
|
|
// Radiation-damage monitor (rotation only): the relative Debye-Waller B change measured from the first
|
|
// to the last frame of the run (A^2; positive = high-resolution intensity fades with dose = damage) and
|
|
// the per-batch relative-B curve it was derived from. Measured before any decay/relative-B correction is
|
|
// applied, so it reports how much radiation damage was present. Diagnostic; NaN / empty for stills or
|
|
// when not determined. batch_deg is the rotation width per batch of the curve.
|
|
double radiation_damage_delta_b = NAN;
|
|
std::vector<float> radiation_damage_b_batch;
|
|
double radiation_damage_batch_deg = 0.0;
|
|
};
|
|
|
|
|
|
std::ostream &operator<<(std::ostream &output, const MergeStatisticsShell &in);
|
|
std::ostream &operator<<(std::ostream &output, const MergeStatistics &in);
|
|
|
|
struct MergeAccum {
|
|
int32_t h = 0;
|
|
int32_t k = 0;
|
|
int32_t l = 0;
|
|
float d = NAN;
|
|
double sum_wI = 0.0;
|
|
double sum_w = 0.0;
|
|
double sum_wI_half[2] = {0.0, 0.0};
|
|
double sum_w_half[2] = {0.0, 0.0};
|
|
size_t n_half[2] = {0, 0};
|
|
};
|
|
|
|
class MergeOnTheFly {
|
|
mutable std::mutex merged_mutex;
|
|
|
|
const int space_group_number = 1;
|
|
|
|
ScalingSettings scaling_settings;
|
|
IndexingSettings indexing_settings;
|
|
|
|
std::optional<UnitCell> reference_cell;
|
|
std::optional<double> high_resolution_limit;
|
|
std::optional<double> image_cc_limit;
|
|
// Apply image_cc_limit in Mask(). One flag for the whole engine, not a per-call argument, so the
|
|
// merge, the error model and MergeStats can never disagree about which images are in.
|
|
bool filter_by_image_cc = false;
|
|
double min_partiality = 0.02;
|
|
|
|
// When set, ice-ring-flagged reflections are left out of this merge. Used for the P1 pass whose
|
|
// merged intensities feed the space-group search and the error model - those model fits must not
|
|
// see the ice-contaminated intensities. The final in-symmetry merge keeps them (for completeness).
|
|
bool exclude_ice_rings = false;
|
|
|
|
// Ice rings (indices into ICE_RING_RES_A) to exclude from this merge because their merged CC1/2
|
|
// collapsed relative to their resolution neighbours - ice decorrelated them. Empty = none masked.
|
|
std::vector<char> masked_ice_rings;
|
|
float mask_ice_half_width_q = 0.03f;
|
|
|
|
HKLKeyGenerator generator;
|
|
|
|
std::map<uint64_t, MergeAccum> accumulator;
|
|
|
|
// Global error model (XDS form): sigma_corr^2 = a*sigma^2 + (b*<I>)^2. a rescales the
|
|
// (under-estimated) counting variance; the (b*<I>)^2 term adds the intensity-
|
|
// proportional systematic error that counting statistics miss, so strong reflections
|
|
// are no longer over-weighted. ISa = 1/b is the asymptotic I/sigma. Refined from the
|
|
// scatter of symmetry equivalents (RefineErrorModel); identity until then.
|
|
bool error_model_active = false;
|
|
double error_model_a = 1.0;
|
|
double error_model_b = 0.0;
|
|
double error_model_chi2 = 0.0; // achieved median reduced chi^2 (~1.0 = honestly calibrated sigmas)
|
|
// The (b*I)^2 term uses the reflection's *mean* intensity (constant over its
|
|
// observations), so it inflates sigma without biasing the inverse-variance weights -
|
|
// using the per-observation I_i instead would over-weight down-fluctuated points.
|
|
std::unordered_map<uint64_t, float> error_model_mean_I;
|
|
[[nodiscard]] float CorrectedSigma(float I_corr, float sigma_corr, float image_scale_corr,
|
|
uint64_t hkl_key) const;
|
|
|
|
// Optional per-observation outlier rejection: drop observations whose corrected
|
|
// intensity lies more than reject_nsigma error-model sigmas from the reflection's
|
|
// *median* (a robust centre). The error-model sigma already captures the genuine
|
|
// (e.g. partiality) scatter, so this removes only the tail beyond it - zingers,
|
|
// overlaps, mis-indexed frames - not good partials. Populated by RefineErrorModel.
|
|
bool reject_outliers = false;
|
|
double reject_nsigma = 6.0;
|
|
std::unordered_map<uint64_t, float> reject_median_I;
|
|
size_t reject_count = 0;
|
|
|
|
bool Mask(const IntegrationOutcome &outcome);
|
|
[[nodiscard]] bool IsMaskedRing(const Reflection &r) const;
|
|
public:
|
|
MergeOnTheFly(const DiffractionExperiment &x);
|
|
MergeOnTheFly& ReferenceCell(const std::optional<UnitCell> &cell);
|
|
MergeOnTheFly& ExcludeIceRings(bool input) { exclude_ice_rings = input; return *this; }
|
|
MergeOnTheFly& FilterByImageCC(bool input) { filter_by_image_cc = input; return *this; }
|
|
MergeOnTheFly& MaskIceRings(std::vector<char> masked, float half_width_q) {
|
|
masked_ice_rings = std::move(masked); mask_ice_half_width_q = half_width_q; return *this;
|
|
}
|
|
|
|
// Fit the global error model from the spread of symmetry-equivalent observations.
|
|
// Call once before merging; AddImage then applies it.
|
|
void RefineErrorModel(const std::vector<IntegrationOutcome> &outcomes);
|
|
[[nodiscard]] bool ErrorModelActive() const { return error_model_active; }
|
|
[[nodiscard]] double ErrorModelA() const { return error_model_a; }
|
|
[[nodiscard]] double ErrorModelB() const { return error_model_b; }
|
|
[[nodiscard]] double ErrorModelChi2() const { return error_model_chi2; }
|
|
|
|
// Outlier rejection (driven by ScalingSettings::GetOutlierRejectNsigma) reports its count.
|
|
[[nodiscard]] size_t RejectedCount() const { return reject_count; }
|
|
|
|
// image_id is the image's stable identity (its index in the outcomes vector). The CC1/2 half-set
|
|
// is a deterministic hash of it, so the split is reproducible run-to-run and independent of the
|
|
// order (or threading) of AddImage calls - not a draw from a shared RNG in call order.
|
|
void AddImage(const IntegrationOutcome& outcome, int64_t image_id);
|
|
|
|
// d_min_override, when set, is the effective high-resolution limit for the shell table (used for
|
|
// the automatic resolution cutoff computed by the caller); otherwise the manual
|
|
// ScalingSettings high-resolution limit stands. The number of shells is ScalingSettings::ReportShellCount.
|
|
MergeStatistics MergeStats(const std::vector<MergedReflection> &merged,
|
|
const std::vector<IntegrationOutcome> &reflections,
|
|
const std::vector<MergedReflection> &reference = {},
|
|
std::optional<double> d_min_override = std::nullopt);
|
|
|
|
std::vector<MergedReflection> ExportReflections();
|
|
};
|
|
|
|
std::vector<MergedReflection> MergeAll(const DiffractionExperiment &x,
|
|
const std::vector<IntegrationOutcome> &reflections);
|
|
|
|
// Pearson CC between one image's corrected intensities (I * image_scale_corr) and a reference set of
|
|
// full intensities, over the reflections that would enter the merge (non-ice, within the resolution
|
|
// limit, partiality above the floor, finite). {NAN, n} when fewer than 20 reflections qualify.
|
|
// This is the per-image image_scale_cc: ScaleOnTheFly sets it, and StillsPartialityRefine recomputes it
|
|
// after refining the partiality model, so the reported CC always describes the corrections that will be
|
|
// merged - which matters because --min-image-cc drops images by it.
|
|
std::pair<double, size_t> ImageReferenceCC(const std::vector<Reflection> &reflections,
|
|
const std::map<HKLKey, double> &reference,
|
|
const HKLKeyGenerator &generator,
|
|
std::optional<double> d_min_limit,
|
|
double min_partiality);
|