From 10f2619051b3c0e4cd7bdcd0bcd6d1de1ab5aba5 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 9 Oct 2020 12:14:21 +0200
Subject: [PATCH] clang-format
---
Core/Aggregate/InterferenceFunction2DParaCrystal.cpp | 3 +--
Core/Aggregate/ParticleLayout.cpp | 4 ++--
Core/Computation/ProcessedSample.cpp | 2 +-
Core/Data/OutputData.h | 2 +-
Core/Detector/DetectorFunctions.cpp | 2 +-
Core/Detector/IDetector.cpp | 6 +++---
Core/Detector/RectangularDetector.cpp | 2 +-
Core/Detector/RectangularPixel.cpp | 2 +-
Core/Detector/SphericalDetector.cpp | 2 +-
Core/Export/SampleToPython.cpp | 4 ++--
Core/Export/SimulationToPython.cpp | 10 +++++-----
Core/Fitting/FitObjective.h | 2 +-
Core/Fitting/ObjectiveMetric.cpp | 2 +-
Core/Fitting/SimDataPair.cpp | 2 +-
Core/Histo/Histogram2D.cpp | 2 +-
Core/Histo/Histogram2D.h | 2 +-
Core/Histo/IHistogram.cpp | 2 +-
Core/InputOutput/IntensityDataIOFactory.cpp | 2 +-
Core/InputOutput/OutputDataReadStrategy.cpp | 2 +-
Core/InputOutput/OutputDataReader.cpp | 2 +-
Core/InputOutput/OutputDataWriteStrategy.cpp | 2 +-
Core/InputOutput/OutputDataWriter.cpp | 2 +-
Core/Instrument/Instrument.cpp | 2 +-
Core/Instrument/IntensityDataFunctions.cpp | 4 ++--
Core/Instrument/PyFmt2.cpp | 8 ++++----
Core/Instrument/SimulationResult.cpp | 2 +-
Core/Material/MaterialUtils.cpp | 1 -
Core/Multilayer/DecouplingApproximationStrategy.cpp | 2 +-
Core/Multilayer/PyImport.cpp | 2 +-
Core/Parametrization/DistributionHandler.cpp | 2 +-
Core/Parametrization/Distributions.cpp | 2 +-
Core/Parametrization/Distributions.h | 2 +-
Core/Parametrization/ParameterDistribution.h | 2 +-
Core/Parametrization/RangedDistributions.cpp | 2 +-
Core/Particle/IParticle.cpp | 2 +-
Core/Particle/ParticleDistribution.cpp | 4 ++--
Core/SampleBuilderEngine/SampleBuilderNode.cpp | 2 +-
Core/SampleBuilderEngine/SampleProvider.h | 2 +-
Core/Scan/AngularSpecScan.cpp | 6 +++---
Core/Scan/QSpecScan.cpp | 6 +++---
Core/Scattering/IFormFactorBorn.cpp | 1 -
Core/Simulation/DepthProbeSimulation.cpp | 4 ++--
Core/Simulation/OffSpecSimulation.cpp | 6 +++---
Core/Simulation/Simulation.cpp | 2 +-
Core/Simulation/Simulation.h | 2 +-
Core/Simulation/SimulationFactory.cpp | 2 +-
Core/Simulation/SpecularSimulation.cpp | 8 ++++----
Core/Simulation/StandardSimulations.cpp | 10 +++++-----
Core/Simulation/UnitConverterUtils.cpp | 6 +++---
Core/Unit/UnitConverter1D.cpp | 2 +-
Examples/cpp/CylindersAndPrisms/CylindersAndPrisms.cpp | 2 +-
GUI/coregui/Models/DomainObjectBuilder.cpp | 2 +-
GUI/coregui/Models/DomainSimulationBuilder.cpp | 2 +-
GUI/coregui/Models/PointwiseAxisItem.cpp | 2 +-
GUI/coregui/Models/TransformFromDomain.cpp | 8 ++++----
GUI/coregui/Models/TransformToDomain.cpp | 4 ++--
GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.cpp | 2 +-
.../ImportDataWidgets/RealDataSelectorActions.cpp | 2 +-
.../IntensityDataWidgets/SaveProjectionsAssistant.cpp | 2 +-
GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp | 2 +-
GUI/coregui/utils/ImportDataInfo.cpp | 2 +-
Param/Base/IParameterized.cpp | 2 +-
Param/Base/ParameterPool.cpp | 2 +-
Param/Base/RealParameter.h | 4 ++--
Param/Node/INode.cpp | 4 ++--
Param/Node/INode.h | 2 +-
Param/Node/INodeVisitor.cpp | 2 +-
Param/Node/NodeUtils.cpp | 4 ++--
Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp | 2 +-
.../Core/CoreSpecial/FourierTransformationTest.cpp | 2 +-
Tests/Functional/GUI/Translate/GUITranslationTest.cpp | 2 +-
Tests/Functional/Python/PyEmbedded/Tests.cpp | 4 ++--
Tests/Performance/Core/CoreIO.cpp | 2 +-
Tests/UnitTests/Core/Axes/UnitConverter1DTest.cpp | 2 +-
Tests/UnitTests/Core/DataStructure/IOStrategyTest.cpp | 2 +-
Tests/UnitTests/Core/DataStructure/OutputDataTest.cpp | 2 +-
.../Core/Detector/OffSpecularConverterTest.cpp | 2 +-
.../UnitTests/Core/Detector/SpecularDetector1DTest.cpp | 2 +-
.../UnitTests/Core/Detector/SphericalConverterTest.cpp | 2 +-
.../UnitTests/Core/Detector/SphericalDetectorTest.cpp | 6 +++---
.../Core/ExportToPython/PythonFormattingTest.cpp | 4 ++--
.../Core/Fresnel/DepthProbeSimulationTest.cpp | 2 +-
Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp | 4 ++--
.../UnitTests/Core/Fresnel/SpecularSimulationTest.cpp | 6 +++---
Tests/UnitTests/Core/Other/ChiSquaredModuleTest.cpp | 2 +-
Tests/UnitTests/Core/Other/SampleBuilderNodeTest.cpp | 2 +-
Tests/UnitTests/Core/Other/SampleProviderTest.cpp | 2 +-
Tests/UnitTests/Core/Other/SpectrumTest.cpp | 2 +-
.../Core/Parameters/ParameterDistributionTest.cpp | 2 +-
Tests/UnitTests/Core/Sample/INodeTest.cpp | 2 +-
.../UnitTests/Core/Sample/MultilayerAveragingTest.cpp | 2 +-
Tests/UnitTests/GUI/TestDetectorItems.cpp | 2 +-
.../UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp | 2 +-
Tests/UnitTests/GUI/TestOutputDataIOService.cpp | 2 +-
Tests/UnitTests/GUI/TestSavingSpecularData.cpp | 2 +-
Tests/UnitTests/GUI/Utils.cpp | 2 +-
96 files changed, 137 insertions(+), 140 deletions(-)
diff --git a/Core/Aggregate/InterferenceFunction2DParaCrystal.cpp b/Core/Aggregate/InterferenceFunction2DParaCrystal.cpp
index 3be8385bdd4..61dbb4ef89c 100644
--- a/Core/Aggregate/InterferenceFunction2DParaCrystal.cpp
+++ b/Core/Aggregate/InterferenceFunction2DParaCrystal.cpp
@@ -207,8 +207,7 @@ double InterferenceFunction2DParaCrystal::interference1D(double qx, double qy, d
tmp = 0.0;
else
tmp = std::pow(fp, n);
- complex_t intermediate =
- fp / (1.0 - fp) - fp * (1.0 - tmp) / nd / (1.0 - fp) / (1.0 - fp);
+ complex_t intermediate = fp / (1.0 - fp) - fp * (1.0 - tmp) / nd / (1.0 - fp) / (1.0 - fp);
return 1.0 + 2.0 * intermediate.real();
}
diff --git a/Core/Aggregate/ParticleLayout.cpp b/Core/Aggregate/ParticleLayout.cpp
index 54b0cb8ae0f..af28244428e 100644
--- a/Core/Aggregate/ParticleLayout.cpp
+++ b/Core/Aggregate/ParticleLayout.cpp
@@ -16,10 +16,10 @@
#include "Base/Types/Exceptions.h"
#include "Core/Aggregate/IInterferenceFunction.h"
#include "Core/Aggregate/InterferenceFunctionNone.h"
-#include "Param/Base/ParameterPool.h"
-#include "Param/Base/RealParameter.h"
#include "Core/Particle/Particle.h"
#include "Core/Particle/ParticleDistribution.h"
+#include "Param/Base/ParameterPool.h"
+#include "Param/Base/RealParameter.h"
namespace
{
diff --git a/Core/Computation/ProcessedSample.cpp b/Core/Computation/ProcessedSample.cpp
index d08b41cd028..b80f3e97bf1 100644
--- a/Core/Computation/ProcessedSample.cpp
+++ b/Core/Computation/ProcessedSample.cpp
@@ -22,8 +22,8 @@
#include "Core/Multilayer/MultiLayerUtils.h"
#include "Core/Multilayer/ScalarFresnelMap.h"
#include "Core/Multilayer/Slice.h"
-#include "Core/RT/SimulationOptions.h"
#include "Core/Particle/HomogeneousRegion.h"
+#include "Core/RT/SimulationOptions.h"
namespace
{
diff --git a/Core/Data/OutputData.h b/Core/Data/OutputData.h
index d2ed0094435..e6398d23efb 100644
--- a/Core/Data/OutputData.h
+++ b/Core/Data/OutputData.h
@@ -18,10 +18,10 @@
#include "Base/Types/SafePointerVector.h"
#include "Base/Utils/Assert.h"
#include "Base/Utils/PyObject.h"
+#include "Base/Utils/ThreadInfo.h"
#include "Core/Axis/FixedBinAxis.h"
#include "Core/Data/LLData.h"
#include "Core/Data/OutputDataIterator.h"
-#include "Base/Utils/ThreadInfo.h"
#include <sstream>
using std::size_t;
diff --git a/Core/Detector/DetectorFunctions.cpp b/Core/Detector/DetectorFunctions.cpp
index 56c2542b7c9..9f9cb3950c1 100644
--- a/Core/Detector/DetectorFunctions.cpp
+++ b/Core/Detector/DetectorFunctions.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Detector/DetectorFunctions.h"
+#include "Core/Data/OutputData.h"
#include "Core/Detector/SimulationArea.h"
#include "Core/Detector/SimulationAreaIterator.h"
-#include "Core/Data/OutputData.h"
#include "Fit/Tools/StringUtils.h"
#include <algorithm>
#include <cctype>
diff --git a/Core/Detector/IDetector.cpp b/Core/Detector/IDetector.cpp
index eebc8bac5e1..ee3cb6f18a1 100644
--- a/Core/Detector/IDetector.cpp
+++ b/Core/Detector/IDetector.cpp
@@ -14,13 +14,13 @@
#include "Core/Detector/IDetector.h"
#include "Core/Axis/IAxis.h"
-#include "Core/Resolution/ConvolutionDetectorResolution.h"
+#include "Core/Data/OutputData.h"
#include "Core/Detector/DetectorMask.h"
-#include "Core/Resolution/IDetectorResolution.h"
#include "Core/Detector/RegionOfInterest.h"
#include "Core/Detector/SimulationArea.h"
-#include "Core/Data/OutputData.h"
#include "Core/Pixel/SimulationElement.h"
+#include "Core/Resolution/ConvolutionDetectorResolution.h"
+#include "Core/Resolution/IDetectorResolution.h"
IDetector::IDetector()
{
diff --git a/Core/Detector/RectangularDetector.cpp b/Core/Detector/RectangularDetector.cpp
index 257e1c2609b..c2d30b1c4a7 100644
--- a/Core/Detector/RectangularDetector.cpp
+++ b/Core/Detector/RectangularDetector.cpp
@@ -16,10 +16,10 @@
#include "Base/Const/MathConstants.h"
#include "Base/Const/Units.h"
#include "Core/Beam/Beam.h"
-#include "Core/Resolution/IDetectorResolution.h"
#include "Core/Detector/RectangularPixel.h"
#include "Core/Detector/RegionOfInterest.h"
#include "Core/Pixel/SimulationElement.h"
+#include "Core/Resolution/IDetectorResolution.h"
RectangularDetector::RectangularDetector(size_t nxbins, double width, size_t nybins, double height)
: m_u0(0.0), m_v0(0.0), m_direction(kvector_t(0.0, -1.0, 0.0)), m_distance(0.0),
diff --git a/Core/Detector/RectangularPixel.cpp b/Core/Detector/RectangularPixel.cpp
index 0729da62d35..54f76981100 100644
--- a/Core/Detector/RectangularPixel.cpp
+++ b/Core/Detector/RectangularPixel.cpp
@@ -16,9 +16,9 @@
#include "Base/Const/MathConstants.h"
#include "Base/Const/Units.h"
#include "Core/Beam/Beam.h"
-#include "Core/Resolution/IDetectorResolution.h"
#include "Core/Detector/RegionOfInterest.h"
#include "Core/Pixel/SimulationElement.h"
+#include "Core/Resolution/IDetectorResolution.h"
RectangularPixel::RectangularPixel(kvector_t corner_pos, kvector_t width, kvector_t height)
: m_corner_pos(std::move(corner_pos)), m_width(std::move(width)), m_height(std::move(height))
diff --git a/Core/Detector/SphericalDetector.cpp b/Core/Detector/SphericalDetector.cpp
index 28fcee7bc99..79fa8a43c04 100644
--- a/Core/Detector/SphericalDetector.cpp
+++ b/Core/Detector/SphericalDetector.cpp
@@ -16,10 +16,10 @@
#include "Base/Const/MathConstants.h"
#include "Base/Const/Units.h"
#include "Core/Beam/Beam.h"
-#include "Core/Resolution/IDetectorResolution.h"
#include "Core/Detector/SphericalPixel.h"
#include "Core/Pixel/IPixel.h"
#include "Core/Pixel/SimulationElement.h"
+#include "Core/Resolution/IDetectorResolution.h"
SphericalDetector::SphericalDetector()
{
diff --git a/Core/Export/SampleToPython.cpp b/Core/Export/SampleToPython.cpp
index 1953fe6423e..ba621665543 100644
--- a/Core/Export/SampleToPython.cpp
+++ b/Core/Export/SampleToPython.cpp
@@ -13,11 +13,13 @@
// ************************************************************************** //
#include "Core/Export/SampleToPython.h"
+#include "Base/Utils/PyFmt.h"
#include "Base/Vector/Transform3D.h"
#include "Core/Aggregate/InterferenceFunctions.h"
#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Export/INodeUtils.h"
#include "Core/Export/SampleLabelHandler.h"
+#include "Core/Instrument/PyFmt2.h"
#include "Core/Lattice/Lattice.h"
#include "Core/Material/Material.h"
#include "Core/Multilayer/Layer.h"
@@ -25,14 +27,12 @@
#include "Core/Multilayer/LayerRoughness.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Parametrization/ParameterUtils.h"
-#include "Base/Utils/PyFmt.h"
#include "Core/Particle/Crystal.h"
#include "Core/Particle/MesoCrystal.h"
#include "Core/Particle/Particle.h"
#include "Core/Particle/ParticleComposition.h"
#include "Core/Particle/ParticleCoreShell.h"
#include "Core/Particle/ParticleDistribution.h"
-#include "Core/Instrument/PyFmt2.h"
#include "Core/Scattering/IFormFactor.h"
#include <iomanip>
#include <map>
diff --git a/Core/Export/SimulationToPython.cpp b/Core/Export/SimulationToPython.cpp
index a57b45ab077..896e38e2d05 100644
--- a/Core/Export/SimulationToPython.cpp
+++ b/Core/Export/SimulationToPython.cpp
@@ -14,22 +14,22 @@
#include "Core/Export/SimulationToPython.h"
#include "Base/Utils/Algorithms.h"
+#include "Base/Utils/PyFmt.h"
#include "Core/Beam/FootprintGauss.h"
#include "Core/Beam/FootprintSquare.h"
#include "Core/Computation/ConstantBackground.h"
#include "Core/Computation/PoissonNoiseBackground.h"
-#include "Core/Resolution/ConvolutionDetectorResolution.h"
#include "Core/Detector/RectangularDetector.h"
#include "Core/Detector/RegionOfInterest.h"
-#include "Core/Resolution/ResolutionFunction2DGaussian.h"
#include "Core/Detector/SphericalDetector.h"
#include "Core/Export/INodeUtils.h"
#include "Core/Export/SampleToPython.h"
-#include "Core/Scan/ISpecularScan.h"
+#include "Core/Instrument/PyFmt2.h"
#include "Core/Parametrization/ParameterUtils.h"
-#include "Base/Utils/PyFmt.h"
#include "Core/Parametrization/PyFmtLimits.h"
-#include "Core/Instrument/PyFmt2.h"
+#include "Core/Resolution/ConvolutionDetectorResolution.h"
+#include "Core/Resolution/ResolutionFunction2DGaussian.h"
+#include "Core/Scan/ISpecularScan.h"
#include "Core/Simulation/GISASSimulation.h"
#include "Core/Simulation/OffSpecSimulation.h"
#include "Core/Simulation/SpecularSimulation.h"
diff --git a/Core/Fitting/FitObjective.h b/Core/Fitting/FitObjective.h
index a77f393c89c..8d6522c4fa4 100644
--- a/Core/Fitting/FitObjective.h
+++ b/Core/Fitting/FitObjective.h
@@ -15,11 +15,11 @@
#ifndef BORNAGAIN_CORE_FITTING_FITOBJECTIVE_H
#define BORNAGAIN_CORE_FITTING_FITOBJECTIVE_H
+#include "Core/Data/OutputData.h"
#include "Core/Fitting/FitTypes.h"
#include "Core/Fitting/IterationInfo.h"
#include "Core/Fitting/SimDataPair.h"
#include "Core/Intensity/ArrayUtils.h"
-#include "Core/Data/OutputData.h"
#include "Fit/Kernel/MinimizerResult.h"
class FitStatus;
diff --git a/Core/Fitting/ObjectiveMetric.cpp b/Core/Fitting/ObjectiveMetric.cpp
index ee63213f625..d1d7061279f 100644
--- a/Core/Fitting/ObjectiveMetric.cpp
+++ b/Core/Fitting/ObjectiveMetric.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Fitting/ObjectiveMetric.h"
+#include "Core/Data/OutputData.h"
#include "Core/Fitting/ObjectiveMetricUtils.h"
#include "Core/Fitting/SimDataPair.h"
-#include "Core/Data/OutputData.h"
#include <cmath>
#include <limits>
diff --git a/Core/Fitting/SimDataPair.cpp b/Core/Fitting/SimDataPair.cpp
index 829106a3ac6..e244320af01 100644
--- a/Core/Fitting/SimDataPair.cpp
+++ b/Core/Fitting/SimDataPair.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Core/Fitting/SimDataPair.h"
-#include "Core/Instrument/IntensityDataFunctions.h"
#include "Core/Data/OutputData.h"
+#include "Core/Instrument/IntensityDataFunctions.h"
#include "Core/Simulation/Simulation.h"
#include "Core/Simulation/UnitConverterUtils.h"
#include "Fit/TestEngine/Numeric.h"
diff --git a/Core/Histo/Histogram2D.cpp b/Core/Histo/Histogram2D.cpp
index 05ba66e035a..a8b0009996a 100644
--- a/Core/Histo/Histogram2D.cpp
+++ b/Core/Histo/Histogram2D.cpp
@@ -14,8 +14,8 @@
#include "Core/Histo/Histogram2D.h"
#include "Core/Axis/VariableBinAxis.h"
-#include "Core/Intensity/ArrayUtils.h"
#include "Core/Histo/Histogram1D.h"
+#include "Core/Intensity/ArrayUtils.h"
#include <memory>
Histogram2D::Histogram2D(int nbinsx, double xlow, double xup, int nbinsy, double ylow, double yup)
diff --git a/Core/Histo/Histogram2D.h b/Core/Histo/Histogram2D.h
index ee7f16bc72f..31b2088fef4 100644
--- a/Core/Histo/Histogram2D.h
+++ b/Core/Histo/Histogram2D.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_CORE_INTENSITY_HISTOGRAM2D_H
#define BORNAGAIN_CORE_INTENSITY_HISTOGRAM2D_H
-#include "Core/Intensity/ArrayUtils.h"
#include "Core/Histo/IHistogram.h"
+#include "Core/Intensity/ArrayUtils.h"
//! Two dimensional histogram.
//! @ingroup tools
diff --git a/Core/Histo/IHistogram.cpp b/Core/Histo/IHistogram.cpp
index e799560e577..807cde9fb0f 100644
--- a/Core/Histo/IHistogram.cpp
+++ b/Core/Histo/IHistogram.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Histo/IHistogram.h"
-#include "Core/InputOutput/IntensityDataIOFactory.h" // TODO rm
#include "Core/Histo/Histogram1D.h"
#include "Core/Histo/Histogram2D.h"
+#include "Core/InputOutput/IntensityDataIOFactory.h" // TODO rm
#include "Fit/TestEngine/Numeric.h"
#include <memory>
diff --git a/Core/InputOutput/IntensityDataIOFactory.cpp b/Core/InputOutput/IntensityDataIOFactory.cpp
index 0327eac1d80..bf1b41e0e00 100644
--- a/Core/InputOutput/IntensityDataIOFactory.cpp
+++ b/Core/InputOutput/IntensityDataIOFactory.cpp
@@ -14,10 +14,10 @@
#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Base/Utils/FileSystemUtils.h"
+#include "Core/Histo/IHistogram.h"
#include "Core/InputOutput/OutputDataReadFactory.h"
#include "Core/InputOutput/OutputDataWriteFactory.h"
#include "Core/Instrument/SimulationResult.h"
-#include "Core/Histo/IHistogram.h"
#include <exception>
#include <fstream>
#include <memory>
diff --git a/Core/InputOutput/OutputDataReadStrategy.cpp b/Core/InputOutput/OutputDataReadStrategy.cpp
index b46be17cf7a..5fe2f3623cd 100644
--- a/Core/InputOutput/OutputDataReadStrategy.cpp
+++ b/Core/InputOutput/OutputDataReadStrategy.cpp
@@ -14,10 +14,10 @@
#include "Core/InputOutput/OutputDataReadStrategy.h"
#include "Core/Axis/PointwiseAxis.h"
+#include "Core/Data/OutputData.h"
#include "Core/InputOutput/DataFormatUtils.h"
#include "Core/InputOutput/TiffHandler.h"
#include "Core/Intensity/ArrayUtils.h"
-#include "Core/Data/OutputData.h"
#include <map>
#include <stdexcept> // need overlooked by g++ 5.4
diff --git a/Core/InputOutput/OutputDataReader.cpp b/Core/InputOutput/OutputDataReader.cpp
index 915a934bdb5..4045193f48f 100644
--- a/Core/InputOutput/OutputDataReader.cpp
+++ b/Core/InputOutput/OutputDataReader.cpp
@@ -14,8 +14,8 @@
#include "Core/InputOutput/OutputDataReader.h"
#include "Base/Utils/FileSystemUtils.h"
-#include "Core/InputOutput/DataFormatUtils.h"
#include "Core/Data/OutputData.h"
+#include "Core/InputOutput/DataFormatUtils.h"
#ifdef _WIN32
#pragma warning(push)
diff --git a/Core/InputOutput/OutputDataWriteStrategy.cpp b/Core/InputOutput/OutputDataWriteStrategy.cpp
index 6a1bb564330..9bd86aab550 100644
--- a/Core/InputOutput/OutputDataWriteStrategy.cpp
+++ b/Core/InputOutput/OutputDataWriteStrategy.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/InputOutput/OutputDataWriteStrategy.h"
+#include "Core/Data/OutputData.h" // needed by some compilers
#include "Core/InputOutput/TiffHandler.h"
#include "Core/Intensity/ArrayUtils.h"
-#include "Core/Data/OutputData.h" // needed by some compilers
#include <cmath>
#include <iomanip>
diff --git a/Core/InputOutput/OutputDataWriter.cpp b/Core/InputOutput/OutputDataWriter.cpp
index f6e13c2ebee..63bc3257d7c 100644
--- a/Core/InputOutput/OutputDataWriter.cpp
+++ b/Core/InputOutput/OutputDataWriter.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Core/InputOutput/OutputDataWriter.h"
-#include "Core/InputOutput/DataFormatUtils.h"
#include "Core/Data/OutputData.h"
+#include "Core/InputOutput/DataFormatUtils.h"
#ifdef _WIN32
#pragma warning(push)
#pragma warning(disable : 4244 4275)
diff --git a/Core/Instrument/Instrument.cpp b/Core/Instrument/Instrument.cpp
index d2e2fe2035d..1090f774e1e 100644
--- a/Core/Instrument/Instrument.cpp
+++ b/Core/Instrument/Instrument.cpp
@@ -15,10 +15,10 @@
#include "Core/Instrument/Instrument.h"
#include "Core/Beam/Beam.h"
#include "Core/Detector/DetectorFunctions.h"
-#include "Core/Resolution/IResolutionFunction2D.h"
#include "Core/Detector/SphericalDetector.h"
#include "Core/Histo/Histogram2D.h"
#include "Core/Pixel/SimulationElement.h"
+#include "Core/Resolution/IResolutionFunction2D.h"
Instrument::Instrument() : mP_detector(new SphericalDetector), m_beam(Beam::horizontalBeam())
{
diff --git a/Core/Instrument/IntensityDataFunctions.cpp b/Core/Instrument/IntensityDataFunctions.cpp
index be13aec1407..99c462d2ad5 100644
--- a/Core/Instrument/IntensityDataFunctions.cpp
+++ b/Core/Instrument/IntensityDataFunctions.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "Core/Instrument/IntensityDataFunctions.h"
-#include "Core/Resolution/ConvolutionDetectorResolution.h"
#include "Core/Detector/IDetector.h"
+#include "Core/Histo/IHistogram.h"
#include "Core/Instrument/FourierTransform.h"
#include "Core/Instrument/Instrument.h"
#include "Core/Instrument/SimulationResult.h"
#include "Core/Intensity/ArrayUtils.h"
-#include "Core/Histo/IHistogram.h"
+#include "Core/Resolution/ConvolutionDetectorResolution.h"
#include "Fit/TestEngine/Numeric.h"
#include <cmath>
#include <iostream>
diff --git a/Core/Instrument/PyFmt2.cpp b/Core/Instrument/PyFmt2.cpp
index 10c38aa96f4..82a1b2f6e99 100644
--- a/Core/Instrument/PyFmt2.cpp
+++ b/Core/Instrument/PyFmt2.cpp
@@ -16,6 +16,7 @@
#include "Base/Const/MathConstants.h"
#include "Base/Const/Units.h"
#include "Base/Utils/Algorithms.h"
+#include "Base/Utils/PyFmt.h"
#include "Core/Axis/FixedBinAxis.h"
#include "Core/Axis/PointwiseAxis.h"
#include "Core/Mask/Ellipse.h"
@@ -24,13 +25,12 @@
#include "Core/Mask/Polygon.h"
#include "Core/Mask/Rectangle.h"
#include "Core/Parametrization/Distributions.h"
-#include "Param/Base/IParameterized.h"
#include "Core/Parametrization/ParameterDistribution.h"
-#include "Param/Base/ParameterPool.h"
-#include "Base/Utils/PyFmt.h"
#include "Core/Parametrization/PyFmtLimits.h"
-#include "Param/Base/RealParameter.h"
#include "Fit/Tools/StringUtils.h"
+#include "Param/Base/IParameterized.h"
+#include "Param/Base/ParameterPool.h"
+#include "Param/Base/RealParameter.h"
#include <iomanip>
namespace pyfmt2
diff --git a/Core/Instrument/SimulationResult.cpp b/Core/Instrument/SimulationResult.cpp
index 3e728f57fca..57101b5ffd4 100644
--- a/Core/Instrument/SimulationResult.cpp
+++ b/Core/Instrument/SimulationResult.cpp
@@ -14,8 +14,8 @@
#include "Core/Instrument/SimulationResult.h"
#include "Core/Axis/FixedBinAxis.h"
-#include "Core/Histo/Histogram2D.h"
#include "Core/Data/OutputData.h"
+#include "Core/Histo/Histogram2D.h"
SimulationResult::SimulationResult(const OutputData<double>& data,
const IUnitConverter& unit_converter)
diff --git a/Core/Material/MaterialUtils.cpp b/Core/Material/MaterialUtils.cpp
index a0dafebeba3..c7b811cd41b 100644
--- a/Core/Material/MaterialUtils.cpp
+++ b/Core/Material/MaterialUtils.cpp
@@ -54,7 +54,6 @@ template Eigen::Matrix2cd MaterialUtils::MagnetizationCorrection(complex_t unit_
double magnetic_factor,
cvector_t polarization);
-
complex_t MaterialUtils::ScalarReducedPotential(complex_t n, kvector_t k, double n_ref)
{
return n * n - n_ref * n_ref * k.sin2Theta();
diff --git a/Core/Multilayer/DecouplingApproximationStrategy.cpp b/Core/Multilayer/DecouplingApproximationStrategy.cpp
index e3f64b36774..908c8bd911b 100644
--- a/Core/Multilayer/DecouplingApproximationStrategy.cpp
+++ b/Core/Multilayer/DecouplingApproximationStrategy.cpp
@@ -18,8 +18,8 @@
#include "Core/Aggregate/IInterferenceFunction.h"
#include "Core/Multilayer/FormFactorCoherentSum.h"
#include "Core/Multilayer/InterferenceFunctionUtils.h"
-#include "Param/Base/RealParameter.h"
#include "Core/Pixel/SimulationElement.h"
+#include "Param/Base/RealParameter.h"
using InterferenceFunctionUtils::PrecomputePolarizedFormFactors;
using InterferenceFunctionUtils::PrecomputeScalarFormFactors;
diff --git a/Core/Multilayer/PyImport.cpp b/Core/Multilayer/PyImport.cpp
index 2732487f770..741c8a4c8a4 100644
--- a/Core/Multilayer/PyImport.cpp
+++ b/Core/Multilayer/PyImport.cpp
@@ -15,9 +15,9 @@
#ifdef BORNAGAIN_PYTHON
#include "Core/Multilayer/PyImport.h"
+#include "Base/Utils/PyEmbeddedUtils.h"
#include "Base/Utils/PythonCore.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Base/Utils/PyEmbeddedUtils.h"
namespace
{
diff --git a/Core/Parametrization/DistributionHandler.cpp b/Core/Parametrization/DistributionHandler.cpp
index f4d8dd05e5f..9af3eefa968 100644
--- a/Core/Parametrization/DistributionHandler.cpp
+++ b/Core/Parametrization/DistributionHandler.cpp
@@ -15,8 +15,8 @@
#include "Core/Parametrization/DistributionHandler.h"
#include "Base/Types/Exceptions.h"
#include "Core/Parametrization/Distributions.h"
-#include "Param/Base/ParameterPool.h"
#include "Core/Parametrization/ParameterSample.h"
+#include "Param/Base/ParameterPool.h"
DistributionHandler::DistributionHandler() : m_nbr_combinations(1)
{
diff --git a/Core/Parametrization/Distributions.cpp b/Core/Parametrization/Distributions.cpp
index 47c802ca3cb..c9e433474e6 100644
--- a/Core/Parametrization/Distributions.cpp
+++ b/Core/Parametrization/Distributions.cpp
@@ -15,8 +15,8 @@
#include "Core/Parametrization/Distributions.h"
#include "Base/Const/MathConstants.h"
#include "Base/Types/Exceptions.h"
-#include "Param/Base/ParameterPool.h"
#include "Core/Parametrization/ParameterSample.h"
+#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
#include <algorithm>
#include <cmath>
diff --git a/Core/Parametrization/Distributions.h b/Core/Parametrization/Distributions.h
index d51d8f2b1a3..f4c1512b377 100644
--- a/Core/Parametrization/Distributions.h
+++ b/Core/Parametrization/Distributions.h
@@ -16,8 +16,8 @@
#define BORNAGAIN_CORE_PARAMETRIZATION_DISTRIBUTIONS_H
#include "Base/Types/ICloneable.h"
-#include "Param/Node/INode.h"
#include "Fit/Tools/RealLimits.h"
+#include "Param/Node/INode.h"
#include <vector>
class ParameterSample;
diff --git a/Core/Parametrization/ParameterDistribution.h b/Core/Parametrization/ParameterDistribution.h
index 2376064aeee..4e133c121cf 100644
--- a/Core/Parametrization/ParameterDistribution.h
+++ b/Core/Parametrization/ParameterDistribution.h
@@ -15,9 +15,9 @@
#ifndef BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERDISTRIBUTION_H
#define BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERDISTRIBUTION_H
-#include "Param/Base/IParameterized.h"
#include "Core/Parametrization/ParameterSample.h"
#include "Fit/Tools/RealLimits.h"
+#include "Param/Base/IParameterized.h"
#include <memory>
#include <vector>
diff --git a/Core/Parametrization/RangedDistributions.cpp b/Core/Parametrization/RangedDistributions.cpp
index 5a7627e4fa2..ad345236a38 100644
--- a/Core/Parametrization/RangedDistributions.cpp
+++ b/Core/Parametrization/RangedDistributions.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Parametrization/RangedDistributions.h"
+#include "Base/Utils/PyFmt.h"
#include "Core/Parametrization/Distributions.h"
#include "Core/Parametrization/ParameterSample.h"
-#include "Base/Utils/PyFmt.h"
#include "Core/Parametrization/PyFmtLimits.h"
#include <limits>
diff --git a/Core/Particle/IParticle.cpp b/Core/Particle/IParticle.cpp
index 0e6ff30e5bb..cb1b13f9712 100644
--- a/Core/Particle/IParticle.cpp
+++ b/Core/Particle/IParticle.cpp
@@ -13,11 +13,11 @@
// ************************************************************************** //
#include "Core/Particle/IParticle.h"
-#include "Param/Base/RealParameter.h"
#include "Core/Particle/SlicedParticle.h"
#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
#include "Core/Scattering/Rotations.h"
#include "Core/Scattering/ZLimits.h"
+#include "Param/Base/RealParameter.h"
IParticle::~IParticle() = default;
diff --git a/Core/Particle/ParticleDistribution.cpp b/Core/Particle/ParticleDistribution.cpp
index 58bb527f929..9956ae434d3 100644
--- a/Core/Particle/ParticleDistribution.cpp
+++ b/Core/Particle/ParticleDistribution.cpp
@@ -15,11 +15,11 @@
#include "Core/Particle/ParticleDistribution.h"
#include "Base/Types/Exceptions.h"
#include "Core/Parametrization/Distributions.h"
-#include "Param/Base/ParameterPool.h"
#include "Core/Parametrization/ParameterSample.h"
#include "Core/Parametrization/ParameterUtils.h"
-#include "Param/Base/RealParameter.h"
#include "Core/Particle/IParticle.h"
+#include "Param/Base/ParameterPool.h"
+#include "Param/Base/RealParameter.h"
#include <map>
ParticleDistribution::ParticleDistribution(const IParticle& prototype,
diff --git a/Core/SampleBuilderEngine/SampleBuilderNode.cpp b/Core/SampleBuilderEngine/SampleBuilderNode.cpp
index 511f7c92c31..87e3ff6ce81 100644
--- a/Core/SampleBuilderEngine/SampleBuilderNode.cpp
+++ b/Core/SampleBuilderEngine/SampleBuilderNode.cpp
@@ -15,8 +15,8 @@
#include "Core/SampleBuilderEngine/SampleBuilderNode.h"
#include "Base/Utils/Assert.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Param/Base/ParameterPool.h"
#include "Core/SampleBuilderEngine/ISampleBuilder.h"
+#include "Param/Base/ParameterPool.h"
#include <stdexcept>
namespace
diff --git a/Core/SampleBuilderEngine/SampleProvider.h b/Core/SampleBuilderEngine/SampleProvider.h
index e95ff3b28f7..8d7d5ce1b06 100644
--- a/Core/SampleBuilderEngine/SampleProvider.h
+++ b/Core/SampleBuilderEngine/SampleProvider.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_CORE_SAMPLEBUILDERENGINE_SAMPLEPROVIDER_H
#define BORNAGAIN_CORE_SAMPLEBUILDERENGINE_SAMPLEPROVIDER_H
-#include "Param/Node/INode.h"
#include "Core/SampleBuilderEngine/SampleBuilderNode.h"
+#include "Param/Node/INode.h"
class MultiLayer;
diff --git a/Core/Scan/AngularSpecScan.cpp b/Core/Scan/AngularSpecScan.cpp
index aec853a175d..41ae500566c 100644
--- a/Core/Scan/AngularSpecScan.cpp
+++ b/Core/Scan/AngularSpecScan.cpp
@@ -13,15 +13,15 @@
// ************************************************************************** //
#include "Core/Scan/AngularSpecScan.h"
+#include "Base/Utils/PyFmt.h"
#include "Core/Axis/FixedBinAxis.h"
#include "Core/Axis/PointwiseAxis.h"
#include "Core/Beam/IFootprintFactor.h"
-#include "Core/Resolution/ScanResolution.h"
+#include "Core/Instrument/PyFmt2.h"
#include "Core/Multilayer/SpecularSimulationElement.h"
#include "Core/Parametrization/ParameterSample.h"
-#include "Base/Utils/PyFmt.h"
#include "Core/Parametrization/RangedDistributions.h"
-#include "Core/Instrument/PyFmt2.h"
+#include "Core/Resolution/ScanResolution.h"
#include "Fit/Tools/RealLimits.h"
namespace
diff --git a/Core/Scan/QSpecScan.cpp b/Core/Scan/QSpecScan.cpp
index f16b2cf00fa..dc974ef0f1b 100644
--- a/Core/Scan/QSpecScan.cpp
+++ b/Core/Scan/QSpecScan.cpp
@@ -13,14 +13,14 @@
// ************************************************************************** //
#include "Core/Scan/QSpecScan.h"
+#include "Base/Utils/PyFmt.h"
#include "Core/Axis/FixedBinAxis.h"
#include "Core/Axis/PointwiseAxis.h"
-#include "Core/Resolution/ScanResolution.h"
+#include "Core/Instrument/PyFmt2.h"
#include "Core/Multilayer/SpecularSimulationElement.h"
#include "Core/Parametrization/ParameterSample.h"
-#include "Base/Utils/PyFmt.h"
#include "Core/Parametrization/RangedDistributions.h"
-#include "Core/Instrument/PyFmt2.h"
+#include "Core/Resolution/ScanResolution.h"
#include "Fit/Tools/RealLimits.h"
namespace
diff --git a/Core/Scattering/IFormFactorBorn.cpp b/Core/Scattering/IFormFactorBorn.cpp
index 8eb54bf4172..16908d49f9b 100644
--- a/Core/Scattering/IFormFactorBorn.cpp
+++ b/Core/Scattering/IFormFactorBorn.cpp
@@ -19,7 +19,6 @@
#include "Core/Scattering/Rotations.h"
#include "Core/Shapes/IShape.h"
-
IFormFactorBorn::IFormFactorBorn() = default;
IFormFactorBorn::IFormFactorBorn(const NodeMeta& meta, const std::vector<double>& PValues)
diff --git a/Core/Simulation/DepthProbeSimulation.cpp b/Core/Simulation/DepthProbeSimulation.cpp
index e629f251359..a9b674480dd 100644
--- a/Core/Simulation/DepthProbeSimulation.cpp
+++ b/Core/Simulation/DepthProbeSimulation.cpp
@@ -18,15 +18,15 @@
#include "Core/Beam/IFootprintFactor.h"
#include "Core/Computation/DepthProbeComputation.h"
#include "Core/Computation/IBackground.h"
+#include "Core/Detector/SimpleUnitConverters.h"
#include "Core/Detector/SpecularDetector1D.h"
#include "Core/Histo/Histogram1D.h"
-#include "Core/Detector/SimpleUnitConverters.h"
#include "Core/Material/MaterialUtils.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Parametrization/Distributions.h"
+#include "Core/SampleBuilderEngine/ISampleBuilder.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
-#include "Core/SampleBuilderEngine/ISampleBuilder.h"
namespace
{
diff --git a/Core/Simulation/OffSpecSimulation.cpp b/Core/Simulation/OffSpecSimulation.cpp
index 3da507b0a61..4d3ee5b1dbf 100644
--- a/Core/Simulation/OffSpecSimulation.cpp
+++ b/Core/Simulation/OffSpecSimulation.cpp
@@ -14,14 +14,14 @@
#include "Core/Simulation/OffSpecSimulation.h"
#include "Core/Computation/DWBAComputation.h"
-#include "Core/Histo/Histogram2D.h"
#include "Core/Detector/SimpleUnitConverters.h"
+#include "Core/Histo/Histogram2D.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Parametrization/Distributions.h"
-#include "Param/Base/ParameterPool.h"
-#include "Param/Base/RealParameter.h"
#include "Core/Pixel/SimulationElement.h"
#include "Core/SampleBuilderEngine/ISampleBuilder.h"
+#include "Param/Base/ParameterPool.h"
+#include "Param/Base/RealParameter.h"
OffSpecSimulation::OffSpecSimulation()
{
diff --git a/Core/Simulation/Simulation.cpp b/Core/Simulation/Simulation.cpp
index 4e4a97fbe67..571451835d0 100644
--- a/Core/Simulation/Simulation.cpp
+++ b/Core/Simulation/Simulation.cpp
@@ -18,12 +18,12 @@
#include "Core/Detector/DetectorFunctions.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Multilayer/MultiLayerUtils.h"
-#include "Param/Base/ParameterPool.h"
#include "Core/Parametrization/ParameterSample.h"
#include "Core/SampleBuilderEngine/ISampleBuilder.h"
#include "Core/Simulation/MPISimulation.h"
#include "Core/Simulation/UnitConverterUtils.h"
#include "Fit/Tools/StringUtils.h"
+#include "Param/Base/ParameterPool.h"
#include <gsl/gsl_errno.h>
#include <iomanip>
#include <iostream>
diff --git a/Core/Simulation/Simulation.h b/Core/Simulation/Simulation.h
index 43253ffc08b..fa3dc1ffb55 100644
--- a/Core/Simulation/Simulation.h
+++ b/Core/Simulation/Simulation.h
@@ -20,9 +20,9 @@
#include "Core/Instrument/Instrument.h"
#include "Core/Instrument/SimulationResult.h"
#include "Core/Parametrization/DistributionHandler.h"
-#include "Param/Node/INode.h"
#include "Core/RT/SimulationOptions.h"
#include "Core/SampleBuilderEngine/SampleProvider.h"
+#include "Param/Node/INode.h"
template <class T> class OutputData;
class IBackground;
diff --git a/Core/Simulation/SimulationFactory.cpp b/Core/Simulation/SimulationFactory.cpp
index 92b25987859..fd0ffb5ad94 100644
--- a/Core/Simulation/SimulationFactory.cpp
+++ b/Core/Simulation/SimulationFactory.cpp
@@ -13,12 +13,12 @@
// ************************************************************************** //
#include "Core/Simulation/SimulationFactory.h"
-#include "Param/Base/RealParameter.h"
#include "Core/Simulation/DepthProbeSimulation.h"
#include "Core/Simulation/GISASSimulation.h"
#include "Core/Simulation/OffSpecSimulation.h"
#include "Core/Simulation/SpecularSimulation.h"
#include "Core/Simulation/StandardSimulations.h"
+#include "Param/Base/RealParameter.h"
SimulationFactory::SimulationFactory()
{
diff --git a/Core/Simulation/SpecularSimulation.cpp b/Core/Simulation/SpecularSimulation.cpp
index 5bd5d72e735..dc52c912b3b 100644
--- a/Core/Simulation/SpecularSimulation.cpp
+++ b/Core/Simulation/SpecularSimulation.cpp
@@ -19,17 +19,17 @@
#include "Core/Computation/IBackground.h"
#include "Core/Computation/SpecularComputation.h"
#include "Core/Detector/SpecularDetector1D.h"
-#include "Core/Scan/AngularSpecScan.h"
-#include "Core/Scan/ISpecularScan.h"
#include "Core/Histo/Histogram1D.h"
-#include "Core/Unit/UnitConverter1D.h"
#include "Core/Material/MaterialUtils.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Multilayer/SpecularSimulationElement.h"
#include "Core/Parametrization/Distributions.h"
+#include "Core/SampleBuilderEngine/ISampleBuilder.h"
+#include "Core/Scan/AngularSpecScan.h"
+#include "Core/Scan/ISpecularScan.h"
+#include "Core/Unit/UnitConverter1D.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
-#include "Core/SampleBuilderEngine/ISampleBuilder.h"
namespace
{
diff --git a/Core/Simulation/StandardSimulations.cpp b/Core/Simulation/StandardSimulations.cpp
index 0f0558dc024..993294dd16b 100644
--- a/Core/Simulation/StandardSimulations.cpp
+++ b/Core/Simulation/StandardSimulations.cpp
@@ -20,10 +20,6 @@
#include "Core/Computation/ConstantBackground.h"
#include "Core/Detector/IsGISAXSDetector.h"
#include "Core/Detector/RectangularDetector.h"
-#include "Core/Resolution/ResolutionFunction2DGaussian.h"
-#include "Core/Resolution/ScanResolution.h"
-#include "Core/Scan/AngularSpecScan.h"
-#include "Core/Scan/QSpecScan.h"
#include "Core/Mask/Ellipse.h"
#include "Core/Mask/Line.h"
#include "Core/Mask/Polygon.h"
@@ -31,12 +27,16 @@
#include "Core/Parametrization/Distributions.h"
#include "Core/Parametrization/ParameterPattern.h"
#include "Core/Parametrization/RangedDistributions.h"
-#include "Param/Base/RealParameter.h"
+#include "Core/Resolution/ResolutionFunction2DGaussian.h"
+#include "Core/Resolution/ScanResolution.h"
+#include "Core/Scan/AngularSpecScan.h"
+#include "Core/Scan/QSpecScan.h"
#include "Core/Simulation/DepthProbeSimulation.h"
#include "Core/Simulation/GISASSimulation.h"
#include "Core/Simulation/OffSpecSimulation.h"
#include "Core/Simulation/SpecularSimulation.h"
#include "Core/StandardSamples/SampleBuilderFactory.h"
+#include "Param/Base/RealParameter.h"
#include <memory>
namespace
diff --git a/Core/Simulation/UnitConverterUtils.cpp b/Core/Simulation/UnitConverterUtils.cpp
index 729191da7dc..628f2cb260c 100644
--- a/Core/Simulation/UnitConverterUtils.cpp
+++ b/Core/Simulation/UnitConverterUtils.cpp
@@ -13,16 +13,16 @@
// ************************************************************************** //
#include "Core/Simulation/UnitConverterUtils.h"
+#include "Core/Data/OutputData.h"
#include "Core/Detector/RectangularDetector.h"
+#include "Core/Detector/SimpleUnitConverters.h"
#include "Core/Detector/SphericalDetector.h"
#include "Core/Instrument/Instrument.h"
-#include "Core/Data/OutputData.h"
-#include "Core/Detector/SimpleUnitConverters.h"
-#include "Core/Unit/UnitConverter1D.h"
#include "Core/Simulation/DepthProbeSimulation.h"
#include "Core/Simulation/GISASSimulation.h"
#include "Core/Simulation/OffSpecSimulation.h"
#include "Core/Simulation/SpecularSimulation.h"
+#include "Core/Unit/UnitConverter1D.h"
std::unique_ptr<OutputData<double>>
UnitConverterUtils::createOutputData(const IUnitConverter& converter, Axes::Units units)
diff --git a/Core/Unit/UnitConverter1D.cpp b/Core/Unit/UnitConverter1D.cpp
index 752e004c58b..5e4e7fffa3b 100644
--- a/Core/Unit/UnitConverter1D.cpp
+++ b/Core/Unit/UnitConverter1D.cpp
@@ -18,10 +18,10 @@
#include "Core/Axis/FixedBinAxis.h"
#include "Core/Axis/PointwiseAxis.h"
#include "Core/Beam/Beam.h"
+#include "Core/Data/OutputData.h"
#include "Core/Scan/AngularSpecScan.h"
#include "Core/Scan/QSpecScan.h"
#include "Core/Unit/AxisNames.h"
-#include "Core/Data/OutputData.h"
namespace
{
diff --git a/Examples/cpp/CylindersAndPrisms/CylindersAndPrisms.cpp b/Examples/cpp/CylindersAndPrisms/CylindersAndPrisms.cpp
index 349c782d470..6a44e7e05c2 100644
--- a/Examples/cpp/CylindersAndPrisms/CylindersAndPrisms.cpp
+++ b/Examples/cpp/CylindersAndPrisms/CylindersAndPrisms.cpp
@@ -17,8 +17,8 @@
#include "Core/Aggregate/ParticleLayout.h"
#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/HardParticle/FormFactorPrism3.h"
-#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Histo/Histogram2D.h"
+#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
diff --git a/GUI/coregui/Models/DomainObjectBuilder.cpp b/GUI/coregui/Models/DomainObjectBuilder.cpp
index e25a6068ba4..f5d0e5d5032 100644
--- a/GUI/coregui/Models/DomainObjectBuilder.cpp
+++ b/GUI/coregui/Models/DomainObjectBuilder.cpp
@@ -16,8 +16,8 @@
#include "Base/Const/Units.h"
#include "Core/Detector/IDetector2D.h"
#include "Core/Detector/SimpleUnitConverters.h"
-#include "Core/Unit/UnitConverter1D.h"
#include "Core/Simulation/UnitConverterUtils.h"
+#include "Core/Unit/UnitConverter1D.h"
#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/BeamItems.h"
#include "GUI/coregui/Models/ComboProperty.h"
diff --git a/GUI/coregui/Models/DomainSimulationBuilder.cpp b/GUI/coregui/Models/DomainSimulationBuilder.cpp
index 0943098ed5e..899e5680416 100644
--- a/GUI/coregui/Models/DomainSimulationBuilder.cpp
+++ b/GUI/coregui/Models/DomainSimulationBuilder.cpp
@@ -16,8 +16,8 @@
#include "Base/Const/Units.h"
#include "Core/Beam/IFootprintFactor.h"
#include "Core/Computation/IBackground.h"
-#include "Core/Scan/AngularSpecScan.h"
#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Scan/AngularSpecScan.h"
#include "Core/Simulation/DepthProbeSimulation.h"
#include "Core/Simulation/GISASSimulation.h"
#include "Core/Simulation/OffSpecSimulation.h"
diff --git a/GUI/coregui/Models/PointwiseAxisItem.cpp b/GUI/coregui/Models/PointwiseAxisItem.cpp
index 5e2f0a3f3b6..2cfaac98da8 100644
--- a/GUI/coregui/Models/PointwiseAxisItem.cpp
+++ b/GUI/coregui/Models/PointwiseAxisItem.cpp
@@ -14,9 +14,9 @@
#include "GUI/coregui/Models/PointwiseAxisItem.h"
#include "Core/Axis/PointwiseAxis.h"
+#include "Core/Data/OutputData.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Unit/IUnitConverter.h"
-#include "Core/Data/OutputData.h"
#include "GUI/coregui/Models/InstrumentItems.h"
namespace
diff --git a/GUI/coregui/Models/TransformFromDomain.cpp b/GUI/coregui/Models/TransformFromDomain.cpp
index 3337eba4ae5..2e2e39abf2c 100644
--- a/GUI/coregui/Models/TransformFromDomain.cpp
+++ b/GUI/coregui/Models/TransformFromDomain.cpp
@@ -23,14 +23,10 @@
#include "Core/Computation/PoissonNoiseBackground.h"
#include "Core/Correlations/FTDistributions1D.h"
#include "Core/Correlations/FTDistributions2D.h"
-#include "Core/Resolution/ConvolutionDetectorResolution.h"
#include "Core/Detector/RectangularDetector.h"
#include "Core/Detector/RegionOfInterest.h"
-#include "Core/Resolution/ResolutionFunction2DGaussian.h"
-#include "Core/Resolution/ScanResolution.h"
#include "Core/Detector/SphericalDetector.h"
#include "Core/Export/INodeUtils.h"
-#include "Core/Scan/AngularSpecScan.h"
#include "Core/Mask/Ellipse.h"
#include "Core/Mask/InfinitePlane.h"
#include "Core/Mask/Line.h"
@@ -44,6 +40,10 @@
#include "Core/Parametrization/RangedDistributions.h"
#include "Core/Particle/Particle.h"
#include "Core/Particle/ParticleDistribution.h"
+#include "Core/Resolution/ConvolutionDetectorResolution.h"
+#include "Core/Resolution/ResolutionFunction2DGaussian.h"
+#include "Core/Resolution/ScanResolution.h"
+#include "Core/Scan/AngularSpecScan.h"
#include "Core/Simulation/GISASSimulation.h"
#include "Core/Simulation/OffSpecSimulation.h"
#include "Core/Simulation/SpecularSimulation.h"
diff --git a/GUI/coregui/Models/TransformToDomain.cpp b/GUI/coregui/Models/TransformToDomain.cpp
index cf9418cb71b..b6247c24185 100644
--- a/GUI/coregui/Models/TransformToDomain.cpp
+++ b/GUI/coregui/Models/TransformToDomain.cpp
@@ -15,14 +15,14 @@
#include "GUI/coregui/Models/TransformToDomain.h"
#include "Base/Const/Units.h"
#include "Core/Aggregate/InterferenceFunctions.h"
-#include "Core/Resolution/ScanResolution.h"
-#include "Core/Scan/AngularSpecScan.h"
#include "Core/Parametrization/Distributions.h"
#include "Core/Parametrization/ParameterPattern.h"
#include "Core/Parametrization/RangedDistributions.h"
#include "Core/Particle/MesoCrystal.h"
#include "Core/Particle/Particle.h"
#include "Core/Particle/ParticleCoreShell.h"
+#include "Core/Resolution/ScanResolution.h"
+#include "Core/Scan/AngularSpecScan.h"
#include "Core/Simulation/GISASSimulation.h"
#include "GUI/coregui/Models/BeamAngleItems.h"
#include "GUI/coregui/Models/BeamItems.h"
diff --git a/GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.cpp b/GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.cpp
index b2950fed298..f184740af48 100644
--- a/GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.h"
+#include "Core/Data/OutputData.h"
#include "Core/Fitting/FitObjective.h"
#include "Core/Fitting/ObjectiveMetric.h"
-#include "Core/Data/OutputData.h"
#include "Core/Simulation/Simulation.h"
#include "Fit/Kernel/KernelTypes.h"
#include "Fit/Kernel/Minimizer.h"
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.cpp
index 223789e158e..811ef509a92 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.h"
-#include "Core/Instrument/IntensityDataFunctions.h"
#include "Core/Data/OutputData.h"
+#include "Core/Instrument/IntensityDataFunctions.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/MaskItems.h"
#include "GUI/coregui/Models/ProjectionItems.h"
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp b/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp
index 33376493fff..0abba186c48 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.h"
+#include "Base/Utils/PyFmt.h"
#include "Core/Histo/Histogram1D.h"
#include "Core/Histo/Histogram2D.h"
-#include "Base/Utils/PyFmt.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/MaskItems.h"
#include "GUI/coregui/Models/ProjectionItems.h"
diff --git a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
index be0ef79b45b..a47f22a66cd 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h"
+#include "Core/Data/OutputData.h"
#include "Core/Detector/DetectorMask.h"
#include "Core/Detector/RegionOfInterest.h"
-#include "Core/Data/OutputData.h"
#include "Core/Mask/IShape2D.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/MaskItems.h"
diff --git a/GUI/coregui/utils/ImportDataInfo.cpp b/GUI/coregui/utils/ImportDataInfo.cpp
index 9f0df9ed7b7..38b0d99967a 100644
--- a/GUI/coregui/utils/ImportDataInfo.cpp
+++ b/GUI/coregui/utils/ImportDataInfo.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/utils/ImportDataInfo.h"
-#include "Core/Unit/AxisNames.h"
#include "Core/Data/OutputData.h"
+#include "Core/Unit/AxisNames.h"
#include "GUI/coregui/Models/JobItemUtils.h"
#include "GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h"
#include "GUI/coregui/utils/GUIHelpers.h"
diff --git a/Param/Base/IParameterized.cpp b/Param/Base/IParameterized.cpp
index 75610ad4d32..e3ed27393c3 100644
--- a/Param/Base/IParameterized.cpp
+++ b/Param/Base/IParameterized.cpp
@@ -14,9 +14,9 @@
#include "Param/Base/IParameterized.h"
#include "Base/Types/Exceptions.h"
+#include "Fit/Tools/RealLimits.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
-#include "Fit/Tools/RealLimits.h"
#include <iostream>
#include <sstream>
#include <stdexcept>
diff --git a/Param/Base/ParameterPool.cpp b/Param/Base/ParameterPool.cpp
index 5518b2143ac..360e2bffe9d 100644
--- a/Param/Base/ParameterPool.cpp
+++ b/Param/Base/ParameterPool.cpp
@@ -15,9 +15,9 @@
#include "Param/Base/ParameterPool.h"
#include "Base/Types/Exceptions.h"
#include "Base/Utils/Assert.h"
-#include "Param/Base/RealParameter.h"
#include "Fit/Tools/RealLimits.h"
#include "Fit/Tools/StringUtils.h"
+#include "Param/Base/RealParameter.h"
#include <algorithm>
#include <iostream>
#include <sstream>
diff --git a/Param/Base/RealParameter.h b/Param/Base/RealParameter.h
index e92e6857bf8..7e190512339 100644
--- a/Param/Base/RealParameter.h
+++ b/Param/Base/RealParameter.h
@@ -15,10 +15,10 @@
#ifndef BORNAGAIN_CORE_PARAMETRIZATION_REALPARAMETER_H
#define BORNAGAIN_CORE_PARAMETRIZATION_REALPARAMETER_H
-#include "Param/Base/IParameter.h"
-#include "Param/Base/Unit.h"
#include "Fit/Tools/Attributes.h"
#include "Fit/Tools/RealLimits.h"
+#include "Param/Base/IParameter.h"
+#include "Param/Base/Unit.h"
#include <string>
class ParameterPool;
diff --git a/Param/Node/INode.cpp b/Param/Node/INode.cpp
index 22256c3ba94..b5701f57d04 100644
--- a/Param/Node/INode.cpp
+++ b/Param/Node/INode.cpp
@@ -16,10 +16,10 @@
#include "Base/Utils/Algorithms.h"
#include "Base/Utils/Assert.h"
#include "Param/Base/IterationStrategy.h"
-#include "Param/Node/NodeIterator.h"
-#include "Param/Node/NodeUtils.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
+#include "Param/Node/NodeIterator.h"
+#include "Param/Node/NodeUtils.h"
#include <algorithm>
#include <exception>
diff --git a/Param/Node/INode.h b/Param/Node/INode.h
index a4a0692c807..775a8642e11 100644
--- a/Param/Node/INode.h
+++ b/Param/Node/INode.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_CORE_PARAMETRIZATION_INODE_H
#define BORNAGAIN_CORE_PARAMETRIZATION_INODE_H
-#include "Param/Node/INodeVisitor.h" // not forward declared because used by all children
#include "Param/Base/IParameterized.h"
+#include "Param/Node/INodeVisitor.h" // not forward declared because used by all children
#include <limits>
#include <memory>
#include <vector>
diff --git a/Param/Node/INodeVisitor.cpp b/Param/Node/INodeVisitor.cpp
index 489c1ca4e72..43b6d1095e4 100644
--- a/Param/Node/INodeVisitor.cpp
+++ b/Param/Node/INodeVisitor.cpp
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#include "Param/Node/INode.h"
#include "Param/Base/IterationStrategy.h"
+#include "Param/Node/INode.h"
#include "Param/Node/NodeIterator.h"
void VisitNodesPreorder(const INode& node, INodeVisitor& visitor)
diff --git a/Param/Node/NodeUtils.cpp b/Param/Node/NodeUtils.cpp
index fd63c674433..ad2af2b5b93 100644
--- a/Param/Node/NodeUtils.cpp
+++ b/Param/Node/NodeUtils.cpp
@@ -14,11 +14,11 @@
#include "Param/Node/NodeUtils.h"
#include "Base/Types/Exceptions.h"
-#include "Param/Node/INode.h"
#include "Param/Base/IterationStrategy.h"
-#include "Param/Node/NodeIterator.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
+#include "Param/Node/INode.h"
+#include "Param/Node/NodeIterator.h"
#include <algorithm>
#include <functional>
#include <iterator>
diff --git a/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp b/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp
index 37de316d3b3..79c12f3a5fa 100644
--- a/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp
+++ b/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp
@@ -14,9 +14,9 @@
#include "BATesting.h"
#include "Base/Utils/FileSystemUtils.h"
+#include "Core/Data/OutputData.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Instrument/IntensityDataFunctions.h"
-#include "Core/Data/OutputData.h"
#include "Tests/GTestWrapper/google_test.h"
#include <boost/filesystem.hpp>
#include <iostream>
diff --git a/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp b/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp
index a156efe3628..e33753c3a78 100644
--- a/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp
+++ b/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp
@@ -14,9 +14,9 @@
#include "BATesting.h"
#include "Base/Utils/FileSystemUtils.h"
+#include "Core/Data/OutputData.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Instrument/IntensityDataFunctions.h"
-#include "Core/Data/OutputData.h"
#include "Tests/GTestWrapper/google_test.h"
#include <iostream>
#include <memory>
diff --git a/Tests/Functional/GUI/Translate/GUITranslationTest.cpp b/Tests/Functional/GUI/Translate/GUITranslationTest.cpp
index 85fa2410b7f..5060e4c96bd 100644
--- a/Tests/Functional/GUI/Translate/GUITranslationTest.cpp
+++ b/Tests/Functional/GUI/Translate/GUITranslationTest.cpp
@@ -14,7 +14,6 @@
#include "Tests/Functional/GUI/Translate/GUITranslationTest.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Param/Base/ParameterPool.h"
#include "Core/Simulation/GISASSimulation.h"
#include "Core/Simulation/SimulationFactory.h"
#include "Core/StandardSamples/SampleBuilderFactory.h"
@@ -37,6 +36,7 @@
#include "GUI/coregui/Models/SampleModel.h"
#include "GUI/coregui/Models/SphericalDetectorItem.h"
#include "GUI/coregui/utils/GUIHelpers.h"
+#include "Param/Base/ParameterPool.h"
#include <QStack>
namespace
diff --git a/Tests/Functional/Python/PyEmbedded/Tests.cpp b/Tests/Functional/Python/PyEmbedded/Tests.cpp
index 5bab1394b37..216b14b6f0f 100644
--- a/Tests/Functional/Python/PyEmbedded/Tests.cpp
+++ b/Tests/Functional/Python/PyEmbedded/Tests.cpp
@@ -13,12 +13,12 @@
#include "BABuild.h"
#include "BAVersion.h"
+#include "Base/Utils/PyEmbeddedUtils.h"
+#include "Base/Utils/PyFmt.h"
#include "Base/Utils/PythonCore.h"
#include "Base/Utils/SysUtils.h"
#include "Core/Export/ExportToPython.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Base/Utils/PyFmt.h"
-#include "Base/Utils/PyEmbeddedUtils.h"
#include "Core/Multilayer/PyImport.h"
#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Performance/Core/CoreIO.cpp b/Tests/Performance/Core/CoreIO.cpp
index 5870e63d8ae..e526cd6b70a 100644
--- a/Tests/Performance/Core/CoreIO.cpp
+++ b/Tests/Performance/Core/CoreIO.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Base/Utils/Assert.h"
-#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Data/OutputData.h"
+#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Fit/TestEngine/Numeric.h"
#include "Tests/Performance/Benchmark.h"
#include <boost/format.hpp>
diff --git a/Tests/UnitTests/Core/Axes/UnitConverter1DTest.cpp b/Tests/UnitTests/Core/Axes/UnitConverter1DTest.cpp
index 713b67ad01f..b219149a41b 100644
--- a/Tests/UnitTests/Core/Axes/UnitConverter1DTest.cpp
+++ b/Tests/UnitTests/Core/Axes/UnitConverter1DTest.cpp
@@ -5,8 +5,8 @@
#include "Core/Axis/PointwiseAxis.h"
#include "Core/Axis/VariableBinAxis.h"
#include "Core/Beam/Beam.h"
-#include "Core/Scan/QSpecScan.h"
#include "Core/Data/OutputData.h"
+#include "Core/Scan/QSpecScan.h"
#include "Tests/GTestWrapper/google_test.h"
class UnitConverter1DTest : public ::testing::Test
diff --git a/Tests/UnitTests/Core/DataStructure/IOStrategyTest.cpp b/Tests/UnitTests/Core/DataStructure/IOStrategyTest.cpp
index 1e512577c8b..40c1b91a340 100644
--- a/Tests/UnitTests/Core/DataStructure/IOStrategyTest.cpp
+++ b/Tests/UnitTests/Core/DataStructure/IOStrategyTest.cpp
@@ -1,7 +1,7 @@
#include "Core/Axis/FixedBinAxis.h"
+#include "Core/Data/OutputData.h"
#include "Core/InputOutput/OutputDataReadStrategy.h"
#include "Core/InputOutput/OutputDataWriteStrategy.h"
-#include "Core/Data/OutputData.h"
#include "Tests/GTestWrapper/google_test.h"
class IOStrategyTest : public ::testing::Test
diff --git a/Tests/UnitTests/Core/DataStructure/OutputDataTest.cpp b/Tests/UnitTests/Core/DataStructure/OutputDataTest.cpp
index 5b9ca8c09a0..e3b9d7d51d7 100644
--- a/Tests/UnitTests/Core/DataStructure/OutputDataTest.cpp
+++ b/Tests/UnitTests/Core/DataStructure/OutputDataTest.cpp
@@ -1,8 +1,8 @@
#include "Core/Data/OutputData.h"
+#include "Base/Utils/ThreadInfo.h"
#include "Core/Axis/FixedBinAxis.h"
#include "Core/Axis/VariableBinAxis.h"
#include "Core/Instrument/IntensityDataFunctions.h"
-#include "Base/Utils/ThreadInfo.h"
#include "Tests/GTestWrapper/google_test.h"
#include <algorithm>
diff --git a/Tests/UnitTests/Core/Detector/OffSpecularConverterTest.cpp b/Tests/UnitTests/Core/Detector/OffSpecularConverterTest.cpp
index 691352c22fa..022ac3bfbbf 100644
--- a/Tests/UnitTests/Core/Detector/OffSpecularConverterTest.cpp
+++ b/Tests/UnitTests/Core/Detector/OffSpecularConverterTest.cpp
@@ -1,8 +1,8 @@
#include "Base/Const/Units.h"
#include "Base/Vector/Vectors3D.h"
#include "Core/Beam/Beam.h"
-#include "Core/Detector/SphericalDetector.h"
#include "Core/Detector/SimpleUnitConverters.h"
+#include "Core/Detector/SphericalDetector.h"
#include "Tests/GTestWrapper/google_test.h"
class OffSpecularConverterTest : public ::testing::Test
diff --git a/Tests/UnitTests/Core/Detector/SpecularDetector1DTest.cpp b/Tests/UnitTests/Core/Detector/SpecularDetector1DTest.cpp
index 4c2b189f756..f13a06d039e 100644
--- a/Tests/UnitTests/Core/Detector/SpecularDetector1DTest.cpp
+++ b/Tests/UnitTests/Core/Detector/SpecularDetector1DTest.cpp
@@ -2,8 +2,8 @@
#include "Base/Const/Units.h"
#include "Core/Axis/FixedBinAxis.h"
#include "Core/Beam/Beam.h"
-#include "Core/Detector/SimulationArea.h"
#include "Core/Data/OutputData.h"
+#include "Core/Detector/SimulationArea.h"
#include "Tests/GTestWrapper/google_test.h"
#include <memory>
diff --git a/Tests/UnitTests/Core/Detector/SphericalConverterTest.cpp b/Tests/UnitTests/Core/Detector/SphericalConverterTest.cpp
index c6b921e1acc..baf8219e9cd 100644
--- a/Tests/UnitTests/Core/Detector/SphericalConverterTest.cpp
+++ b/Tests/UnitTests/Core/Detector/SphericalConverterTest.cpp
@@ -1,8 +1,8 @@
#include "Base/Const/Units.h"
#include "Base/Vector/Vectors3D.h"
#include "Core/Beam/Beam.h"
-#include "Core/Detector/SphericalDetector.h"
#include "Core/Detector/SimpleUnitConverters.h"
+#include "Core/Detector/SphericalDetector.h"
#include "Tests/GTestWrapper/google_test.h"
class SphericalConverterTest : public ::testing::Test
diff --git a/Tests/UnitTests/Core/Detector/SphericalDetectorTest.cpp b/Tests/UnitTests/Core/Detector/SphericalDetectorTest.cpp
index b354f4af67e..fa9c8eaf63c 100644
--- a/Tests/UnitTests/Core/Detector/SphericalDetectorTest.cpp
+++ b/Tests/UnitTests/Core/Detector/SphericalDetectorTest.cpp
@@ -3,14 +3,14 @@
#include "Base/Types/Exceptions.h"
#include "Core/Axis/FixedBinAxis.h"
#include "Core/Beam/Beam.h"
-#include "Core/Resolution/ConvolutionDetectorResolution.h"
+#include "Core/Data/OutputData.h"
#include "Core/Detector/DetectorFunctions.h"
#include "Core/Detector/RegionOfInterest.h"
-#include "Core/Resolution/ResolutionFunction2DGaussian.h"
#include "Core/Detector/SimulationArea.h"
-#include "Core/Data/OutputData.h"
#include "Core/Mask/Polygon.h"
#include "Core/Mask/Rectangle.h"
+#include "Core/Resolution/ConvolutionDetectorResolution.h"
+#include "Core/Resolution/ResolutionFunction2DGaussian.h"
#include "Tests/GTestWrapper/google_test.h"
#include <memory>
diff --git a/Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.cpp b/Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.cpp
index 86974d80671..42a2976b263 100644
--- a/Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.cpp
+++ b/Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.cpp
@@ -1,10 +1,10 @@
-#include "Core/Instrument/PyFmt2.h"
#include "Base/Const/Units.h"
+#include "Base/Utils/PyFmt.h"
#include "Core/Axis/FixedBinAxis.h"
#include "Core/Axis/PointwiseAxis.h"
+#include "Core/Instrument/PyFmt2.h"
#include "Core/Parametrization/Distributions.h"
#include "Core/Parametrization/ParameterDistribution.h"
-#include "Base/Utils/PyFmt.h"
#include "Core/Parametrization/PyFmtLimits.h"
#include "Fit/Tools/RealLimits.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.cpp b/Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.cpp
index 1b843221bc5..622806d3da4 100644
--- a/Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.cpp
@@ -8,8 +8,8 @@
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Parametrization/Distributions.h"
#include "Core/Parametrization/ParameterPattern.h"
-#include "Param/Base/RealParameter.h"
#include "Core/SampleBuilderEngine/ISampleBuilder.h"
+#include "Param/Base/RealParameter.h"
#include "Tests/GTestWrapper/google_test.h"
class DepthProbeSimulationTest : public ::testing::Test
diff --git a/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp b/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp
index 25007d1da9b..cba422cdac9 100644
--- a/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp
@@ -1,11 +1,11 @@
#include "Core/Axis/FixedBinAxis.h"
#include "Core/Axis/PointwiseAxis.h"
#include "Core/Beam/FootprintGauss.h"
+#include "Core/Multilayer/SpecularSimulationElement.h"
+#include "Core/Parametrization/RangedDistributions.h"
#include "Core/Resolution/ScanResolution.h"
#include "Core/Scan/AngularSpecScan.h"
#include "Core/Scan/QSpecScan.h"
-#include "Core/Multilayer/SpecularSimulationElement.h"
-#include "Core/Parametrization/RangedDistributions.h"
#include "Tests/GTestWrapper/google_test.h"
class SpecularScanTest : public ::testing::Test
diff --git a/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp b/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp
index ee01db8dc58..0cf9d26c42b 100644
--- a/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp
@@ -4,16 +4,16 @@
#include "Base/Types/Exceptions.h"
#include "Core/Axis/FixedBinAxis.h"
#include "Core/Axis/VariableBinAxis.h"
-#include "Core/Scan/AngularSpecScan.h"
-#include "Core/Scan/QSpecScan.h"
#include "Core/Histo/Histogram1D.h"
#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Parametrization/Distributions.h"
#include "Core/Parametrization/ParameterPattern.h"
-#include "Param/Base/RealParameter.h"
#include "Core/SampleBuilderEngine/ISampleBuilder.h"
+#include "Core/Scan/AngularSpecScan.h"
+#include "Core/Scan/QSpecScan.h"
+#include "Param/Base/RealParameter.h"
#include "Tests/GTestWrapper/google_test.h"
#include <iostream>
diff --git a/Tests/UnitTests/Core/Other/ChiSquaredModuleTest.cpp b/Tests/UnitTests/Core/Other/ChiSquaredModuleTest.cpp
index a792841773f..dc6418f4543 100644
--- a/Tests/UnitTests/Core/Other/ChiSquaredModuleTest.cpp
+++ b/Tests/UnitTests/Core/Other/ChiSquaredModuleTest.cpp
@@ -1,6 +1,6 @@
#include "Core/Instrument/ChiSquaredModule.h"
-#include "Core/Instrument/VarianceFunctions.h"
#include "Core/Data/OutputData.h"
+#include "Core/Instrument/VarianceFunctions.h"
#include "Tests/GTestWrapper/google_test.h"
// TODO revise test
diff --git a/Tests/UnitTests/Core/Other/SampleBuilderNodeTest.cpp b/Tests/UnitTests/Core/Other/SampleBuilderNodeTest.cpp
index 23538ac6080..cc91639bb80 100644
--- a/Tests/UnitTests/Core/Other/SampleBuilderNodeTest.cpp
+++ b/Tests/UnitTests/Core/Other/SampleBuilderNodeTest.cpp
@@ -1,7 +1,7 @@
#include "Core/SampleBuilderEngine/SampleBuilderNode.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Param/Base/ParameterPool.h"
#include "Core/SampleBuilderEngine/ISampleBuilder.h"
+#include "Param/Base/ParameterPool.h"
#include "Tests/GTestWrapper/google_test.h"
#include <iostream>
#include <memory>
diff --git a/Tests/UnitTests/Core/Other/SampleProviderTest.cpp b/Tests/UnitTests/Core/Other/SampleProviderTest.cpp
index deac6067eae..dedf34e389f 100644
--- a/Tests/UnitTests/Core/Other/SampleProviderTest.cpp
+++ b/Tests/UnitTests/Core/Other/SampleProviderTest.cpp
@@ -1,8 +1,8 @@
#include "Core/SampleBuilderEngine/SampleProvider.h"
#include "Core/Multilayer/MultiLayer.h"
+#include "Core/SampleBuilderEngine/ISampleBuilder.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
-#include "Core/SampleBuilderEngine/ISampleBuilder.h"
#include "Tests/GTestWrapper/google_test.h"
#include <memory>
diff --git a/Tests/UnitTests/Core/Other/SpectrumTest.cpp b/Tests/UnitTests/Core/Other/SpectrumTest.cpp
index 8a06f10454a..1a7711a7c3d 100644
--- a/Tests/UnitTests/Core/Other/SpectrumTest.cpp
+++ b/Tests/UnitTests/Core/Other/SpectrumTest.cpp
@@ -1,5 +1,5 @@
-#include "Core/Instrument/SpectrumUtils.h"
#include "Core/Histo/Histogram2D.h"
+#include "Core/Instrument/SpectrumUtils.h"
#include "Tests/GTestWrapper/google_test.h"
#include "tspectrum.h"
#include <iostream>
diff --git a/Tests/UnitTests/Core/Parameters/ParameterDistributionTest.cpp b/Tests/UnitTests/Core/Parameters/ParameterDistributionTest.cpp
index cfa662a3f34..8808e920ec8 100644
--- a/Tests/UnitTests/Core/Parameters/ParameterDistributionTest.cpp
+++ b/Tests/UnitTests/Core/Parameters/ParameterDistributionTest.cpp
@@ -1,9 +1,9 @@
#include "Core/Parametrization/ParameterDistribution.h"
#include "Base/Types/Exceptions.h"
#include "Core/Parametrization/Distributions.h"
-#include "Param/Base/IParameterized.h"
#include "Core/Parametrization/ParameterSample.h"
#include "Core/Parametrization/ParameterUtils.h"
+#include "Param/Base/IParameterized.h"
#include "Tests/GTestWrapper/google_test.h"
#include <cmath>
diff --git a/Tests/UnitTests/Core/Sample/INodeTest.cpp b/Tests/UnitTests/Core/Sample/INodeTest.cpp
index ee1ad37618e..0425dfbd1d8 100644
--- a/Tests/UnitTests/Core/Sample/INodeTest.cpp
+++ b/Tests/UnitTests/Core/Sample/INodeTest.cpp
@@ -1,8 +1,8 @@
#include "Param/Node/INode.h"
#include "Base/Types/Exceptions.h"
-#include "Param/Node/NodeUtils.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
+#include "Param/Node/NodeUtils.h"
#include "Tests/GTestWrapper/google_test.h"
#include <memory>
diff --git a/Tests/UnitTests/Core/Sample/MultilayerAveragingTest.cpp b/Tests/UnitTests/Core/Sample/MultilayerAveragingTest.cpp
index 6d0a42b27ee..94fcbb45db7 100644
--- a/Tests/UnitTests/Core/Sample/MultilayerAveragingTest.cpp
+++ b/Tests/UnitTests/Core/Sample/MultilayerAveragingTest.cpp
@@ -7,8 +7,8 @@
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Multilayer/Slice.h"
-#include "Core/RT/SimulationOptions.h"
#include "Core/Particle/Particle.h"
+#include "Core/RT/SimulationOptions.h"
#include "Tests/GTestWrapper/google_test.h"
class MultilayerAveragingTest : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestDetectorItems.cpp b/Tests/UnitTests/GUI/TestDetectorItems.cpp
index 621fd918ec4..5e6678b3aa0 100644
--- a/Tests/UnitTests/GUI/TestDetectorItems.cpp
+++ b/Tests/UnitTests/GUI/TestDetectorItems.cpp
@@ -1,6 +1,6 @@
#include "Base/Const/Units.h"
-#include "Core/Resolution/ConvolutionDetectorResolution.h"
#include "Core/Detector/IDetector2D.h"
+#include "Core/Resolution/ConvolutionDetectorResolution.h"
#include "Core/Resolution/ResolutionFunction2DGaussian.h"
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/DetectorItems.h"
diff --git a/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp b/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp
index 08da092d5a2..a672a0db83a 100644
--- a/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp
+++ b/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp
@@ -1,9 +1,9 @@
#include "Base/Const/Units.h"
#include "Core/Aggregate/InterferenceFunctions.h"
#include "Core/HardParticle/HardParticles.h"
-#include "Param/Base/ParameterPool.h"
#include "GUI/coregui/Models/FormFactorItems.h"
#include "GUI/coregui/Models/InterferenceFunctionItems.h"
+#include "Param/Base/ParameterPool.h"
#include "Tests/GTestWrapper/google_test.h"
class TestGUICoreObjectCorrespondence : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestOutputDataIOService.cpp b/Tests/UnitTests/GUI/TestOutputDataIOService.cpp
index e17980b9bfe..3c07e520bc8 100644
--- a/Tests/UnitTests/GUI/TestOutputDataIOService.cpp
+++ b/Tests/UnitTests/GUI/TestOutputDataIOService.cpp
@@ -1,5 +1,5 @@
-#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Data/OutputData.h"
+#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "GUI/coregui/Models/ApplicationModels.h"
#include "GUI/coregui/Models/DataItem.h"
#include "GUI/coregui/Models/JobItem.h"
diff --git a/Tests/UnitTests/GUI/TestSavingSpecularData.cpp b/Tests/UnitTests/GUI/TestSavingSpecularData.cpp
index 28509647388..cf2d6f447a2 100644
--- a/Tests/UnitTests/GUI/TestSavingSpecularData.cpp
+++ b/Tests/UnitTests/GUI/TestSavingSpecularData.cpp
@@ -1,6 +1,6 @@
#include "Core/Axis/PointwiseAxis.h"
-#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Data/OutputData.h"
+#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "GUI/coregui/Models/ApplicationModels.h"
#include "GUI/coregui/Models/DataItem.h"
#include "GUI/coregui/Models/GroupItem.h"
diff --git a/Tests/UnitTests/GUI/Utils.cpp b/Tests/UnitTests/GUI/Utils.cpp
index 8c37c4ea0a3..bdc753d40b0 100644
--- a/Tests/UnitTests/GUI/Utils.cpp
+++ b/Tests/UnitTests/GUI/Utils.cpp
@@ -14,9 +14,9 @@
// ************************************************************************** //
#include "Tests/UnitTests/GUI/Utils.h"
+#include "Core/Data/OutputData.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Instrument/IntensityDataFunctions.h"
-#include "Core/Data/OutputData.h"
#include "GUI/coregui/Models/RealDataItem.h"
#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/mainwindow/ProjectUtils.h"
--
GitLab