IndexAndRefine: Refactor integration

image_analysis/MXAnalysisWithoutFPGA.cpp

@@ -6,14 +6,14 @@
 #include "spot_finding/StrongPixelSet.h"
 #include "../compression/JFJochDecompress.h"
 
-#include "SpotAnalyze.h"
+#include "spot_finding/SpotUtils.h"
 #include "spot_finding/ImageSpotFinderFactory.h"
 #include "bragg_integration/BraggPredictionFactory.h"
 
 MXAnalysisWithoutFPGA::MXAnalysisWithoutFPGA(const DiffractionExperiment &in_experiment,
                                              const AzimuthalIntegration &in_integration,
                                              const PixelMask &in_mask,
-                                             IndexerThreadPool *in_indexer)
+                                             IndexAndRefine &in_indexer)
     : experiment(in_experiment),
       integration(in_integration),
       roi_map(experiment.ExportROIMap()),
@@ -160,9 +160,12 @@ void MXAnalysisWithoutFPGA::Analyze(DataMessage &output,
 
         const std::vector<DiffractionSpot> spots = spotFinder->Run(settings, mask_resolution);
 
-        SpotAnalyze(experiment, settings, spots,
-                    CompressedImage(updated_image, experiment.GetXPixelsNum(), experiment.GetYPixelsNum()),
-                    *prediction, indexer, output);
+        SpotAnalyze(experiment, settings, spots, output);
+
+        if (settings.indexing)
+            indexer.ProcessImage(output, settings,
+                CompressedImage(updated_image, experiment.GetXPixelsNum(), experiment.GetYPixelsNum()),
+                *prediction);
     }
 
     profile.Add(azim_sum, azim_count);