Files
Jungfraujoch/image_analysis/geom_refinement/XtalOptimizer.h
T
leonarski_f a395f358ef
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
1.0.0-rc.174 (#84)
* 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>
2026-10-06 14:03:18 +02:00

79 lines
3.7 KiB
C++

// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#pragma once
#include <optional>
#include <span>
#include "../common/GoniometerAxis.h"
#include "../common/CrystalLattice.h"
#include "../common/DiffractionGeometry.h"
#include "../common/SpotToSave.h"
#include "gemmi/symmetry.hpp"
struct XtalOptimizerData {
DiffractionGeometry geom;
CrystalLattice latt;
gemmi::CrystalSystem crystal_system = gemmi::CrystalSystem::Triclinic;
int64_t min_spots = 8;
float min_length_A = 5.0;
float max_length_A = 500.0;
float min_angle_deg = 60.0f;
float max_angle_deg = 120.0f;
bool refine_beam_center = true;
bool refine_detector_angles = false;
bool refine_unit_cell = true; // This refines unit cell size + angles - orientation is always refined
bool refine_rotation_axis = false;
bool index_ice_rings = true;
// Weight each spot by how strong it is for its resolution, so that low-confidence spots contribute
// without driving the fit (see SpotConfidenceWeights). Off by default: the indexers call this with a
// spot list they have already selected, it is the per-image refinement that gets the raw list.
bool weight_spots_by_confidence = false;
// Stopping rule. max_iterations > 0 bounds the solver by ITERATIONS, which is reproducible;
// otherwise it is bounded by max_time, wall-clock seconds, which is not - the same image refines
// to a different answer on a busier machine. Online acquisition needs the wall-clock bound because
// its budget is real; offline reprocessing wants the reproducible one.
float max_time = 1.0;
int max_iterations = 0;
std::optional<GoniometerAxis> axis;
// The rocking geometry, for the acceptance gate's dead zone alone - NOT for back-rotation. A
// refinement that holds a single frame does not back-rotate (the frame's angle is a gauge its
// orientation block absorbs) and so passes no `axis`, but the spots on that frame still
// diffracted at different angles spanning the exposure, and the gate still has to be told it
// does not know which. Left unset - or a wedge below the coarse-slicing trigger - the gate is
// the plain fractional-index test.
std::optional<Coord> rocking_spindle;
float rocking_wedge_deg = 0.0f;
// output
std::optional<double> beam_corr_x;
std::optional<double> beam_corr_y;
// For rotation only optimizer
std::optional<double> angle_corr;
std::optional<Coord> angle_axis;
};
// num_threads sets the thread count of the internal least-squares refine (the answer does not depend on it). It defaults
// to 1 because XtalOptimizer is usually called from many threads at once; raise it only when a caller
// runs a small number of refinements concurrently and wants each to use several cores.
bool XtalOptimizer(XtalOptimizerData &data, std::span<const std::vector<SpotToSave>> spots,
int num_threads = 1);
// Single frame. Not the same as passing {spots} to the overload above: a braced list copies the spot
// list, its elements being const, which on the per-image path is the whole list once per image.
bool XtalOptimizer(XtalOptimizerData &data, const std::vector<SpotToSave> &spots, int num_threads = 1);
bool XtalOptimizerRotationOnly(XtalOptimizerData &data, const std::vector<SpotToSave> &spots, float tolerance);
// The widest of the three fractional-index gates XtalOptimizer fits through. Its first pass selects
// spots on this one and its last pass on 0.1, so the spots between the two are carried into the fit
// and then dropped from it: this is the population a converged solve does NOT optimise.
constexpr float XTAL_OPTIMIZER_WIDE_TOLERANCE = 0.3f;