From ca35307b6e8695bd2881982e6dd9bb9f5f92e063 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Sat, 8 Aug 2020 11:07:58 +0200
Subject: [PATCH] mv ZLimits; clang-format
---
Core/Beam/FootprintGauss.cpp | 3 +-
Core/Beam/FootprintSquare.cpp | 3 +-
Core/Detector/DetectorMask.cpp | 2 +-
Core/Detector/IDetector.cpp | 2 +-
Core/Export/SimulationToPython.cpp | 8 ++---
Core/HardParticle/FormFactorPolyhedron.cpp | 21 +++++-------
Core/HardParticle/FormFactorPolyhedron.h | 33 +++++++------------
Core/InputOutput/IntensityDataIOFactory.cpp | 2 +-
Core/Instrument/ChiSquaredModule.cpp | 2 +-
Core/Instrument/IChiSquaredModule.cpp | 2 +-
Core/Instrument/IResolutionFunction2D.cpp | 7 ++--
Core/Instrument/IResolutionFunction2D.h | 11 +++----
Core/Instrument/Instrument.cpp | 4 +--
Core/Intensity/IntensityDataFunctions.cpp | 6 ++--
Core/Intensity/SimpleUnitConverters.cpp | 4 +--
Core/Intensity/SimulationArea.cpp | 2 +-
Core/Intensity/UnitConverter1D.cpp | 2 +-
Core/Intensity/UnitConverterUtils.cpp | 4 +--
Core/Multilayer/LayerFillLimits.h | 2 +-
Core/Multilayer/MultiLayer.h | 2 +-
Core/Parametrization/INode.h | 2 +-
Core/Particle/IParticle.cpp | 2 +-
Core/Particle/IParticle.h | 2 +-
Core/Particle/MesoCrystal.cpp | 2 +-
Core/Particle/Particle.cpp | 2 +-
Core/Particle/Particle.h | 4 +--
Core/Scattering/FormFactorDecoratorMaterial.h | 2 +-
Core/Scattering/IFormFactor.cpp | 2 +-
Core/Scattering/IFormFactor.h | 2 +-
Core/{Particle => Scattering}/ZLimits.cpp | 4 +--
Core/{Particle => Scattering}/ZLimits.h | 2 +-
Core/Simulation/DepthProbeSimulation.cpp | 2 +-
Core/Simulation/SpecularSimulation.cpp | 4 +--
Core/StandardSamples/StandardSimulations.cpp | 4 +--
Core/includeIncludes/FormFactors.h | 2 +-
Core/includeIncludes/SoftParticles.h | 2 +-
GUI/coregui/Models/TransformFromDomain.cpp | 6 ++--
.../Views/FitWidgets/FitObjectiveBuilder.cpp | 2 +-
.../MaskWidgets/MaskResultsPresenter.cpp | 2 +-
.../RealSpaceBuilderUtils.cpp | 2 +-
Tests/Functional/Core/Fitting/PlanCases.cpp | 2 +-
Tests/Performance/Core/Mesocrystal.cpp | 2 +-
.../Performance/Core/ThreadingComponents.cpp | 2 +-
.../Core/Axes/UnitConverter1DTest.cpp | 2 +-
.../Detector/OffSpecularConverterTest.cpp | 2 +-
.../Core/Detector/SphericalConverterTest.cpp | 2 +-
.../Core/Detector/SphericalDetectorTest.cpp | 2 +-
.../Core/Fresnel/SpecularScanTest.cpp | 3 +-
.../Core/Fresnel/SpecularSimulationTest.cpp | 2 +-
.../Core/Other/ChiSquaredModuleTest.cpp | 2 +-
Tests/UnitTests/Core/Other/SpectrumTest.cpp | 2 +-
Tests/UnitTests/Core/Other/ZLimitsTest.cpp | 2 +-
.../GUI/TestRealSpaceBuilderUtils.cpp | 2 +-
53 files changed, 91 insertions(+), 110 deletions(-)
rename Core/{Particle => Scattering}/ZLimits.cpp (97%)
rename Core/{Particle => Scattering}/ZLimits.h (97%)
diff --git a/Core/Beam/FootprintGauss.cpp b/Core/Beam/FootprintGauss.cpp
index da02f3b042c..17c6f7c0b8b 100644
--- a/Core/Beam/FootprintGauss.cpp
+++ b/Core/Beam/FootprintGauss.cpp
@@ -47,8 +47,7 @@ std::string FootprintGauss::print() const
return result.str();
}
-FootprintGauss::FootprintGauss(const FootprintGauss& other)
- : IFootprintFactor(other)
+FootprintGauss::FootprintGauss(const FootprintGauss& other) : IFootprintFactor(other)
{
initialize();
}
diff --git a/Core/Beam/FootprintSquare.cpp b/Core/Beam/FootprintSquare.cpp
index 1b7388a6d3b..58f89237f8d 100644
--- a/Core/Beam/FootprintSquare.cpp
+++ b/Core/Beam/FootprintSquare.cpp
@@ -48,8 +48,7 @@ std::string FootprintSquare::print() const
return result.str();
}
-FootprintSquare::FootprintSquare(const FootprintSquare& other)
- : IFootprintFactor(other)
+FootprintSquare::FootprintSquare(const FootprintSquare& other) : IFootprintFactor(other)
{
initialize();
}
diff --git a/Core/Detector/DetectorMask.cpp b/Core/Detector/DetectorMask.cpp
index 32a01ccdc19..ed415dfe420 100644
--- a/Core/Detector/DetectorMask.cpp
+++ b/Core/Detector/DetectorMask.cpp
@@ -12,9 +12,9 @@
//
// ************************************************************************** //
-#include "Core/Intensity/Histogram2D.h"
#include "Core/Detector/IDetector2D.h"
#include "Core/Detector/RegionOfInterest.h"
+#include "Core/Intensity/Histogram2D.h"
DetectorMask::DetectorMask() : m_number_of_masked_channels(0) {}
diff --git a/Core/Detector/IDetector.cpp b/Core/Detector/IDetector.cpp
index 3049730933e..9b33cd969ce 100644
--- a/Core/Detector/IDetector.cpp
+++ b/Core/Detector/IDetector.cpp
@@ -16,8 +16,8 @@
#include "Core/Detector/ConvolutionDetectorResolution.h"
#include "Core/Detector/DetectorMask.h"
#include "Core/Detector/IDetectorResolution.h"
-#include "Core/Intensity/OutputData.h"
#include "Core/Detector/RegionOfInterest.h"
+#include "Core/Intensity/OutputData.h"
#include "Core/Intensity/SimulationArea.h"
#include "Core/SimulationElement/SimulationElement.h"
diff --git a/Core/Export/SimulationToPython.cpp b/Core/Export/SimulationToPython.cpp
index 88ff529b9fc..f3fc1394293 100644
--- a/Core/Export/SimulationToPython.cpp
+++ b/Core/Export/SimulationToPython.cpp
@@ -17,14 +17,14 @@
#include "Core/Beam/FootprintSquare.h"
#include "Core/Computation/ConstantBackground.h"
#include "Core/Computation/PoissonNoiseBackground.h"
-#include "Core/Export/INodeUtils.h"
-#include "Core/Export/SampleToPython.h"
#include "Core/Detector/ConvolutionDetectorResolution.h"
-#include "Core/Instrument/ISpecularScan.h"
#include "Core/Detector/RectangularDetector.h"
#include "Core/Detector/RegionOfInterest.h"
-#include "Core/Instrument/ResolutionFunction2DGaussian.h"
#include "Core/Detector/SphericalDetector.h"
+#include "Core/Export/INodeUtils.h"
+#include "Core/Export/SampleToPython.h"
+#include "Core/Instrument/ISpecularScan.h"
+#include "Core/Instrument/ResolutionFunction2DGaussian.h"
#include "Core/Parametrization/ParameterUtils.h"
#include "Core/Simulation/GISASSimulation.h"
#include "Core/Simulation/OffSpecSimulation.h"
diff --git a/Core/HardParticle/FormFactorPolyhedron.cpp b/Core/HardParticle/FormFactorPolyhedron.cpp
index c21da87490f..2bd3aceb988 100644
--- a/Core/HardParticle/FormFactorPolyhedron.cpp
+++ b/Core/HardParticle/FormFactorPolyhedron.cpp
@@ -421,10 +421,9 @@ void FormFactorPolyhedron::setLimits(double _q, int _n)
#endif
FormFactorPolyhedron::FormFactorPolyhedron(
- const INode* parent, const std::vector<const char*> PName,
- const std::vector<const char*> PUnit,
- const std::vector<double> PMin, const std::vector<double> PMax,
- const std::vector<double> PDefault, std::vector<double> P)
+ const INode* parent, const std::vector<const char*> PName, const std::vector<const char*> PUnit,
+ const std::vector<double> PMin, const std::vector<double> PMax,
+ const std::vector<double> PDefault, std::vector<double> P)
: IFormFactorBorn{parent, PName, PUnit, PMin, PMax, PDefault, P}
{
}
@@ -610,10 +609,9 @@ void FormFactorPolyhedron::assert_platonic() const
//**************************************************************************************************
FormFactorPolygonalPrism::FormFactorPolygonalPrism(
- const INode* parent, const std::vector<const char*> PName,
- const std::vector<const char*> PUnit,
- const std::vector<double> PMin, const std::vector<double> PMax,
- const std::vector<double> PDefault, std::vector<double> P)
+ const INode* parent, const std::vector<const char*> PName, const std::vector<const char*> PUnit,
+ const std::vector<double> PMin, const std::vector<double> PMax,
+ const std::vector<double> PDefault, std::vector<double> P)
: IFormFactorBorn{parent, PName, PUnit, PMin, PMax, PDefault, P}
{
}
@@ -684,10 +682,9 @@ complex_t FormFactorPolygonalPrism::evaluate_for_q(cvector_t q) const
//**************************************************************************************************
FormFactorPolygonalSurface::FormFactorPolygonalSurface(
- const INode* parent, const std::vector<const char*> PName,
- const std::vector<const char*> PUnit,
- const std::vector<double> PMin, const std::vector<double> PMax,
- const std::vector<double> PDefault, std::vector<double> P)
+ const INode* parent, const std::vector<const char*> PName, const std::vector<const char*> PUnit,
+ const std::vector<double> PMin, const std::vector<double> PMax,
+ const std::vector<double> PDefault, std::vector<double> P)
: IFormFactorBorn{parent, PName, PUnit, PMin, PMax, PDefault, P}
{
}
diff --git a/Core/HardParticle/FormFactorPolyhedron.h b/Core/HardParticle/FormFactorPolyhedron.h
index cc5e5fb3dcd..8ac30bf8325 100644
--- a/Core/HardParticle/FormFactorPolyhedron.h
+++ b/Core/HardParticle/FormFactorPolyhedron.h
@@ -105,13 +105,10 @@ public:
#endif
FormFactorPolyhedron() {}
- FormFactorPolyhedron(const INode* parent,
- const std::vector<const char*> PName,
- const std::vector<const char*> PUnit,
- const std::vector<double> PMin,
- const std::vector<double> PMax,
- const std::vector<double> PDefault,
- std::vector<double> P);
+ FormFactorPolyhedron(const INode* parent, const std::vector<const char*> PName,
+ const std::vector<const char*> PUnit, const std::vector<double> PMin,
+ const std::vector<double> PMax, const std::vector<double> PDefault,
+ std::vector<double> P);
double bottomZ(const IRotation& rotation) const override final;
double topZ(const IRotation& rotation) const override final;
@@ -146,13 +143,10 @@ class BA_CORE_API_ FormFactorPolygonalPrism : public IFormFactorBorn
{
public:
FormFactorPolygonalPrism() = default;
- FormFactorPolygonalPrism(const INode* parent,
- const std::vector<const char*> PName,
- const std::vector<const char*> PUnit,
- const std::vector<double> PMin,
- const std::vector<double> PMax,
- const std::vector<double> PDefault,
- std::vector<double> P);
+ FormFactorPolygonalPrism(const INode* parent, const std::vector<const char*> PName,
+ const std::vector<const char*> PUnit, const std::vector<double> PMin,
+ const std::vector<double> PMax, const std::vector<double> PDefault,
+ std::vector<double> P);
double bottomZ(const IRotation& rotation) const override final;
double topZ(const IRotation& rotation) const override final;
@@ -175,13 +169,10 @@ class BA_CORE_API_ FormFactorPolygonalSurface : public IFormFactorBorn
{
public:
FormFactorPolygonalSurface() = default;
- FormFactorPolygonalSurface(const INode* parent,
- const std::vector<const char*> PName,
- const std::vector<const char*> PUnit,
- const std::vector<double> PMin,
- const std::vector<double> PMax,
- const std::vector<double> PDefault,
- std::vector<double> P);
+ FormFactorPolygonalSurface(const INode* parent, const std::vector<const char*> PName,
+ const std::vector<const char*> PUnit, const std::vector<double> PMin,
+ const std::vector<double> PMax, const std::vector<double> PDefault,
+ std::vector<double> P);
complex_t evaluate_for_q(cvector_t q) const override final;
double volume() const override { return 0; }
diff --git a/Core/InputOutput/IntensityDataIOFactory.cpp b/Core/InputOutput/IntensityDataIOFactory.cpp
index 390a3f7bebf..bcb09b8dcf8 100644
--- a/Core/InputOutput/IntensityDataIOFactory.cpp
+++ b/Core/InputOutput/IntensityDataIOFactory.cpp
@@ -15,8 +15,8 @@
#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/InputOutput/OutputDataReadFactory.h"
#include "Core/InputOutput/OutputDataWriteFactory.h"
-#include "Core/Intensity/IHistogram.h"
#include "Core/Instrument/SimulationResult.h"
+#include "Core/Intensity/IHistogram.h"
#include "Core/Tools/FileSystemUtils.h"
#include <exception>
#include <fstream>
diff --git a/Core/Instrument/ChiSquaredModule.cpp b/Core/Instrument/ChiSquaredModule.cpp
index ac1ceb957d5..ccbe492df43 100644
--- a/Core/Instrument/ChiSquaredModule.cpp
+++ b/Core/Instrument/ChiSquaredModule.cpp
@@ -14,8 +14,8 @@
#include "Core/Instrument/ChiSquaredModule.h"
#include "Core/Basics/Assert.h"
-#include "Core/Intensity/IIntensityFunction.h"
#include "Core/Instrument/VarianceFunctions.h"
+#include "Core/Intensity/IIntensityFunction.h"
#include <cmath>
#include <limits>
diff --git a/Core/Instrument/IChiSquaredModule.cpp b/Core/Instrument/IChiSquaredModule.cpp
index 0fb7fd0b260..bffd6b9ab1c 100644
--- a/Core/Instrument/IChiSquaredModule.cpp
+++ b/Core/Instrument/IChiSquaredModule.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Core/Instrument/IChiSquaredModule.h"
-#include "Core/Intensity/IIntensityFunction.h"
#include "Core/Instrument/VarianceFunctions.h"
+#include "Core/Intensity/IIntensityFunction.h"
IChiSquaredModule::IChiSquaredModule() : m_variance_function(new VarianceSimFunction) {}
diff --git a/Core/Instrument/IResolutionFunction2D.cpp b/Core/Instrument/IResolutionFunction2D.cpp
index 61d5dd14491..4a680f76269 100644
--- a/Core/Instrument/IResolutionFunction2D.cpp
+++ b/Core/Instrument/IResolutionFunction2D.cpp
@@ -15,10 +15,9 @@
#include "Core/Instrument/IResolutionFunction2D.h"
IResolutionFunction2D::IResolutionFunction2D(
- const INode* parent, const std::vector<const char*> PName,
- const std::vector<const char*> PUnit,
- const std::vector<double> PMin, const std::vector<double> PMax,
- const std::vector<double> PDefault, std::vector<double> P)
+ const INode* parent, const std::vector<const char*> PName, const std::vector<const char*> PUnit,
+ const std::vector<double> PMin, const std::vector<double> PMax,
+ const std::vector<double> PDefault, std::vector<double> P)
: INode{parent, PName, PUnit, PMin, PMax, PDefault, P}
{
}
diff --git a/Core/Instrument/IResolutionFunction2D.h b/Core/Instrument/IResolutionFunction2D.h
index 32c9555fa81..3e45e8c9fe0 100644
--- a/Core/Instrument/IResolutionFunction2D.h
+++ b/Core/Instrument/IResolutionFunction2D.h
@@ -25,13 +25,10 @@ class BA_CORE_API_ IResolutionFunction2D : public ICloneable, public INode
{
public:
IResolutionFunction2D() = default;
- IResolutionFunction2D(const INode* parent,
- const std::vector<const char*> PName,
- const std::vector<const char*> PUnit,
- const std::vector<double> PMin,
- const std::vector<double> PMax,
- const std::vector<double> PDefault,
- std::vector<double> P);
+ IResolutionFunction2D(const INode* parent, const std::vector<const char*> PName,
+ const std::vector<const char*> PUnit, const std::vector<double> PMin,
+ const std::vector<double> PMax, const std::vector<double> PDefault,
+ std::vector<double> P);
virtual ~IResolutionFunction2D() {}
diff --git a/Core/Instrument/Instrument.cpp b/Core/Instrument/Instrument.cpp
index 23e2127f35d..3250bfeee73 100644
--- a/Core/Instrument/Instrument.cpp
+++ b/Core/Instrument/Instrument.cpp
@@ -15,9 +15,9 @@
#include "Core/Instrument/Instrument.h"
#include "Core/Beam/Beam.h"
#include "Core/Detector/DetectorFunctions.h"
-#include "Core/Intensity/Histogram2D.h"
-#include "Core/Instrument/IResolutionFunction2D.h"
#include "Core/Detector/SphericalDetector.h"
+#include "Core/Instrument/IResolutionFunction2D.h"
+#include "Core/Intensity/Histogram2D.h"
#include "Core/SimulationElement/SimulationElement.h"
Instrument::Instrument() : mP_detector(new SphericalDetector)
diff --git a/Core/Intensity/IntensityDataFunctions.cpp b/Core/Intensity/IntensityDataFunctions.cpp
index ffccc8e714c..b691e9812a2 100644
--- a/Core/Intensity/IntensityDataFunctions.cpp
+++ b/Core/Intensity/IntensityDataFunctions.cpp
@@ -13,14 +13,14 @@
// ************************************************************************** //
#include "Core/Intensity/IntensityDataFunctions.h"
-#include "Core/Instrument/ArrayUtils.h"
#include "Core/Detector/ConvolutionDetectorResolution.h"
#include "Core/Detector/DetectorFunctions.h"
-#include "Core/Instrument/FourierTransform.h"
#include "Core/Detector/IDetector.h"
-#include "Core/Intensity/IHistogram.h"
+#include "Core/Instrument/ArrayUtils.h"
+#include "Core/Instrument/FourierTransform.h"
#include "Core/Instrument/Instrument.h"
#include "Core/Instrument/SimulationResult.h"
+#include "Core/Intensity/IHistogram.h"
#include "Core/Intensity/UnitConverterUtils.h"
#include "Core/Simulation/Simulation.h"
#include "Fit/TestEngine/Numeric.h"
diff --git a/Core/Intensity/SimpleUnitConverters.cpp b/Core/Intensity/SimpleUnitConverters.cpp
index e53d30481cd..343402af516 100644
--- a/Core/Intensity/SimpleUnitConverters.cpp
+++ b/Core/Intensity/SimpleUnitConverters.cpp
@@ -18,11 +18,11 @@
#include "Core/Basics/MathConstants.h"
#include "Core/Beam/Beam.h"
-#include "Core/Instrument/AxisNames.h"
#include "Core/Detector/RectangularDetector.h"
#include "Core/Detector/RegionOfInterest.h"
-#include "Core/Intensity/SimpleUnitConverters.h"
#include "Core/Detector/SphericalDetector.h"
+#include "Core/Instrument/AxisNames.h"
+#include "Core/Intensity/SimpleUnitConverters.h"
#include "Core/Intensity/UnitConverterUtils.h"
#include "Core/Parametrization/Units.h"
diff --git a/Core/Intensity/SimulationArea.cpp b/Core/Intensity/SimulationArea.cpp
index dd903279c8f..98ebfc393f0 100644
--- a/Core/Intensity/SimulationArea.cpp
+++ b/Core/Intensity/SimulationArea.cpp
@@ -16,8 +16,8 @@
#include "Core/Basics/Exceptions.h"
#include "Core/Detector/DetectorMask.h"
#include "Core/Detector/IDetector.h"
-#include "Core/Intensity/IntensityDataFunctions.h"
#include "Core/Detector/RegionOfInterest.h"
+#include "Core/Intensity/IntensityDataFunctions.h"
#include "Core/Mask/Rectangle.h"
#include <sstream>
diff --git a/Core/Intensity/UnitConverter1D.cpp b/Core/Intensity/UnitConverter1D.cpp
index 2b508a4a399..830a23f9b51 100644
--- a/Core/Intensity/UnitConverter1D.cpp
+++ b/Core/Intensity/UnitConverter1D.cpp
@@ -19,8 +19,8 @@
#include "Core/Binning/PointwiseAxis.h"
#include "Core/Instrument/AngularSpecScan.h"
#include "Core/Instrument/AxisNames.h"
-#include "Core/Intensity/OutputData.h"
#include "Core/Instrument/QSpecScan.h"
+#include "Core/Intensity/OutputData.h"
#include "Core/Intensity/UnitConverterUtils.h"
#include "Core/Parametrization/Units.h"
diff --git a/Core/Intensity/UnitConverterUtils.cpp b/Core/Intensity/UnitConverterUtils.cpp
index 9f53cc8b1cc..fd4770171e1 100644
--- a/Core/Intensity/UnitConverterUtils.cpp
+++ b/Core/Intensity/UnitConverterUtils.cpp
@@ -13,11 +13,11 @@
// ************************************************************************** //
#include "Core/Intensity/UnitConverterUtils.h"
+#include "Core/Detector/RectangularDetector.h"
+#include "Core/Detector/SphericalDetector.h"
#include "Core/Instrument/Instrument.h"
#include "Core/Intensity/OutputData.h"
-#include "Core/Detector/RectangularDetector.h"
#include "Core/Intensity/SimpleUnitConverters.h"
-#include "Core/Detector/SphericalDetector.h"
#include "Core/Intensity/UnitConverter1D.h"
#include "Core/Simulation/DepthProbeSimulation.h"
#include "Core/Simulation/GISASSimulation.h"
diff --git a/Core/Multilayer/LayerFillLimits.h b/Core/Multilayer/LayerFillLimits.h
index 814fc464f00..603c128b533 100644
--- a/Core/Multilayer/LayerFillLimits.h
+++ b/Core/Multilayer/LayerFillLimits.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_CORE_MULTILAYER_LAYERFILLLIMITS_H
#include "Core/Particle/IParticle.h"
-#include "Core/Particle/ZLimits.h"
+#include "Core/Scattering/ZLimits.h"
#include <cstddef>
#include <utility>
#include <vector>
diff --git a/Core/Multilayer/MultiLayer.h b/Core/Multilayer/MultiLayer.h
index d12e0faf831..81afc8a0c32 100644
--- a/Core/Multilayer/MultiLayer.h
+++ b/Core/Multilayer/MultiLayer.h
@@ -16,8 +16,8 @@
#define BORNAGAIN_CORE_MULTILAYER_MULTILAYER_H
#include "Core/Multilayer/RoughnessModels.h"
-#include "Core/Particle/ZLimits.h"
#include "Core/Scattering/ISample.h"
+#include "Core/Scattering/ZLimits.h"
#include "Core/Tools/SafePointerVector.h"
#include "Core/Vector/Vectors3D.h"
diff --git a/Core/Parametrization/INode.h b/Core/Parametrization/INode.h
index 176c4574405..94b2ac68b8e 100644
--- a/Core/Parametrization/INode.h
+++ b/Core/Parametrization/INode.h
@@ -17,9 +17,9 @@
#include "Core/Parametrization/INodeVisitor.h" // not forward declared because used by all children
#include "Core/Parametrization/IParameterized.h"
+#include <limits>
#include <memory>
#include <vector>
-#include <limits>
const double INF = std::numeric_limits<double>::infinity();
diff --git a/Core/Particle/IParticle.cpp b/Core/Particle/IParticle.cpp
index b60f810ac3e..6396be0dbcb 100644
--- a/Core/Particle/IParticle.cpp
+++ b/Core/Particle/IParticle.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Particle/IParticle.h"
-#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
IFormFactor* IParticle::createFormFactor() const
{
diff --git a/Core/Particle/IParticle.h b/Core/Particle/IParticle.h
index 5b96ef84cc2..da89accb348 100644
--- a/Core/Particle/IParticle.h
+++ b/Core/Particle/IParticle.h
@@ -17,8 +17,8 @@
#include "Core/Particle/IAbstractParticle.h"
#include "Core/Particle/SlicedParticle.h"
-#include "Core/Particle/ZLimits.h"
#include "Core/Scattering/Rotations.h"
+#include "Core/Scattering/ZLimits.h"
#include "Core/Tools/SafePointerVector.h"
#include "Core/Vector/Vectors3D.h"
#include <memory>
diff --git a/Core/Particle/MesoCrystal.cpp b/Core/Particle/MesoCrystal.cpp
index 7757c7fcf0b..ad583abd775 100644
--- a/Core/Particle/MesoCrystal.cpp
+++ b/Core/Particle/MesoCrystal.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Particle/MesoCrystal.h"
+#include "Core/Particle/IClusteredParticles.h"
#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
#include "Core/Scattering/FormFactorDecoratorRotation.h"
-#include "Core/Particle/IClusteredParticles.h"
MesoCrystal::MesoCrystal(const IClusteredParticles& particle_structure,
const IFormFactor& form_factor)
diff --git a/Core/Particle/Particle.cpp b/Core/Particle/Particle.cpp
index baf00bbf039..05c203668dd 100644
--- a/Core/Particle/Particle.cpp
+++ b/Core/Particle/Particle.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Core/Particle/Particle.h"
-#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
Particle::Particle() : m_material(HomogeneousMaterial())
{
diff --git a/Core/Particle/Particle.h b/Core/Particle/Particle.h
index b189bd6d7fa..7ca81cefcdb 100644
--- a/Core/Particle/Particle.h
+++ b/Core/Particle/Particle.h
@@ -15,10 +15,10 @@
#ifndef BORNAGAIN_CORE_PARTICLE_PARTICLE_H
#define BORNAGAIN_CORE_PARTICLE_PARTICLE_H
-#include "Core/Scattering/FormFactorDecoratorMaterial.h"
-#include "Core/Scattering/FormFactorDecoratorRotation.h"
#include "Core/Material/Material.h"
#include "Core/Particle/IParticle.h"
+#include "Core/Scattering/FormFactorDecoratorMaterial.h"
+#include "Core/Scattering/FormFactorDecoratorRotation.h"
//! A particle with a form factor and refractive index.
//! @ingroup samples
diff --git a/Core/Scattering/FormFactorDecoratorMaterial.h b/Core/Scattering/FormFactorDecoratorMaterial.h
index 0656b362812..50b4e6365db 100644
--- a/Core/Scattering/FormFactorDecoratorMaterial.h
+++ b/Core/Scattering/FormFactorDecoratorMaterial.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_CORE_DECORATEDFORMFACTOR_FORMFACTORDECORATORMATERIAL_H
#define BORNAGAIN_CORE_DECORATEDFORMFACTOR_FORMFACTORDECORATORMATERIAL_H
-#include "Core/Scattering/IFormFactorDecorator.h"
#include "Core/Material/Material.h"
+#include "Core/Scattering/IFormFactorDecorator.h"
#include <memory>
//! Decorates a scalar formfactor with the correct factor for the material's
diff --git a/Core/Scattering/IFormFactor.cpp b/Core/Scattering/IFormFactor.cpp
index 2d4f478f5d9..89599cf622a 100644
--- a/Core/Scattering/IFormFactor.cpp
+++ b/Core/Scattering/IFormFactor.cpp
@@ -14,9 +14,9 @@
#include "Core/Scattering/IFormFactor.h"
#include "Core/Basics/Exceptions.h"
+#include "Core/Multilayer/ILayerRTCoefficients.h"
#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
#include "Core/Scattering/FormFactorDecoratorRotation.h"
-#include "Core/Multilayer/ILayerRTCoefficients.h"
#include "Core/Scattering/Rotations.h"
#include "Core/Vector/WavevectorInfo.h"
#include <memory>
diff --git a/Core/Scattering/IFormFactor.h b/Core/Scattering/IFormFactor.h
index b80bacf0639..2dfa5af6422 100644
--- a/Core/Scattering/IFormFactor.h
+++ b/Core/Scattering/IFormFactor.h
@@ -17,8 +17,8 @@
#include "Core/Basics/Complex.h"
#include "Core/Material/Material.h"
-#include "Core/Particle/ZLimits.h"
#include "Core/Scattering/ISample.h"
+#include "Core/Scattering/ZLimits.h"
#include "Core/Vector/EigenCore.h"
#include "Core/Vector/Vectors3D.h"
diff --git a/Core/Particle/ZLimits.cpp b/Core/Scattering/ZLimits.cpp
similarity index 97%
rename from Core/Particle/ZLimits.cpp
rename to Core/Scattering/ZLimits.cpp
index 4cc518de944..2a1149d3541 100644
--- a/Core/Particle/ZLimits.cpp
+++ b/Core/Scattering/ZLimits.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Core/Particle/ZLimits.cpp
+//! @file Core/Scattering/ZLimits.cpp
//! @brief Defines class ZLimits.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************** //
-#include "Core/Particle/ZLimits.h"
+#include "Core/Scattering/ZLimits.h"
#include <algorithm>
#include <stdexcept>
diff --git a/Core/Particle/ZLimits.h b/Core/Scattering/ZLimits.h
similarity index 97%
rename from Core/Particle/ZLimits.h
rename to Core/Scattering/ZLimits.h
index ac87b253e36..3be13967510 100644
--- a/Core/Particle/ZLimits.h
+++ b/Core/Scattering/ZLimits.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Core/Particle/ZLimits.h
+//! @file Core/Scattering/ZLimits.h
//! @brief Defines class ZLimits.
//!
//! @homepage http://www.bornagainproject.org
diff --git a/Core/Simulation/DepthProbeSimulation.cpp b/Core/Simulation/DepthProbeSimulation.cpp
index 116a58f5657..efb700cf2bf 100644
--- a/Core/Simulation/DepthProbeSimulation.cpp
+++ b/Core/Simulation/DepthProbeSimulation.cpp
@@ -17,9 +17,9 @@
#include "Core/Beam/IFootprintFactor.h"
#include "Core/Computation/DepthProbeComputation.h"
#include "Core/Computation/IBackground.h"
+#include "Core/Detector/SpecularDetector1D.h"
#include "Core/Intensity/Histogram1D.h"
#include "Core/Intensity/SimpleUnitConverters.h"
-#include "Core/Detector/SpecularDetector1D.h"
#include "Core/Material/MaterialUtils.h"
#include "Core/Multilayer/IMultiLayerBuilder.h"
#include "Core/Multilayer/MultiLayer.h"
diff --git a/Core/Simulation/SpecularSimulation.cpp b/Core/Simulation/SpecularSimulation.cpp
index 607e57f6418..d89a5381052 100644
--- a/Core/Simulation/SpecularSimulation.cpp
+++ b/Core/Simulation/SpecularSimulation.cpp
@@ -18,10 +18,10 @@
#include "Core/Binning/PointwiseAxis.h"
#include "Core/Computation/IBackground.h"
#include "Core/Computation/SpecularComputation.h"
+#include "Core/Detector/SpecularDetector1D.h"
#include "Core/Instrument/AngularSpecScan.h"
-#include "Core/Intensity/Histogram1D.h"
#include "Core/Instrument/ISpecularScan.h"
-#include "Core/Detector/SpecularDetector1D.h"
+#include "Core/Intensity/Histogram1D.h"
#include "Core/Intensity/UnitConverter1D.h"
#include "Core/Material/MaterialUtils.h"
#include "Core/Multilayer/IMultiLayerBuilder.h"
diff --git a/Core/StandardSamples/StandardSimulations.cpp b/Core/StandardSamples/StandardSimulations.cpp
index 2de16176d19..0d303bf8f0f 100644
--- a/Core/StandardSamples/StandardSimulations.cpp
+++ b/Core/StandardSamples/StandardSimulations.cpp
@@ -17,10 +17,10 @@
#include "Core/Beam/FootprintSquare.h"
#include "Core/Binning/FixedBinAxis.h"
#include "Core/Computation/ConstantBackground.h"
-#include "Core/Instrument/AngularSpecScan.h"
#include "Core/Detector/IsGISAXSDetector.h"
-#include "Core/Instrument/QSpecScan.h"
#include "Core/Detector/RectangularDetector.h"
+#include "Core/Instrument/AngularSpecScan.h"
+#include "Core/Instrument/QSpecScan.h"
#include "Core/Instrument/ResolutionFunction2DGaussian.h"
#include "Core/Instrument/ScanResolution.h"
#include "Core/Mask/Ellipse.h"
diff --git a/Core/includeIncludes/FormFactors.h b/Core/includeIncludes/FormFactors.h
index 62c8166c01d..9026de0cb33 100644
--- a/Core/includeIncludes/FormFactors.h
+++ b/Core/includeIncludes/FormFactors.h
@@ -15,10 +15,10 @@
#ifndef BORNAGAIN_CORE_INCLUDEINCLUDES_FORMFACTORS_H
#define BORNAGAIN_CORE_INCLUDEINCLUDES_FORMFACTORS_H
+#include "Core/Particle/FormFactorWeighted.h"
#include "Core/Scattering/FormFactorDecoratorMaterial.h"
#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
#include "Core/Scattering/FormFactorDecoratorRotation.h"
-#include "Core/Particle/FormFactorWeighted.h"
#include "Core/includeIncludes/HardParticles.h"
#include "Core/includeIncludes/SoftParticles.h"
diff --git a/Core/includeIncludes/SoftParticles.h b/Core/includeIncludes/SoftParticles.h
index 52c183dccab..ea170d10f0c 100644
--- a/Core/includeIncludes/SoftParticles.h
+++ b/Core/includeIncludes/SoftParticles.h
@@ -15,13 +15,13 @@
#ifndef BORNAGAIN_CORE_INCLUDEINCLUDES_SOFTPARTICLES_H
#define BORNAGAIN_CORE_INCLUDEINCLUDES_SOFTPARTICLES_H
+#include "Core/HardParticle/FormFactorHollowSphere.h"
#include "Core/SoftParticle/FormFactorDebyeBueche.h"
#include "Core/SoftParticle/FormFactorGauss.h"
#include "Core/SoftParticle/FormFactorLorentz.h"
#include "Core/SoftParticle/FormFactorOrnsteinZernike.h"
#include "Core/SoftParticle/FormFactorSphereGaussianRadius.h"
#include "Core/SoftParticle/FormFactorSphereLogNormalRadius.h"
-#include "Core/HardParticle/FormFactorHollowSphere.h"
#include "Core/includeIncludes/SoftParticles.h"
#endif // BORNAGAIN_CORE_INCLUDEINCLUDES_SOFTPARTICLES_H
diff --git a/GUI/coregui/Models/TransformFromDomain.cpp b/GUI/coregui/Models/TransformFromDomain.cpp
index 035312dc45f..d47bf2bc60a 100644
--- a/GUI/coregui/Models/TransformFromDomain.cpp
+++ b/GUI/coregui/Models/TransformFromDomain.cpp
@@ -21,14 +21,14 @@
#include "Core/Binning/FixedBinAxis.h"
#include "Core/Computation/ConstantBackground.h"
#include "Core/Computation/PoissonNoiseBackground.h"
-#include "Core/Export/INodeUtils.h"
-#include "Core/Instrument/AngularSpecScan.h"
#include "Core/Detector/ConvolutionDetectorResolution.h"
#include "Core/Detector/RectangularDetector.h"
#include "Core/Detector/RegionOfInterest.h"
+#include "Core/Detector/SphericalDetector.h"
+#include "Core/Export/INodeUtils.h"
+#include "Core/Instrument/AngularSpecScan.h"
#include "Core/Instrument/ResolutionFunction2DGaussian.h"
#include "Core/Instrument/ScanResolution.h"
-#include "Core/Detector/SphericalDetector.h"
#include "Core/Mask/Ellipse.h"
#include "Core/Mask/InfinitePlane.h"
#include "Core/Mask/Line.h"
diff --git a/GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.cpp b/GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.cpp
index 6eb4240c578..54862c89982 100644
--- a/GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.cpp
@@ -16,9 +16,9 @@
#include "Core/Fitting/FitObjective.h"
#include "Core/Fitting/ObjectiveMetric.h"
#include "Core/Instrument/ChiSquaredModule.h"
+#include "Core/Instrument/VarianceFunctions.h"
#include "Core/Intensity/IIntensityFunction.h"
#include "Core/Intensity/OutputData.h"
-#include "Core/Instrument/VarianceFunctions.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Simulation/Simulation.h"
#include "Fit/Kernel/KernelTypes.h"
diff --git a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
index 1cb41fa18ee..6e53006b1b0 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
@@ -14,8 +14,8 @@
#include "GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h"
#include "Core/Detector/DetectorMask.h"
-#include "Core/Intensity/OutputData.h"
#include "Core/Detector/RegionOfInterest.h"
+#include "Core/Intensity/OutputData.h"
#include "Core/Mask/IShape2D.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/MaskItems.h"
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
index 1eb27b30c6b..fdcb5652f19 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h"
#include "Core/Basics/Exceptions.h"
-#include "Core/Scattering/IFormFactorDecorator.h"
#include "Core/Parametrization/Units.h"
#include "Core/Particle/FormFactorCrystal.h"
#include "Core/Particle/IParticle.h"
@@ -22,6 +21,7 @@
#include "Core/Particle/Particle.h"
#include "Core/Particle/ParticleCoreShell.h"
#include "Core/Particle/ParticleDistribution.h"
+#include "Core/Scattering/IFormFactorDecorator.h"
#include "Core/Scattering/Rotations.h"
#include "Core/includeIncludes/InterferenceFunctions.h"
#include "GUI/coregui/Models/InterferenceFunctionItems.h"
diff --git a/Tests/Functional/Core/Fitting/PlanCases.cpp b/Tests/Functional/Core/Fitting/PlanCases.cpp
index 52e451d3ac4..c1189c860e5 100644
--- a/Tests/Functional/Core/Fitting/PlanCases.cpp
+++ b/Tests/Functional/Core/Fitting/PlanCases.cpp
@@ -16,9 +16,9 @@
#include "Core/Aggregate/FTDecayFunctions.h"
#include "Core/Aggregate/InterferenceFunction2DLattice.h"
#include "Core/Aggregate/ParticleLayout.h"
+#include "Core/Detector/RectangularDetector.h"
#include "Core/Fitting/FitObjective.h"
#include "Core/HardParticle/FormFactorCylinder.h"
-#include "Core/Detector/RectangularDetector.h"
#include "Core/Mask/Rectangle.h"
#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
diff --git a/Tests/Performance/Core/Mesocrystal.cpp b/Tests/Performance/Core/Mesocrystal.cpp
index cade8b0e7bb..2cd2368a9ec 100644
--- a/Tests/Performance/Core/Mesocrystal.cpp
+++ b/Tests/Performance/Core/Mesocrystal.cpp
@@ -14,8 +14,8 @@
#include "Core/Particle/MesoCrystal.h"
#include "Core/Aggregate/ParticleLayout.h"
-#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/Detector/RectangularDetector.h"
+#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/Lattice/ISelectionRule.h"
#include "Core/Lattice/Lattice.h"
#include "Core/Material/Material.h"
diff --git a/Tests/Performance/Core/ThreadingComponents.cpp b/Tests/Performance/Core/ThreadingComponents.cpp
index 113ba531c6a..66b7f8d53ab 100644
--- a/Tests/Performance/Core/ThreadingComponents.cpp
+++ b/Tests/Performance/Core/ThreadingComponents.cpp
@@ -15,8 +15,8 @@
#include "Tests/Performance/Core/ThreadingComponents.h"
#include "Core/Aggregate/InterferenceFunction2DLattice.h"
#include "Core/Aggregate/ParticleLayout.h"
-#include "Core/HardParticle/FormFactorFullSphere.h"
#include "Core/Detector/RectangularDetector.h"
+#include "Core/HardParticle/FormFactorFullSphere.h"
#include "Core/Mask/Rectangle.h"
#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
diff --git a/Tests/UnitTests/Core/Axes/UnitConverter1DTest.cpp b/Tests/UnitTests/Core/Axes/UnitConverter1DTest.cpp
index c9ea5ebb0c3..0264c069690 100644
--- a/Tests/UnitTests/Core/Axes/UnitConverter1DTest.cpp
+++ b/Tests/UnitTests/Core/Axes/UnitConverter1DTest.cpp
@@ -4,8 +4,8 @@
#include "Core/Binning/FixedBinAxis.h"
#include "Core/Binning/PointwiseAxis.h"
#include "Core/Binning/VariableBinAxis.h"
-#include "Core/Intensity/OutputData.h"
#include "Core/Instrument/QSpecScan.h"
+#include "Core/Intensity/OutputData.h"
#include "Core/Parametrization/Units.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/Core/Detector/OffSpecularConverterTest.cpp b/Tests/UnitTests/Core/Detector/OffSpecularConverterTest.cpp
index 17aed5871e7..d59f8310043 100644
--- a/Tests/UnitTests/Core/Detector/OffSpecularConverterTest.cpp
+++ b/Tests/UnitTests/Core/Detector/OffSpecularConverterTest.cpp
@@ -1,6 +1,6 @@
#include "Core/Beam/Beam.h"
-#include "Core/Intensity/SimpleUnitConverters.h"
#include "Core/Detector/SphericalDetector.h"
+#include "Core/Intensity/SimpleUnitConverters.h"
#include "Core/Parametrization/Units.h"
#include "Core/Vector/Vectors3D.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/Core/Detector/SphericalConverterTest.cpp b/Tests/UnitTests/Core/Detector/SphericalConverterTest.cpp
index 5324602c632..adc3cd05e57 100644
--- a/Tests/UnitTests/Core/Detector/SphericalConverterTest.cpp
+++ b/Tests/UnitTests/Core/Detector/SphericalConverterTest.cpp
@@ -1,6 +1,6 @@
#include "Core/Beam/Beam.h"
-#include "Core/Intensity/SimpleUnitConverters.h"
#include "Core/Detector/SphericalDetector.h"
+#include "Core/Intensity/SimpleUnitConverters.h"
#include "Core/Parametrization/Units.h"
#include "Core/Vector/Vectors3D.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/Core/Detector/SphericalDetectorTest.cpp b/Tests/UnitTests/Core/Detector/SphericalDetectorTest.cpp
index 6f1363efa29..45c8731a493 100644
--- a/Tests/UnitTests/Core/Detector/SphericalDetectorTest.cpp
+++ b/Tests/UnitTests/Core/Detector/SphericalDetectorTest.cpp
@@ -4,9 +4,9 @@
#include "Core/Binning/FixedBinAxis.h"
#include "Core/Detector/ConvolutionDetectorResolution.h"
#include "Core/Detector/DetectorFunctions.h"
-#include "Core/Intensity/OutputData.h"
#include "Core/Detector/RegionOfInterest.h"
#include "Core/Instrument/ResolutionFunction2DGaussian.h"
+#include "Core/Intensity/OutputData.h"
#include "Core/Intensity/SimulationArea.h"
#include "Core/Mask/Polygon.h"
#include "Core/Mask/Rectangle.h"
diff --git a/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp b/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp
index 27d96e981bd..f0c05959bf4 100644
--- a/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp
@@ -172,8 +172,7 @@ TEST_F(SpecularScanTest, AngularScanClone)
EXPECT_EQ(scan_clone2->footprintFactor()->widthRatio(), f_factor.widthRatio());
EXPECT_NE(scan_clone2->footprintFactor(), scan.footprintFactor());
EXPECT_NE(scan_clone2->footprintFactor(), &f_factor);
- EXPECT_NE(dynamic_cast<const FootprintGauss*>(scan_clone2->footprintFactor()),
- nullptr);
+ EXPECT_NE(dynamic_cast<const FootprintGauss*>(scan_clone2->footprintFactor()), nullptr);
}
TEST_F(SpecularScanTest, QScanClone)
diff --git a/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp b/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp
index 018fe4609be..42e3e9de799 100644
--- a/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp
@@ -4,8 +4,8 @@
#include "Core/Binning/FixedBinAxis.h"
#include "Core/Binning/VariableBinAxis.h"
#include "Core/Instrument/AngularSpecScan.h"
-#include "Core/Intensity/Histogram1D.h"
#include "Core/Instrument/QSpecScan.h"
+#include "Core/Intensity/Histogram1D.h"
#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/IMultiLayerBuilder.h"
#include "Core/Multilayer/Layer.h"
diff --git a/Tests/UnitTests/Core/Other/ChiSquaredModuleTest.cpp b/Tests/UnitTests/Core/Other/ChiSquaredModuleTest.cpp
index 2f87a9f1357..c2b8c340e84 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/Intensity/OutputData.h"
#include "Core/Instrument/VarianceFunctions.h"
+#include "Core/Intensity/OutputData.h"
#include "Tests/GTestWrapper/google_test.h"
// TODO revise test
diff --git a/Tests/UnitTests/Core/Other/SpectrumTest.cpp b/Tests/UnitTests/Core/Other/SpectrumTest.cpp
index e32e26860bc..82752951878 100644
--- a/Tests/UnitTests/Core/Other/SpectrumTest.cpp
+++ b/Tests/UnitTests/Core/Other/SpectrumTest.cpp
@@ -1,5 +1,5 @@
-#include "Core/Intensity/Histogram2D.h"
#include "Core/Instrument/SpectrumUtils.h"
+#include "Core/Intensity/Histogram2D.h"
#include "Tests/GTestWrapper/google_test.h"
#include "tspectrum.h"
#include <iostream>
diff --git a/Tests/UnitTests/Core/Other/ZLimitsTest.cpp b/Tests/UnitTests/Core/Other/ZLimitsTest.cpp
index 2b25b5855bf..c25764427cc 100644
--- a/Tests/UnitTests/Core/Other/ZLimitsTest.cpp
+++ b/Tests/UnitTests/Core/Other/ZLimitsTest.cpp
@@ -1,4 +1,4 @@
-#include "Core/Particle/ZLimits.h"
+#include "Core/Scattering/ZLimits.h"
#include "Tests/GTestWrapper/google_test.h"
#include <stdexcept>
diff --git a/Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.cpp b/Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.cpp
index b6f11b20866..20410e3dd83 100644
--- a/Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.cpp
+++ b/Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.cpp
@@ -1,6 +1,6 @@
-#include "Core/Scattering/IFormFactorDecorator.h"
#include "Core/Particle/Particle.h"
#include "Core/Scattering/IFormFactor.h"
+#include "Core/Scattering/IFormFactorDecorator.h"
#include "GUI/coregui/Models/ApplicationModels.h"
#include "GUI/coregui/Models/ParticleItem.h"
#include "GUI/coregui/Models/ParticleLayoutItem.h"
--
GitLab