From 4c798205fbbfc0a2fc6382f80cc8622cb799df45 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Tue, 9 Nov 2021 15:34:21 +0100
Subject: [PATCH] mv PyFmt to Base/Utils; has nothing to do with other files in
 Base/Py

---
 Base/{Py => Utils}/PyFmt.cpp                            | 4 ++--
 Base/{Py => Utils}/PyFmt.h                              | 8 ++++----
 Core/Export/PyFmt2.cpp                                  | 2 +-
 Core/Export/PyFmtLimits.cpp                             | 2 +-
 Core/Export/SampleToPython.cpp                          | 2 +-
 Core/Export/SimulationToPython.cpp                      | 2 +-
 GUI/View/Intensity/PlotEventInfo.cpp                    | 2 +-
 GUI/View/Projection/SaveProjectionsAssistant.cpp        | 2 +-
 Param/Distrib/Distributions.cpp                         | 2 +-
 Sample/Correlations/FTDecay1D.cpp                       | 2 +-
 Sample/Correlations/FTDecay2D.cpp                       | 2 +-
 Sample/Correlations/FTDistributions1D.cpp               | 2 +-
 Sample/Correlations/FTDistributions2D.cpp               | 2 +-
 Sample/Interface/LayerRoughness.cpp                     | 2 +-
 Sample/Scattering/IFormFactor.cpp                       | 2 +-
 Sample/SoftParticle/FormFactorSphereLogNormalRadius.cpp | 2 +-
 Tests/Functional/PyEmbedded/Tests.cpp                   | 2 +-
 Tests/Unit/Core/PythonFormattingTest.cpp                | 2 +-
 18 files changed, 22 insertions(+), 22 deletions(-)
 rename Base/{Py => Utils}/PyFmt.cpp (98%)
 rename Base/{Py => Utils}/PyFmt.h (95%)

diff --git a/Base/Py/PyFmt.cpp b/Base/Utils/PyFmt.cpp
similarity index 98%
rename from Base/Py/PyFmt.cpp
rename to Base/Utils/PyFmt.cpp
index 1de783d8ae4..c51cb39bb88 100644
--- a/Base/Py/PyFmt.cpp
+++ b/Base/Utils/PyFmt.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Base/Py/PyFmt.cpp
+//! @file      Base/Utils/PyFmt.cpp
 //! @brief     Implements functions from namespace pyfmt.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Base/Py/PyFmt.h"
+#include "Base/Utils/PyFmt.h"
 #include "Base/Const/Units.h" // printDegrees
 #include "Base/Math/Constants.h"
 #include "Base/Utils/Algorithms.h"
diff --git a/Base/Py/PyFmt.h b/Base/Utils/PyFmt.h
similarity index 95%
rename from Base/Py/PyFmt.h
rename to Base/Utils/PyFmt.h
index 1e15f14f06e..7c08e9b4b95 100644
--- a/Base/Py/PyFmt.h
+++ b/Base/Utils/PyFmt.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Base/Py/PyFmt.h
+//! @file      Base/Utils/PyFmt.h
 //! @brief     Defines namespace pyfmt.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,8 +17,8 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_BASE_PY_PYFMT_H
-#define BORNAGAIN_BASE_PY_PYFMT_H
+#ifndef BORNAGAIN_BASE_UTILS_PYFMT_H
+#define BORNAGAIN_BASE_UTILS_PYFMT_H
 
 #include "Base/Vector/Vectors3D.h"
 #include <string>
@@ -74,5 +74,5 @@ std::string indent(size_t width = 4u);
 
 } // namespace Py::Fmt
 
-#endif // BORNAGAIN_BASE_PY_PYFMT_H
+#endif // BORNAGAIN_BASE_UTILS_PYFMT_H
 #endif // USER_API
diff --git a/Core/Export/PyFmt2.cpp b/Core/Export/PyFmt2.cpp
index 0d8415184b1..1e330560880 100644
--- a/Core/Export/PyFmt2.cpp
+++ b/Core/Export/PyFmt2.cpp
@@ -17,7 +17,7 @@
 #include "Base/Axis/PointwiseAxis.h"
 #include "Base/Const/Units.h"
 #include "Base/Math/Constants.h"
-#include "Base/Py/PyFmt.h"
+#include "Base/Utils/PyFmt.h"
 #include "Base/Utils/Algorithms.h"
 #include "Base/Utils/StringUtils.h"
 #include "Core/Export/PyFmtLimits.h"
diff --git a/Core/Export/PyFmtLimits.cpp b/Core/Export/PyFmtLimits.cpp
index f8edfa3dda5..9674b8b1a44 100644
--- a/Core/Export/PyFmtLimits.cpp
+++ b/Core/Export/PyFmtLimits.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Core/Export/PyFmtLimits.h"
-#include "Base/Py/PyFmt.h"
+#include "Base/Utils/PyFmt.h"
 #include "Fit/Param/RealLimits.h"
 #include <iomanip>
 
diff --git a/Core/Export/SampleToPython.cpp b/Core/Export/SampleToPython.cpp
index 5670f02f9a5..f4c51180a95 100644
--- a/Core/Export/SampleToPython.cpp
+++ b/Core/Export/SampleToPython.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Core/Export/SampleToPython.h"
-#include "Base/Py/PyFmt.h"
+#include "Base/Utils/PyFmt.h"
 #include "Base/Utils/Assert.h"
 #include "Base/Vector/Transform3D.h"
 #include "Core/Export/ComponentKeyHandler.h"
diff --git a/Core/Export/SimulationToPython.cpp b/Core/Export/SimulationToPython.cpp
index 5e27d3a1abd..a45e1132c73 100644
--- a/Core/Export/SimulationToPython.cpp
+++ b/Core/Export/SimulationToPython.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Core/Export/SimulationToPython.h"
-#include "Base/Py/PyFmt.h"
+#include "Base/Utils/PyFmt.h"
 #include "Base/Utils/Algorithms.h"
 #include "Core/Background/ConstantBackground.h"
 #include "Core/Background/PoissonNoiseBackground.h"
diff --git a/GUI/View/Intensity/PlotEventInfo.cpp b/GUI/View/Intensity/PlotEventInfo.cpp
index 4a1f8ca8231..536cc98cdcb 100644
--- a/GUI/View/Intensity/PlotEventInfo.cpp
+++ b/GUI/View/Intensity/PlotEventInfo.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Intensity/PlotEventInfo.h"
-#include "Base/Py/PyFmt.h"
+#include "Base/Utils/PyFmt.h"
 
 PlotEventInfo::PlotEventInfo(PLOT_TYPE type)
     : m_in_axes_range(false)
diff --git a/GUI/View/Projection/SaveProjectionsAssistant.cpp b/GUI/View/Projection/SaveProjectionsAssistant.cpp
index c8e3386971a..416d7b18474 100644
--- a/GUI/View/Projection/SaveProjectionsAssistant.cpp
+++ b/GUI/View/Projection/SaveProjectionsAssistant.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Projection/SaveProjectionsAssistant.h"
-#include "Base/Py/PyFmt.h"
+#include "Base/Utils/PyFmt.h"
 #include "Device/Histo/Histogram1D.h"
 #include "Device/Histo/Histogram2D.h"
 #include "GUI/Application/GlobalSettings.h"
diff --git a/Param/Distrib/Distributions.cpp b/Param/Distrib/Distributions.cpp
index d4e19966028..3ace290ab31 100644
--- a/Param/Distrib/Distributions.cpp
+++ b/Param/Distrib/Distributions.cpp
@@ -14,7 +14,7 @@
 
 #include "Param/Distrib/Distributions.h"
 #include "Base/Math/Constants.h"
-#include "Base/Py/PyFmt.h"
+#include "Base/Utils/PyFmt.h"
 #include "Param/Distrib/ParameterSample.h"
 #include <algorithm>
 #include <cmath>
diff --git a/Sample/Correlations/FTDecay1D.cpp b/Sample/Correlations/FTDecay1D.cpp
index fb7a242bb4d..31d1fe772ac 100644
--- a/Sample/Correlations/FTDecay1D.cpp
+++ b/Sample/Correlations/FTDecay1D.cpp
@@ -14,7 +14,7 @@
 
 #include "Sample/Correlations/FTDecay1D.h"
 #include "Base/Math/Functions.h"
-#include "Base/Py/PyFmt.h"
+#include "Base/Utils/PyFmt.h"
 #include "Base/Utils/Assert.h"
 #include <algorithm>
 
diff --git a/Sample/Correlations/FTDecay2D.cpp b/Sample/Correlations/FTDecay2D.cpp
index 7b9d6be9904..75e6f1b5c7c 100644
--- a/Sample/Correlations/FTDecay2D.cpp
+++ b/Sample/Correlations/FTDecay2D.cpp
@@ -14,7 +14,7 @@
 
 #include "Sample/Correlations/FTDecay2D.h"
 #include "Base/Math/Functions.h"
-#include "Base/Py/PyFmt.h"
+#include "Base/Utils/PyFmt.h"
 #include "Base/Utils/Assert.h"
 #include <algorithm>
 
diff --git a/Sample/Correlations/FTDistributions1D.cpp b/Sample/Correlations/FTDistributions1D.cpp
index 1d2c9968d9c..0d59b3468f3 100644
--- a/Sample/Correlations/FTDistributions1D.cpp
+++ b/Sample/Correlations/FTDistributions1D.cpp
@@ -15,7 +15,7 @@
 #include "Sample/Correlations/FTDistributions1D.h"
 #include "Base/Math/Constants.h"
 #include "Base/Math/Functions.h"
-#include "Base/Py/PyFmt.h"
+#include "Base/Utils/PyFmt.h"
 #include "Base/Utils/Assert.h"
 #include <limits>
 
diff --git a/Sample/Correlations/FTDistributions2D.cpp b/Sample/Correlations/FTDistributions2D.cpp
index a691271ecb2..1041bab1084 100644
--- a/Sample/Correlations/FTDistributions2D.cpp
+++ b/Sample/Correlations/FTDistributions2D.cpp
@@ -15,7 +15,7 @@
 #include "Sample/Correlations/FTDistributions2D.h"
 #include "Base/Math/Bessel.h"
 #include "Base/Math/IntegratorGK.h"
-#include "Base/Py/PyFmt.h"
+#include "Base/Utils/PyFmt.h"
 #include "Base/Utils/Assert.h"
 #include <limits>
 
diff --git a/Sample/Interface/LayerRoughness.cpp b/Sample/Interface/LayerRoughness.cpp
index 677e3a3e4e6..998c792db23 100644
--- a/Sample/Interface/LayerRoughness.cpp
+++ b/Sample/Interface/LayerRoughness.cpp
@@ -14,7 +14,7 @@
 
 #include "Sample/Interface/LayerRoughness.h"
 #include "Base/Math/Constants.h"
-#include "Base/Py/PyFmt.h"
+#include "Base/Utils/PyFmt.h"
 #include "Fit/Param/RealLimits.h"
 
 //! Constructor of layer roughness.
diff --git a/Sample/Scattering/IFormFactor.cpp b/Sample/Scattering/IFormFactor.cpp
index d36f07eeca6..baf23bd36d5 100644
--- a/Sample/Scattering/IFormFactor.cpp
+++ b/Sample/Scattering/IFormFactor.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Sample/Scattering/IFormFactor.h"
-#include "Base/Py/PyFmt.h"
+#include "Base/Utils/PyFmt.h"
 #include "Base/Utils/StringUtils.h"
 #include "Base/Vector/WavevectorInfo.h"
 #include "Sample/Scattering/FormFactorDecoratorPositionFactor.h"
diff --git a/Sample/SoftParticle/FormFactorSphereLogNormalRadius.cpp b/Sample/SoftParticle/FormFactorSphereLogNormalRadius.cpp
index 70099662b6a..2679e1b6ad5 100644
--- a/Sample/SoftParticle/FormFactorSphereLogNormalRadius.cpp
+++ b/Sample/SoftParticle/FormFactorSphereLogNormalRadius.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Sample/SoftParticle/FormFactorSphereLogNormalRadius.h"
-#include "Base/Py/PyFmt.h"
+#include "Base/Utils/PyFmt.h"
 #include "Param/Distrib/Distributions.h"
 #include "Param/Distrib/ParameterSample.h"
 #include "Sample/LibFF/SomeFormFactors.h"
diff --git a/Tests/Functional/PyEmbedded/Tests.cpp b/Tests/Functional/PyEmbedded/Tests.cpp
index 3f81124835b..607b7931262 100644
--- a/Tests/Functional/PyEmbedded/Tests.cpp
+++ b/Tests/Functional/PyEmbedded/Tests.cpp
@@ -14,7 +14,7 @@
 #include "BABuild.h"
 #include "BAVersion.h"
 #include "Base/Py/PyCore.h"
-#include "Base/Py/PyFmt.h"
+#include "Base/Utils/PyFmt.h"
 #include "Base/Py/PyUtils.h"
 #include "Base/Utils/SysUtils.h"
 #include "Core/Export/ExportToPython.h"
diff --git a/Tests/Unit/Core/PythonFormattingTest.cpp b/Tests/Unit/Core/PythonFormattingTest.cpp
index 3e604c89f76..e0e6525d5b9 100644
--- a/Tests/Unit/Core/PythonFormattingTest.cpp
+++ b/Tests/Unit/Core/PythonFormattingTest.cpp
@@ -1,5 +1,5 @@
 #include "Base/Const/Units.h"
-#include "Base/Py/PyFmt.h"
+#include "Base/Utils/PyFmt.h"
 #include "Core/Export/PyFmt2.h"
 #include "Core/Export/PyFmtLimits.h"
 #include "Param/Distrib/Distributions.h"
-- 
GitLab