Build Packages / Create release (push) Successful in 17s
Build Packages / build:viewer:macos-arm64:nocuda (push) Successful in 3m22s
Build Packages / build:rugnux:macos-arm64:nocuda (push) Successful in 2m37s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 9m33s
Build Packages / build:rugnux:linux-x86_64:cuda (push) Successful in 10m39s
Build Packages / build:viewer:linux-x86_64:nocuda (push) Successful in 11m4s
Build Packages / build:viewer:linux-x86_64:cuda (push) Successful in 13m19s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 17m37s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 18m49s
Build Packages / build:viewer:windows-x86_64:nocuda (push) Successful in 19m10s
Build Packages / build:viewer:windows-x86_64:cuda (push) Successful in 24m26s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 25m31s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 18m54s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 20m45s
Build Packages / Generate python client (push) Successful in 37s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 20m20s
Build Packages / Build documentation (push) Successful in 1m32s
Build Packages / build:rugnux:windows-x86_64:cuda (push) Successful in 14m37s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 21m6s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 19m49s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 20m29s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 17m2s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 14m27s
Build Packages / Unit tests (push) Successful in 1h18m12s
* Rugnux: Performance improvements on GPU and CPU (more of the pre-scan and of scaling on the GPU, faster CPU spot finding and crystal refinement), with unchanged results. * Rugnux: More robust processing - patches of persistently hot pixels are masked, an inconsistent merge triggers a retry at the measured beam centre, and builds targeting different CPU levels give the same results. * Rugnux: Improved scaling and merging - reflections with an overloaded pixel are dropped, as in XDS, sparse rotation sweeps are scaled more reliably, and French-Wilson amplitudes use an anisotropic Wilson prior. * Rugnux: Improved space-group determination - glide planes in groups without a centre of symmetry, screw axes from short or weak axial rows kept when a higher group is adopted, and more reliable decisions on twinned and pseudo-symmetric crystals. * Rugnux: Improved small-molecule processing - spots that grow wider than the integration disk and split spots are integrated over their measured footprint, sparse lattices are integrated on every frame, and the `.hkl` file holds unmerged scaled reflections (SHELX HKLF 4). * Rugnux: Reads Rigaku d*TREK SMV images (Saturn CCD), including detector 2theta and encoded pixel overflows; home-source (rotating-anode) datasets were added to the validation battery. * jfjoch_viewer: Fixed processing failing at the end with "Wrong JPEG library version" on Linux; the merge window shows the space group with proper subscripts and a checklist of crystal pathologies. Reviewed-on: #84 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
36 lines
2.0 KiB
C++
36 lines
2.0 KiB
C++
// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <cstdint>
|
|
#include <vector>
|
|
|
|
#include "../../common/Reflection.h"
|
|
#include "gemmi/math.hpp"
|
|
#include "gemmi/symmetry.hpp"
|
|
|
|
struct FrenchWilsonOptions {
|
|
int num_shells = 20; // resolution shells for the Wilson mean <I>
|
|
int min_reflections_per_shell = 20; // below this, fall back to the overall mean for the shell
|
|
int integration_points = 400; // posterior integration steps (weak reflections only)
|
|
double strong_cutoff = 20.0; // I/sigma above which <|F|> = sqrt(I) (FW bias negligible)
|
|
double reject_below = -3.7; // I/sigma below which no amplitude is given (as ctruncate)
|
|
int num_threads = 1; // workers for the per-reflection integration (independent per reflection)
|
|
// Anisotropic Wilson prior: the anisotropy tensor B (ln <I(s)> = c - 1/2 s^T B s, A^2) in the
|
|
// Miller-index basis, Q with s^T B s = h^T Q h (AnisotropyTensorHKL). The default, zero, is the
|
|
// isotropic prior.
|
|
gemmi::Mat33 anisotropy_hkl = gemmi::Mat33(0.0);
|
|
};
|
|
|
|
// Fill F and sigmaF on every merged reflection with the French-Wilson estimate of the amplitude:
|
|
// the posterior mean |F| given the measured intensity I and its sigma under the Wilson prior. The
|
|
// prior uses the resolution-shell mean intensity - scaled along the reflection's direction by the
|
|
// anisotropy tensor when one is given - the correct centric/acentric form, and the reflection's
|
|
// epsilon (symmetry-enhancement) multiplicity. Strong reflections reduce to sqrt(I);
|
|
// reflections with an unusable I/sigma fall back to sqrt(max(I,0)) with propagated sigma. An
|
|
// intensity below reject_below sigmas gets no amplitude (F = NaN) and stays out of the prior; the
|
|
// intensity itself is kept.
|
|
void ApplyFrenchWilson(std::vector<MergedReflection> &merged, const gemmi::SpaceGroup &space_group,
|
|
const FrenchWilsonOptions &opts = {});
|