BraggPrediction: Split into a separate directory

2025-12-17 16:35:00 +01:00
parent 981c119097
commit 5456be7527
21 changed files with 33 additions and 32 deletions
--- a/image_analysis/CMakeLists.txt
+++ b/image_analysis/CMakeLists.txt
@@ -18,4 +18,4 @@ ADD_SUBDIRECTORY(indexing)
 ADD_SUBDIRECTORY(geom_refinement)
 ADD_SUBDIRECTORY(lattice_search)

-TARGET_LINK_LIBRARIES(JFJochImageAnalysis JFJochBraggIntegration JFJochLatticeSearch JFJochIndexing JFJochSpotFinding JFJochCommon JFJochGeomRefinement gemmi)
+TARGET_LINK_LIBRARIES(JFJochImageAnalysis JFJochBraggPrediction JFJochBraggIntegration JFJochLatticeSearch JFJochIndexing JFJochSpotFinding JFJochCommon JFJochGeomRefinement gemmi)
--- a/image_analysis/MXAnalysisAfterFPGA.cpp
+++ b/image_analysis/MXAnalysisAfterFPGA.cpp
@@ -5,7 +5,7 @@
 #include "spot_finding/DetModuleSpotFinder_cpu.h"
 #include "../common/CUDAWrapper.h"
 #include "spot_finding/SpotUtils.h"
-#include "bragg_integration/BraggPredictionFactory.h"
+#include "bragg_prediction/BraggPredictionFactory.h"

 double stddev(const std::vector<float> &v) {
    if (v.size() <= 1)
--- a/image_analysis/MXAnalysisAfterFPGA.h
+++ b/image_analysis/MXAnalysisAfterFPGA.h
@@ -5,7 +5,7 @@
 #define JUNGFRAUJOCH_MXANALYZER_H

 #include "../common/DiffractionExperiment.h"
-#include "bragg_integration/BraggPrediction.h"
+#include "bragg_prediction/BraggPrediction.h"
 #include "indexing/IndexerThreadPool.h"
 #include "spot_finding/StrongPixelSet.h"
 #include "IndexAndRefine.h"
--- a/image_analysis/MXAnalysisWithoutFPGA.cpp
+++ b/image_analysis/MXAnalysisWithoutFPGA.cpp
@@ -8,7 +8,7 @@

 #include "spot_finding/SpotUtils.h"
 #include "spot_finding/ImageSpotFinderFactory.h"
-#include "bragg_integration/BraggPredictionFactory.h"
+#include "bragg_prediction/BraggPredictionFactory.h"

 MXAnalysisWithoutFPGA::MXAnalysisWithoutFPGA(const DiffractionExperiment &in_experiment,
                                             const AzimuthalIntegration &in_integration,
--- a/image_analysis/MXAnalysisWithoutFPGA.h
+++ b/image_analysis/MXAnalysisWithoutFPGA.h
@@ -11,7 +11,7 @@
 #include "../common/AzimuthalIntegration.h"
 #include "../common/PixelMask.h"
 #include "../common/AzimuthalIntegrationProfile.h"
-#include "bragg_integration/BraggPrediction.h"
+#include "bragg_prediction/BraggPrediction.h"
 #include "spot_finding/ImageSpotFinder.h"
 #include "indexing/IndexerThreadPool.h"
 #include "IndexAndRefine.h"
--- a/image_analysis/bragg_integration/BraggIntegrate2D.cpp
+++ b/image_analysis/bragg_integration/BraggIntegrate2D.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-3.0-only

 #include "BraggIntegrate2D.h"
-#include "BraggPrediction.h"

 template<class T>
 bool IntegrateReflection(Reflection &r, const T *image, size_t xpixel, size_t ypixel,
--- a/image_analysis/bragg_integration/BraggIntegrate2D.h
+++ b/image_analysis/bragg_integration/BraggIntegrate2D.h
@@ -6,9 +6,7 @@

 #include <vector>
 #include "../../common/DiffractionExperiment.h"
-#include "../../common/CrystalLattice.h"
 #include "../../common/Reflection.h"
-#include "BraggPrediction.h"

 std::vector<Reflection> BraggIntegrate2D(const DiffractionExperiment &experiment,
                                         const CompressedImage &image,
--- a/image_analysis/bragg_integration/CMakeLists.txt
+++ b/image_analysis/bragg_integration/CMakeLists.txt
@@ -1,22 +1,10 @@
 ADD_LIBRARY(JFJochBraggIntegration STATIC
        BraggIntegrate2D.cpp
        BraggIntegrate2D.h
-        BraggPrediction.cpp
-        BraggPrediction.h
        Regression.h
        CalcISigma.cpp
        CalcISigma.h
-        BraggPredictionFactory.cpp
-        BraggPredictionFactory.h
        SystematicAbsence.h
-        BraggPredictionRotation.cpp
-        BraggPredictionRotation.h
 )

 TARGET_LINK_LIBRARIES(JFJochBraggIntegration JFJochCommon)
-
-IF (JFJOCH_CUDA_AVAILABLE)
-    TARGET_SOURCES(JFJochBraggIntegration PRIVATE
-            ../indexing/CUDAMemHelpers.h
-            BraggPredictionGPU.cu BraggPredictionGPU.h)
-ENDIF()
--- a/image_analysis/bragg_integration/BraggPrediction.cpp
+++ b/image_analysis/bragg_integration/BraggPrediction.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
 // SPDX-License-Identifier: GPL-3.0-only

-#include "BraggPrediction.h"
-#include "SystematicAbsence.h"
+#include "../bragg_integration/BraggPrediction.h"
+#include "../bragg_integration/SystematicAbsence.h"

 BraggPrediction::BraggPrediction(int max_reflections)
    : max_reflections(max_reflections), reflections(max_reflections) {}
--- a/image_analysis/bragg_integration/BraggPrediction.h
+++ b/image_analysis/bragg_integration/BraggPrediction.h
--- a/image_analysis/bragg_integration/BraggPredictionFactory.cpp
+++ b/image_analysis/bragg_integration/BraggPredictionFactory.cpp
@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
 // SPDX-License-Identifier: GPL-3.0-only

-#include "BraggPredictionFactory.h"
+#include "../bragg_integration/BraggPredictionFactory.h"

 #ifdef JFJOCH_USE_CUDA
 #include "../../common/CUDAWrapper.h"
-#include "BraggPredictionGPU.h"
+#include "../bragg_integration/BraggPredictionGPU.h"
 #endif

 std::unique_ptr<BraggPrediction> CreateBraggPrediction(int max_reflections) {
--- a/image_analysis/bragg_integration/BraggPredictionFactory.h
+++ b/image_analysis/bragg_integration/BraggPredictionFactory.h
--- a/image_analysis/bragg_integration/BraggPredictionGPU.cu
+++ b/image_analysis/bragg_integration/BraggPredictionGPU.cu
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
 // SPDX-License-Identifier: GPL-3.0-only

-#include "BraggPredictionGPU.h"
+#include "../bragg_integration/BraggPredictionGPU.h"

 #ifdef JFJOCH_USE_CUDA
 #include "../indexing/CUDAMemHelpers.h"
--- a/image_analysis/bragg_integration/BraggPredictionGPU.h
+++ b/image_analysis/bragg_integration/BraggPredictionGPU.h
--- a/image_analysis/bragg_integration/BraggPredictionRotation.cpp
+++ b/image_analysis/bragg_integration/BraggPredictionRotation.cpp
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
 // SPDX-License-Identifier: GPL-3.0-only

-#include "BraggPredictionRotation.h"
+#include "../bragg_integration/BraggPredictionRotation.h"

 #include <cmath>
 #include <algorithm>
@@ -9,7 +9,7 @@
 #include "../../common/DiffractionGeometry.h"
 #include "../../common/GoniometerAxis.h"
 #include "../../common/JFJochException.h"
-#include "SystematicAbsence.h"
+#include "../bragg_integration/SystematicAbsence.h"

 namespace {
    inline float deg_to_rad(float deg) {
--- a/image_analysis/bragg_integration/BraggPredictionRotation.h
+++ b/image_analysis/bragg_integration/BraggPredictionRotation.h
--- a/image_analysis/bragg_prediction/CMakeLists.txt
+++ b/image_analysis/bragg_prediction/CMakeLists.txt
@@ -0,0 +1,16 @@
+ADD_LIBRARY(JFJochBraggPrediction STATIC
+        BraggPrediction.cpp
+        BraggPrediction.h
+        BraggPredictionFactory.cpp
+        BraggPredictionFactory.h
+        BraggPredictionRotation.cpp
+        BraggPredictionRotation.h
+)
+
+TARGET_LINK_LIBRARIES(JFJochBraggPrediction JFJochCommon)
+
+IF (JFJOCH_CUDA_AVAILABLE)
+    TARGET_SOURCES(JFJochBraggPrediction PRIVATE
+            ../indexing/CUDAMemHelpers.h
+            BraggPredictionGPU.cu BraggPredictionGPU.h)
+ENDIF()
--- a/tests/CalcBraggPredictionTest.cpp
+++ b/tests/CalcBraggPredictionTest.cpp
@@ -3,7 +3,7 @@

 #include <catch2/catch_all.hpp>

-#include "../image_analysis/bragg_integration/BraggPrediction.h"
+#include "../image_analysis/bragg_prediction/BraggPrediction.h"
 #include <iostream>

 TEST_CASE("BraggPrediction_11keV") {
@@ -204,7 +204,7 @@ TEST_CASE("BraggPrediction_systematic_absences") {
 }

 #ifdef JFJOCH_USE_CUDA
-#include "../image_analysis/bragg_integration/BraggPredictionGPU.h"
+#include "../image_analysis/bragg_prediction/BraggPredictionGPU.h"

 TEST_CASE("BraggPredictionGPU") {
    DiffractionExperiment experiment(DetJF4M());
--- a/tests/RotationIndexerTest.cpp
+++ b/tests/RotationIndexerTest.cpp
@@ -5,7 +5,7 @@
 #include <iostream>

 #include "../image_analysis/RotationIndexer.h"
-#include "../image_analysis/bragg_integration/BraggPrediction.h"
+#include "../image_analysis/bragg_prediction/BraggPrediction.h"

 TEST_CASE("RotationIndexer") {
    DiffractionExperiment exp_i;
--- a/tests/XtalOptimizerTest.cpp
+++ b/tests/XtalOptimizerTest.cpp
@@ -5,7 +5,7 @@
 #include <iostream>

 #include "../image_analysis/geom_refinement/XtalOptimizer.h"
-#include "../image_analysis/bragg_integration/BraggPrediction.h"
+#include "../image_analysis/bragg_prediction/BraggPrediction.h"

 TEST_CASE("XtalOptimizer") {
    DiffractionExperiment exp_i;
--- a/tools/jfjoch_indexing_test.cpp
+++ b/tools/jfjoch_indexing_test.cpp
@@ -5,7 +5,7 @@
 #include "../image_analysis/indexing/IndexerFactory.h"
 #include "../common/Logger.h"
 #include "../image_analysis/IndexAndRefine.h"
-#include "../image_analysis/bragg_integration/BraggPredictionFactory.h"
+#include "../image_analysis/bragg_prediction/BraggPredictionFactory.h"
 #include "../writer/FileWriter.h"
 #include "../image_analysis/indexing/AnalyzeIndexing.h"