v1.0.0-rc.64

image_analysis/ImageAnalysisCPU.cpp

@@ -5,7 +5,6 @@
 
 #include "StrongPixelSet.h"
 #include "../compression/JFJochDecompress.h"
-#include "indexing/IndexerFactory.h"
 #include "SpotAnalysis.h"
 
 ImageAnalysisCPU::ImageAnalysisCPU(const DiffractionExperiment &in_experiment,
@@ -19,7 +18,8 @@ ImageAnalysisCPU::ImageAnalysisCPU(const DiffractionExperiment &in_experiment,
           spotFinder(in_integration),
           saturation_limit(experiment.GetSaturationLimit()),
           roi_count(0),
-          mask(in_mask) {
+          mask(in_mask),
+          indexer(nullptr) {
 
     nquads = 2;
 
@@ -27,8 +27,6 @@ ImageAnalysisCPU::ImageAnalysisCPU(const DiffractionExperiment &in_experiment,
 
     for (int i = 0; i < npixels; i++)
         mask_1byte[i] = (in_mask.GetMask().at(i) != 0);
-
-    indexer = CreateIndexer(experiment);
 }
 
 void ImageAnalysisCPU::UpdateROI() {
@@ -160,7 +158,7 @@ void ImageAnalysisCPU::Analyze(DataMessage &output,
     for (const auto &spot: spots_out)
         output.spots.push_back(spot);
 
-    if (indexer && spot_finding_settings.indexing) {
+    if ((indexer != nullptr) && spot_finding_settings.indexing) {
         auto latt = indexer->Run(output, spots_out);
         if (latt && spot_finding_settings.quick_integration) {
             auto img = CompressedImage(updated_image, experiment.GetXPixelsNum(),
@@ -188,4 +186,9 @@ void ImageAnalysisCPU::Analyze(DataMessage &output,
 ImageAnalysisCPU &ImageAnalysisCPU::NeuralNetInference(NeuralNetInferenceClient *client) {
     inference_client = client;
     return *this;
-}
+}
+
+ImageAnalysisCPU &ImageAnalysisCPU::SetIndexer(Indexer *new_indexer) {
+    indexer = new_indexer;
+    return *this;
+}