From 3522568d49d4db723103d2adce0e064e2d44c171 Mon Sep 17 00:00:00 2001 From: leonarski_f Date: Fri, 5 Jun 2026 15:05:11 +0200 Subject: [PATCH] MultiLatticeSearch: Works --- image_analysis/indexing/MultiLatticeSearch.cpp | 4 ---- tests/MultiLatticeSearchTest.cpp | 12 +++++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/image_analysis/indexing/MultiLatticeSearch.cpp b/image_analysis/indexing/MultiLatticeSearch.cpp index 07da2edb..3080fc31 100644 --- a/image_analysis/indexing/MultiLatticeSearch.cpp +++ b/image_analysis/indexing/MultiLatticeSearch.cpp @@ -3,7 +3,6 @@ #include "MultiLatticeSearch.h" -#include #include namespace { @@ -86,9 +85,6 @@ std::vector MultiLatticeSearch(const std::vector(rod.y()), static_cast(rod.z())); - std::cout << rotation_vector << std::endl; - std::cout << rotation_vector.Length() * 180.0 / M_PI << " deg\n" << std::endl; - if (found) continue; ret.push_back({rotation_vector}); diff --git a/tests/MultiLatticeSearchTest.cpp b/tests/MultiLatticeSearchTest.cpp index 4f94b868..a068537a 100644 --- a/tests/MultiLatticeSearchTest.cpp +++ b/tests/MultiLatticeSearchTest.cpp @@ -44,8 +44,6 @@ TEST_CASE("MultiLatticeSearch_Empty") { CHECK(result.empty()); } -#include - TEST_CASE("MultiLatticeSearch_EP") { // Real EP case CrystalLattice cell1(Coord(-13.2, -30.0, -29.6), @@ -58,8 +56,12 @@ TEST_CASE("MultiLatticeSearch_EP") { auto result = MultiLatticeSearch({cell1, cell2}, 0.1, 3); - REQUIRE(result.size() == 1); - std::cout << result[0].rotation_vector << std::endl; - std::cout << result[0].rotation_vector.Length() * 180.0 / M_PI << std::endl; + + RotMatrix matrix(result[0].rotation_vector.Length(), result[0].rotation_vector.Normalize()); + auto cell2_rot = cell1.Multiply(matrix); + + CHECK((cell2_rot.Vec0() - cell2.Vec0()).Length() < cell2.Vec0().Length() / 100); + CHECK((cell2_rot.Vec1() - cell2.Vec1()).Length() < cell2.Vec1().Length() / 100); + CHECK((cell2_rot.Vec2() - cell2.Vec2()).Length() < cell2.Vec2().Length() / 100); } \ No newline at end of file