From 74c1a7a828eec41bae4b7633a6796a2013eec392 Mon Sep 17 00:00:00 2001 From: leonarski_f Date: Fri, 5 Jun 2026 13:51:39 +0200 Subject: [PATCH] MultiLatticeSearch: Remove reduced function --- .../indexing/MultiLatticeSearch.cpp | 22 ------------------- image_analysis/indexing/MultiLatticeSearch.h | 10 +-------- 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/image_analysis/indexing/MultiLatticeSearch.cpp b/image_analysis/indexing/MultiLatticeSearch.cpp index 11d0cf55..78681e55 100644 --- a/image_analysis/indexing/MultiLatticeSearch.cpp +++ b/image_analysis/indexing/MultiLatticeSearch.cpp @@ -105,25 +105,3 @@ std::vector MultiLatticeSearch(const std::vector MultiLatticeSearchReduced(const std::vector &lattices, - float dist_tolerance, - float angle_tolerance_deg) { - if (lattices.empty()) - return {}; - - // Reduce lattice 0 to its primitive Niggli setting; that becomes the reference basis. - std::vector reduced; - reduced.reserve(lattices.size()); - - // Reduce every candidate the same way so metric comparison and rotation - // are all done in the reduced setting. - for (const auto & lattice : lattices) - reduced.push_back(lattice.NiggliReduce()); - - auto ret = MultiLatticeSearch(reduced, dist_tolerance, angle_tolerance_deg); - - // Keep input_lattice pointing at the original (un-reduced) lattices for debugging. - - return ret; -} \ No newline at end of file diff --git a/image_analysis/indexing/MultiLatticeSearch.h b/image_analysis/indexing/MultiLatticeSearch.h index 09eddabf..e5f341ae 100644 --- a/image_analysis/indexing/MultiLatticeSearch.h +++ b/image_analysis/indexing/MultiLatticeSearch.h @@ -22,12 +22,4 @@ struct MultiLatticeSearchResult { // proper rotation R mapping reference -> lattice and store output_lattice = R * reference. std::vector MultiLatticeSearch(const std::vector &lattices, float dist_tolerance = 0.03f, - float angle_tolerance_deg = 3.0f); - -// Same as above, but first runs LatticeSearch on lattice 0 to obtain a -// Niggli-reduced / conventional reference, and reduces every candidate the -// same way before comparing/rotating. Rotations are returned in the reduced -// reference setting. -std::vector MultiLatticeSearchReduced(const std::vector &lattices, - float dist_tolerance = 0.03f, - float angle_tolerance_deg = 3.0f); \ No newline at end of file + float angle_tolerance_deg = 3.0f); \ No newline at end of file