Build Packages / Create release (push) Successful in 15s
Build Packages / build:rugnux:aarch64 (cross) (push) Successful in 7m21s
Build Packages / build:rugnux-tgz (x86_64) (push) Successful in 8m28s
Build Packages / build:viewer-tgz:cpu (push) Successful in 9m53s
Build Packages / build:viewer-tgz:cuda (push) Successful in 11m57s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 15m12s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 15m50s
Build Packages / build:windows:nocuda (push) Successful in 17m15s
Build Packages / build:windows:cuda (push) Successful in 19m50s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 23m14s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 19m9s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 19m12s
Build Packages / build:rugnux:windows (push) Successful in 10m50s
Build Packages / Generate python client (push) Successful in 44s
Build Packages / Build documentation (push) Successful in 1m23s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 20m10s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 19m23s
Build Packages / build:rpm (rocky8) (push) Successful in 18m2s
Build Packages / build:rpm (rocky9) (push) Successful in 18m22s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 13m46s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 12m25s
Build Packages / Unit tests (push) Successful in 1h12m4s
A space group confirmed from the intensities AFTER integration is one no constrained fit has produced. The Bravais class is decided on the unrefined indexing candidate, so a two-fold the spot positions never offered leaves the freely refined metric standing in the group's own setting - a C 1 2 1 whose alpha is 88.5 - and that cell goes to the report, the master file and the MTZ. At adoption, re-refine the lattice under the group's constraint against the accumulated rotation spots, at the geometry the images were integrated at, and keep it when the spots do - the bar the indexer's own pseudo-symmetry guard uses. Where they refuse it, report the nearest metric the group fixes and say that a deviation that size is not refinement noise. A cell whose violation is above MAX_METRIC_VIOLATION is the WRONG cell for its group rather than an unconstrained one, and nothing here touches it: a visible mismatch must not become a plausible-looking one. The projection is applied as a change of basis, not as three rebuilt vectors: the three-Coord constructor enforces a right-handed basis, and a left-handed lattice came back with an axis flipped and its free angle replaced by the supplement, which failed the merge outright. Battery over 151 datasets, base against this: 144 byte-identical, 7 cells moved onto their group's metric, no space group changed, no run gained or lost, open arm 94/99 both ways. Every merge statistic of the seven is unchanged except completeness, which rises on four and falls 0.1 % on one. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01KWkZ1o2aoQ9EimF2wtzBky
183 lines
7.4 KiB
C++
183 lines
7.4 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include <catch2/catch_all.hpp>
|
|
#include <iostream>
|
|
|
|
#include "../image_analysis/rotation_indexer/RotationIndexer.h"
|
|
#include "../image_analysis/bragg_prediction/BraggPrediction.h"
|
|
|
|
TEST_CASE("RotationIndexer") {
|
|
DiffractionExperiment exp_i;
|
|
exp_i.IncidentEnergy_keV(WVL_1A_IN_KEV)
|
|
.BeamX_pxl(1000)
|
|
.BeamY_pxl(1000)
|
|
.PoniRot1_rad(0.01)
|
|
.PoniRot2_rad(0.02)
|
|
.DetectorDistance_mm(200)
|
|
.ImagesPerTrigger(50);
|
|
|
|
IndexingSettings settings;
|
|
#ifdef JFJOCH_USE_CUDA
|
|
settings.Algorithm(IndexingAlgorithmEnum::FFT);
|
|
#elif JFJOCH_USE_FFTW
|
|
settings.Algorithm(IndexingAlgorithmEnum::FFTW);
|
|
#else
|
|
return;
|
|
#endif
|
|
|
|
settings.RotationIndexing(true).RotationIndexingAngularStride_deg(1.0).RotationIndexingMinAngularRange_deg(30.0);
|
|
exp_i.ImportIndexingSettings(settings);
|
|
|
|
// Base lattice (non-pathological)
|
|
CrystalLattice latt_base(40, 50, 80, 90, 90, 90);
|
|
latt_base = latt_base.Multiply(RotMatrix(2.0, Coord(sqrt(3)/3,sqrt(3)/3,sqrt(3)/3)));
|
|
|
|
// Rotation axis: around X with 1 deg per image
|
|
GoniometerAxis axis("omega", 0.0f, 1.0f, Coord(1,0,0), std::nullopt);
|
|
exp_i.Goniometer(axis);
|
|
|
|
BraggPredictionSettings prediction_settings{
|
|
.high_res_A = 1.3,
|
|
.ewald_dist_cutoff = 0.002
|
|
};
|
|
|
|
IndexerThreadPool indexer_thread_pool(exp_i.GetIndexingSettings());
|
|
RotationIndexer indexer(exp_i, indexer_thread_pool);
|
|
|
|
BraggPrediction prediction;
|
|
|
|
int cnt = 0;
|
|
|
|
// Predict reflections for images at 0-30 deg.
|
|
for (int img = 0; img < 50; ++img) {
|
|
std::vector<SpotToSave> spots;
|
|
// For a rotated image, per-image lattice is obtained as Multiply(rot.transpose())
|
|
const float angle_deg = axis.GetAngle_deg(img) + axis.GetWedge_deg() / 2.0f;
|
|
const RotMatrix rot = axis.GetTransformationAngle(angle_deg);
|
|
const CrystalLattice latt_img = latt_base.Multiply(rot.transpose());
|
|
|
|
const auto n = prediction.Calc(exp_i, latt_img, prediction_settings);
|
|
for (int i = 0; i < n; ++i) {
|
|
const auto& r = prediction.GetReflections().at(i);
|
|
SpotToSave s{};
|
|
s.x = r.predicted_x;
|
|
s.y = r.predicted_y;
|
|
s.image = img; // provide image index for rotation-aware refinement
|
|
s.intensity = 1.0f; // minimal positive value
|
|
s.phi = angle_deg;
|
|
s.ice_ring = false;
|
|
s.indexed = true;
|
|
spots.push_back(s);
|
|
}
|
|
|
|
indexer.ProcessImage(img, spots);
|
|
if (img == 30)
|
|
indexer.RunIndexing();
|
|
|
|
auto result = indexer.GetLattice();
|
|
if (result.has_value())
|
|
cnt++;
|
|
}
|
|
|
|
CHECK(cnt == 20);
|
|
// An indexer that ran records no error; only one that threw does. A caller reporting "no lattice"
|
|
// to the user tells the two apart on this.
|
|
CHECK_FALSE(indexer.GetIndexerError().has_value());
|
|
|
|
auto ret = indexer.GetLattice();
|
|
REQUIRE(ret.has_value());
|
|
auto uc = ret->lattice.GetUnitCell();
|
|
auto uc_ref = latt_base.GetUnitCell();
|
|
REQUIRE(std::fabs(uc.a - uc_ref.a) < 0.1);
|
|
REQUIRE(std::fabs(uc.b - uc_ref.b) < 0.1);
|
|
REQUIRE(std::fabs(uc.c - uc_ref.c) < 0.1);
|
|
REQUIRE(std::fabs(uc.alpha - uc_ref.alpha) < 0.1);
|
|
REQUIRE(std::fabs(uc.beta - uc_ref.beta) < 0.1);
|
|
REQUIRE(std::fabs(uc.gamma - uc_ref.gamma) < 0.1);
|
|
CHECK(ret->search_result.centering == 'P');
|
|
CHECK(ret->search_result.system == gemmi::CrystalSystem::Orthorhombic);
|
|
}
|
|
|
|
// RefineConstrained is what a caller reaches for when it has ADOPTED a symmetry the indexing never
|
|
// refined under - the intensities confirm a two-fold the spot positions never offered - and so holds
|
|
// a cell whose metric is still the free fit's. Give it such a cell: the lattice this crystal indexes
|
|
// on, sheared so that alpha is a degree off, which is what that situation looks like. The constraint
|
|
// has to take it back to a cell the group can describe, and the spots have to be happier for it.
|
|
TEST_CASE("RotationIndexer::RefineConstrained puts a free metric back on its class") {
|
|
DiffractionExperiment exp_i;
|
|
exp_i.IncidentEnergy_keV(WVL_1A_IN_KEV)
|
|
.BeamX_pxl(1000)
|
|
.BeamY_pxl(1000)
|
|
.DetectorDistance_mm(200)
|
|
.ImagesPerTrigger(50);
|
|
|
|
IndexingSettings settings;
|
|
#ifdef JFJOCH_USE_CUDA
|
|
settings.Algorithm(IndexingAlgorithmEnum::FFT);
|
|
#elif JFJOCH_USE_FFTW
|
|
settings.Algorithm(IndexingAlgorithmEnum::FFTW);
|
|
#else
|
|
return;
|
|
#endif
|
|
settings.RotationIndexing(true).RotationIndexingAngularStride_deg(1.0).RotationIndexingMinAngularRange_deg(30.0);
|
|
exp_i.ImportIndexingSettings(settings);
|
|
|
|
const CrystalLattice latt_base =
|
|
CrystalLattice(40, 50, 80, 90, 105, 90).Multiply(RotMatrix(2.0, Coord(sqrt(3)/3, sqrt(3)/3, sqrt(3)/3)));
|
|
|
|
GoniometerAxis axis("omega", 0.0f, 1.0f, Coord(1, 0, 0), std::nullopt);
|
|
exp_i.Goniometer(axis);
|
|
|
|
BraggPredictionSettings prediction_settings{ .high_res_A = 1.3, .ewald_dist_cutoff = 0.002 };
|
|
IndexerThreadPool indexer_thread_pool(exp_i.GetIndexingSettings());
|
|
RotationIndexer indexer(exp_i, indexer_thread_pool);
|
|
BraggPrediction prediction;
|
|
|
|
for (int img = 0; img < 50; ++img) {
|
|
std::vector<SpotToSave> spots;
|
|
const float angle_deg = axis.GetAngle_deg(img) + axis.GetWedge_deg() / 2.0f;
|
|
const CrystalLattice latt_img = latt_base.Multiply(axis.GetTransformationAngle(angle_deg).transpose());
|
|
const auto n = prediction.Calc(exp_i, latt_img, prediction_settings);
|
|
for (int i = 0; i < n; ++i) {
|
|
const auto &r = prediction.GetReflections().at(i);
|
|
SpotToSave s{};
|
|
s.x = r.predicted_x;
|
|
s.y = r.predicted_y;
|
|
s.image = img;
|
|
s.intensity = 1.0f;
|
|
s.phi = angle_deg;
|
|
s.ice_ring = false;
|
|
s.indexed = true;
|
|
spots.push_back(s);
|
|
}
|
|
indexer.ProcessImage(img, spots);
|
|
if (img == 30)
|
|
indexer.RunIndexing();
|
|
}
|
|
|
|
REQUIRE(indexer.GetLattice().has_value());
|
|
|
|
// Shear c along b: the orientation and two of the axes are untouched, and alpha - which the class
|
|
// fixes at 90 - moves by about a degree. A free refinement that has walked into a class leaves
|
|
// exactly this, a cell the group cannot describe standing in the group's own setting.
|
|
const CrystalLattice sheared(latt_base.Vec0(), latt_base.Vec1(),
|
|
latt_base.Vec2() + latt_base.Vec1() * 0.02f);
|
|
CHECK(std::fabs(sheared.GetUnitCell().alpha - 90.0) > 0.5);
|
|
|
|
const auto refit = indexer.RefineConstrained(sheared, gemmi::CrystalSystem::Monoclinic);
|
|
REQUIRE(refit.has_value());
|
|
const auto uc = refit->lattice.GetUnitCell();
|
|
CHECK(uc.alpha == Catch::Approx(90.0).margin(1e-3));
|
|
CHECK(uc.gamma == Catch::Approx(90.0).margin(1e-3));
|
|
// ...and it is the cell the crystal has, not merely a cell obeying the constraint.
|
|
CHECK(uc.a == Catch::Approx(40.0).margin(0.2));
|
|
CHECK(uc.b == Catch::Approx(50.0).margin(0.2));
|
|
CHECK(uc.c == Catch::Approx(80.0).margin(0.2));
|
|
CHECK(uc.beta == Catch::Approx(105.0).margin(0.2));
|
|
// The spots decide whether a caller keeps it, so the fractions have to be the real comparison:
|
|
// the sheared cell indexes worse than the one the constraint brings back.
|
|
CHECK(refit->indexed_fraction > refit->indexed_fraction_before);
|
|
CHECK(refit->indexed_fraction > 0.5f);
|
|
}
|