From a31065f6aee6b8a3b5cdec7d35b1ca4388b0840e Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Mon, 19 Jan 2026 14:00:02 +0100 Subject: [PATCH] CreateBraggPrediction: No rotation for now --- image_analysis/MXAnalysisAfterFPGA.cpp | 2 +- image_analysis/MXAnalysisWithoutFPGA.cpp | 2 +- image_analysis/bragg_prediction/BraggPredictionFactory.cpp | 2 +- image_analysis/bragg_prediction/BraggPredictionFactory.h | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/image_analysis/MXAnalysisAfterFPGA.cpp b/image_analysis/MXAnalysisAfterFPGA.cpp index 9d815999..64a09c85 100644 --- a/image_analysis/MXAnalysisAfterFPGA.cpp +++ b/image_analysis/MXAnalysisAfterFPGA.cpp @@ -28,7 +28,7 @@ double stddev(const std::vector &v) { MXAnalysisAfterFPGA::MXAnalysisAfterFPGA(const DiffractionExperiment &in_experiment, IndexAndRefine &indexer) : experiment(in_experiment), indexer(indexer), - prediction(CreateBraggPrediction(in_experiment.IsRotationIndexing())) { + prediction(CreateBraggPrediction()) { if (experiment.IsSpotFindingEnabled()) find_spots = true; } diff --git a/image_analysis/MXAnalysisWithoutFPGA.cpp b/image_analysis/MXAnalysisWithoutFPGA.cpp index 5ac206ad..18c31c71 100644 --- a/image_analysis/MXAnalysisWithoutFPGA.cpp +++ b/image_analysis/MXAnalysisWithoutFPGA.cpp @@ -24,7 +24,7 @@ MXAnalysisWithoutFPGA::MXAnalysisWithoutFPGA(const DiffractionExperiment &in_exp mask_1bit(npixels, false), spotFinder(CreateImageSpotFinder(experiment.GetXPixelsNum(), experiment.GetYPixelsNum())), indexer(in_indexer), - prediction(CreateBraggPrediction(in_experiment.IsRotationIndexing())), + prediction(CreateBraggPrediction()), updated_image(spotFinder->GetInputBuffer()), azint_bins(in_integration.GetBinNumber()), saturation_limit(experiment.GetSaturationLimit()), diff --git a/image_analysis/bragg_prediction/BraggPredictionFactory.cpp b/image_analysis/bragg_prediction/BraggPredictionFactory.cpp index 9c6dde50..12c03182 100644 --- a/image_analysis/bragg_prediction/BraggPredictionFactory.cpp +++ b/image_analysis/bragg_prediction/BraggPredictionFactory.cpp @@ -9,7 +9,7 @@ #include "BraggPredictionGPU.h" #endif -std::unique_ptr CreateBraggPrediction(bool rotation_indexing, int max_reflections) { +std::unique_ptr CreateBraggPrediction(int max_reflections) { #ifdef JFJOCH_USE_CUDA if (get_gpu_count() > 0) return std::make_unique(max_reflections); diff --git a/image_analysis/bragg_prediction/BraggPredictionFactory.h b/image_analysis/bragg_prediction/BraggPredictionFactory.h index 136597e3..fb3070c3 100644 --- a/image_analysis/bragg_prediction/BraggPredictionFactory.h +++ b/image_analysis/bragg_prediction/BraggPredictionFactory.h @@ -6,7 +6,6 @@ #include "BraggPrediction.h" -std::unique_ptr CreateBraggPrediction(bool rotation_indexing, - int max_reflections = 10000); +std::unique_ptr CreateBraggPrediction(int max_reflections = 10000); #endif //JFJOCH_BRAGGPREDICTIONFACTORY_H \ No newline at end of file