All checks were successful
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 11m0s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 11m2s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 11m54s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 8m20s
Build Packages / Generate python client (push) Successful in 24s
Build Packages / Build documentation (push) Successful in 56s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky8) (push) Successful in 8m51s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 9m9s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 8m53s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 8m21s
Build Packages / build:rpm (rocky9) (push) Successful in 9m47s
Build Packages / Unit tests (push) Successful in 1h13m38s
This is an UNSTABLE release and not recommended for production use (please use rc.111 instead). * jfjoch_broker: Improve handling of rotation indexing * jfjoch_broker: More information saved in CBOR end message (WIP) * jfjoch_writer: Save rotation indexing lattice parameters and Niggli class * jfjoch_viewer: Remove (for now) primitive cell information Reviewed-on: #19 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch> Co-committed-by: Filip Leonarski <filip.leonarski@psi.ch>
157 lines
5.1 KiB
C++
157 lines
5.1 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include "RotationIndexer.h"
|
|
|
|
#include "geom_refinement/XtalOptimizer.h"
|
|
#include "indexing/FFTIndexer.h"
|
|
#include "lattice_search/LatticeSearch.h"
|
|
|
|
RotationIndexer::RotationIndexer(const DiffractionExperiment &x, IndexerThreadPool &indexer)
|
|
: experiment(x),
|
|
index_ice_rings(x.GetIndexingSettings().GetIndexIceRings()),
|
|
axis_(x.GetGoniometer()),
|
|
geom_(x.GetDiffractionGeometry()),
|
|
updated_geom_(geom_),
|
|
indexer_(indexer) {
|
|
if (axis_) {
|
|
float angle_norm_deg = std::fabs(axis_->GetIncrement_deg());
|
|
if (angle_norm_deg < 1e-6) {
|
|
// Guard against rotation close to zero
|
|
axis_ = std::nullopt;
|
|
} else {
|
|
if (x.GetImageNum() < min_images_for_indexing) {
|
|
// For short measurements - only indexing at the end
|
|
first_image_to_try_indexing = INT64_MAX;
|
|
image_stride = 1;
|
|
} else {
|
|
first_image_to_try_indexing = std::max<int64_t>(min_images_for_indexing,
|
|
x.GetIndexingSettings().GetRotationIndexingMinAngularRange_deg() / angle_norm_deg);
|
|
image_stride = std::ceil(x.GetIndexingSettings().GetRotationIndexingAngularStride_deg() / angle_norm_deg);
|
|
if (image_stride == 0)
|
|
image_stride = 1;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void RotationIndexer::SetLattice(const CrystalLattice &lattice) {
|
|
std::unique_lock ul(m);
|
|
indexed_lattice = lattice;
|
|
}
|
|
|
|
void RotationIndexer::TryIndex() {
|
|
// Index
|
|
std::vector<SpotToSave> v_sel;
|
|
std::vector<Coord> coords_sel;
|
|
|
|
if (coords_.size() > max_spots) {
|
|
|
|
// Indices into v_ / coords_
|
|
std::vector<std::size_t> idx(coords_.size());
|
|
std::iota(idx.begin(), idx.end(), std::size_t{0});
|
|
|
|
// Sort indices by descending intensity
|
|
std::partial_sort(
|
|
idx.begin(),
|
|
idx.begin() + max_spots,
|
|
idx.end(),
|
|
[this](std::size_t a, std::size_t b) {
|
|
// Replace `.intensity` with the actual SpotToSave intensity member
|
|
return v_[a].intensity > v_[b].intensity;
|
|
}
|
|
);
|
|
|
|
v_sel.reserve(max_spots);
|
|
coords_sel.reserve(max_spots);
|
|
|
|
for (std::size_t i = 0; i < max_spots; ++i) {
|
|
const std::size_t k = idx[i];
|
|
v_sel.emplace_back(v_[k]);
|
|
coords_sel.emplace_back(coords_[k]);
|
|
}
|
|
} else {
|
|
v_sel = v_;
|
|
coords_sel = coords_;
|
|
}
|
|
|
|
auto indexer_result = indexer_.Run(experiment, coords_sel).get();
|
|
if (!indexer_result.lattice.empty()) {
|
|
// Find lattice type
|
|
search_result_ = LatticeSearch(indexer_result.lattice[0]);
|
|
// Run refinement
|
|
|
|
DiffractionExperiment experiment_copy(experiment);
|
|
XtalOptimizerData data{
|
|
.geom = experiment_copy.GetDiffractionGeometry(),
|
|
.latt = search_result_.conventional,
|
|
.crystal_system = search_result_.system,
|
|
.min_spots = experiment.GetIndexingSettings().GetViableCellMinSpots(),
|
|
.refine_beam_center = true,
|
|
.refine_distance_mm = false,
|
|
.axis = axis_
|
|
};
|
|
|
|
if (data.crystal_system == gemmi::CrystalSystem::Trigonal)
|
|
data.crystal_system = gemmi::CrystalSystem::Hexagonal;
|
|
|
|
if (XtalOptimizer(data, v_sel)) {
|
|
indexed_lattice = data.latt;
|
|
updated_geom_ = data.geom;
|
|
}
|
|
}
|
|
}
|
|
|
|
std::optional<RotationIndexerResult> RotationIndexer::ProcessImage(int64_t image, const std::vector<SpotToSave> &spots) {
|
|
std::unique_lock ul(m);
|
|
|
|
// For non-rotation just ignore the whole procedure
|
|
if (!axis_)
|
|
return {};
|
|
|
|
const auto rot = axis_->GetTransformation(image);
|
|
|
|
if (!indexed_lattice && image >= last_accumulated_image + image_stride) {
|
|
v_.reserve(v_.size() + spots.size());
|
|
coords_.reserve(coords_.size() + spots.size());
|
|
|
|
for (const auto &s: spots) {
|
|
if (index_ice_rings || !s.ice_ring) {
|
|
v_.emplace_back(s);
|
|
coords_.emplace_back(rot * s.ReciprocalCoord(geom_));
|
|
}
|
|
}
|
|
|
|
accumulated_images++;
|
|
last_accumulated_image = image;
|
|
|
|
if (!indexed_lattice && accumulated_images >= min_images_for_indexing && image >= first_image_to_try_indexing) {
|
|
TryIndex();
|
|
// If fails increase rotation range by a factor of two
|
|
if (!indexed_lattice)
|
|
first_image_to_try_indexing *= 2;
|
|
}
|
|
}
|
|
|
|
if (indexed_lattice) {
|
|
return RotationIndexerResult{
|
|
.lattice = indexed_lattice->Multiply(rot.transpose()),
|
|
.search_result = search_result_,
|
|
.geom = updated_geom_
|
|
};
|
|
}
|
|
return {};
|
|
}
|
|
|
|
std::optional<RotationIndexerResult> RotationIndexer::Finalize() {
|
|
if (!indexed_lattice)
|
|
TryIndex();
|
|
if (!indexed_lattice)
|
|
return std::nullopt;
|
|
return RotationIndexerResult{
|
|
.lattice = indexed_lattice.value(),
|
|
.search_result = search_result_,
|
|
.geom = geom_
|
|
};
|
|
}
|