From 8d3d84c36d519858e1ff53a0a1530646b99837d5 Mon Sep 17 00:00:00 2001 From: Kamil Skwarczynski Date: Tue, 25 Aug 2026 08:54:08 +0000 Subject: [PATCH] break down Fitters folder --- CIValidations/Benchmark/MaCh3Benchmark.cpp | 6 +++--- CIValidations/FitterValidations.cpp | 2 +- CIValidations/NuDock/RunNuDockServer.cpp | 2 +- CIValidations/NuMCMCconversion.cpp | 6 ++++-- CIValidations/SplinePlotting/SplinePlotting.cpp | 3 ++- CIValidations/UnitTests/statistical_tests.cpp | 2 +- MaCh3Plugins/MCMCTutorialPlugin.cpp | 2 +- Tutorial/KinemDistributionTutorial.cpp | 2 +- Tutorial/LLHScanTutorial.cpp | 2 +- Tutorial/PredictiveTutorial.cpp | 4 ++-- Tutorial/SigmaVarTutorial.cpp | 2 +- Tutorial/TutorialEventRates.cpp | 2 +- 12 files changed, 19 insertions(+), 16 deletions(-) diff --git a/CIValidations/Benchmark/MaCh3Benchmark.cpp b/CIValidations/Benchmark/MaCh3Benchmark.cpp index 50c0324e..3a0d155d 100755 --- a/CIValidations/Benchmark/MaCh3Benchmark.cpp +++ b/CIValidations/Benchmark/MaCh3Benchmark.cpp @@ -1,10 +1,10 @@ // MaCh3 spline includes -#include "Fitters/MaCh3Factory.h" +#include "Fitters/Algorithms/MaCh3Factory.h" #include "SamplesTutorial/SampleHandlerTutorial.h" - +_MaCh3_Safe_Include_Start_ //{ #include "catch2/catch_test_macros.hpp" #include "catch2/benchmark/catch_benchmark.hpp" - +_MaCh3_Safe_Include_End_ //} void CreateChungusYaml(const std::string& filename = "ChungusSystematics.yaml", size_t nParams = 5000) { diff --git a/CIValidations/FitterValidations.cpp b/CIValidations/FitterValidations.cpp index 27a4387f..93b64a83 100755 --- a/CIValidations/FitterValidations.cpp +++ b/CIValidations/FitterValidations.cpp @@ -1,5 +1,5 @@ // MaCh3 spline includes -#include "Fitters/MaCh3Factory.h" +#include "Fitters/Algorithms/MaCh3Factory.h" #include "Parameters/ParameterHandlerGeneric.h" #include "Utils/Comparison.h" #include "SamplesTutorial/SampleHandlerTutorial.h" diff --git a/CIValidations/NuDock/RunNuDockServer.cpp b/CIValidations/NuDock/RunNuDockServer.cpp index 3f6af603..58e020e9 100644 --- a/CIValidations/NuDock/RunNuDockServer.cpp +++ b/CIValidations/NuDock/RunNuDockServer.cpp @@ -1,6 +1,6 @@ // MaCh3 includes #include "Manager/Manager.h" -#include "Fitters/MaCh3Factory.h" +#include "Fitters/Algorithms/MaCh3Factory.h" #include "NuDock/NuDockFactory.h" #include "NuDock/NuDockServerBase.h" diff --git a/CIValidations/NuMCMCconversion.cpp b/CIValidations/NuMCMCconversion.cpp index 264abd68..0817c854 100755 --- a/CIValidations/NuMCMCconversion.cpp +++ b/CIValidations/NuMCMCconversion.cpp @@ -1,12 +1,14 @@ #include +#include "Fitters/Algorithms/MaCh3Factory.h" +_MaCh3_Safe_Include_Start_ //{ +// ROOT includes #include "TChain.h" #include "TFile.h" #include "TTree.h" #include "TNamed.h" #include "TObjString.h" - -#include "Fitters/MaCh3Factory.h" +_MaCh3_Safe_Include_End_ //} int main(int argc, char *argv[]) { diff --git a/CIValidations/SplinePlotting/SplinePlotting.cpp b/CIValidations/SplinePlotting/SplinePlotting.cpp index 78eae509..43334e77 100644 --- a/CIValidations/SplinePlotting/SplinePlotting.cpp +++ b/CIValidations/SplinePlotting/SplinePlotting.cpp @@ -1,10 +1,11 @@ #include "Samples/SampleHandlerBase.h" #include "Splines/BinnedSplineHandler.h" +_MaCh3_Safe_Include_Start_ //{ #include "TSpline.h" #include "TCanvas.h" #include "TLegend.h" #include "TColor.h" - +_MaCh3_Safe_Include_End_ //} struct KnotSet { std::vector x; std::vector y; diff --git a/CIValidations/UnitTests/statistical_tests.cpp b/CIValidations/UnitTests/statistical_tests.cpp index 6bf63883..e9b0a1ce 100644 --- a/CIValidations/UnitTests/statistical_tests.cpp +++ b/CIValidations/UnitTests/statistical_tests.cpp @@ -1,7 +1,7 @@ #include "catch2/catch_test_macros.hpp" #include "catch2/matchers/catch_matchers_floating_point.hpp" -#include "Fitters/StatisticalUtils.h" +#include "Fitters/Processing/StatisticalUtils.h" // Test for Jeffreys Scale TEST_CASE("Jeffreys Scale", "[StatisticalUtils]") { diff --git a/MaCh3Plugins/MCMCTutorialPlugin.cpp b/MaCh3Plugins/MCMCTutorialPlugin.cpp index 73f79910..909c4048 100644 --- a/MaCh3Plugins/MCMCTutorialPlugin.cpp +++ b/MaCh3Plugins/MCMCTutorialPlugin.cpp @@ -1,6 +1,6 @@ // MaCh3 includes #include "Manager/MaCh3Logger.h" -#include "Fitters/MaCh3Factory.h" +#include "Fitters/Algorithms/MaCh3Factory.h" #include "SamplesTutorial/SampleHandlerTutorial.h" #include "MaCh3Plugins/MCMCTutorialPlugin.hpp" diff --git a/Tutorial/KinemDistributionTutorial.cpp b/Tutorial/KinemDistributionTutorial.cpp index c38064b5..f2c9358c 100755 --- a/Tutorial/KinemDistributionTutorial.cpp +++ b/Tutorial/KinemDistributionTutorial.cpp @@ -1,5 +1,5 @@ // MaCh3 includes -#include "Fitters/MaCh3Factory.h" +#include "Fitters/Algorithms/MaCh3Factory.h" #include "SamplesTutorial/SampleHandlerTutorial.h" struct PlotKinematicCut { diff --git a/Tutorial/LLHScanTutorial.cpp b/Tutorial/LLHScanTutorial.cpp index 84fa1c9a..a0344170 100755 --- a/Tutorial/LLHScanTutorial.cpp +++ b/Tutorial/LLHScanTutorial.cpp @@ -1,5 +1,5 @@ // MaCh3 spline includes -#include "Fitters/MaCh3Factory.h" +#include "Fitters/Algorithms/MaCh3Factory.h" #include "SamplesTutorial/SampleHandlerTutorial.h" int main(int argc, char *argv[]){ diff --git a/Tutorial/PredictiveTutorial.cpp b/Tutorial/PredictiveTutorial.cpp index c590c833..89b591d5 100755 --- a/Tutorial/PredictiveTutorial.cpp +++ b/Tutorial/PredictiveTutorial.cpp @@ -1,6 +1,6 @@ // MaCh3 includes -#include "Fitters/MaCh3Factory.h" -#include "Fitters/PredictiveThrower.h" +#include "Fitters/Algorithms/MaCh3Factory.h" +#include "Fitters/Algorithms/PredictiveThrower.h" #include "SamplesTutorial/SampleHandlerTutorial.h" int main(int argc, char *argv[]) { diff --git a/Tutorial/SigmaVarTutorial.cpp b/Tutorial/SigmaVarTutorial.cpp index 8289700a..c265ce79 100644 --- a/Tutorial/SigmaVarTutorial.cpp +++ b/Tutorial/SigmaVarTutorial.cpp @@ -1,5 +1,5 @@ // MaCh3 spline includes -#include "Fitters/MaCh3Factory.h" +#include "Fitters/Algorithms/MaCh3Factory.h" #include "SamplesTutorial/SampleHandlerTutorial.h" int main(int argc, char *argv[]){ diff --git a/Tutorial/TutorialEventRates.cpp b/Tutorial/TutorialEventRates.cpp index ec80978b..16ca4a3f 100755 --- a/Tutorial/TutorialEventRates.cpp +++ b/Tutorial/TutorialEventRates.cpp @@ -1,5 +1,5 @@ // MaCh3 includes -#include "Fitters/MaCh3Factory.h" +#include "Fitters/Algorithms/MaCh3Factory.h" #include "SamplesTutorial/SampleHandlerTutorial.h" int main(int argc, char *argv[]) {