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
* 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>
55 lines
2.7 KiB
C++
55 lines
2.7 KiB
C++
// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
#include "../../common/CrystalLattice.h"
|
|
#include "../../common/UnitCell.h"
|
|
|
|
// What a lattice indexed from the spots the crystal's lattice left over is, relative to that lattice.
|
|
enum class LeftoverLatticeKind {
|
|
Self, // the same cell within 1 deg: spots of the crystal's own lattice its tolerance missed
|
|
Domain, // the same cell, misoriented, spread over the sweep: a split crystal
|
|
TwinDomain, // the same, turned by ~180 deg: a non-merohedral twin domain
|
|
Segmented, // the same cell, but its spots are concentrated in part of the sweep: the crystal in
|
|
// the beam changes along the rotation
|
|
RelatedCell, // a cell n or 1/n times the volume: a question about the crystal's own cell
|
|
Foreign // an unrelated cell: a second crystal species, or a wrong main lattice
|
|
};
|
|
|
|
const char *LeftoverLatticeKindName(LeftoverLatticeKind kind);
|
|
|
|
// The smallest rotation, in degrees, taking lattice `a` onto lattice `b`, over every basis of `b` whose
|
|
// metric matches `a`'s (so a symmetry of the lattice is not read as a misorientation). Both are
|
|
// primitive reduced cells. NaN where no basis of `b` matches `a`'s metric.
|
|
double LatticeMisorientationDeg(const CrystalLattice &a, const CrystalLattice &b);
|
|
|
|
// `volume_ratio` is the reduced volume against the crystal's lattice, `sweep_concentration` the share of
|
|
// the lattice's spots in the 2 densest of 8 equal blocks of the sweep (0.25 is uniform).
|
|
LeftoverLatticeKind ClassifyLeftoverLattice(double misorientation_deg, double volume_ratio,
|
|
double sweep_concentration);
|
|
|
|
struct LeftoverLattice {
|
|
LeftoverLatticeKind kind = LeftoverLatticeKind::Foreign;
|
|
UnitCell cell{};
|
|
char centering = 'P';
|
|
std::string system;
|
|
double volume_ratio = 0.0;
|
|
double misorientation_deg = 0.0; // NaN where the cell differs
|
|
double z = 0.0; // leftover validation spots on it, against a wrong spindle angle
|
|
double spots_pct = 0.0; // of the non-ice spots of the census frames
|
|
double intensity_pct = 0.0; // of their summed intensity
|
|
double sweep_concentration = 0.0;
|
|
};
|
|
|
|
// The lattices the leftover spots index to, beside the crystal's own share of the same spots.
|
|
// Only lattices clear of the displaced-angle null (z >= 5) and not the crystal's own lattice.
|
|
struct LeftoverLatticeCensus {
|
|
double primary_spots_pct = 0.0;
|
|
double primary_intensity_pct = 0.0;
|
|
int frames = 0;
|
|
std::vector<LeftoverLattice> lattices;
|
|
};
|