From 0f566eda10f28c5d88e839997b98349f26511b6e Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 19 Nov 2020 09:08:44 +0100
Subject: [PATCH] rename directory -> Fit/Adapter (not restricted to Root)
---
.../GSLLevenbergMarquardtMinimizer.cpp | 6 +++---
.../GSLLevenbergMarquardtMinimizer.h | 4 ++--
Fit/{RootAdapter => Adapter}/GSLMultiMinimizer.cpp | 4 ++--
Fit/{RootAdapter => Adapter}/GSLMultiMinimizer.h | 4 ++--
Fit/{RootAdapter => Adapter}/GeneticMinimizer.cpp | 4 ++--
Fit/{RootAdapter => Adapter}/GeneticMinimizer.h | 4 ++--
Fit/{Kernel => Adapter}/IFunctionAdapter.cpp | 4 ++--
Fit/{Kernel => Adapter}/IFunctionAdapter.h | 2 +-
Fit/{RootAdapter => Adapter}/Minuit2Minimizer.cpp | 4 ++--
Fit/{RootAdapter => Adapter}/Minuit2Minimizer.h | 4 ++--
.../ObjectiveFunctionAdapter.cpp | 12 ++++++------
.../ObjectiveFunctionAdapter.h | 2 +-
.../ResidualFunctionAdapter.cpp | 6 +++---
.../ResidualFunctionAdapter.h | 4 ++--
.../RootMinimizerAdapter.cpp | 12 ++++++------
Fit/{RootAdapter => Adapter}/RootMinimizerAdapter.h | 2 +-
.../RootResidualFunction.cpp | 4 ++--
Fit/{RootAdapter => Adapter}/RootResidualFunction.h | 2 +-
Fit/{RootAdapter => Adapter}/RootScalarFunction.cpp | 4 ++--
Fit/{RootAdapter => Adapter}/RootScalarFunction.h | 2 +-
.../ScalarFunctionAdapter.cpp | 6 +++---
Fit/{RootAdapter => Adapter}/ScalarFunctionAdapter.h | 4 ++--
Fit/{RootAdapter => Adapter}/SimAnMinimizer.cpp | 6 +++---
Fit/{RootAdapter => Adapter}/SimAnMinimizer.h | 4 ++--
Fit/Kernel/MinimizerFactory.cpp | 10 +++++-----
Fit/Minimizer/MinimizerResult.cpp | 2 +-
Fit/{Kernel => Report}/Report.cpp | 6 +++---
Fit/{Kernel => Report}/Report.h | 2 +-
GUI/coregui/Models/MinimizerItem.cpp | 10 +++++-----
29 files changed, 70 insertions(+), 70 deletions(-)
rename Fit/{RootAdapter => Adapter}/GSLLevenbergMarquardtMinimizer.cpp (95%)
rename Fit/{RootAdapter => Adapter}/GSLLevenbergMarquardtMinimizer.h (95%)
rename Fit/{RootAdapter => Adapter}/GSLMultiMinimizer.cpp (95%)
rename Fit/{RootAdapter => Adapter}/GSLMultiMinimizer.h (94%)
rename Fit/{RootAdapter => Adapter}/GeneticMinimizer.cpp (97%)
rename Fit/{RootAdapter => Adapter}/GeneticMinimizer.h (95%)
rename Fit/{Kernel => Adapter}/IFunctionAdapter.cpp (91%)
rename Fit/{Kernel => Adapter}/IFunctionAdapter.h (96%)
rename Fit/{RootAdapter => Adapter}/Minuit2Minimizer.cpp (98%)
rename Fit/{RootAdapter => Adapter}/Minuit2Minimizer.h (96%)
rename Fit/{RootAdapter => Adapter}/ObjectiveFunctionAdapter.cpp (84%)
rename Fit/{RootAdapter => Adapter}/ObjectiveFunctionAdapter.h (96%)
rename Fit/{RootAdapter => Adapter}/ResidualFunctionAdapter.cpp (96%)
rename Fit/{RootAdapter => Adapter}/ResidualFunctionAdapter.h (95%)
rename Fit/{RootAdapter => Adapter}/RootMinimizerAdapter.cpp (95%)
rename Fit/{RootAdapter => Adapter}/RootMinimizerAdapter.h (98%)
rename Fit/{RootAdapter => Adapter}/RootResidualFunction.cpp (96%)
rename Fit/{RootAdapter => Adapter}/RootResidualFunction.h (97%)
rename Fit/{RootAdapter => Adapter}/RootScalarFunction.cpp (87%)
rename Fit/{RootAdapter => Adapter}/RootScalarFunction.h (95%)
rename Fit/{RootAdapter => Adapter}/ScalarFunctionAdapter.cpp (89%)
rename Fit/{RootAdapter => Adapter}/ScalarFunctionAdapter.h (94%)
rename Fit/{RootAdapter => Adapter}/SimAnMinimizer.cpp (96%)
rename Fit/{RootAdapter => Adapter}/SimAnMinimizer.h (96%)
rename Fit/{Kernel => Report}/Report.cpp (96%)
rename Fit/{Kernel => Report}/Report.h (97%)
diff --git a/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.cpp b/Fit/Adapter/GSLLevenbergMarquardtMinimizer.cpp
similarity index 95%
rename from Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.cpp
rename to Fit/Adapter/GSLLevenbergMarquardtMinimizer.cpp
index 9390caeadb8..343770056a9 100644
--- a/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.cpp
+++ b/Fit/Adapter/GSLLevenbergMarquardtMinimizer.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.cpp
+//! @file Fit/Adapter/GSLLevenbergMarquardtMinimizer.cpp
//! @brief Implements class GSLLevenbergMarquardtMinimizer.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h"
-#include "Fit/RootAdapter/GSLMultiMinimizer.h"
+#include "Fit/Adapter/GSLLevenbergMarquardtMinimizer.h"
+#include "Fit/Adapter/GSLMultiMinimizer.h"
#include "Fit/Tools/MinimizerUtils.h"
#include "Fit/Tools/StringUtils.h"
#include <stdexcept>
diff --git a/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h b/Fit/Adapter/GSLLevenbergMarquardtMinimizer.h
similarity index 95%
rename from Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h
rename to Fit/Adapter/GSLLevenbergMarquardtMinimizer.h
index 37a421e7a9d..b28914c5839 100644
--- a/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h
+++ b/Fit/Adapter/GSLLevenbergMarquardtMinimizer.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h
+//! @file Fit/Adapter/GSLLevenbergMarquardtMinimizer.h
//! @brief Declares class GSLLevenbergMarquardtMinimizer.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_FIT_ROOTADAPTER_GSLLEVENBERGMARQUARDTMINIMIZER_H
#define BORNAGAIN_FIT_ROOTADAPTER_GSLLEVENBERGMARQUARDTMINIMIZER_H
-#include "Fit/RootAdapter/RootMinimizerAdapter.h"
+#include "Fit/Adapter/RootMinimizerAdapter.h"
namespace ROOT
{
diff --git a/Fit/RootAdapter/GSLMultiMinimizer.cpp b/Fit/Adapter/GSLMultiMinimizer.cpp
similarity index 95%
rename from Fit/RootAdapter/GSLMultiMinimizer.cpp
rename to Fit/Adapter/GSLMultiMinimizer.cpp
index 9f08d6243b9..6fc9071e14d 100644
--- a/Fit/RootAdapter/GSLMultiMinimizer.cpp
+++ b/Fit/Adapter/GSLMultiMinimizer.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/RootAdapter/GSLMultiMinimizer.cpp
+//! @file Fit/Adapter/GSLMultiMinimizer.cpp
//! @brief Implements class GSLMultiMinimizer.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Fit/RootAdapter/GSLMultiMinimizer.h"
+#include "Fit/Adapter/GSLMultiMinimizer.h"
#include "Fit/Tools/MinimizerUtils.h"
#include <string>
diff --git a/Fit/RootAdapter/GSLMultiMinimizer.h b/Fit/Adapter/GSLMultiMinimizer.h
similarity index 94%
rename from Fit/RootAdapter/GSLMultiMinimizer.h
rename to Fit/Adapter/GSLMultiMinimizer.h
index e9c96ab570a..3dbda2e465f 100644
--- a/Fit/RootAdapter/GSLMultiMinimizer.h
+++ b/Fit/Adapter/GSLMultiMinimizer.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/RootAdapter/GSLMultiMinimizer.h
+//! @file Fit/Adapter/GSLMultiMinimizer.h
//! @brief Declares class GSLMultiMinimizer.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_FIT_ROOTADAPTER_GSLMULTIMINIMIZER_H
#define BORNAGAIN_FIT_ROOTADAPTER_GSLMULTIMINIMIZER_H
-#include "Fit/RootAdapter/RootMinimizerAdapter.h"
+#include "Fit/Adapter/RootMinimizerAdapter.h"
namespace ROOT
{
diff --git a/Fit/RootAdapter/GeneticMinimizer.cpp b/Fit/Adapter/GeneticMinimizer.cpp
similarity index 97%
rename from Fit/RootAdapter/GeneticMinimizer.cpp
rename to Fit/Adapter/GeneticMinimizer.cpp
index 68035a2740d..ee97896ab15 100644
--- a/Fit/RootAdapter/GeneticMinimizer.cpp
+++ b/Fit/Adapter/GeneticMinimizer.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/RootAdapter/GeneticMinimizer.cpp
+//! @file Fit/Adapter/GeneticMinimizer.cpp
//! @brief Implements class GeneticMinimizer.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Fit/RootAdapter/GeneticMinimizer.h"
+#include "Fit/Adapter/GeneticMinimizer.h"
#include <Math/GeneticMinimizer.h>
namespace
diff --git a/Fit/RootAdapter/GeneticMinimizer.h b/Fit/Adapter/GeneticMinimizer.h
similarity index 95%
rename from Fit/RootAdapter/GeneticMinimizer.h
rename to Fit/Adapter/GeneticMinimizer.h
index 5606222704d..392335b161b 100644
--- a/Fit/RootAdapter/GeneticMinimizer.h
+++ b/Fit/Adapter/GeneticMinimizer.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/RootAdapter/GeneticMinimizer.h
+//! @file Fit/Adapter/GeneticMinimizer.h
//! @brief Declares class GeneticMinimizer.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_FIT_ROOTADAPTER_GENETICMINIMIZER_H
#define BORNAGAIN_FIT_ROOTADAPTER_GENETICMINIMIZER_H
-#include "Fit/RootAdapter/RootMinimizerAdapter.h"
+#include "Fit/Adapter/RootMinimizerAdapter.h"
namespace ROOT
{
diff --git a/Fit/Kernel/IFunctionAdapter.cpp b/Fit/Adapter/IFunctionAdapter.cpp
similarity index 91%
rename from Fit/Kernel/IFunctionAdapter.cpp
rename to Fit/Adapter/IFunctionAdapter.cpp
index 4d0522c9b3e..e07daf6f1ad 100644
--- a/Fit/Kernel/IFunctionAdapter.cpp
+++ b/Fit/Adapter/IFunctionAdapter.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/Kernel/IFunctionAdapter.cpp
+//! @file Fit/Adapter/IFunctionAdapter.cpp
//! @brief Implements interface IFunctionAdapter.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Fit/Kernel/IFunctionAdapter.h"
+#include "Fit/Adapter/IFunctionAdapter.h"
using namespace Fit;
diff --git a/Fit/Kernel/IFunctionAdapter.h b/Fit/Adapter/IFunctionAdapter.h
similarity index 96%
rename from Fit/Kernel/IFunctionAdapter.h
rename to Fit/Adapter/IFunctionAdapter.h
index 67a95c58f8b..77a012ee408 100644
--- a/Fit/Kernel/IFunctionAdapter.h
+++ b/Fit/Adapter/IFunctionAdapter.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/Kernel/IFunctionAdapter.h
+//! @file Fit/Adapter/IFunctionAdapter.h
//! @brief Defines interface IFunctionAdapter.
//!
//! @homepage http://www.bornagainproject.org
diff --git a/Fit/RootAdapter/Minuit2Minimizer.cpp b/Fit/Adapter/Minuit2Minimizer.cpp
similarity index 98%
rename from Fit/RootAdapter/Minuit2Minimizer.cpp
rename to Fit/Adapter/Minuit2Minimizer.cpp
index 5bc6c7ec89a..b3fc2ec7130 100644
--- a/Fit/RootAdapter/Minuit2Minimizer.cpp
+++ b/Fit/Adapter/Minuit2Minimizer.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/RootAdapter/Minuit2Minimizer.cpp
+//! @file Fit/Adapter/Minuit2Minimizer.cpp
//! @brief Declares class Minuit2Minimizer.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Fit/RootAdapter/Minuit2Minimizer.h"
+#include "Fit/Adapter/Minuit2Minimizer.h"
#include "Fit/Tools/StringUtils.h"
#include <Minuit2/Minuit2Minimizer.h>
diff --git a/Fit/RootAdapter/Minuit2Minimizer.h b/Fit/Adapter/Minuit2Minimizer.h
similarity index 96%
rename from Fit/RootAdapter/Minuit2Minimizer.h
rename to Fit/Adapter/Minuit2Minimizer.h
index c085b64ef25..348ca526f5e 100644
--- a/Fit/RootAdapter/Minuit2Minimizer.h
+++ b/Fit/Adapter/Minuit2Minimizer.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/RootAdapter/Minuit2Minimizer.h
+//! @file Fit/Adapter/Minuit2Minimizer.h
//! @brief Declares class Minuit2Minimizer.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_FIT_ROOTADAPTER_MINUIT2MINIMIZER_H
#define BORNAGAIN_FIT_ROOTADAPTER_MINUIT2MINIMIZER_H
-#include "Fit/RootAdapter/RootMinimizerAdapter.h"
+#include "Fit/Adapter/RootMinimizerAdapter.h"
#include <memory>
namespace ROOT
diff --git a/Fit/RootAdapter/ObjectiveFunctionAdapter.cpp b/Fit/Adapter/ObjectiveFunctionAdapter.cpp
similarity index 84%
rename from Fit/RootAdapter/ObjectiveFunctionAdapter.cpp
rename to Fit/Adapter/ObjectiveFunctionAdapter.cpp
index 957db3d0ffd..3bcb12be891 100644
--- a/Fit/RootAdapter/ObjectiveFunctionAdapter.cpp
+++ b/Fit/Adapter/ObjectiveFunctionAdapter.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/RootAdapter/ObjectiveFunctionAdapter.cpp
+//! @file Fit/Adapter/ObjectiveFunctionAdapter.cpp
//! @brief Implements class ObjectiveFunctionAdapter.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#include "Fit/RootAdapter/ObjectiveFunctionAdapter.h"
-#include "Fit/RootAdapter/ResidualFunctionAdapter.h"
-#include "Fit/RootAdapter/RootResidualFunction.h"
-#include "Fit/RootAdapter/RootScalarFunction.h"
-#include "Fit/RootAdapter/ScalarFunctionAdapter.h"
+#include "Fit/Adapter/ObjectiveFunctionAdapter.h"
+#include "Fit/Adapter/ResidualFunctionAdapter.h"
+#include "Fit/Adapter/RootResidualFunction.h"
+#include "Fit/Adapter/RootScalarFunction.h"
+#include "Fit/Adapter/ScalarFunctionAdapter.h"
using namespace Fit;
diff --git a/Fit/RootAdapter/ObjectiveFunctionAdapter.h b/Fit/Adapter/ObjectiveFunctionAdapter.h
similarity index 96%
rename from Fit/RootAdapter/ObjectiveFunctionAdapter.h
rename to Fit/Adapter/ObjectiveFunctionAdapter.h
index 5ed903878a5..07e11a0797f 100644
--- a/Fit/RootAdapter/ObjectiveFunctionAdapter.h
+++ b/Fit/Adapter/ObjectiveFunctionAdapter.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/RootAdapter/ObjectiveFunctionAdapter.h
+//! @file Fit/Adapter/ObjectiveFunctionAdapter.h
//! @brief Declares class ObjectiveFunctionAdapter.
//!
//! @homepage http://www.bornagainproject.org
diff --git a/Fit/RootAdapter/ResidualFunctionAdapter.cpp b/Fit/Adapter/ResidualFunctionAdapter.cpp
similarity index 96%
rename from Fit/RootAdapter/ResidualFunctionAdapter.cpp
rename to Fit/Adapter/ResidualFunctionAdapter.cpp
index 9202ddb6f22..fa03669372b 100644
--- a/Fit/RootAdapter/ResidualFunctionAdapter.cpp
+++ b/Fit/Adapter/ResidualFunctionAdapter.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/RootAdapter/ResidualFunctionAdapter.cpp
+//! @file Fit/Adapter/ResidualFunctionAdapter.cpp
//! @brief Implements class ResidualFunctionAdapter.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "Fit/RootAdapter/ResidualFunctionAdapter.h"
-#include "Fit/RootAdapter/RootResidualFunction.h"
+#include "Fit/Adapter/ResidualFunctionAdapter.h"
+#include "Fit/Adapter/RootResidualFunction.h"
#include <cassert>
#include <sstream>
diff --git a/Fit/RootAdapter/ResidualFunctionAdapter.h b/Fit/Adapter/ResidualFunctionAdapter.h
similarity index 95%
rename from Fit/RootAdapter/ResidualFunctionAdapter.h
rename to Fit/Adapter/ResidualFunctionAdapter.h
index f5dfbdf84f9..d79660ec4ac 100644
--- a/Fit/RootAdapter/ResidualFunctionAdapter.h
+++ b/Fit/Adapter/ResidualFunctionAdapter.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/RootAdapter/ResidualFunctionAdapter.h
+//! @file Fit/Adapter/ResidualFunctionAdapter.h
//! @brief Defines class ResidualFunctionAdapter.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_FIT_ROOTADAPTER_RESIDUALFUNCTIONADAPTER_H
#define BORNAGAIN_FIT_ROOTADAPTER_RESIDUALFUNCTIONADAPTER_H
-#include "Fit/Kernel/IFunctionAdapter.h"
+#include "Fit/Adapter/IFunctionAdapter.h"
#include "Fit/Minimizer/Types.h"
#include "Fit/Param/Parameters.h"
#include <functional>
diff --git a/Fit/RootAdapter/RootMinimizerAdapter.cpp b/Fit/Adapter/RootMinimizerAdapter.cpp
similarity index 95%
rename from Fit/RootAdapter/RootMinimizerAdapter.cpp
rename to Fit/Adapter/RootMinimizerAdapter.cpp
index 0885b69123a..43bd58aeb61 100644
--- a/Fit/RootAdapter/RootMinimizerAdapter.cpp
+++ b/Fit/Adapter/RootMinimizerAdapter.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/RootAdapter/RootMinimizerAdapter.cpp
+//! @file Fit/Adapter/RootMinimizerAdapter.cpp
//! @brief Implements class RootMinimizerAdapter.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#include "Fit/RootAdapter/RootMinimizerAdapter.h"
-#include "Fit/Kernel/Report.h"
-#include "Fit/RootAdapter/ObjectiveFunctionAdapter.h"
-#include "Fit/RootAdapter/RootResidualFunction.h"
-#include "Fit/RootAdapter/RootScalarFunction.h"
+#include "Fit/Adapter/RootMinimizerAdapter.h"
+#include "Fit/Report/Report.h"
+#include "Fit/Adapter/ObjectiveFunctionAdapter.h"
+#include "Fit/Adapter/RootResidualFunction.h"
+#include "Fit/Adapter/RootScalarFunction.h"
#include "Fit/Tools/StringUtils.h"
#include <Math/Minimizer.h>
diff --git a/Fit/RootAdapter/RootMinimizerAdapter.h b/Fit/Adapter/RootMinimizerAdapter.h
similarity index 98%
rename from Fit/RootAdapter/RootMinimizerAdapter.h
rename to Fit/Adapter/RootMinimizerAdapter.h
index 837c2d78d49..edfa100d15a 100644
--- a/Fit/RootAdapter/RootMinimizerAdapter.h
+++ b/Fit/Adapter/RootMinimizerAdapter.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/RootAdapter/RootMinimizerAdapter.h
+//! @file Fit/Adapter/RootMinimizerAdapter.h
//! @brief Declares class RootMinimizerAdapter.
//!
//! @homepage http://www.bornagainproject.org
diff --git a/Fit/RootAdapter/RootResidualFunction.cpp b/Fit/Adapter/RootResidualFunction.cpp
similarity index 96%
rename from Fit/RootAdapter/RootResidualFunction.cpp
rename to Fit/Adapter/RootResidualFunction.cpp
index aad061c9cac..e6d39a8beb9 100644
--- a/Fit/RootAdapter/RootResidualFunction.cpp
+++ b/Fit/Adapter/RootResidualFunction.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/RootAdapter/RootResidualFunction.cpp
+//! @file Fit/Adapter/RootResidualFunction.cpp
//! @brief Implements class RootResidualFunction.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Fit/RootAdapter/RootResidualFunction.h"
+#include "Fit/Adapter/RootResidualFunction.h"
RootResidualFunction::RootResidualFunction(scalar_function_t objective_fun,
gradient_function_t gradient_fun, size_t npars,
diff --git a/Fit/RootAdapter/RootResidualFunction.h b/Fit/Adapter/RootResidualFunction.h
similarity index 97%
rename from Fit/RootAdapter/RootResidualFunction.h
rename to Fit/Adapter/RootResidualFunction.h
index 11c3dd672f6..592fcdf6521 100644
--- a/Fit/RootAdapter/RootResidualFunction.h
+++ b/Fit/Adapter/RootResidualFunction.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/RootAdapter/RootResidualFunction.h
+//! @file Fit/Adapter/RootResidualFunction.h
//! @brief Declares class RootResidualFunction.
//!
//! @homepage http://www.bornagainproject.org
diff --git a/Fit/RootAdapter/RootScalarFunction.cpp b/Fit/Adapter/RootScalarFunction.cpp
similarity index 87%
rename from Fit/RootAdapter/RootScalarFunction.cpp
rename to Fit/Adapter/RootScalarFunction.cpp
index ad30cf6ac7b..2dc53640619 100644
--- a/Fit/RootAdapter/RootScalarFunction.cpp
+++ b/Fit/Adapter/RootScalarFunction.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/RootAdapter/RootScalarFunction.cpp
+//! @file Fit/Adapter/RootScalarFunction.cpp
//! @brief Implements class RootScalarFunction
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Fit/RootAdapter/RootScalarFunction.h"
+#include "Fit/Adapter/RootScalarFunction.h"
RootScalarFunction::RootScalarFunction(root_scalar_t fcn, int ndims)
: ROOT::Math::Functor(fcn, static_cast<unsigned int>(ndims))
diff --git a/Fit/RootAdapter/RootScalarFunction.h b/Fit/Adapter/RootScalarFunction.h
similarity index 95%
rename from Fit/RootAdapter/RootScalarFunction.h
rename to Fit/Adapter/RootScalarFunction.h
index fd52410a614..4de94e80e0c 100644
--- a/Fit/RootAdapter/RootScalarFunction.h
+++ b/Fit/Adapter/RootScalarFunction.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/RootAdapter/RootScalarFunction.h
+//! @file Fit/Adapter/RootScalarFunction.h
//! @brief Defines classes RootScalarFunction
//!
//! @homepage http://www.bornagainproject.org
diff --git a/Fit/RootAdapter/ScalarFunctionAdapter.cpp b/Fit/Adapter/ScalarFunctionAdapter.cpp
similarity index 89%
rename from Fit/RootAdapter/ScalarFunctionAdapter.cpp
rename to Fit/Adapter/ScalarFunctionAdapter.cpp
index 08277817857..d1bc6e8fbe7 100644
--- a/Fit/RootAdapter/ScalarFunctionAdapter.cpp
+++ b/Fit/Adapter/ScalarFunctionAdapter.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/RootAdapter/ScalarFunctionAdapter.cpp
+//! @file Fit/Adapter/ScalarFunctionAdapter.cpp
//! @brief Defines class ScalarFunctionAdapter.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "Fit/RootAdapter/ScalarFunctionAdapter.h"
-#include "Fit/RootAdapter/RootScalarFunction.h"
+#include "Fit/Adapter/ScalarFunctionAdapter.h"
+#include "Fit/Adapter/RootScalarFunction.h"
using namespace Fit;
diff --git a/Fit/RootAdapter/ScalarFunctionAdapter.h b/Fit/Adapter/ScalarFunctionAdapter.h
similarity index 94%
rename from Fit/RootAdapter/ScalarFunctionAdapter.h
rename to Fit/Adapter/ScalarFunctionAdapter.h
index ac733605ab2..fb534d34ce1 100644
--- a/Fit/RootAdapter/ScalarFunctionAdapter.h
+++ b/Fit/Adapter/ScalarFunctionAdapter.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/RootAdapter/ScalarFunctionAdapter.h
+//! @file Fit/Adapter/ScalarFunctionAdapter.h
//! @brief Defines class ScalarFunctionAdapter.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_FIT_ROOTADAPTER_SCALARFUNCTIONADAPTER_H
#define BORNAGAIN_FIT_ROOTADAPTER_SCALARFUNCTIONADAPTER_H
-#include "Fit/Kernel/IFunctionAdapter.h"
+#include "Fit/Adapter/IFunctionAdapter.h"
#include "Fit/Minimizer/Types.h"
#include "Fit/Param/Parameters.h"
#include <functional>
diff --git a/Fit/RootAdapter/SimAnMinimizer.cpp b/Fit/Adapter/SimAnMinimizer.cpp
similarity index 96%
rename from Fit/RootAdapter/SimAnMinimizer.cpp
rename to Fit/Adapter/SimAnMinimizer.cpp
index 1e87a98aad2..da202ed8b3b 100644
--- a/Fit/RootAdapter/SimAnMinimizer.cpp
+++ b/Fit/Adapter/SimAnMinimizer.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/RootAdapter/SimAnMinimizer.cpp
+//! @file Fit/Adapter/SimAnMinimizer.cpp
//! @brief Implements class SimAnMinimizer.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "Fit/RootAdapter/SimAnMinimizer.h"
-#include "Fit/RootAdapter/GSLMultiMinimizer.h"
+#include "Fit/Adapter/SimAnMinimizer.h"
+#include "Fit/Adapter/GSLMultiMinimizer.h"
#ifdef _WIN32
#pragma warning(push)
diff --git a/Fit/RootAdapter/SimAnMinimizer.h b/Fit/Adapter/SimAnMinimizer.h
similarity index 96%
rename from Fit/RootAdapter/SimAnMinimizer.h
rename to Fit/Adapter/SimAnMinimizer.h
index 79832b88c5c..4bad303f54b 100644
--- a/Fit/RootAdapter/SimAnMinimizer.h
+++ b/Fit/Adapter/SimAnMinimizer.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/RootAdapter/SimAnMinimizer.h
+//! @file Fit/Adapter/SimAnMinimizer.h
//! @brief Declares class SimAnMinimizer.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_FIT_ROOTADAPTER_SIMANMINIMIZER_H
#define BORNAGAIN_FIT_ROOTADAPTER_SIMANMINIMIZER_H
-#include "Fit/RootAdapter/RootMinimizerAdapter.h"
+#include "Fit/Adapter/RootMinimizerAdapter.h"
namespace ROOT
{
diff --git a/Fit/Kernel/MinimizerFactory.cpp b/Fit/Kernel/MinimizerFactory.cpp
index 88f6705688e..95860e3a5cd 100644
--- a/Fit/Kernel/MinimizerFactory.cpp
+++ b/Fit/Kernel/MinimizerFactory.cpp
@@ -14,11 +14,11 @@
#include "Fit/Kernel/MinimizerFactory.h"
#include "Fit/Minimizer/TestMinimizer.h"
-#include "Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h"
-#include "Fit/RootAdapter/GSLMultiMinimizer.h"
-#include "Fit/RootAdapter/GeneticMinimizer.h"
-#include "Fit/RootAdapter/Minuit2Minimizer.h"
-#include "Fit/RootAdapter/SimAnMinimizer.h"
+#include "Fit/Adapter/GSLLevenbergMarquardtMinimizer.h"
+#include "Fit/Adapter/GSLMultiMinimizer.h"
+#include "Fit/Adapter/GeneticMinimizer.h"
+#include "Fit/Adapter/Minuit2Minimizer.h"
+#include "Fit/Adapter/SimAnMinimizer.h"
#include <boost/format.hpp>
#include <iomanip>
#include <iostream>
diff --git a/Fit/Minimizer/MinimizerResult.cpp b/Fit/Minimizer/MinimizerResult.cpp
index 95bb1aa0c3c..2afb998fdeb 100644
--- a/Fit/Minimizer/MinimizerResult.cpp
+++ b/Fit/Minimizer/MinimizerResult.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Fit/Minimizer/MinimizerResult.h"
-#include "Fit/Kernel/Report.h"
+#include "Fit/Report/Report.h"
#include "Fit/Tools/MinimizerUtils.h"
#include <sstream>
diff --git a/Fit/Kernel/Report.cpp b/Fit/Report/Report.cpp
similarity index 96%
rename from Fit/Kernel/Report.cpp
rename to Fit/Report/Report.cpp
index 0b2864daea3..33ba199e138 100644
--- a/Fit/Kernel/Report.cpp
+++ b/Fit/Report/Report.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/Kernel/Report.cpp
+//! @file Fit/Report/Report.cpp
//! @brief Implements report namespace.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "Fit/Kernel/Report.h"
-#include "Fit/RootAdapter/RootMinimizerAdapter.h"
+#include "Fit/Report/Report.h"
+#include "Fit/Adapter/RootMinimizerAdapter.h"
#include "Fit/Tools/MinimizerUtils.h"
#include <boost/format.hpp>
#include <iomanip>
diff --git a/Fit/Kernel/Report.h b/Fit/Report/Report.h
similarity index 97%
rename from Fit/Kernel/Report.h
rename to Fit/Report/Report.h
index 0c520a587cd..af82f004b65 100644
--- a/Fit/Kernel/Report.h
+++ b/Fit/Report/Report.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/Kernel/Report.h
+//! @file Fit/Report/Report.h
//! @brief Declares report namespace.
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/MinimizerItem.cpp b/GUI/coregui/Models/MinimizerItem.cpp
index 15ae443605d..5a7a7c9d623 100644
--- a/GUI/coregui/Models/MinimizerItem.cpp
+++ b/GUI/coregui/Models/MinimizerItem.cpp
@@ -16,11 +16,11 @@
#include "Core/Fitting/ObjectiveMetric.h"
#include "Core/Fitting/ObjectiveMetricUtils.h"
#include "Fit/Minimizer/TestMinimizer.h"
-#include "Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h"
-#include "Fit/RootAdapter/GSLMultiMinimizer.h"
-#include "Fit/RootAdapter/GeneticMinimizer.h"
-#include "Fit/RootAdapter/Minuit2Minimizer.h"
-#include "Fit/RootAdapter/SimAnMinimizer.h"
+#include "Fit/Adapter/GSLLevenbergMarquardtMinimizer.h"
+#include "Fit/Adapter/GSLMultiMinimizer.h"
+#include "Fit/Adapter/GeneticMinimizer.h"
+#include "Fit/Adapter/Minuit2Minimizer.h"
+#include "Fit/Adapter/SimAnMinimizer.h"
#include "GUI/coregui/Models/MinimizerItemCatalog.h"
MinimizerItem::MinimizerItem(const QString& model_type) : SessionItem(model_type) {}
--
GitLab