From 71f85b294d67971ac967d1be30d2f00ebd5da0e7 Mon Sep 17 00:00:00 2001
From: Filip Leonarski <filip.leonarski@psi.ch>
Date: Mon, 19 Jan 2026 13:56:28 +0100
Subject: [PATCH] RotationIndexer: Remove SetLattice() - not sure why it was
 necessary in the first place

---
 image_analysis/IndexAndRefine.cpp  |  8 --------
 image_analysis/IndexAndRefine.h    |  1 -
 image_analysis/RotationIndexer.cpp | 13 +++++++------
 image_analysis/RotationIndexer.h   |  1 -
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/image_analysis/IndexAndRefine.cpp b/image_analysis/IndexAndRefine.cpp
index 8a297d72..3db59d91 100644
--- a/image_analysis/IndexAndRefine.cpp
+++ b/image_analysis/IndexAndRefine.cpp
@@ -19,14 +19,6 @@ IndexAndRefine::IndexAndRefine(const DiffractionExperiment &x, IndexerThreadPool
     if (indexer && x.IsRotationIndexing())
         rotation_indexer = std::make_unique<RotationIndexer>(x, *indexer);
 }
-#include <iostream>
-
-void IndexAndRefine::SetLattice(const CrystalLattice &lattice) {
-    if (rotation_indexer) {
-        rotation_indexer->SetLattice(lattice);
-        std::cout << "Set lattice for rotation indexing" << std::endl;
-    }
-}
 
 IndexAndRefine::IndexingOutcome IndexAndRefine::DetermineLatticeAndSymmetry(DataMessage &msg) {
     IndexingOutcome outcome(experiment);
diff --git a/image_analysis/IndexAndRefine.h b/image_analysis/IndexAndRefine.h
index 36d3ba58..8582da59 100644
--- a/image_analysis/IndexAndRefine.h
+++ b/image_analysis/IndexAndRefine.h
@@ -49,7 +49,6 @@ class IndexAndRefine {
                                  const IndexingOutcome &outcome);
 public:
     IndexAndRefine(const DiffractionExperiment &x, IndexerThreadPool *indexer);
-    void SetLattice(const CrystalLattice &lattice);
     void ProcessImage(DataMessage &msg, const SpotFindingSettings &settings, const CompressedImage &image, BraggPrediction &prediction);
     std::optional<RotationIndexerResult> Finalize();
 };
diff --git a/image_analysis/RotationIndexer.cpp b/image_analysis/RotationIndexer.cpp
index ed46490a..564e5584 100644
--- a/image_analysis/RotationIndexer.cpp
+++ b/image_analysis/RotationIndexer.cpp
@@ -35,11 +35,6 @@ RotationIndexer::RotationIndexer(const DiffractionExperiment &x, IndexerThreadPo
     }
 }
 
-void RotationIndexer::SetLattice(const CrystalLattice &lattice) {
-    std::unique_lock ul(m);
-    indexed_lattice = lattice;
-}
-
 void RotationIndexer::TryIndex() {
     indexing_tried = true;
 
@@ -130,7 +125,13 @@ std::optional<RotationIndexerResult> RotationIndexer::ProcessImage(int64_t image
         if (accumulated_images >= min_images_for_indexing && image >= first_image_to_try_indexing)
             TryIndex();
     }
-
+    if (!indexed_lattice)
+        return {};
+    return RotationIndexerResult{
+        .lattice = indexed_lattice.value(),
+        .search_result = search_result_,
+        .geom = updated_geom_
+    };
     return GetLattice();
 }
 
diff --git a/image_analysis/RotationIndexer.h b/image_analysis/RotationIndexer.h
index 437281ee..be6fde20 100644
--- a/image_analysis/RotationIndexer.h
+++ b/image_analysis/RotationIndexer.h
@@ -54,7 +54,6 @@ class RotationIndexer {
     void TryIndex();
 public:
     RotationIndexer(const DiffractionExperiment& x, IndexerThreadPool& indexer);
-    void SetLattice(const CrystalLattice &lattice);
     std::optional<RotationIndexerResult> ProcessImage(int64_t image, const std::vector<SpotToSave>& spots);
     std::optional<RotationIndexerResult> GetLattice();
 };