From 79df2a9a6b32c18092f29693751cac8a065e9754 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Sat, 1 Jul 2023 12:57:37 +0200
Subject: [PATCH] new dir Fit/Residual

---
 Fit/Adapter/MinimizerAdapter.cpp                      |  4 ++--
 Fit/Adapter/ObjectiveFunctionAdapter.cpp              |  8 ++++----
 Fit/{Adapter => Residual}/IFunctionAdapter.cpp        |  4 ++--
 Fit/{Adapter => Residual}/IFunctionAdapter.h          |  8 ++++----
 Fit/{Adapter => Residual}/ResidualFunctionAdapter.cpp |  6 +++---
 Fit/{Adapter => Residual}/ResidualFunctionAdapter.h   | 10 +++++-----
 Fit/{Adapter => Residual}/RootResidualFunction.cpp    |  4 ++--
 Fit/{Adapter => Residual}/RootResidualFunction.h      |  8 ++++----
 Fit/{Adapter => Residual}/RootScalarFunction.cpp      |  4 ++--
 Fit/{Adapter => Residual}/RootScalarFunction.h        |  8 ++++----
 Fit/{Adapter => Residual}/ScalarFunctionAdapter.cpp   |  6 +++---
 Fit/{Adapter => Residual}/ScalarFunctionAdapter.h     | 10 +++++-----
 12 files changed, 40 insertions(+), 40 deletions(-)
 rename Fit/{Adapter => Residual}/IFunctionAdapter.cpp (90%)
 rename Fit/{Adapter => Residual}/IFunctionAdapter.h (84%)
 rename Fit/{Adapter => Residual}/ResidualFunctionAdapter.cpp (96%)
 rename Fit/{Adapter => Residual}/ResidualFunctionAdapter.h (88%)
 rename Fit/{Adapter => Residual}/RootResidualFunction.cpp (96%)
 rename Fit/{Adapter => Residual}/RootResidualFunction.h (90%)
 rename Fit/{Adapter => Residual}/RootScalarFunction.cpp (88%)
 rename Fit/{Adapter => Residual}/RootScalarFunction.h (83%)
 rename Fit/{Adapter => Residual}/ScalarFunctionAdapter.cpp (89%)
 rename Fit/{Adapter => Residual}/ScalarFunctionAdapter.h (85%)

diff --git a/Fit/Adapter/MinimizerAdapter.cpp b/Fit/Adapter/MinimizerAdapter.cpp
index 85ba581a05d..0351277cae6 100644
--- a/Fit/Adapter/MinimizerAdapter.cpp
+++ b/Fit/Adapter/MinimizerAdapter.cpp
@@ -15,8 +15,8 @@
 #include "Fit/Adapter/MinimizerAdapter.h"
 #include "Fit/Adapter/ObjectiveFunctionAdapter.h"
 #include "Fit/Adapter/Report.h"
-#include "Fit/Adapter/RootResidualFunction.h"
-#include "Fit/Adapter/RootScalarFunction.h"
+#include "Fit/Residual/RootResidualFunction.h"
+#include "Fit/Residual/RootScalarFunction.h"
 #include "Fit/Tools/StringUtil.h"
 #include <Math/Minimizer.h>
 
diff --git a/Fit/Adapter/ObjectiveFunctionAdapter.cpp b/Fit/Adapter/ObjectiveFunctionAdapter.cpp
index 34a13b8c129..d7e7b7f9d33 100644
--- a/Fit/Adapter/ObjectiveFunctionAdapter.cpp
+++ b/Fit/Adapter/ObjectiveFunctionAdapter.cpp
@@ -13,10 +13,10 @@
 //  ************************************************************************************************
 
 #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"
+#include "Fit/Residual/ResidualFunctionAdapter.h"
+#include "Fit/Residual/RootResidualFunction.h"
+#include "Fit/Residual/RootScalarFunction.h"
+#include "Fit/Residual/ScalarFunctionAdapter.h"
 
 using namespace mumufit;
 
diff --git a/Fit/Adapter/IFunctionAdapter.cpp b/Fit/Residual/IFunctionAdapter.cpp
similarity index 90%
rename from Fit/Adapter/IFunctionAdapter.cpp
rename to Fit/Residual/IFunctionAdapter.cpp
index 9283126edbc..425ed12d73a 100644
--- a/Fit/Adapter/IFunctionAdapter.cpp
+++ b/Fit/Residual/IFunctionAdapter.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Fit/Adapter/IFunctionAdapter.cpp
+//! @file      Fit/Residual/IFunctionAdapter.cpp
 //! @brief     Implements interface IFunctionAdapter.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/Adapter/IFunctionAdapter.h"
+#include "Fit/Residual/IFunctionAdapter.h"
 
 using namespace mumufit;
 
diff --git a/Fit/Adapter/IFunctionAdapter.h b/Fit/Residual/IFunctionAdapter.h
similarity index 84%
rename from Fit/Adapter/IFunctionAdapter.h
rename to Fit/Residual/IFunctionAdapter.h
index db9dd0289cf..017fbc3ab77 100644
--- a/Fit/Adapter/IFunctionAdapter.h
+++ b/Fit/Residual/IFunctionAdapter.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Fit/Adapter/IFunctionAdapter.h
+//! @file      Fit/Residual/IFunctionAdapter.h
 //! @brief     Defines interface IFunctionAdapter.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_FIT_ADAPTER_IFUNCTIONADAPTER_H
-#define BORNAGAIN_FIT_ADAPTER_IFUNCTIONADAPTER_H
+#ifndef BORNAGAIN_FIT_RESIDUAL_IFUNCTIONADAPTER_H
+#define BORNAGAIN_FIT_RESIDUAL_IFUNCTIONADAPTER_H
 
 namespace mumufit {
 
@@ -38,4 +38,4 @@ protected:
 
 } // namespace mumufit
 
-#endif // BORNAGAIN_FIT_ADAPTER_IFUNCTIONADAPTER_H
+#endif // BORNAGAIN_FIT_RESIDUAL_IFUNCTIONADAPTER_H
diff --git a/Fit/Adapter/ResidualFunctionAdapter.cpp b/Fit/Residual/ResidualFunctionAdapter.cpp
similarity index 96%
rename from Fit/Adapter/ResidualFunctionAdapter.cpp
rename to Fit/Residual/ResidualFunctionAdapter.cpp
index 2b30e761c26..461b6644f6f 100644
--- a/Fit/Adapter/ResidualFunctionAdapter.cpp
+++ b/Fit/Residual/ResidualFunctionAdapter.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Fit/Adapter/ResidualFunctionAdapter.cpp
+//! @file      Fit/Residual/ResidualFunctionAdapter.cpp
 //! @brief     Implements class ResidualFunctionAdapter.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/Adapter/ResidualFunctionAdapter.h"
-#include "Fit/Adapter/RootResidualFunction.h"
+#include "Fit/Residual/ResidualFunctionAdapter.h"
+#include "Fit/Residual/RootResidualFunction.h"
 #include <cassert>
 #include <memory>
 #include <sstream>
diff --git a/Fit/Adapter/ResidualFunctionAdapter.h b/Fit/Residual/ResidualFunctionAdapter.h
similarity index 88%
rename from Fit/Adapter/ResidualFunctionAdapter.h
rename to Fit/Residual/ResidualFunctionAdapter.h
index d47a8bec4b6..0af989f5afd 100644
--- a/Fit/Adapter/ResidualFunctionAdapter.h
+++ b/Fit/Residual/ResidualFunctionAdapter.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Fit/Adapter/ResidualFunctionAdapter.h
+//! @file      Fit/Residual/ResidualFunctionAdapter.h
 //! @brief     Defines class ResidualFunctionAdapter.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,10 +15,10 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_FIT_ADAPTER_RESIDUALFUNCTIONADAPTER_H
-#define BORNAGAIN_FIT_ADAPTER_RESIDUALFUNCTIONADAPTER_H
+#ifndef BORNAGAIN_FIT_RESIDUAL_RESIDUALFUNCTIONADAPTER_H
+#define BORNAGAIN_FIT_RESIDUAL_RESIDUALFUNCTIONADAPTER_H
 
-#include "Fit/Adapter/IFunctionAdapter.h"
+#include "Fit/Residual/IFunctionAdapter.h"
 #include "Fit/Minimizer/Types.h"
 #include "Fit/Param/Parameters.h"
 #include <functional>
@@ -59,4 +59,4 @@ private:
 
 } // namespace mumufit
 
-#endif // BORNAGAIN_FIT_ADAPTER_RESIDUALFUNCTIONADAPTER_H
+#endif // BORNAGAIN_FIT_RESIDUAL_RESIDUALFUNCTIONADAPTER_H
diff --git a/Fit/Adapter/RootResidualFunction.cpp b/Fit/Residual/RootResidualFunction.cpp
similarity index 96%
rename from Fit/Adapter/RootResidualFunction.cpp
rename to Fit/Residual/RootResidualFunction.cpp
index 054f30b3ac4..4c849c737ac 100644
--- a/Fit/Adapter/RootResidualFunction.cpp
+++ b/Fit/Residual/RootResidualFunction.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Fit/Adapter/RootResidualFunction.cpp
+//! @file      Fit/Residual/RootResidualFunction.cpp
 //! @brief     Implements class RootResidualFunction.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/Adapter/RootResidualFunction.h"
+#include "Fit/Residual/RootResidualFunction.h"
 
 #include <utility>
 
diff --git a/Fit/Adapter/RootResidualFunction.h b/Fit/Residual/RootResidualFunction.h
similarity index 90%
rename from Fit/Adapter/RootResidualFunction.h
rename to Fit/Residual/RootResidualFunction.h
index 65af33fdbf4..9496b65d1ca 100644
--- a/Fit/Adapter/RootResidualFunction.h
+++ b/Fit/Residual/RootResidualFunction.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Fit/Adapter/RootResidualFunction.h
+//! @file      Fit/Residual/RootResidualFunction.h
 //! @brief     Declares class RootResidualFunction.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_FIT_ADAPTER_ROOTRESIDUALFUNCTION_H
-#define BORNAGAIN_FIT_ADAPTER_ROOTRESIDUALFUNCTION_H
+#ifndef BORNAGAIN_FIT_RESIDUAL_ROOTRESIDUALFUNCTION_H
+#define BORNAGAIN_FIT_RESIDUAL_ROOTRESIDUALFUNCTION_H
 
 #include "Fit/Minimizer/Types.h"
 
@@ -58,4 +58,4 @@ private:
     size_t m_datasize;
 };
 
-#endif // BORNAGAIN_FIT_ADAPTER_ROOTRESIDUALFUNCTION_H
+#endif // BORNAGAIN_FIT_RESIDUAL_ROOTRESIDUALFUNCTION_H
diff --git a/Fit/Adapter/RootScalarFunction.cpp b/Fit/Residual/RootScalarFunction.cpp
similarity index 88%
rename from Fit/Adapter/RootScalarFunction.cpp
rename to Fit/Residual/RootScalarFunction.cpp
index a9c3ed8cc14..02719293b6a 100644
--- a/Fit/Adapter/RootScalarFunction.cpp
+++ b/Fit/Residual/RootScalarFunction.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Fit/Adapter/RootScalarFunction.cpp
+//! @file      Fit/Residual/RootScalarFunction.cpp
 //! @brief     Implements class RootScalarFunction
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/Adapter/RootScalarFunction.h"
+#include "Fit/Residual/RootScalarFunction.h"
 
 RootScalarFunction::RootScalarFunction(root_scalar_t fcn, int ndims)
     : ROOT::Math::Functor(fcn, static_cast<unsigned int>(ndims))
diff --git a/Fit/Adapter/RootScalarFunction.h b/Fit/Residual/RootScalarFunction.h
similarity index 83%
rename from Fit/Adapter/RootScalarFunction.h
rename to Fit/Residual/RootScalarFunction.h
index 4399bd8d8ad..9bd1fe0ced7 100644
--- a/Fit/Adapter/RootScalarFunction.h
+++ b/Fit/Residual/RootScalarFunction.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Fit/Adapter/RootScalarFunction.h
+//! @file      Fit/Residual/RootScalarFunction.h
 //! @brief     Defines classes RootScalarFunction
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_FIT_ADAPTER_ROOTSCALARFUNCTION_H
-#define BORNAGAIN_FIT_ADAPTER_ROOTSCALARFUNCTION_H
+#ifndef BORNAGAIN_FIT_RESIDUAL_ROOTSCALARFUNCTION_H
+#define BORNAGAIN_FIT_RESIDUAL_ROOTSCALARFUNCTION_H
 
 #include "Fit/Minimizer/Types.h"
 
@@ -36,4 +36,4 @@ public:
     RootScalarFunction(root_scalar_t fcn, int ndims);
 };
 
-#endif // BORNAGAIN_FIT_ADAPTER_ROOTSCALARFUNCTION_H
+#endif // BORNAGAIN_FIT_RESIDUAL_ROOTSCALARFUNCTION_H
diff --git a/Fit/Adapter/ScalarFunctionAdapter.cpp b/Fit/Residual/ScalarFunctionAdapter.cpp
similarity index 89%
rename from Fit/Adapter/ScalarFunctionAdapter.cpp
rename to Fit/Residual/ScalarFunctionAdapter.cpp
index a5b030cec20..fa88a7cea19 100644
--- a/Fit/Adapter/ScalarFunctionAdapter.cpp
+++ b/Fit/Residual/ScalarFunctionAdapter.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Fit/Adapter/ScalarFunctionAdapter.cpp
+//! @file      Fit/Residual/ScalarFunctionAdapter.cpp
 //! @brief     Defines class ScalarFunctionAdapter.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,9 +12,9 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/Adapter/ScalarFunctionAdapter.h"
+#include "Fit/Residual/ScalarFunctionAdapter.h"
 
-#include "Fit/Adapter/RootScalarFunction.h"
+#include "Fit/Residual/RootScalarFunction.h"
 #include <utility>
 
 using namespace mumufit;
diff --git a/Fit/Adapter/ScalarFunctionAdapter.h b/Fit/Residual/ScalarFunctionAdapter.h
similarity index 85%
rename from Fit/Adapter/ScalarFunctionAdapter.h
rename to Fit/Residual/ScalarFunctionAdapter.h
index 0894995ec5d..d2c989efb24 100644
--- a/Fit/Adapter/ScalarFunctionAdapter.h
+++ b/Fit/Residual/ScalarFunctionAdapter.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Fit/Adapter/ScalarFunctionAdapter.h
+//! @file      Fit/Residual/ScalarFunctionAdapter.h
 //! @brief     Defines class ScalarFunctionAdapter.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,10 +15,10 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_FIT_ADAPTER_SCALARFUNCTIONADAPTER_H
-#define BORNAGAIN_FIT_ADAPTER_SCALARFUNCTIONADAPTER_H
+#ifndef BORNAGAIN_FIT_RESIDUAL_SCALARFUNCTIONADAPTER_H
+#define BORNAGAIN_FIT_RESIDUAL_SCALARFUNCTIONADAPTER_H
 
-#include "Fit/Adapter/IFunctionAdapter.h"
+#include "Fit/Residual/IFunctionAdapter.h"
 #include "Fit/Minimizer/Types.h"
 #include "Fit/Param/Parameters.h"
 #include <functional>
@@ -49,4 +49,4 @@ private:
 
 } // namespace mumufit
 
-#endif // BORNAGAIN_FIT_ADAPTER_SCALARFUNCTIONADAPTER_H
+#endif // BORNAGAIN_FIT_RESIDUAL_SCALARFUNCTIONADAPTER_H
-- 
GitLab