Files
Jungfraujoch/image_analysis/scale_merge/RfreeFlags.h
T
leonarski_fandFilip Leonarski 19b135186d
Build Packages / Create release (push) Successful in 7s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 4m56s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 9m10s
Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 13m51s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 16m56s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 20m59s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 21m25s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 21m17s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 14m14s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 25m59s
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 25m48s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 15m52s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 19m33s
Build Packages / Generate python client (push) Successful in 29s
Build Packages / Build documentation (push) Successful in 1m19s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 20m49s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 25m31s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 25m24s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 26m5s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 22m19s
Build Packages / Unit tests (push) Failing after 2h28m24s
Build Packages / Validation Battery (push) Successful in 40m33s
v1.0.0-rc.175 (#85)
* Rugnux: Processes a collection live while jfjoch_broker writes it (`rugnux <master.h5> <broker URL>`).
* Rugnux: Processing starts on the first images and confirms its choices once all are in, so analysis can begin during collection.
* Rugnux: Faster processing, especially on servers with several GPUs and CPU sockets and on computers without a GPU (`--no-gpu`, macOS).
* Rugnux: Uses much less GPU memory, so large data sets stay on the GPU of smaller cards, and a data set too large for the card is processed on the CPU instead.
* Rugnux: On macOS, Bragg integration runs on the Apple GPU.
* Rugnux: Better handling of twinning and pseudo-symmetry, with the twin hypothesis written as `<prefix>_twin_<SG>.mtz`, and a wrong `--model` no longer confirms the data or decides the hand.
* Rugnux: `--model` accepts predicted (AlphaFold) models and falls back to molecular replacement when the model is not placed as a rigid body (experimental `--mr` forces it), settling space group, hand and twinning and writing a different answer as `<prefix>_mr.mtz`.
* Rugnux: Molecular replacement is faster and settles the space group in more cases with several copies in the asymmetric unit.
* Rugnux: Deposition-ready mmCIF, a richer report, and numbered steps on the terminal with the full log in `<prefix>_log.txt`; `_P1.mtz`, `--estimate-beam-center` and `--beam-center-search` are removed.
* Rugnux: The beam-stop shadow is found correctly on tilted detectors.
* Rugnux: Stills files that record a stationary goniometer axis get the default stills geometry refinement.
* jfjoch_viewer: "Analyze dataset" uses the same defaults as a bare `rugnux <file>`, and shows the results of processed CBF, marCCD and SMV sweeps.
* jfjoch_viewer: The Files panel refreshes on F5 and every few seconds, and the plot type and other selections stay put during live collection.
* jfjoch_writer: Memory stays bounded and old data files are closed efficiently on long runs, any failure ends the run in an error state the broker is told about, and the master file appears only after its data files; the ZeroMQ pusher logs when a stalled writer makes it drop images.
* Fixes: The TCP image pusher no longer blocks the broker's receiver, GPU out-of-memory failures stop with a clear message, and the XDS plugin masks module and chip edges.

---------

Co-authored-by: Filip Leonarski <jungfrau@filips-mac-mini.home>
Reviewed-on: #85
Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
2026-10-16 15:34:43 +02:00

47 lines
3.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 <cstddef>
#include <cstdint>
#include <optional>
#include <vector>
#include "../../common/Reflection.h"
#include "../../common/UnitCell.h"
#include "gemmi/symmetry.hpp"
// Assign R-free (test-set) flags to merged reflections. With the cell given, the flag is a pure
// function of the reflection's orbit under the LATTICE HOLOHEDRY (the metric symmetry of the cell,
// which contains the merging group); without one, or when the cell does not carry the merging group,
// of its Friedel-merged (Laue) ASU key in space_group. That gives four properties:
// - all symmetry- and Friedel-equivalent reflections share one flag, so a Bijvoet pair I(+)/I(-)
// is never split across the work and free sets;
// - with the cell, twin-law mates share one too, and every file of one crystal - whatever space
// group it is merged in - carries the same free set;
// - the assignment is reproducible run-to-run and independent of merge/call order;
// - it depends only on the reflection index, not on the dataset's resolution range or contents, so
// every dataset of one crystal form gets the SAME free set (needed for multi-dataset campaigns:
// ensemble refinement, PanDDA). A uniform hash draws ~rfree_fraction of the distinct reflections.
//
// min_free_reflections floors the test-set size: on small data, where rfree_fraction would give too
// few test reflections for a statistically stable R-free (Brunger's ~500-2000 rule), the fraction is
// lifted so ~min_free_reflections distinct reflections are free - but never above 10% (a large test
// set steals working data for no gain). For ordinary data (rfree_fraction already clears the floor)
// this is inactive and the fraction stays flat, so the cross-dataset-identical property above holds;
// the floor only lifts the fraction on genuinely small datasets, where per-dataset R-free stability
// matters more than cross-dataset identity (and a shared reference/ApplyReferenceFreeFlags is the way
// to keep exact identity there). Pass 0 to disable the floor.
void AssignRfreeFlags(std::vector<MergedReflection> &merged, const gemmi::SpaceGroup &space_group,
double rfree_fraction, int min_free_reflections = 500,
const std::optional<UnitCell> &cell = std::nullopt, size_t nthreads = 1);
// Override the R-free flags on `merged` from a reference set (e.g. a reference MTZ's FreeR_flag
// column), so an entire campaign shares one test set. A merged reflection whose Friedel-merged
// (Laue) ASU key matches a reference reflection takes the reference's flag; reflections with no
// match keep the flag they already carry (the deterministic per-hkl hash from AssignRfreeFlags).
// Returns the number of merged reflections matched to the reference (for logging).
size_t ApplyReferenceFreeFlags(std::vector<MergedReflection> &merged, const gemmi::SpaceGroup &space_group,
const std::vector<MergedReflection> &reference);