From 8326e4a59f00a453c83666d4adabde2b120b9b39 Mon Sep 17 00:00:00 2001
From: Filip Leonarski <filip.leonarski@psi.ch>
Date: Sun, 30 Nov 2025 13:32:13 +0100
Subject: [PATCH] Revert "jfjoch_indexing_test: Bring back old, working code,
 to further modify"

This reverts commit 756115606c200a09998dba016e9e30759c97d740.
---
 tools/jfjoch_indexing_test.cpp | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/tools/jfjoch_indexing_test.cpp b/tools/jfjoch_indexing_test.cpp
index 69651788..d45daef5 100644
--- a/tools/jfjoch_indexing_test.cpp
+++ b/tools/jfjoch_indexing_test.cpp
@@ -4,7 +4,8 @@
 #include "../reader/JFJochHDF5Reader.h"
 #include "../image_analysis/indexing/IndexerFactory.h"
 #include "../common/Logger.h"
-#include "../image_analysis/RotationIndexer.h"
+#include "../image_analysis/IndexAndRefine.h"
+#include "../image_analysis/bragg_integration/BraggPredictionFactory.h"
 #include "../writer/FileWriter.h"
 #include "../image_analysis/indexing/AnalyzeIndexing.h"
 
@@ -24,8 +25,8 @@ int main(int argc, char** argv) {
     indexing_settings.Algorithm(IndexingAlgorithmEnum::FFT);
     indexing_settings.RotationIndexing(true);
     indexing_settings.GeomRefinementAlgorithm(GeomRefinementAlgorithmEnum::BeamCenter);
-
     DiffractionExperiment experiment(reader.GetDataset()->experiment);
+    experiment.ImportIndexingSettings(indexing_settings);
     experiment.SetUnitCell({});
     experiment.FilePrefix("output");
 
@@ -34,12 +35,16 @@ int main(int argc, char** argv) {
     // FileWriter fw(msg);
 
     IndexerThreadPool indexer(experiment.GetIndexingSettings());
+    SpotFindingSettings settings{};
+    settings.quick_integration = false;
+    settings.indexing = true;
 
     auto geom = experiment.GetDiffractionGeometry();
-    RotationIndexer rot_index(experiment, indexer);
-    int cnt = 0;
-    int cnt_2 = 0;
+    IndexAndRefine rot_index(experiment, &indexer);
 
+    auto prediction = CreateBraggPrediction();
+
+    int cnt = 0;
     for (int i = 0; i < reader.GetNumberOfImages(); i++) {
         auto img = reader.LoadImage(i);
 
@@ -48,19 +53,13 @@ int main(int argc, char** argv) {
 
         DataMessage msg = img->ImageData();
 
-        auto img_res = rot_index.ProcessImage(i, msg.spots);
-        if (img_res ) {
-            auto img_latt = img_res->lattice;
-            DiffractionExperiment x(experiment);
-            x.DetectorDistance_mm(img_res->geom.GetDetectorDistance_mm())
-                    .BeamX_pxl(img_res->geom.GetBeamX_pxl())
-                    .BeamY_pxl(img_res->geom.GetBeamY_pxl());
+        rot_index.ProcessImage(msg, settings, msg.image, *prediction);
+
+        if (msg.indexing_result && msg.indexing_result.value())
             cnt++;
-            if (AnalyzeIndexing(msg, x, img_latt))
-                 cnt_2++;
-        }
+
         if (i % 200 == 0)
-            logger.Info("Image {} {} {}", i, cnt, cnt_2);
+            logger.Info("Image {} {}", i, cnt);
 
     }
     auto latt_1 = rot_index.Finalize(false);