1.0.0-rc.66

image_analysis/MXAnalyzer.cpp

@@ -27,11 +27,15 @@ double stddev(const std::vector<float> &v) {
 
 MXAnalyzer::MXAnalyzer(const DiffractionExperiment &in_experiment)
 : experiment(in_experiment) {
-    indexer = CreateIndexer(experiment);
     if (experiment.IsSpotFindingEnabled())
         find_spots = true;
 }
 
+MXAnalyzer &MXAnalyzer::SetIndexer(IndexerThreadPool *input) {
+    indexer = input;
+    return *this;
+}
+
 void MXAnalyzer::ReadFromFPGA(const DeviceOutput *output, const SpotFindingSettings &settings, size_t module_number) {
     if (!find_spots || !settings.enable)
         return;
@@ -172,7 +176,7 @@ void MXAnalyzer::Process(DataMessage &message, const SpotFindingSettings& settin
         message.spots.push_back(spot);
 
     if (indexer && settings.indexing) {
-        auto latt = indexer->Run(message, spots_out);
+        auto latt = indexer->Run(experiment, message, spots_out).get();
 
         if (latt && settings.quick_integration) {
             auto res = BraggIntegrate2D(experiment, message.image, latt.value());