diff --git a/Base/Axis/FixedBinAxis.cpp b/Base/Axis/FixedBinAxis.cpp
index 5b5d490370618a96dbe27d8d9e350d38edd24c0b..2e26923e6594668616b643069b6e8bcff77f810e 100644
--- a/Base/Axis/FixedBinAxis.cpp
+++ b/Base/Axis/FixedBinAxis.cpp
@@ -126,8 +126,8 @@ bool FixedBinAxis::equals(const IAxis& other) const
std::string FixedBinAxis::pyString(const std::string& units, size_t) const
{
std::ostringstream result;
- result << "ba.FixedBinAxis(" << pyfmt::printString(getName()) << ", "
- << size() << ", " << pyfmt::printValue(getMin(), units) << ", "
- << pyfmt::printValue(getMax(), units) << ")";
+ result << "ba.FixedBinAxis(" << pyfmt::printString(getName()) << ", " << size() << ", "
+ << pyfmt::printValue(getMin(), units) << ", " << pyfmt::printValue(getMax(), units)
+ << ")";
return result.str();
}
diff --git a/Core/Computation/LayoutStrategyBuilder.cpp b/Core/Computation/LayoutStrategyBuilder.cpp
index 85d529cb4cc30db73290133de5949753a18bd07d..e425cf95874fdfc1075d19d01fe86748f218ae58 100644
--- a/Core/Computation/LayoutStrategyBuilder.cpp
+++ b/Core/Computation/LayoutStrategyBuilder.cpp
@@ -14,8 +14,8 @@
#include "Core/Computation/LayoutStrategyBuilder.h"
#include "Base/Types/Exceptions.h"
-#include "Sample/Aggregate/InterferenceFunctionRadialParaCrystal.h"
#include "Core/Computation/ProcessedLayout.h"
+#include "Sample/Aggregate/InterferenceFunctionRadialParaCrystal.h"
#include "Sample/Multilayer/DecouplingApproximationStrategy.h"
#include "Sample/Multilayer/SSCApproximationStrategy.h"
diff --git a/Core/Export/SampleToPython.cpp b/Core/Export/SampleToPython.cpp
index 5c38be5a6a192b1c96a04b3bff69704bd171cd0a..3300a5e7650983990f1f50d450091bc98d340f75 100644
--- a/Core/Export/SampleToPython.cpp
+++ b/Core/Export/SampleToPython.cpp
@@ -14,11 +14,12 @@
#include "Core/Export/SampleToPython.h"
#include "Base/Utils/PyFmt.h"
-#include "Sample/Aggregate/InterferenceFunctions.h"
-#include "Sample/Aggregate/ParticleLayout.h"
#include "Core/Export/INodeUtils.h"
#include "Core/Export/SampleLabelHandler.h"
#include "Device/Instrument/PyFmt2.h"
+#include "Param/Varia/ParameterUtils.h"
+#include "Sample/Aggregate/InterferenceFunctions.h"
+#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/LayerInterface.h"
#include "Sample/Multilayer/LayerRoughness.h"
@@ -29,7 +30,6 @@
#include "Sample/Particle/ParticleComposition.h"
#include "Sample/Particle/ParticleCoreShell.h"
#include "Sample/Particle/ParticleDistribution.h"
-#include "Param/Varia/ParameterUtils.h"
#include <iomanip>
#include <map>
#include <set>
diff --git a/Core/Export/SimulationToPython.cpp b/Core/Export/SimulationToPython.cpp
index b9e3aa10039a3ef76ef65ccd9fbf0353456d483b..ca87bfe2eb5217615fe097e0a3252410e564c936 100644
--- a/Core/Export/SimulationToPython.cpp
+++ b/Core/Export/SimulationToPython.cpp
@@ -15,22 +15,22 @@
#include "Core/Export/SimulationToPython.h"
#include "Base/Utils/Algorithms.h"
#include "Base/Utils/PyFmt.h"
-#include "Device/Beam/FootprintGauss.h"
-#include "Device/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/Simulation/GISASSimulation.h"
+#include "Core/Simulation/OffSpecSimulation.h"
+#include "Core/Simulation/SpecularSimulation.h"
+#include "Device/Beam/FootprintGauss.h"
+#include "Device/Beam/FootprintSquare.h"
#include "Device/Detector/RectangularDetector.h"
#include "Device/Detector/RegionOfInterest.h"
#include "Device/Detector/SphericalDetector.h"
-#include "Core/Export/INodeUtils.h"
-#include "Core/Export/SampleToPython.h"
#include "Device/Instrument/PyFmt2.h"
#include "Device/Resolution/ConvolutionDetectorResolution.h"
#include "Device/Resolution/ResolutionFunction2DGaussian.h"
#include "Device/Scan/ISpecularScan.h"
-#include "Core/Simulation/GISASSimulation.h"
-#include "Core/Simulation/OffSpecSimulation.h"
-#include "Core/Simulation/SpecularSimulation.h"
#include "Param/Varia/ParameterUtils.h"
#include "Param/Varia/PyFmtLimits.h"
#include <iomanip>
diff --git a/Core/Fitting/FitObjective.cpp b/Core/Fitting/FitObjective.cpp
index 579e0d92de7653973fc29956b0a15e22f465b958..70a2972e406d9cb9db09de774716ecd98958d6eb 100644
--- a/Core/Fitting/FitObjective.cpp
+++ b/Core/Fitting/FitObjective.cpp
@@ -17,8 +17,8 @@
#include "Core/Fitting/ObjectiveMetric.h"
#include "Core/Fitting/ObjectiveMetricUtils.h"
#include "Core/Fitting/PyFittingCallbacks.h"
-#include "Device/Instrument/ChiSquaredModule.h"
#include "Core/Simulation/Simulation.h"
+#include "Device/Instrument/ChiSquaredModule.h"
#include <stdexcept>
class IMetricWrapper
diff --git a/Core/Fitting/ObjectiveMetric.cpp b/Core/Fitting/ObjectiveMetric.cpp
index 15f34c0ad0ddd9f2cc1576d6a6931846ab4a1810..a8aff56d0b42b061827538ae8f47abf4f8b1a75a 100644
--- a/Core/Fitting/ObjectiveMetric.cpp
+++ b/Core/Fitting/ObjectiveMetric.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Fitting/ObjectiveMetric.h"
-#include "Device/Data/OutputData.h"
#include "Core/Fitting/ObjectiveMetricUtils.h"
#include "Core/Fitting/SimDataPair.h"
+#include "Device/Data/OutputData.h"
#include <cmath>
#include <limits>
diff --git a/Core/Fitting/SimDataPair.cpp b/Core/Fitting/SimDataPair.cpp
index 86dfd8cecacd443e182d38ac621d85edb106ba5b..67170b7c007f26183b3081c0b9ff04f30dba6a6e 100644
--- a/Core/Fitting/SimDataPair.cpp
+++ b/Core/Fitting/SimDataPair.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Fitting/SimDataPair.h"
-#include "Device/Instrument/IntensityDataFunctions.h"
#include "Core/Simulation/Simulation.h"
#include "Core/Simulation/UnitConverterUtils.h"
+#include "Device/Instrument/IntensityDataFunctions.h"
#include "Fit/TestEngine/Numeric.h"
namespace
diff --git a/Core/Simulation/DepthProbeSimulation.cpp b/Core/Simulation/DepthProbeSimulation.cpp
index 74d137632253d17eccb142d046b765b857115d25..7811829263546d22565f2ca582b318050c0d3ffe 100644
--- a/Core/Simulation/DepthProbeSimulation.cpp
+++ b/Core/Simulation/DepthProbeSimulation.cpp
@@ -14,18 +14,18 @@
#include "Core/Simulation/DepthProbeSimulation.h"
#include "Base/Const/MathConstants.h"
-#include "Device/Beam/IFootprintFactor.h"
#include "Core/Computation/DepthProbeComputation.h"
#include "Core/Computation/IBackground.h"
+#include "Device/Beam/IFootprintFactor.h"
#include "Device/Detector/SimpleUnitConverters.h"
#include "Device/Detector/SpecularDetector1D.h"
#include "Device/Histo/Histogram1D.h"
-#include "Sample/Material/MaterialUtils.h"
-#include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
#include "Param/Distrib/Distributions.h"
+#include "Sample/Material/MaterialUtils.h"
+#include "Sample/Multilayer/MultiLayer.h"
+#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
namespace
{
diff --git a/Core/Simulation/DepthProbeSimulation.h b/Core/Simulation/DepthProbeSimulation.h
index 70d24c28366ff8e076fc3aec82c24c9ce539eb74..da7dfefe37dca04d69fd515c61f4cb0b94e18f49 100644
--- a/Core/Simulation/DepthProbeSimulation.h
+++ b/Core/Simulation/DepthProbeSimulation.h
@@ -16,8 +16,8 @@
#define BORNAGAIN_CORE_SIMULATION_DEPTHPROBESIMULATION_H
#include "Core/Computation/DepthProbeElement.h"
-#include "Sample/RT/ILayerRTCoefficients.h"
#include "Core/Simulation/Simulation.h"
+#include "Sample/RT/ILayerRTCoefficients.h"
#include <vector>
diff --git a/Core/Simulation/GISASSimulation.cpp b/Core/Simulation/GISASSimulation.cpp
index 5b3c0cbde2d920604130827f3eb0f3f5af0b329e..87a1ffc6174805ba8800c35ff16e4a3a7b43e274 100644
--- a/Core/Simulation/GISASSimulation.cpp
+++ b/Core/Simulation/GISASSimulation.cpp
@@ -15,10 +15,10 @@
#include "Core/Simulation/GISASSimulation.h"
#include "Core/Computation/DWBAComputation.h"
#include "Core/Computation/IBackground.h"
+#include "Core/Simulation/UnitConverterUtils.h"
#include "Device/Histo/Histogram2D.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
-#include "Core/Simulation/UnitConverterUtils.h"
GISASSimulation::GISASSimulation()
{
diff --git a/Core/Simulation/OffSpecSimulation.cpp b/Core/Simulation/OffSpecSimulation.cpp
index b7c051311826a11e9db3992db8e7134cf066b24c..ad551ecd291df97eabe6c5d2871561e918394d66 100644
--- a/Core/Simulation/OffSpecSimulation.cpp
+++ b/Core/Simulation/OffSpecSimulation.cpp
@@ -16,11 +16,11 @@
#include "Core/Computation/DWBAComputation.h"
#include "Device/Detector/SimpleUnitConverters.h"
#include "Device/Histo/Histogram2D.h"
-#include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
#include "Param/Distrib/Distributions.h"
+#include "Sample/Multilayer/MultiLayer.h"
+#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
OffSpecSimulation::OffSpecSimulation()
{
diff --git a/Core/Simulation/Simulation.cpp b/Core/Simulation/Simulation.cpp
index 2fba9f5561a7375a2680504ee1c057320f3d3a48..0709743257882a1a76a75f2e16412bfc802a867e 100644
--- a/Core/Simulation/Simulation.cpp
+++ b/Core/Simulation/Simulation.cpp
@@ -15,14 +15,14 @@
#include "Core/Simulation/Simulation.h"
#include "Core/Computation/IBackground.h"
#include "Core/Computation/IComputation.h"
-#include "Device/Detector/DetectorFunctions.h"
-#include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Multilayer/MultiLayerUtils.h"
-#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
#include "Core/Simulation/MPISimulation.h"
#include "Core/Simulation/UnitConverterUtils.h"
+#include "Device/Detector/DetectorFunctions.h"
#include "Fit/Tools/StringUtils.h"
#include "Param/Base/ParameterPool.h"
+#include "Sample/Multilayer/MultiLayer.h"
+#include "Sample/Multilayer/MultiLayerUtils.h"
+#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
#include <gsl/gsl_errno.h>
#include <iomanip>
#include <iostream>
diff --git a/Core/Simulation/Simulation.h b/Core/Simulation/Simulation.h
index 71152c558009eadb40bffa15fd08c82a6c449486..def41e1dc848ecc48a94aba570085dde7d749a96 100644
--- a/Core/Simulation/Simulation.h
+++ b/Core/Simulation/Simulation.h
@@ -19,9 +19,9 @@
#include "Device/Detector/IDetector2D.h"
#include "Device/Histo/SimulationResult.h"
#include "Device/Instrument/Instrument.h"
+#include "Param/Distrib/DistributionHandler.h"
#include "Sample/RT/SimulationOptions.h"
#include "Sample/SampleBuilderEngine/SampleProvider.h"
-#include "Param/Distrib/DistributionHandler.h"
template <class T> class OutputData;
class IBackground;
diff --git a/Core/Simulation/SpecularSimulation.cpp b/Core/Simulation/SpecularSimulation.cpp
index 4116a3a0e90ea3bee5db98275d855f365d981594..f9dccfb21675753dd714effafcc93ea67ad7779c 100644
--- a/Core/Simulation/SpecularSimulation.cpp
+++ b/Core/Simulation/SpecularSimulation.cpp
@@ -15,20 +15,20 @@
#include "Core/Simulation/SpecularSimulation.h"
#include "Base/Axis/PointwiseAxis.h"
#include "Base/Const/MathConstants.h"
-#include "Device/Beam/IFootprintFactor.h"
#include "Core/Computation/IBackground.h"
#include "Core/Computation/SpecularComputation.h"
+#include "Device/Beam/IFootprintFactor.h"
#include "Device/Detector/SpecularDetector1D.h"
#include "Device/Histo/Histogram1D.h"
-#include "Sample/Material/MaterialUtils.h"
-#include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Multilayer/SpecularSimulationElement.h"
-#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
#include "Device/Scan/AngularSpecScan.h"
#include "Device/Unit/UnitConverter1D.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
#include "Param/Distrib/Distributions.h"
+#include "Sample/Material/MaterialUtils.h"
+#include "Sample/Multilayer/MultiLayer.h"
+#include "Sample/Multilayer/SpecularSimulationElement.h"
+#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
namespace
{
diff --git a/Core/Simulation/SpecularSimulation.h b/Core/Simulation/SpecularSimulation.h
index 73062397f2db0e34ef17067efa2cb749b916f203..5b797d799adec4881ecddd5a79ca7f6fdf68bcd6 100644
--- a/Core/Simulation/SpecularSimulation.h
+++ b/Core/Simulation/SpecularSimulation.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_CORE_SIMULATION_SPECULARSIMULATION_H
#define BORNAGAIN_CORE_SIMULATION_SPECULARSIMULATION_H
-#include "Sample/RT/ILayerRTCoefficients.h"
#include "Core/Simulation/Simulation.h"
+#include "Sample/RT/ILayerRTCoefficients.h"
class IAxis;
class IComputation;
diff --git a/Core/Simulation/StandardSimulations.cpp b/Core/Simulation/StandardSimulations.cpp
index 7a34ddfb235e023d7209a9f4392333bbfca15e6e..6e91b0dcae0a9d53e1ece66ff4efb9da65f542f0 100644
--- a/Core/Simulation/StandardSimulations.cpp
+++ b/Core/Simulation/StandardSimulations.cpp
@@ -14,9 +14,13 @@
#include "Core/Simulation/StandardSimulations.h"
#include "Base/Const/Units.h"
+#include "Core/Computation/ConstantBackground.h"
+#include "Core/Simulation/DepthProbeSimulation.h"
+#include "Core/Simulation/GISASSimulation.h"
+#include "Core/Simulation/OffSpecSimulation.h"
+#include "Core/Simulation/SpecularSimulation.h"
#include "Device/Beam/FootprintGauss.h"
#include "Device/Beam/FootprintSquare.h"
-#include "Core/Computation/ConstantBackground.h"
#include "Device/Detector/IsGISAXSDetector.h"
#include "Device/Detector/RectangularDetector.h"
#include "Device/Mask/Ellipse.h"
@@ -27,15 +31,11 @@
#include "Device/Resolution/ScanResolution.h"
#include "Device/Scan/AngularSpecScan.h"
#include "Device/Scan/QSpecScan.h"
-#include "Core/Simulation/DepthProbeSimulation.h"
-#include "Core/Simulation/GISASSimulation.h"
-#include "Core/Simulation/OffSpecSimulation.h"
-#include "Core/Simulation/SpecularSimulation.h"
-#include "Sample/StandardSamples/SampleBuilderFactory.h"
#include "Param/Base/RealParameter.h"
#include "Param/Distrib/Distributions.h"
#include "Param/Distrib/RangedDistributions.h"
#include "Param/Varia/ParameterPattern.h"
+#include "Sample/StandardSamples/SampleBuilderFactory.h"
#include <memory>
namespace
diff --git a/Core/Simulation/UnitConverterUtils.cpp b/Core/Simulation/UnitConverterUtils.cpp
index 8edfb00a3210a110066b3756f1d82076661d2a39..fd5ef173f5036d587256ca0963946918d5245da3 100644
--- a/Core/Simulation/UnitConverterUtils.cpp
+++ b/Core/Simulation/UnitConverterUtils.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "Core/Simulation/UnitConverterUtils.h"
-#include "Device/Detector/RectangularDetector.h"
-#include "Device/Detector/SimpleUnitConverters.h"
-#include "Device/Detector/SphericalDetector.h"
#include "Core/Simulation/DepthProbeSimulation.h"
#include "Core/Simulation/GISASSimulation.h"
#include "Core/Simulation/OffSpecSimulation.h"
#include "Core/Simulation/SpecularSimulation.h"
+#include "Device/Detector/RectangularDetector.h"
+#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/SphericalDetector.h"
#include "Device/Unit/UnitConverter1D.h"
std::unique_ptr<OutputData<double>>
diff --git a/Device/Scan/AngularSpecScan.cpp b/Device/Scan/AngularSpecScan.cpp
index 58006d5c31a3b7094e405aed057e3123ab614d81..6d86ed497ca19a22db8495009615dbbc6256c6c6 100644
--- a/Device/Scan/AngularSpecScan.cpp
+++ b/Device/Scan/AngularSpecScan.cpp
@@ -17,9 +17,9 @@
#include "Base/Axis/PointwiseAxis.h"
#include "Base/Utils/PyFmt.h"
#include "Device/Beam/IFootprintFactor.h"
-#include "Sample/Multilayer/SpecularSimulationElement.h"
#include "Device/Resolution/ScanResolution.h"
#include "Param/Distrib/RangedDistributions.h"
+#include "Sample/Multilayer/SpecularSimulationElement.h"
namespace
{
diff --git a/Device/Scan/QSpecScan.cpp b/Device/Scan/QSpecScan.cpp
index fbb047cbcfc4cb83e9d40b8b51762674a8e2e072..3e84a1fb119ee737f5317aa8449f7527f2690844 100644
--- a/Device/Scan/QSpecScan.cpp
+++ b/Device/Scan/QSpecScan.cpp
@@ -16,9 +16,9 @@
#include "Base/Axis/FixedBinAxis.h"
#include "Base/Axis/PointwiseAxis.h"
#include "Base/Utils/PyFmt.h"
-#include "Sample/Multilayer/SpecularSimulationElement.h"
#include "Device/Resolution/ScanResolution.h"
#include "Param/Distrib/RangedDistributions.h"
+#include "Sample/Multilayer/SpecularSimulationElement.h"
namespace
{
diff --git a/Examples/cpp/CylindersAndPrisms/CylindersAndPrisms.cpp b/Examples/cpp/CylindersAndPrisms/CylindersAndPrisms.cpp
index 4eaf5150fa1d2a8a96b4253d40198c14e837df8a..3eddfff5367f2efc0cace41ebc17c24792530df5 100644
--- a/Examples/cpp/CylindersAndPrisms/CylindersAndPrisms.cpp
+++ b/Examples/cpp/CylindersAndPrisms/CylindersAndPrisms.cpp
@@ -14,16 +14,16 @@
// ********************************************************************************************** //
#include "Base/Const/Units.h"
+#include "Core/Simulation/GISASSimulation.h"
+#include "Device/Histo/Histogram2D.h"
+#include "Device/Histo/IntensityDataIOFactory.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/FormFactorCylinder.h"
#include "Sample/HardParticle/FormFactorPrism3.h"
-#include "Device/Histo/Histogram2D.h"
-#include "Device/Histo/IntensityDataIOFactory.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Particle.h"
-#include "Core/Simulation/GISASSimulation.h"
int main()
{
diff --git a/GUI/coregui/Models/ApplicationModels.cpp b/GUI/coregui/Models/ApplicationModels.cpp
index 832ac5342423bd0da044ecc02217c002ecd6128e..6dbc0a1f170e6eff56356497edda1a3d8f4c39e1 100644
--- a/GUI/coregui/Models/ApplicationModels.cpp
+++ b/GUI/coregui/Models/ApplicationModels.cpp
@@ -13,11 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Models/ApplicationModels.h"
-#include "Device/Histo/IntensityDataIOFactory.h"
-#include "Sample/Multilayer/MultiLayer.h"
#include "Core/Simulation/OffSpecSimulation.h"
#include "Core/Simulation/StandardSimulations.h"
-#include "Sample/StandardSamples/SampleBuilderFactory.h"
+#include "Device/Histo/IntensityDataIOFactory.h"
#include "GUI/coregui/Models/DocumentModel.h"
#include "GUI/coregui/Models/GUIObjectBuilder.h"
#include "GUI/coregui/Models/InstrumentItems.h"
@@ -32,6 +30,8 @@
#include "GUI/coregui/Models/SampleModel.h"
#include "GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h"
#include "GUI/coregui/utils/MessageService.h"
+#include "Sample/Multilayer/MultiLayer.h"
+#include "Sample/StandardSamples/SampleBuilderFactory.h"
#include <QtCore/QXmlStreamWriter>
ApplicationModels::ApplicationModels(QObject* parent)
diff --git a/GUI/coregui/Models/DepthProbeInstrumentItem.cpp b/GUI/coregui/Models/DepthProbeInstrumentItem.cpp
index c33be7ce0c4f36e3c2d450193dadc91726f8644d..4f6bed52f1ef020dcdcfb4fd0b42e27c50dc2d38 100644
--- a/GUI/coregui/Models/DepthProbeInstrumentItem.cpp
+++ b/GUI/coregui/Models/DepthProbeInstrumentItem.cpp
@@ -14,8 +14,8 @@
#include "GUI/coregui/Models/DepthProbeInstrumentItem.h"
#include "Base/Const/Units.h"
-#include "Device/Detector/SimpleUnitConverters.h"
#include "Core/Simulation/DepthProbeSimulation.h"
+#include "Device/Detector/SimpleUnitConverters.h"
#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/BeamWavelengthItem.h"
#include "GUI/coregui/Models/SpecularBeamInclinationItem.h"
diff --git a/GUI/coregui/Models/DomainObjectBuilder.cpp b/GUI/coregui/Models/DomainObjectBuilder.cpp
index 1bafa3a28ea48dbb89626101d5cb4c63232245cc..6f3be24156fee900aa53e9377e28d5ee9b5c92be 100644
--- a/GUI/coregui/Models/DomainObjectBuilder.cpp
+++ b/GUI/coregui/Models/DomainObjectBuilder.cpp
@@ -14,9 +14,9 @@
#include "GUI/coregui/Models/DomainObjectBuilder.h"
#include "Base/Const/Units.h"
+#include "Core/Simulation/UnitConverterUtils.h"
#include "Device/Detector/IDetector2D.h"
#include "Device/Detector/SimpleUnitConverters.h"
-#include "Core/Simulation/UnitConverterUtils.h"
#include "Device/Unit/UnitConverter1D.h"
#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/ComboProperty.h"
diff --git a/GUI/coregui/Models/DomainSimulationBuilder.cpp b/GUI/coregui/Models/DomainSimulationBuilder.cpp
index 4cc6d6eb6dcb8862669f1347a149425ed9785bd1..b370c9c7245fb7dce448e783755e74866063748c 100644
--- a/GUI/coregui/Models/DomainSimulationBuilder.cpp
+++ b/GUI/coregui/Models/DomainSimulationBuilder.cpp
@@ -14,13 +14,13 @@
#include "GUI/coregui/Models/DomainSimulationBuilder.h"
#include "Base/Const/Units.h"
-#include "Device/Beam/IFootprintFactor.h"
#include "Core/Computation/IBackground.h"
-#include "Device/Scan/AngularSpecScan.h"
#include "Core/Simulation/DepthProbeSimulation.h"
#include "Core/Simulation/GISASSimulation.h"
#include "Core/Simulation/OffSpecSimulation.h"
#include "Core/Simulation/SpecularSimulation.h"
+#include "Device/Beam/IFootprintFactor.h"
+#include "Device/Scan/AngularSpecScan.h"
#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/BackgroundItems.h"
#include "GUI/coregui/Models/DepthProbeInstrumentItem.h"
diff --git a/GUI/coregui/Models/FTDecayFunctionItems.h b/GUI/coregui/Models/FTDecayFunctionItems.h
index e578f85aa9e6e3db0c6a8e735a18b6c3c9cffb7c..c20f32db9b5407f73b4e74469edbe8cda2ec4ad8 100644
--- a/GUI/coregui/Models/FTDecayFunctionItems.h
+++ b/GUI/coregui/Models/FTDecayFunctionItems.h
@@ -15,9 +15,9 @@
#ifndef BORNAGAIN_GUI_COREGUI_MODELS_FTDECAYFUNCTIONITEMS_H
#define BORNAGAIN_GUI_COREGUI_MODELS_FTDECAYFUNCTIONITEMS_H
+#include "GUI/coregui/Models/SessionItem.h"
#include "Sample/Correlations/FTDecay1D.h"
#include "Sample/Correlations/FTDecay2D.h"
-#include "GUI/coregui/Models/SessionItem.h"
class BA_CORE_API_ FTDecayFunction1DItem : public SessionItem
{
diff --git a/GUI/coregui/Models/FTDistributionItems.h b/GUI/coregui/Models/FTDistributionItems.h
index 346bcc3c3ca90c4c12de992d84bff8ed041e0769..f6c66e4bee00fb6db0191138193a9633b173ca38 100644
--- a/GUI/coregui/Models/FTDistributionItems.h
+++ b/GUI/coregui/Models/FTDistributionItems.h
@@ -15,9 +15,9 @@
#ifndef BORNAGAIN_GUI_COREGUI_MODELS_FTDISTRIBUTIONITEMS_H
#define BORNAGAIN_GUI_COREGUI_MODELS_FTDISTRIBUTIONITEMS_H
+#include "GUI/coregui/Models/SessionItem.h"
#include "Sample/Correlations/FTDistributions1D.h"
#include "Sample/Correlations/FTDistributions2D.h"
-#include "GUI/coregui/Models/SessionItem.h"
class BA_CORE_API_ FTDistribution1DItem : public SessionItem
{
diff --git a/GUI/coregui/Models/GUIDomainSampleVisitor.cpp b/GUI/coregui/Models/GUIDomainSampleVisitor.cpp
index ce7d6221e03e036511e73f0875fb3bc7b91dd855..4e845ddf5678d3520c2e2ed8e3edb4fa092186e0 100644
--- a/GUI/coregui/Models/GUIDomainSampleVisitor.cpp
+++ b/GUI/coregui/Models/GUIDomainSampleVisitor.cpp
@@ -14,18 +14,6 @@
#include "GUI/coregui/Models/GUIDomainSampleVisitor.h"
#include "Base/Const/Units.h"
-#include "Sample/Aggregate/ParticleLayout.h"
-#include "Sample/HardParticle/HardParticles.h"
-#include "Sample/Multilayer/Layer.h"
-#include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Multilayer/MultiLayerUtils.h"
-#include "Sample/Particle/Crystal.h"
-#include "Sample/Particle/MesoCrystal.h"
-#include "Sample/Particle/Particle.h"
-#include "Sample/Particle/ParticleComposition.h"
-#include "Sample/Particle/ParticleCoreShell.h"
-#include "Sample/Particle/ParticleDistribution.h"
-#include "Sample/SoftParticle/SoftParticles.h"
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/FormFactorItems.h"
#include "GUI/coregui/Models/LayerItem.h"
@@ -42,6 +30,18 @@
#include "GUI/coregui/Models/TransformationItem.h"
#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
#include "GUI/coregui/utils/GUIHelpers.h"
+#include "Sample/Aggregate/ParticleLayout.h"
+#include "Sample/HardParticle/HardParticles.h"
+#include "Sample/Multilayer/Layer.h"
+#include "Sample/Multilayer/MultiLayer.h"
+#include "Sample/Multilayer/MultiLayerUtils.h"
+#include "Sample/Particle/Crystal.h"
+#include "Sample/Particle/MesoCrystal.h"
+#include "Sample/Particle/Particle.h"
+#include "Sample/Particle/ParticleComposition.h"
+#include "Sample/Particle/ParticleCoreShell.h"
+#include "Sample/Particle/ParticleDistribution.h"
+#include "Sample/SoftParticle/SoftParticles.h"
using SessionItemUtils::SetVectorItem;
diff --git a/GUI/coregui/Models/GUIExamplesFactory.cpp b/GUI/coregui/Models/GUIExamplesFactory.cpp
index 48b725839c53d66965fcdb6b5f605f413a5f7c9e..92db0d0c40f5a5b5b31cd346d48abcdb04536fb6 100644
--- a/GUI/coregui/Models/GUIExamplesFactory.cpp
+++ b/GUI/coregui/Models/GUIExamplesFactory.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Models/GUIExamplesFactory.h"
+#include "GUI/coregui/Models/GUIObjectBuilder.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/StandardSamples/SampleBuilderFactory.h"
-#include "GUI/coregui/Models/GUIObjectBuilder.h"
#include <memory>
//! Defines correspondance between example name and real name of simulation from SimulationFactory
diff --git a/GUI/coregui/Models/GUIObjectBuilder.cpp b/GUI/coregui/Models/GUIObjectBuilder.cpp
index fa726024d48a761da7a16f657ef8827533cd7f84..4e8bd0bf33630092809a745d68a28c22cee07e58 100644
--- a/GUI/coregui/Models/GUIObjectBuilder.cpp
+++ b/GUI/coregui/Models/GUIObjectBuilder.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Models/GUIObjectBuilder.h"
#include "Base/Const/Units.h"
-#include "Sample/Multilayer/MultiLayer.h"
#include "Core/Simulation/GISASSimulation.h"
#include "Core/Simulation/OffSpecSimulation.h"
#include "Core/Simulation/SpecularSimulation.h"
@@ -26,6 +25,7 @@
#include "GUI/coregui/Models/SimulationOptionsItem.h"
#include "GUI/coregui/Models/TransformFromDomain.h"
#include "GUI/coregui/utils/GUIHelpers.h"
+#include "Sample/Multilayer/MultiLayer.h"
namespace
{
diff --git a/GUI/coregui/Models/InterferenceFunctionItems.cpp b/GUI/coregui/Models/InterferenceFunctionItems.cpp
index 25f4ef6c7d1a8245e1f8bccae48996eb95ec5857..987c37d34b4d8572ba184998a81c89d422b2ef36 100644
--- a/GUI/coregui/Models/InterferenceFunctionItems.cpp
+++ b/GUI/coregui/Models/InterferenceFunctionItems.cpp
@@ -14,12 +14,12 @@
#include "GUI/coregui/Models/InterferenceFunctionItems.h"
#include "Base/Const/Units.h"
-#include "Sample/Aggregate/InterferenceFunctions.h"
#include "GUI/coregui/Models/FTDecayFunctionItems.h"
#include "GUI/coregui/Models/FTDistributionItems.h"
#include "GUI/coregui/Models/GroupItem.h"
#include "GUI/coregui/Models/Lattice2DItems.h"
#include "GUI/coregui/Models/ModelPath.h"
+#include "Sample/Aggregate/InterferenceFunctions.h"
namespace
{
diff --git a/GUI/coregui/Models/MaterialItem.cpp b/GUI/coregui/Models/MaterialItem.cpp
index 41eaf007c627ce6edeef6cfbe9ebd14de1f07509..00d37fe31376d313f461b3d226846d15860da722 100644
--- a/GUI/coregui/Models/MaterialItem.cpp
+++ b/GUI/coregui/Models/MaterialItem.cpp
@@ -12,11 +12,11 @@
//
// ************************************************************************** //
-#include "Sample/Material/MaterialFactoryFuncs.h"
#include "GUI/coregui/Models/MaterialDataItems.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
#include "GUI/coregui/utils/GUIHelpers.h"
+#include "Sample/Material/MaterialFactoryFuncs.h"
using SessionItemUtils::GetVectorItem;
diff --git a/GUI/coregui/Models/MesoCrystalItem.cpp b/GUI/coregui/Models/MesoCrystalItem.cpp
index 43ec88fd1a3e25fe039f0326ff67df5b12bf17b2..86ed0425acb4a205446e1624bc4cb97ed2b7c9a0 100644
--- a/GUI/coregui/Models/MesoCrystalItem.cpp
+++ b/GUI/coregui/Models/MesoCrystalItem.cpp
@@ -13,10 +13,6 @@
// ************************************************************************** //
#include "GUI/coregui/Models/MesoCrystalItem.h"
-#include "Sample/Particle/Crystal.h"
-#include "Sample/Particle/MesoCrystal.h"
-#include "Sample/Particle/Particle.h"
-#include "Sample/Particle/ParticleCoreShell.h"
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/FormFactorItems.h"
#include "GUI/coregui/Models/ModelPath.h"
@@ -27,6 +23,10 @@
#include "GUI/coregui/Models/TransformToDomain.h"
#include "GUI/coregui/Models/VectorItem.h"
#include "GUI/coregui/utils/GUIHelpers.h"
+#include "Sample/Particle/Crystal.h"
+#include "Sample/Particle/MesoCrystal.h"
+#include "Sample/Particle/Particle.h"
+#include "Sample/Particle/ParticleCoreShell.h"
using SessionItemUtils::GetVectorItem;
diff --git a/GUI/coregui/Models/MesoCrystalItem.h b/GUI/coregui/Models/MesoCrystalItem.h
index 259236bf5b49660e2eadedafe96c9b5c16d2960d..615e811b000f0a8268f3b74cb3ebd28e25ed9ba4 100644
--- a/GUI/coregui/Models/MesoCrystalItem.h
+++ b/GUI/coregui/Models/MesoCrystalItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_COREGUI_MODELS_MESOCRYSTALITEM_H
#define BORNAGAIN_GUI_COREGUI_MODELS_MESOCRYSTALITEM_H
-#include "Sample/Lattice/Lattice.h"
#include "GUI/coregui/Models/SessionGraphicsItem.h"
+#include "Sample/Lattice/Lattice.h"
class IFormFactor;
class IParticle;
diff --git a/GUI/coregui/Models/ParticleCompositionItem.cpp b/GUI/coregui/Models/ParticleCompositionItem.cpp
index f922f7aa7b0e0a08db84f9b051fca0691a2cbad3..5f68856739e97058e11a38b5be7c44d8960f3bc4 100644
--- a/GUI/coregui/Models/ParticleCompositionItem.cpp
+++ b/GUI/coregui/Models/ParticleCompositionItem.cpp
@@ -13,15 +13,15 @@
// ************************************************************************** //
#include "GUI/coregui/Models/ParticleCompositionItem.h"
-#include "Sample/Particle/MesoCrystal.h"
-#include "Sample/Particle/Particle.h"
-#include "Sample/Particle/ParticleCoreShell.h"
#include "GUI/coregui/Models/MesoCrystalItem.h"
#include "GUI/coregui/Models/ModelPath.h"
#include "GUI/coregui/Models/ParticleCoreShellItem.h"
#include "GUI/coregui/Models/ParticleItem.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "GUI/coregui/Models/TransformToDomain.h"
+#include "Sample/Particle/MesoCrystal.h"
+#include "Sample/Particle/Particle.h"
+#include "Sample/Particle/ParticleCoreShell.h"
namespace
{
diff --git a/GUI/coregui/Models/ParticleCompositionItem.h b/GUI/coregui/Models/ParticleCompositionItem.h
index 4d41b2a3c6bf9eb5fb61e81d71b2b3dc2c58d4ba..f006c86291c7f88fa43b13be8ae63d7f8348006c 100644
--- a/GUI/coregui/Models/ParticleCompositionItem.h
+++ b/GUI/coregui/Models/ParticleCompositionItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_COREGUI_MODELS_PARTICLECOMPOSITIONITEM_H
#define BORNAGAIN_GUI_COREGUI_MODELS_PARTICLECOMPOSITIONITEM_H
-#include "Sample/Particle/ParticleComposition.h"
#include "GUI/coregui/Models/SessionGraphicsItem.h"
+#include "Sample/Particle/ParticleComposition.h"
class BA_CORE_API_ ParticleCompositionItem : public SessionGraphicsItem
{
diff --git a/GUI/coregui/Models/ParticleCoreShellItem.cpp b/GUI/coregui/Models/ParticleCoreShellItem.cpp
index 2e8f6d7614a0c4cf2bfc1c6000272cb74eb1f47c..cfab8fbc7b85ca8f4758cd4345454c02d7c9e28f 100644
--- a/GUI/coregui/Models/ParticleCoreShellItem.cpp
+++ b/GUI/coregui/Models/ParticleCoreShellItem.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "GUI/coregui/Models/ParticleCoreShellItem.h"
-#include "Sample/Particle/Particle.h"
-#include "Sample/Particle/ParticleCoreShell.h"
#include "GUI/coregui/Models/ModelPath.h"
#include "GUI/coregui/Models/ParticleItem.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "GUI/coregui/Models/TransformToDomain.h"
#include "GUI/coregui/utils/GUIHelpers.h"
+#include "Sample/Particle/Particle.h"
+#include "Sample/Particle/ParticleCoreShell.h"
namespace
{
diff --git a/GUI/coregui/Models/ParticleDistributionItem.h b/GUI/coregui/Models/ParticleDistributionItem.h
index b16633ccf9d1e1aa711bf5b9639a64bb4c23d8b5..c4d2030f9da9badc0f36b5217b4f51142e3f8e4f 100644
--- a/GUI/coregui/Models/ParticleDistributionItem.h
+++ b/GUI/coregui/Models/ParticleDistributionItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_COREGUI_MODELS_PARTICLEDISTRIBUTIONITEM_H
#define BORNAGAIN_GUI_COREGUI_MODELS_PARTICLEDISTRIBUTIONITEM_H
-#include "Sample/Particle/ParticleDistribution.h"
#include "GUI/coregui/Models/SessionGraphicsItem.h"
+#include "Sample/Particle/ParticleDistribution.h"
#include <string>
#include <vector>
diff --git a/GUI/coregui/Models/ParticleItem.cpp b/GUI/coregui/Models/ParticleItem.cpp
index 9276c0b8f16a6d6a26522a14bf9cbf05653066e0..9e2b105ddcd23c1bdfa480edc735a88c8ecddeb7 100644
--- a/GUI/coregui/Models/ParticleItem.cpp
+++ b/GUI/coregui/Models/ParticleItem.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "GUI/coregui/Models/ParticleItem.h"
-#include "Sample/Particle/Particle.h"
#include "GUI/coregui/Models/FormFactorItems.h"
#include "GUI/coregui/Models/ModelPath.h"
#include "GUI/coregui/Models/ParticleCoreShellItem.h"
@@ -22,6 +21,7 @@
#include "GUI/coregui/Models/TransformToDomain.h"
#include "GUI/coregui/Models/VectorItem.h"
#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
+#include "Sample/Particle/Particle.h"
using SessionItemUtils::SetVectorItem;
diff --git a/GUI/coregui/Models/TransformFromDomain.cpp b/GUI/coregui/Models/TransformFromDomain.cpp
index 4a0ce99143f53e07ad29d887a5360a50c3e0a348..c9c986069106e7e03dc37f3e0fd39a78be1f3899 100644
--- a/GUI/coregui/Models/TransformFromDomain.cpp
+++ b/GUI/coregui/Models/TransformFromDomain.cpp
@@ -14,31 +14,26 @@
#include "GUI/coregui/Models/TransformFromDomain.h"
#include "Base/Const/Units.h"
-#include "Sample/Aggregate/InterferenceFunctions.h"
-#include "Device/Beam/FootprintGauss.h"
-#include "Device/Beam/FootprintSquare.h"
#include "Core/Computation/ConstantBackground.h"
#include "Core/Computation/PoissonNoiseBackground.h"
+#include "Core/Export/INodeUtils.h"
+#include "Core/Simulation/GISASSimulation.h"
+#include "Core/Simulation/OffSpecSimulation.h"
+#include "Core/Simulation/SpecularSimulation.h"
+#include "Device/Beam/FootprintGauss.h"
+#include "Device/Beam/FootprintSquare.h"
#include "Device/Detector/RectangularDetector.h"
#include "Device/Detector/RegionOfInterest.h"
#include "Device/Detector/SphericalDetector.h"
-#include "Core/Export/INodeUtils.h"
#include "Device/Mask/Ellipse.h"
#include "Device/Mask/InfinitePlane.h"
#include "Device/Mask/Line.h"
#include "Device/Mask/Polygon.h"
#include "Device/Mask/Rectangle.h"
-#include "Sample/Multilayer/Layer.h"
-#include "Sample/Multilayer/LayerInterface.h"
-#include "Sample/Multilayer/LayerRoughness.h"
-#include "Sample/Particle/Particle.h"
#include "Device/Resolution/ConvolutionDetectorResolution.h"
#include "Device/Resolution/ResolutionFunction2DGaussian.h"
#include "Device/Resolution/ScanResolution.h"
#include "Device/Scan/AngularSpecScan.h"
-#include "Core/Simulation/GISASSimulation.h"
-#include "Core/Simulation/OffSpecSimulation.h"
-#include "Core/Simulation/SpecularSimulation.h"
#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/BackgroundItems.h"
#include "GUI/coregui/Models/BeamAngleItems.h"
@@ -62,6 +57,11 @@
#include "Param/Distrib/Distributions.h"
#include "Param/Distrib/RangedDistributions.h"
#include "Param/Varia/ParameterPattern.h"
+#include "Sample/Aggregate/InterferenceFunctions.h"
+#include "Sample/Multilayer/Layer.h"
+#include "Sample/Multilayer/LayerInterface.h"
+#include "Sample/Multilayer/LayerRoughness.h"
+#include "Sample/Particle/Particle.h"
using namespace INodeUtils;
using SessionItemUtils::SetVectorItem;
diff --git a/GUI/coregui/Models/TransformToDomain.cpp b/GUI/coregui/Models/TransformToDomain.cpp
index f43f87bdb6d294e966aea25c9941d96523eadbd6..4b770de9f99fc6b8212ecb6a8b7c191234ff0e2b 100644
--- a/GUI/coregui/Models/TransformToDomain.cpp
+++ b/GUI/coregui/Models/TransformToDomain.cpp
@@ -14,13 +14,9 @@
#include "GUI/coregui/Models/TransformToDomain.h"
#include "Base/Const/Units.h"
-#include "Sample/Aggregate/InterferenceFunctions.h"
-#include "Sample/Particle/MesoCrystal.h"
-#include "Sample/Particle/Particle.h"
-#include "Sample/Particle/ParticleCoreShell.h"
+#include "Core/Simulation/GISASSimulation.h"
#include "Device/Resolution/ScanResolution.h"
#include "Device/Scan/AngularSpecScan.h"
-#include "Core/Simulation/GISASSimulation.h"
#include "GUI/coregui/Models/BeamAngleItems.h"
#include "GUI/coregui/Models/BeamItems.h"
#include "GUI/coregui/Models/BeamWavelengthItem.h"
@@ -52,6 +48,10 @@
#include "GUI/coregui/utils/GUIHelpers.h"
#include "Param/Distrib/RangedDistributions.h"
#include "Param/Varia/ParameterPattern.h"
+#include "Sample/Aggregate/InterferenceFunctions.h"
+#include "Sample/Particle/MesoCrystal.h"
+#include "Sample/Particle/Particle.h"
+#include "Sample/Particle/ParticleCoreShell.h"
using SessionItemUtils::GetVectorItem;
diff --git a/GUI/coregui/Models/TransformToDomain.h b/GUI/coregui/Models/TransformToDomain.h
index 1e34de84dcd6560ae7c4919c6959a22e928df36c..9788cfb41a020068f32036063014558062a79528 100644
--- a/GUI/coregui/Models/TransformToDomain.h
+++ b/GUI/coregui/Models/TransformToDomain.h
@@ -15,15 +15,15 @@
#ifndef BORNAGAIN_GUI_COREGUI_MODELS_TRANSFORMTODOMAIN_H
#define BORNAGAIN_GUI_COREGUI_MODELS_TRANSFORMTODOMAIN_H
+#include "Device/Instrument/Instrument.h"
+#include "Param/Distrib/Distributions.h" // for IDistribution1D
#include "Sample/Aggregate/IInterferenceFunction.h"
#include "Sample/Aggregate/ParticleLayout.h"
-#include "Device/Instrument/Instrument.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/LayerRoughness.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/IParticle.h"
#include "Sample/Particle/ParticleDistribution.h"
-#include "Param/Distrib/Distributions.h" // for IDistribution1D
#include <memory>
class AngularSpecScan;
diff --git a/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp b/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
index c8465a6e300282e31143800902117291983b9468..c421f10ad5aa654edc25fc3edfb0b4b5503fcd32 100644
--- a/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Views/InfoWidgets/PySampleWidget.h"
#include "Core/Export/ExportToPython.h"
-#include "Sample/Multilayer/MultiLayer.h"
#include "GUI/coregui/Models/DomainObjectBuilder.h"
#include "GUI/coregui/Models/MultiLayerItem.h"
#include "GUI/coregui/Models/SampleModel.h"
@@ -23,6 +22,7 @@
#include "GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h"
#include "GUI/coregui/Views/InfoWidgets/WarningSign.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
+#include "Sample/Multilayer/MultiLayer.h"
#include <QScrollBar>
#include <QTextEdit>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp b/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
index 906a269c1dd36bfe8a68b9edaf5427e643c1691e..82a925b03d63c561e256ef8d248b44728992951c 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
-#include "Sample/Material/Material.h"
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/LayerItem.h"
#include "GUI/coregui/Models/MaterialDataItems.h"
@@ -29,6 +28,7 @@
#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
#include "GUI/coregui/mainwindow/AppSvc.h"
#include "GUI/coregui/utils/GUIHelpers.h"
+#include "Sample/Material/Material.h"
#include <QColorDialog>
namespace
diff --git a/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp b/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp
index f84fc3ee0c9b60c20e2d101a8363c06ded4c528a..3b7c439bd1e14dfce78df0c542e82e47967b43ce 100644
--- a/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp
+++ b/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp
@@ -13,8 +13,6 @@
// ************************************************************************** //
#include "GUI/coregui/Views/PropertyEditor/TestComponentView.h"
-#include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/StandardSamples/SampleBuilderFactory.h"
#include "GUI/coregui/Models/GUIObjectBuilder.h"
#include "GUI/coregui/Models/MaterialDataItems.h"
#include "GUI/coregui/Models/MaterialModel.h"
@@ -26,6 +24,8 @@
#include "GUI/coregui/Views/PropertyEditor/ComponentTreeView.h"
#include "GUI/coregui/mainwindow/mainwindow.h"
#include "GUI/coregui/utils/StyleUtils.h"
+#include "Sample/Multilayer/MultiLayer.h"
+#include "Sample/StandardSamples/SampleBuilderFactory.h"
#include <QBoxLayout>
#include <QDebug>
#include <QItemSelectionModel>
diff --git a/GUI/coregui/Views/RealSpaceWidgets/IPositionBuilder.cpp b/GUI/coregui/Views/RealSpaceWidgets/IPositionBuilder.cpp
index 78b2da66be970e3f7e3485b960a85146bb552ed3..7904242c7c2344acdb50c7790cd2d30a245947a4 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/IPositionBuilder.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/IPositionBuilder.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/RealSpaceWidgets/IPositionBuilder.h"
-#include "Sample/Aggregate/InterferenceFunctions.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.h"
+#include "Sample/Aggregate/InterferenceFunctions.h"
#include <cmath>
#include <random>
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.cpp
index df83d3a510fa637e0de9713adf1a467a69f23e8d..8d1895e5d4d35168adb648c3f2f9853ea8341978 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.h"
-#include "Sample/Aggregate/InterferenceFunction2DParaCrystal.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h"
+#include "Sample/Aggregate/InterferenceFunction2DParaCrystal.h"
namespace
{
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.cpp
index 076fb5d6591d1142939204921e8d3407bde474b4..ebbc7bd55d0f560c0a8fff15c7cb537933ad8608 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.cpp
@@ -14,9 +14,6 @@
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h"
#include "Base/Const/Units.h"
-#include "Sample/Aggregate/InterferenceFunctions.h"
-#include "Sample/Particle/Particle.h"
-#include "Sample/Particle/ParticleCoreShell.h"
#include "GUI/coregui/Models/InterferenceFunctionItems.h"
#include "GUI/coregui/Models/Lattice2DItems.h"
#include "GUI/coregui/Models/LayerItem.h"
@@ -35,6 +32,9 @@
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpacePositionBuilder.h"
#include "GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h"
+#include "Sample/Aggregate/InterferenceFunctions.h"
+#include "Sample/Particle/Particle.h"
+#include "Sample/Particle/ParticleCoreShell.h"
#include <QDebug>
namespace
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
index 347b0cf9230ecede5e903c32d41bc8a0fbbf231c..9e1566e088ca4b47e76c452c18b7b0e22e9da89d 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
@@ -15,11 +15,6 @@
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h"
#include "Base/Const/Units.h"
#include "Base/Types/Exceptions.h"
-#include "Sample/Aggregate/InterferenceFunctions.h"
-#include "Sample/Particle/FormFactorCrystal.h"
-#include "Sample/Particle/MesoCrystal.h"
-#include "Sample/Particle/Particle.h"
-#include "Sample/Particle/ParticleCoreShell.h"
#include "GUI/coregui/Models/InterferenceFunctionItems.h"
#include "GUI/coregui/Models/Lattice2DItems.h"
#include "GUI/coregui/Models/LayerItem.h"
@@ -42,6 +37,11 @@
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h"
#include "GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h"
#include "GUI/coregui/mainwindow/AppSvc.h"
+#include "Sample/Aggregate/InterferenceFunctions.h"
+#include "Sample/Particle/FormFactorCrystal.h"
+#include "Sample/Particle/MesoCrystal.h"
+#include "Sample/Particle/Particle.h"
+#include "Sample/Particle/ParticleCoreShell.h"
namespace
{
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
index ede15b66104d826226a1e2c553eaefc4a82b8c2e..bb959505fa249f89f02439e6f6dad78acfc695e0 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
@@ -15,10 +15,6 @@
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.h"
#include "Base/Const/Units.h"
#include "Base/Types/Exceptions.h"
-#include "Sample/HardParticle/HardParticles.h"
-#include "Sample/Particle/MesoCrystal.h"
-#include "Sample/Particle/Particle.h"
-#include "Sample/Particle/ParticleCoreShell.h"
#include "GUI/coregui/Models/Lattice2DItems.h"
#include "GUI/coregui/Models/MesoCrystalItem.h"
#include "GUI/coregui/Models/ParticleCompositionItem.h"
@@ -27,6 +23,10 @@
#include "GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h"
#include "GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h"
+#include "Sample/HardParticle/HardParticles.h"
+#include "Sample/Particle/MesoCrystal.h"
+#include "Sample/Particle/Particle.h"
+#include "Sample/Particle/ParticleCoreShell.h"
namespace
{
diff --git a/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp b/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp
index c909e45a65ed93a324be594688f1c90c09845286..f8a5e830dc20d3dd4e9993358821217e8379e5ba 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h"
#include "Base/Const/Units.h"
-#include "Sample/HardParticle/HardParticles.h"
#include "GUI/coregui/Models/FormFactorItems.h"
#include "GUI/coregui/Models/GUIDomainSampleVisitor.h"
#include "GUI/coregui/Models/LayerItem.h"
@@ -24,6 +23,7 @@
#include "GUI/coregui/Models/VectorItem.h"
#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h"
+#include "Sample/HardParticle/HardParticles.h"
namespace
{
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
index 6ede6798e6096bf459ace7e975f234124c8c4281..4c2a26d14eac4ecd35d19b045bee00f39ef9174f 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SampleDesigner/DesignerScene.h"
-#include "Sample/StandardSamples/SampleBuilderFactory.h"
#include "GUI/coregui/Models/FilterPropertyProxy.h"
#include "GUI/coregui/Models/GUIExamplesFactory.h"
#include "GUI/coregui/Models/InstrumentModel.h"
@@ -30,6 +29,7 @@
#include "GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h"
#include "GUI/coregui/Views/SampleDesigner/SampleViewAligner.h"
#include "GUI/coregui/Views/SampleDesigner/SampleViewFactory.h"
+#include "Sample/StandardSamples/SampleBuilderFactory.h"
#include <QGraphicsSceneMouseEvent>
#include <QItemSelection>
#include <QPainter>
diff --git a/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp b/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
index ade23f5b388e544945d13c28a1e883cf9aaa6ac9..1e57181a2980daf28a34196826c02c3345fe6eca 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SampleDesigner/SampleDesigner.h"
-#include "Sample/Scattering/ISample.h"
#include "GUI/coregui/Models/ApplicationModels.h"
#include "GUI/coregui/Models/FilterPropertyProxy.h"
#include "GUI/coregui/Views/SampleDesigner/MultiLayerView.h"
+#include "Sample/Scattering/ISample.h"
SampleDesigner::SampleDesigner(QWidget* parent)
: SampleDesignerInterface(parent), m_designerScene(0), m_designerView(0)
diff --git a/GUI/coregui/mainwindow/PyImportAssistant.cpp b/GUI/coregui/mainwindow/PyImportAssistant.cpp
index ca6098387c155c61bb6b365b53c8324249143301..25b0e2bc20a157e00a9fe6c498a60e36436a81bf 100644
--- a/GUI/coregui/mainwindow/PyImportAssistant.cpp
+++ b/GUI/coregui/mainwindow/PyImportAssistant.cpp
@@ -17,8 +17,6 @@
#include "GUI/coregui/mainwindow/PyImportAssistant.h"
#include "BABuild.h"
#include "Base/Utils/SysUtils.h"
-#include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Multilayer/PyImport.h"
#include "GUI/coregui/Models/GUIObjectBuilder.h"
#include "GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.h"
#include "GUI/coregui/Views/InfoWidgets/DetailedMessageBox.h"
@@ -27,6 +25,8 @@
#include "GUI/coregui/mainwindow/mainwindow.h"
#include "GUI/coregui/mainwindow/projectmanager.h"
#include "GUI/coregui/utils/GUIHelpers.h"
+#include "Sample/Multilayer/MultiLayer.h"
+#include "Sample/Multilayer/PyImport.h"
#include <QApplication>
#include <QDebug>
#include <QFileDialog>
diff --git a/Sample/Aggregate/InterferenceFunction1DLattice.cpp b/Sample/Aggregate/InterferenceFunction1DLattice.cpp
index f0c30143d5ad4d8f878601c4d4e73ff9782a067c..a0f11673048daa44fe735bea435057a1271ae8e3 100644
--- a/Sample/Aggregate/InterferenceFunction1DLattice.cpp
+++ b/Sample/Aggregate/InterferenceFunction1DLattice.cpp
@@ -15,9 +15,9 @@
#include "Sample/Aggregate/InterferenceFunction1DLattice.h"
#include "Base/Types/Exceptions.h"
#include "Base/Utils/Assert.h"
+#include "Param/Base/RealParameter.h"
#include "Sample/Correlations/FTDecay1D.h"
#include "Sample/Correlations/FTDecay2D.h"
-#include "Param/Base/RealParameter.h"
#include <algorithm>
namespace
diff --git a/Sample/Aggregate/InterferenceFunction2DSuperLattice.cpp b/Sample/Aggregate/InterferenceFunction2DSuperLattice.cpp
index 66420573d4b85afcb31f287c2b5e5acb3b83a320..ffdc17a37c1f804995c80db16c752bbac328bcce 100644
--- a/Sample/Aggregate/InterferenceFunction2DSuperLattice.cpp
+++ b/Sample/Aggregate/InterferenceFunction2DSuperLattice.cpp
@@ -17,8 +17,8 @@
#include "Base/Types/Exceptions.h"
#include "Base/Utils/Integrator.h"
#include "Base/Utils/MathFunctions.h"
-#include "Sample/Aggregate/InterferenceFunctionNone.h"
#include "Param/Base/RealParameter.h"
+#include "Sample/Aggregate/InterferenceFunctionNone.h"
#include <limits>
diff --git a/Sample/Aggregate/ParticleLayout.cpp b/Sample/Aggregate/ParticleLayout.cpp
index 04ef28d88fc65cbc4b68c9805a84e4a6c9faee0a..f1dad10b23c4da83e41def2a049d3c91403068ad 100644
--- a/Sample/Aggregate/ParticleLayout.cpp
+++ b/Sample/Aggregate/ParticleLayout.cpp
@@ -14,11 +14,11 @@
#include "Sample/Aggregate/ParticleLayout.h"
#include "Base/Types/Exceptions.h"
+#include "Param/Base/ParameterPool.h"
+#include "Param/Base/RealParameter.h"
#include "Sample/Aggregate/InterferenceFunctionNone.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Particle/ParticleDistribution.h"
-#include "Param/Base/ParameterPool.h"
-#include "Param/Base/RealParameter.h"
namespace
{
diff --git a/Sample/Correlations/FTDistributions1D.h b/Sample/Correlations/FTDistributions1D.h
index 0fd879bd764eb035dc5070fe72bbcee7c0c1c881..ce14bcaf060229bd87507c9cd3076bf2e42c6151 100644
--- a/Sample/Correlations/FTDistributions1D.h
+++ b/Sample/Correlations/FTDistributions1D.h
@@ -16,8 +16,8 @@
#define BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS1D_H
#include "Base/Types/ICloneable.h"
-#include "Sample/Correlations/IDistribution1DSampler.h"
#include "Param/Node/INode.h"
+#include "Sample/Correlations/IDistribution1DSampler.h"
//! Interface for a one-dimensional distribution, with normalization adjusted so that
//! the Fourier transform evaluate(q) is a decay function that starts at evaluate(0)=1.
diff --git a/Sample/Correlations/FTDistributions2D.h b/Sample/Correlations/FTDistributions2D.h
index f8f40dd5c03241ba3cc08e746edc9ac3af0350af..6766a215bdf35287690a8fd772d2b110bceca955 100644
--- a/Sample/Correlations/FTDistributions2D.h
+++ b/Sample/Correlations/FTDistributions2D.h
@@ -17,8 +17,8 @@
#include "Base/Const/MathConstants.h"
#include "Base/Types/ICloneable.h"
-#include "Sample/Correlations/IDistribution2DSampler.h"
#include "Param/Node/INode.h"
+#include "Sample/Correlations/IDistribution2DSampler.h"
//! Interface for two-dimensional distributions in Fourier space.
//! @ingroup distribution_internal
diff --git a/Sample/HardParticle/FormFactorTruncatedSphere.cpp b/Sample/HardParticle/FormFactorTruncatedSphere.cpp
index 9554edd51c7f91b5bb31e77c4ddd19a19e3a82a4..077034ce5bf2ad7f98228268db177d4b2d6cbc17 100644
--- a/Sample/HardParticle/FormFactorTruncatedSphere.cpp
+++ b/Sample/HardParticle/FormFactorTruncatedSphere.cpp
@@ -17,8 +17,8 @@
#include "Base/Types/Exceptions.h"
#include "Base/Utils/Integrator.h"
#include "Base/Utils/MathFunctions.h"
-#include "Sample/Shapes/TruncatedEllipsoid.h"
#include "Fit/Tools/RealLimits.h"
+#include "Sample/Shapes/TruncatedEllipsoid.h"
#include <limits>
FormFactorTruncatedSphere::FormFactorTruncatedSphere(const std::vector<double> P)
diff --git a/Sample/Lattice/Lattice.cpp b/Sample/Lattice/Lattice.cpp
index 8e7a3cbf48455053f8cd41338960ac628a970eeb..dda413a56d0484b7b9bc94e218ffbd02ee1320e7 100644
--- a/Sample/Lattice/Lattice.cpp
+++ b/Sample/Lattice/Lattice.cpp
@@ -15,8 +15,8 @@
#include "Sample/Lattice/Lattice.h"
#include "Base/Const/MathConstants.h"
#include "Base/Vector/Transform3D.h"
-#include "Sample/Lattice/ISelectionRule.h"
#include "Param/Base/RealParameter.h"
+#include "Sample/Lattice/ISelectionRule.h"
#include <gsl/gsl_linalg.h>
Lattice::Lattice()
diff --git a/Sample/Multilayer/DecouplingApproximationStrategy.cpp b/Sample/Multilayer/DecouplingApproximationStrategy.cpp
index e1ae21f505596307302de215a53710f8fff1aad4..682fd293f167be77fb088bc364e55570360520fe 100644
--- a/Sample/Multilayer/DecouplingApproximationStrategy.cpp
+++ b/Sample/Multilayer/DecouplingApproximationStrategy.cpp
@@ -16,10 +16,10 @@
#include "Base/Pixel/SimulationElement.h"
#include "Base/Types/Exceptions.h"
#include "Base/Utils/MathFunctions.h"
+#include "Param/Base/RealParameter.h"
#include "Sample/Aggregate/IInterferenceFunction.h"
#include "Sample/Multilayer/FormFactorCoherentSum.h"
#include "Sample/Multilayer/InterferenceFunctionUtils.h"
-#include "Param/Base/RealParameter.h"
using InterferenceFunctionUtils::PrecomputePolarizedFormFactors;
using InterferenceFunctionUtils::PrecomputeScalarFormFactors;
diff --git a/Sample/Multilayer/Layer.cpp b/Sample/Multilayer/Layer.cpp
index b78e23af3f6987d61bd84caf6e7f3ba8adb99b85..f33917ce14f6d9337aa9a4bb66264aaffa35c665 100644
--- a/Sample/Multilayer/Layer.cpp
+++ b/Sample/Multilayer/Layer.cpp
@@ -14,9 +14,9 @@
#include "Sample/Multilayer/Layer.h"
#include "Base/Types/Exceptions.h"
-#include "Sample/Correlations/ILayout.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
+#include "Sample/Correlations/ILayout.h"
//! Constructor of a layer with thickness and material
//! @param material: material the layer is made of
diff --git a/Sample/Multilayer/MultiLayer.cpp b/Sample/Multilayer/MultiLayer.cpp
index a2a577f2b7eae4bc335d749401da625ab0916a24..8fe0d91050a7b631ecf8eeca3e9c16c7938deed8 100644
--- a/Sample/Multilayer/MultiLayer.cpp
+++ b/Sample/Multilayer/MultiLayer.cpp
@@ -14,6 +14,8 @@
#include "Sample/Multilayer/MultiLayer.h"
#include "Base/Types/Exceptions.h"
+#include "Param/Base/ParameterPool.h"
+#include "Param/Base/RealParameter.h"
#include "Sample/Correlations/ILayout.h"
#include "Sample/Material/MaterialUtils.h"
#include "Sample/Multilayer/Layer.h"
@@ -21,8 +23,6 @@
#include "Sample/Multilayer/LayerInterface.h"
#include "Sample/Multilayer/LayerRoughness.h"
#include "Sample/Multilayer/MultiLayerUtils.h"
-#include "Param/Base/ParameterPool.h"
-#include "Param/Base/RealParameter.h"
MultiLayer::MultiLayer() : m_crossCorrLength(0)
{
diff --git a/Sample/Multilayer/SpecularSimulationElement.cpp b/Sample/Multilayer/SpecularSimulationElement.cpp
index 7edefeec95d4071a28eabb998d0fcdba6d43c753..a619335b0c637d9cd2c00dc652ba4ac49eaa3d5c 100644
--- a/Sample/Multilayer/SpecularSimulationElement.cpp
+++ b/Sample/Multilayer/SpecularSimulationElement.cpp
@@ -25,10 +25,10 @@ SpecularSimulationElement::SpecularSimulationElement(double kz)
SpecularSimulationElement::SpecularSimulationElement(double wavelength, double alpha)
: m_intensity(0.0), m_calculation_flag(true),
- m_kz_computation([k = vecOfLambdaAlphaPhi(wavelength, alpha, 0.0)](
- const std::vector<Slice>& slices) {
- return KzComputation::computeKzFromRefIndices(slices, k);
- })
+ m_kz_computation(
+ [k = vecOfLambdaAlphaPhi(wavelength, alpha, 0.0)](const std::vector<Slice>& slices) {
+ return KzComputation::computeKzFromRefIndices(slices, k);
+ })
{
}
diff --git a/Sample/Particle/IParticle.cpp b/Sample/Particle/IParticle.cpp
index b02466c2fcbb3471529520699d46c77245592017..d29a8b4a655a4cac8656aa133ef0962d626e76ec 100644
--- a/Sample/Particle/IParticle.cpp
+++ b/Sample/Particle/IParticle.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "Sample/Particle/IParticle.h"
+#include "Param/Base/RealParameter.h"
#include "Sample/Particle/SlicedParticle.h"
#include "Sample/Scattering/FormFactorDecoratorPositionFactor.h"
#include "Sample/Scattering/Rotations.h"
-#include "Param/Base/RealParameter.h"
IParticle::~IParticle() = default;
diff --git a/Sample/Particle/ParticleDistribution.cpp b/Sample/Particle/ParticleDistribution.cpp
index 16c4e879650002ae174c3134c3828dda7a0528ab..f11fad8ca8957030efd77972635d390b8af49a8c 100644
--- a/Sample/Particle/ParticleDistribution.cpp
+++ b/Sample/Particle/ParticleDistribution.cpp
@@ -14,11 +14,11 @@
#include "Sample/Particle/ParticleDistribution.h"
#include "Base/Types/Exceptions.h"
-#include "Sample/Particle/IParticle.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
#include "Param/Distrib/Distributions.h"
#include "Param/Varia/ParameterUtils.h"
+#include "Sample/Particle/IParticle.h"
#include <map>
ParticleDistribution::ParticleDistribution(const IParticle& prototype,
diff --git a/Sample/Particle/ParticleDistribution.h b/Sample/Particle/ParticleDistribution.h
index 1f06b8548f158bbac811a07d25c4d5aa89332ba1..e8e147b4974afc659dfd8fff83283cf193a08150 100644
--- a/Sample/Particle/ParticleDistribution.h
+++ b/Sample/Particle/ParticleDistribution.h
@@ -16,8 +16,8 @@
#define BORNAGAIN_CORE_PARTICLE_PARTICLEDISTRIBUTION_H
#include "Base/Types/SafePointerVector.h"
-#include "Sample/Particle/IAbstractParticle.h"
#include "Param/Distrib/ParameterDistribution.h"
+#include "Sample/Particle/IAbstractParticle.h"
class IParticle;
diff --git a/Sample/SampleBuilderEngine/SampleBuilderNode.cpp b/Sample/SampleBuilderEngine/SampleBuilderNode.cpp
index 3ba00b327bf9b91736ae9ceff705d2434ed29920..9ea26ad96f27dce539d2eb80e59cc1f6d290b4e3 100644
--- a/Sample/SampleBuilderEngine/SampleBuilderNode.cpp
+++ b/Sample/SampleBuilderEngine/SampleBuilderNode.cpp
@@ -14,9 +14,9 @@
#include "Sample/SampleBuilderEngine/SampleBuilderNode.h"
#include "Base/Utils/Assert.h"
+#include "Param/Base/ParameterPool.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
-#include "Param/Base/ParameterPool.h"
#include <stdexcept>
namespace
diff --git a/Sample/SoftParticle/FormFactorSphereGaussianRadius.cpp b/Sample/SoftParticle/FormFactorSphereGaussianRadius.cpp
index 28f4b869d7504278c45661cc01fb37e4340155e8..42b94fb3b45ccd5df78a6436861bf8c611860d99 100644
--- a/Sample/SoftParticle/FormFactorSphereGaussianRadius.cpp
+++ b/Sample/SoftParticle/FormFactorSphereGaussianRadius.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Sample/SoftParticle/FormFactorSphereGaussianRadius.h"
+#include "Fit/Tools/RealLimits.h"
#include "Sample/LibFF/SomeFormFactors.h"
#include "Sample/Shapes/TruncatedEllipsoid.h"
-#include "Fit/Tools/RealLimits.h"
FormFactorSphereGaussianRadius::FormFactorSphereGaussianRadius(const std::vector<double> P)
: IFormFactorBorn({"FormFactorSphereGaussianRadius",
diff --git a/Sample/SoftParticle/FormFactorSphereLogNormalRadius.cpp b/Sample/SoftParticle/FormFactorSphereLogNormalRadius.cpp
index 586b20256dcaa63c8c6538c8ffe4da26d662eb02..55b0490935876ac5ca452b0b7c780ce9584e07ca 100644
--- a/Sample/SoftParticle/FormFactorSphereLogNormalRadius.cpp
+++ b/Sample/SoftParticle/FormFactorSphereLogNormalRadius.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "Sample/SoftParticle/FormFactorSphereLogNormalRadius.h"
-#include "Sample/LibFF/SomeFormFactors.h"
-#include "Sample/Shapes/TruncatedEllipsoid.h"
#include "Param/Distrib/Distributions.h"
#include "Param/Varia/ParameterSample.h"
+#include "Sample/LibFF/SomeFormFactors.h"
+#include "Sample/Shapes/TruncatedEllipsoid.h"
FormFactorSphereLogNormalRadius::FormFactorSphereLogNormalRadius(const std::vector<double> P,
size_t n_samples)
diff --git a/Sample/StandardSamples/ParticleDistributionsBuilder.cpp b/Sample/StandardSamples/ParticleDistributionsBuilder.cpp
index ad7ef024a067604c6f32a63bf3fe774bb65c31e0..3a0d529db2433c1e2a27b6c8872a4ae2d6c5295f 100644
--- a/Sample/StandardSamples/ParticleDistributionsBuilder.cpp
+++ b/Sample/StandardSamples/ParticleDistributionsBuilder.cpp
@@ -14,6 +14,8 @@
#include "Sample/StandardSamples/ParticleDistributionsBuilder.h"
#include "Base/Const/Units.h"
+#include "Param/Distrib/Distributions.h"
+#include "Param/Varia/ParameterPattern.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/FormFactorBox.h"
#include "Sample/HardParticle/FormFactorCone.h"
@@ -25,8 +27,6 @@
#include "Sample/Particle/Particle.h"
#include "Sample/Particle/ParticleDistribution.h"
#include "Sample/StandardSamples/ReferenceMaterials.h"
-#include "Param/Distrib/Distributions.h"
-#include "Param/Varia/ParameterPattern.h"
MultiLayer* CylindersWithSizeDistributionBuilder::buildSample() const
{
diff --git a/Sample/StandardSamples/SampleBuilderFactory.h b/Sample/StandardSamples/SampleBuilderFactory.h
index 1df66a249b6b6cae8fcf9395eaecf5f97314c420..d945aeb226f3958d2c2100b7f653141c1e164188 100644
--- a/Sample/StandardSamples/SampleBuilderFactory.h
+++ b/Sample/StandardSamples/SampleBuilderFactory.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_SAMPLEBUILDERFACTORY_H
#define BORNAGAIN_CORE_STANDARDSAMPLES_SAMPLEBUILDERFACTORY_H
-#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
#include "Fit/TestEngine/IFactory.h"
+#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
class MultiLayer;
diff --git a/Sample/StandardSamples/SizeDistributionModelsBuilder.cpp b/Sample/StandardSamples/SizeDistributionModelsBuilder.cpp
index 7066cfe934edc5cb6d05e5a5c4572b9656c39bf6..4eb3c00f635a2edcb4e80d8ef6fc0606a82eb50e 100644
--- a/Sample/StandardSamples/SizeDistributionModelsBuilder.cpp
+++ b/Sample/StandardSamples/SizeDistributionModelsBuilder.cpp
@@ -14,6 +14,8 @@
#include "Sample/StandardSamples/SizeDistributionModelsBuilder.h"
#include "Base/Const/Units.h"
+#include "Param/Distrib/Distributions.h"
+#include "Param/Varia/ParameterPattern.h"
#include "Sample/Aggregate/InterferenceFunctionRadialParaCrystal.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/FormFactorCylinder.h"
@@ -22,8 +24,6 @@
#include "Sample/Particle/Particle.h"
#include "Sample/Particle/ParticleDistribution.h"
#include "Sample/StandardSamples/ReferenceMaterials.h"
-#include "Param/Distrib/Distributions.h"
-#include "Param/Varia/ParameterPattern.h"
MultiLayer* SizeDistributionDAModelBuilder::buildSample() const
{
diff --git a/Tests/Functional/Core/CoreSpecial/BatchSimulation.cpp b/Tests/Functional/Core/CoreSpecial/BatchSimulation.cpp
index 4844234f239c71a9d32f545952ca79b903bdbbef..dd6e8dcae15b7d7650c39c6fea32d58d724ce63f 100644
--- a/Tests/Functional/Core/CoreSpecial/BatchSimulation.cpp
+++ b/Tests/Functional/Core/CoreSpecial/BatchSimulation.cpp
@@ -11,8 +11,8 @@
//
// ************************************************************************** //
-#include "Device/Instrument/IntensityDataFunctions.h"
#include "Core/Simulation/SimulationFactory.h"
+#include "Device/Instrument/IntensityDataFunctions.h"
#include "Sample/StandardSamples/SampleBuilderFactory.h"
#include "Tests/GTestWrapper/google_test.h"
#include <iostream>
diff --git a/Tests/Functional/Core/Fitting/Plan.cpp b/Tests/Functional/Core/Fitting/Plan.cpp
index fabf50614729e3cef149730aa105be5bdca437cf..c72fff403e9de85188e660bb8cfcee2b9c11ec99 100644
--- a/Tests/Functional/Core/Fitting/Plan.cpp
+++ b/Tests/Functional/Core/Fitting/Plan.cpp
@@ -14,10 +14,10 @@
#include "Tests/Functional/Core/Fitting/Plan.h"
#include "Core/Fitting/FitObjective.h"
-#include "Sample/Multilayer/MultiLayer.h"
#include "Core/Simulation/SimulationFactory.h"
-#include "Sample/StandardSamples/SampleBuilderFactory.h"
#include "Fit/Kernel/Minimizer.h"
+#include "Sample/Multilayer/MultiLayer.h"
+#include "Sample/StandardSamples/SampleBuilderFactory.h"
Plan::Plan(const std::string& name, bool residual_based)
: MinimizerTestPlan(name), m_residual_based(residual_based)
diff --git a/Tests/Functional/Core/Fitting/PlanCases.cpp b/Tests/Functional/Core/Fitting/PlanCases.cpp
index e98da21f8e20325d3ccf377c3beb114b749d7506..ae76c9a3202f1b4314349671d4f45155a7194f70 100644
--- a/Tests/Functional/Core/Fitting/PlanCases.cpp
+++ b/Tests/Functional/Core/Fitting/PlanCases.cpp
@@ -14,17 +14,17 @@
#include "Tests/Functional/Core/Fitting/PlanCases.h"
#include "Base/Const/Units.h"
+#include "Core/Fitting/FitObjective.h"
+#include "Core/Simulation/GISASSimulation.h"
+#include "Device/Detector/RectangularDetector.h"
+#include "Device/Mask/Rectangle.h"
#include "Sample/Aggregate/InterferenceFunction2DLattice.h"
#include "Sample/Aggregate/ParticleLayout.h"
-#include "Device/Detector/RectangularDetector.h"
-#include "Core/Fitting/FitObjective.h"
#include "Sample/HardParticle/FormFactorCylinder.h"
-#include "Device/Mask/Rectangle.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Particle.h"
-#include "Core/Simulation/GISASSimulation.h"
using namespace Fit;
diff --git a/Tests/Functional/Core/MPI/mpitest.cpp b/Tests/Functional/Core/MPI/mpitest.cpp
index 7dc01fb59ac051b7bd3d2d4f8753613ed40fce10..c0940a5fb3cd8d1d7d3ae21c712039aaeb002bff 100644
--- a/Tests/Functional/Core/MPI/mpitest.cpp
+++ b/Tests/Functional/Core/MPI/mpitest.cpp
@@ -1,9 +1,9 @@
#include <mpi.h>
+#include "Core/Simulation/SimulationFactory.h"
#include "Device/Histo/IntensityDataIOFactory.h"
#include "Device/Instrument/IntensityDataFunctions.h"
#include "Sample/Multilayer/MultiLayer.h"
-#include "Core/Simulation/SimulationFactory.h"
#include "Sample/StandardSamples/SampleBuilderFactory.h"
#include <iostream>
diff --git a/Tests/Functional/Core/Std/Check.cpp b/Tests/Functional/Core/Std/Check.cpp
index 119e1449ea8663ea7901b5cbb3ef53c97692149e..07a9fee0ae54090232a7291cc86bee385fa54d02 100644
--- a/Tests/Functional/Core/Std/Check.cpp
+++ b/Tests/Functional/Core/Std/Check.cpp
@@ -15,10 +15,10 @@
#include "BABuild.h"
#include "BATesting.h"
#include "Base/Utils/FileSystemUtils.h"
+#include "Core/Simulation/SimulationFactory.h"
#include "Device/Histo/IntensityDataIOFactory.h"
#include "Device/Instrument/IntensityDataFunctions.h"
#include "Sample/Multilayer/MultiLayer.h"
-#include "Core/Simulation/SimulationFactory.h"
#include "Sample/StandardSamples/SampleBuilderFactory.h"
#include <iostream>
diff --git a/Tests/Functional/GUI/Other/SaveLoadProject.cpp b/Tests/Functional/GUI/Other/SaveLoadProject.cpp
index 028e8d9455478f7d72e77b9469e486793e61c02b..dedb00e72e22bba3b089c11a1361d8b0b0a068b8 100644
--- a/Tests/Functional/GUI/Other/SaveLoadProject.cpp
+++ b/Tests/Functional/GUI/Other/SaveLoadProject.cpp
@@ -15,8 +15,6 @@
#include "Tests/Functional/GUI/Other/SaveLoadProject.h"
#include "BATesting.h"
#include "Base/Utils/FileSystemUtils.h"
-#include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/StandardSamples/SampleBuilderFactory.h"
#include "GUI/coregui/Models/ApplicationModels.h"
#include "GUI/coregui/Models/DetectorItems.h"
#include "GUI/coregui/Models/DocumentModel.h"
@@ -30,6 +28,8 @@
#include "GUI/coregui/mainwindow/ProjectUtils.h"
#include "GUI/coregui/mainwindow/projectdocument.h"
#include "GUI/coregui/utils/MessageService.h"
+#include "Sample/Multilayer/MultiLayer.h"
+#include "Sample/StandardSamples/SampleBuilderFactory.h"
#include <QCoreApplication>
#include <QElapsedTimer>
#include <QXmlStreamWriter>
diff --git a/Tests/Functional/GUI/Std/Check.cpp b/Tests/Functional/GUI/Std/Check.cpp
index f42e111954dddc4a57ff2e61316685411267bb43..b0149f89abb973e77715a74ff0a9cd27a14cb1d0 100644
--- a/Tests/Functional/GUI/Std/Check.cpp
+++ b/Tests/Functional/GUI/Std/Check.cpp
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#include "Device/Instrument/IntensityDataFunctions.h"
#include "Core/Simulation/Simulation.h"
+#include "Device/Instrument/IntensityDataFunctions.h"
#include "GUI/coregui/Models/DocumentModel.h"
#include "GUI/coregui/Models/DomainSimulationBuilder.h"
#include "GUI/coregui/Models/GUIObjectBuilder.h"
diff --git a/Tests/Functional/GUI/Translate/GUITranslationTest.cpp b/Tests/Functional/GUI/Translate/GUITranslationTest.cpp
index 41e98cbccfe90f00b4351b0d8d010a24739bbb3b..43b6b74f00cbf6c7b3c9bb831d85ae7e766d6750 100644
--- a/Tests/Functional/GUI/Translate/GUITranslationTest.cpp
+++ b/Tests/Functional/GUI/Translate/GUITranslationTest.cpp
@@ -13,9 +13,7 @@
// ************************************************************************** //
#include "Tests/Functional/GUI/Translate/GUITranslationTest.h"
-#include "Sample/Multilayer/MultiLayer.h"
#include "Core/Simulation/SimulationFactory.h"
-#include "Sample/StandardSamples/SampleBuilderFactory.h"
#include "Fit/Tools/StringUtils.h"
#include "GUI/coregui/Models/ApplicationModels.h"
#include "GUI/coregui/Models/DocumentModel.h"
@@ -35,6 +33,8 @@
#include "GUI/coregui/Models/SphericalDetectorItem.h"
#include "GUI/coregui/utils/GUIHelpers.h"
#include "Param/Base/ParameterPool.h"
+#include "Sample/Multilayer/MultiLayer.h"
+#include "Sample/StandardSamples/SampleBuilderFactory.h"
#include <QStack>
namespace
diff --git a/Tests/Functional/Python/Std/Check.cpp b/Tests/Functional/Python/Std/Check.cpp
index 54d9bedc98406fc4d49972fc1f5ad1751941da2b..a3398d14aff5b0c0a7bef686985eeec6c791250e 100644
--- a/Tests/Functional/Python/Std/Check.cpp
+++ b/Tests/Functional/Python/Std/Check.cpp
@@ -16,9 +16,9 @@
#include "BATesting.h"
#include "Base/Utils/FileSystemUtils.h"
#include "Core/Export/ExportToPython.h"
+#include "Core/Simulation/Simulation.h"
#include "Device/Histo/IntensityDataIOFactory.h"
#include "Device/Instrument/IntensityDataFunctions.h"
-#include "Core/Simulation/Simulation.h"
#include <fstream>
#include <iostream>
diff --git a/Tests/Functional/Std/Run.cpp b/Tests/Functional/Std/Run.cpp
index 2a43bc0b7ec6a440921f7157894e49299c7c5557..cff02284f7d06b20b6fae2ef4ae77d75d90eccf9 100644
--- a/Tests/Functional/Std/Run.cpp
+++ b/Tests/Functional/Std/Run.cpp
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#include "Sample/Multilayer/MultiLayer.h"
#include "Core/Simulation/SimulationFactory.h"
+#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/StandardSamples/SampleBuilderFactory.h"
#include <iostream>
diff --git a/Tests/Performance/Core/Mesocrystal.cpp b/Tests/Performance/Core/Mesocrystal.cpp
index a88e3fa9d225c72913276f8359011a000bde767d..0414806c4796b1f928e03ce495ccc86023365369 100644
--- a/Tests/Performance/Core/Mesocrystal.cpp
+++ b/Tests/Performance/Core/Mesocrystal.cpp
@@ -14,8 +14,9 @@
#include "Sample/Particle/MesoCrystal.h"
#include "Base/Const/Units.h"
-#include "Sample/Aggregate/ParticleLayout.h"
+#include "Core/Simulation/GISASSimulation.h"
#include "Device/Detector/RectangularDetector.h"
+#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/FormFactorCylinder.h"
#include "Sample/Lattice/ISelectionRule.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
@@ -26,7 +27,6 @@
#include "Sample/Particle/Particle.h"
#include "Sample/Particle/ParticleComposition.h"
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
-#include "Core/Simulation/GISASSimulation.h"
#include "Sample/SoftParticle/FormFactorSphereLogNormalRadius.h"
#include <iostream>
diff --git a/Tests/Performance/Core/Threading.cpp b/Tests/Performance/Core/Threading.cpp
index b94299dc58629357da9b9541607a3690df222543..4cd75beb6958755fd60b42ff073d3e01d8921480 100644
--- a/Tests/Performance/Core/Threading.cpp
+++ b/Tests/Performance/Core/Threading.cpp
@@ -13,12 +13,12 @@
// ************************************************************************** //
#include "Base/Const/Units.h"
-#include "Sample/Multilayer/MultiLayer.h"
#include "Core/Simulation/GISASSimulation.h"
-#include "Sample/StandardSamples/CylindersBuilder.h"
-#include "Sample/StandardSamples/ParaCrystalBuilder.h"
#include "Param/Distrib/Distributions.h"
#include "Param/Varia/ParameterPattern.h"
+#include "Sample/Multilayer/MultiLayer.h"
+#include "Sample/StandardSamples/CylindersBuilder.h"
+#include "Sample/StandardSamples/ParaCrystalBuilder.h"
#include "Tests/Performance/Core/ThreadingComponents.h"
#include <algorithm>
#include <boost/format.hpp>
diff --git a/Tests/Performance/Core/ThreadingComponents.cpp b/Tests/Performance/Core/ThreadingComponents.cpp
index aa36ee62ab54c632293efd96c14b65b8aab1b693..53bdf36f2d87d2de2ffc9a17437a79a1c2b0e9f9 100644
--- a/Tests/Performance/Core/ThreadingComponents.cpp
+++ b/Tests/Performance/Core/ThreadingComponents.cpp
@@ -14,20 +14,20 @@
#include "Tests/Performance/Core/ThreadingComponents.h"
#include "Base/Const/Units.h"
+#include "Core/Simulation/GISASSimulation.h"
+#include "Device/Detector/RectangularDetector.h"
+#include "Device/Mask/Rectangle.h"
+#include "Param/Distrib/Distributions.h"
+#include "Param/Varia/ParameterPattern.h"
#include "Sample/Aggregate/InterferenceFunction2DLattice.h"
#include "Sample/Aggregate/ParticleLayout.h"
-#include "Device/Detector/RectangularDetector.h"
#include "Sample/HardParticle/FormFactorFullSphere.h"
-#include "Device/Mask/Rectangle.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Particle/ParticleDistribution.h"
-#include "Core/Simulation/GISASSimulation.h"
#include "Sample/StandardSamples/CylindersBuilder.h"
-#include "Param/Distrib/Distributions.h"
-#include "Param/Varia/ParameterPattern.h"
namespace
{
diff --git a/Tests/Performance/GUI/GUIPerformanceTest.cpp b/Tests/Performance/GUI/GUIPerformanceTest.cpp
index 841fa96173bb012adf3b427313bb152f00c000bc..df49d2a4fb17b97dedb33e4c7179bbace3dc49dd 100644
--- a/Tests/Performance/GUI/GUIPerformanceTest.cpp
+++ b/Tests/Performance/GUI/GUIPerformanceTest.cpp
@@ -13,9 +13,7 @@
// ************************************************************************** //
#include "Tests/Performance/GUI/GUIPerformanceTest.h"
-#include "Sample/Multilayer/MultiLayer.h"
#include "Core/Simulation/GISASSimulation.h"
-#include "Sample/StandardSamples/SampleBuilderFactory.h"
#include "GUI/coregui/Models/ApplicationModels.h"
#include "GUI/coregui/Models/DetectorItems.h"
#include "GUI/coregui/Models/DocumentModel.h"
@@ -32,6 +30,8 @@
#include "GUI/coregui/Models/ParameterTreeUtils.h"
#include "GUI/coregui/Models/SampleModel.h"
#include "GUI/coregui/utils/GUIHelpers.h"
+#include "Sample/Multilayer/MultiLayer.h"
+#include "Sample/StandardSamples/SampleBuilderFactory.h"
#include "Tests/Performance/Benchmark.h"
#include <QCoreApplication>
#include <QDebug>
diff --git a/Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.cpp b/Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.cpp
index 77d8b22ef43ffba46289d5a861b6559a53f1e46a..e867165f1234e8f1bd3db8430f3b36721230333f 100644
--- a/Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.cpp
+++ b/Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.cpp
@@ -103,12 +103,11 @@ TEST_F(PythonFormattingTest, printAxis)
EXPECT_EQ(axis1.pyString("", 0), "ba.FixedBinAxis(\"axis0\", 10, -1.0, 2.0)");
FixedBinAxis axis2("axis0", 10, -1.0 * Units::deg, 2.0 * Units::deg);
- EXPECT_EQ(axis2.pyString("rad", 0),
- "ba.FixedBinAxis(\"axis0\", 10, -1.0*deg, 2.0*deg)");
+ EXPECT_EQ(axis2.pyString("rad", 0), "ba.FixedBinAxis(\"axis0\", 10, -1.0*deg, 2.0*deg)");
PointwiseAxis axis3("axis3",
std::vector<double>{1.0 * Units::deg, 2.0 * Units::deg, 3.0 * Units::deg});
EXPECT_EQ(axis3.pyString("rad", 0), "numpy.asarray([1.0*deg,\n"
- " 2.0*deg,\n"
- " 3.0*deg])");
+ " 2.0*deg,\n"
+ " 3.0*deg])");
}
diff --git a/Tests/UnitTests/Core/Fitting/FittingTestHelper.h b/Tests/UnitTests/Core/Fitting/FittingTestHelper.h
index b9947b27965940be4c1288d4ba28d6f76551086a..a0fa69d4187726617854b1b09c26a94d03fe7067 100644
--- a/Tests/UnitTests/Core/Fitting/FittingTestHelper.h
+++ b/Tests/UnitTests/Core/Fitting/FittingTestHelper.h
@@ -2,11 +2,11 @@
#define BORNAGAIN_TESTS_UNITTESTS_CORE_FITTING_FITTINGTESTHELPER_H
#include "Base/Const/Units.h"
+#include "Core/Simulation/GISASSimulation.h"
+#include "Fit/Kernel/Parameters.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
-#include "Core/Simulation/GISASSimulation.h"
-#include "Fit/Kernel/Parameters.h"
#include <memory>
//! Helper class to simplify testing of SimDataPair and FitObjective
diff --git a/Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.cpp b/Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.cpp
index 09143026f771f686c0dd384b71fa835b6ed2e378..1eba17627bc83b18dd8ad06aa467f0b4b6cd1675 100644
--- a/Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.cpp
@@ -2,13 +2,13 @@
#include "Base/Const/MathConstants.h"
#include "Base/Const/Units.h"
#include "Device/Histo/Histogram2D.h"
+#include "Param/Base/RealParameter.h"
+#include "Param/Distrib/Distributions.h"
+#include "Param/Varia/ParameterPattern.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
-#include "Param/Base/RealParameter.h"
-#include "Param/Distrib/Distributions.h"
-#include "Param/Varia/ParameterPattern.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 e0dbcf4e85c5b9aec62de61dc118807d60a8f5a0..928bbfc2d0ed0c67f0d89146f402d47874ed19d0 100644
--- a/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp
@@ -1,11 +1,11 @@
#include "Base/Axis/FixedBinAxis.h"
#include "Base/Axis/PointwiseAxis.h"
#include "Device/Beam/FootprintGauss.h"
-#include "Sample/Multilayer/SpecularSimulationElement.h"
#include "Device/Resolution/ScanResolution.h"
#include "Device/Scan/AngularSpecScan.h"
#include "Device/Scan/QSpecScan.h"
#include "Param/Distrib/RangedDistributions.h"
+#include "Sample/Multilayer/SpecularSimulationElement.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 12d7f3a290b60e4d0ca681992953c261482a9907..61674187658979b26aab7435efa852d84792b683 100644
--- a/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp
@@ -3,15 +3,15 @@
#include "Base/Const/MathConstants.h"
#include "Base/Const/Units.h"
#include "Device/Histo/Histogram1D.h"
-#include "Sample/Material/MaterialFactoryFuncs.h"
-#include "Sample/Multilayer/Layer.h"
-#include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
#include "Device/Scan/AngularSpecScan.h"
#include "Device/Scan/QSpecScan.h"
#include "Param/Base/RealParameter.h"
#include "Param/Distrib/Distributions.h"
#include "Param/Varia/ParameterPattern.h"
+#include "Sample/Material/MaterialFactoryFuncs.h"
+#include "Sample/Multilayer/Layer.h"
+#include "Sample/Multilayer/MultiLayer.h"
+#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
#include "Tests/GTestWrapper/google_test.h"
#include <iostream>
diff --git a/Tests/UnitTests/Core/Other/SampleBuilderNodeTest.cpp b/Tests/UnitTests/Core/Other/SampleBuilderNodeTest.cpp
index 47aedb556d15996283371b944fb0cedc8e1ceaf4..5a3ad8b104c89d71dfd93271a2ca6f70d328683d 100644
--- a/Tests/UnitTests/Core/Other/SampleBuilderNodeTest.cpp
+++ b/Tests/UnitTests/Core/Other/SampleBuilderNodeTest.cpp
@@ -1,7 +1,7 @@
#include "Sample/SampleBuilderEngine/SampleBuilderNode.h"
+#include "Param/Base/ParameterPool.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/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 d8a7eceedf9887f949957ad9e3aac5fee6e93923..1761748b364bd25a6fa7ecbdf288ba2ff14bd887 100644
--- a/Tests/UnitTests/Core/Other/SampleProviderTest.cpp
+++ b/Tests/UnitTests/Core/Other/SampleProviderTest.cpp
@@ -1,8 +1,8 @@
#include "Sample/SampleBuilderEngine/SampleProvider.h"
-#include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
+#include "Sample/Multilayer/MultiLayer.h"
+#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
#include "Tests/GTestWrapper/google_test.h"
#include <memory>
diff --git a/Tests/UnitTests/Core/Parameters/FTDistributionsTest.cpp b/Tests/UnitTests/Core/Parameters/FTDistributionsTest.cpp
index d3419976ddfb82823e8c06adf446bc6beee6d0e7..9bce403deaeb89e3b373a2f12da3d364e251be3e 100644
--- a/Tests/UnitTests/Core/Parameters/FTDistributionsTest.cpp
+++ b/Tests/UnitTests/Core/Parameters/FTDistributionsTest.cpp
@@ -1,6 +1,6 @@
+#include "Param/Base/RealParameter.h"
#include "Sample/Correlations/FTDistributions1D.h"
#include "Sample/Correlations/FTDistributions2D.h"
-#include "Param/Base/RealParameter.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 6abd25775b65173e2b9033d16a4f8e040890e963..4ae223b38d804c89b0a8be30b29fa18a5c714b31 100644
--- a/Tests/UnitTests/Core/Sample/MultilayerAveragingTest.cpp
+++ b/Tests/UnitTests/Core/Sample/MultilayerAveragingTest.cpp
@@ -1,6 +1,6 @@
+#include "Core/Computation/ProcessedSample.h"
#include "Sample/Aggregate/InterferenceFunction2DLattice.h"
#include "Sample/Aggregate/ParticleLayout.h"
-#include "Core/Computation/ProcessedSample.h"
#include "Sample/HardParticle/FormFactorCylinder.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
#include "Sample/Multilayer/Layer.h"
diff --git a/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp b/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp
index 1a7f6e12fc6c7812c10ac38d4f3d625d141fbf61..b367b4a0cc0caa9b8f30b68dffaecabe34de60c6 100644
--- a/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp
+++ b/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp
@@ -1,10 +1,10 @@
#include "Sample/Particle/ParticleDistribution.h"
#include "Base/Const/Units.h"
+#include "Param/Distrib/Distributions.h"
#include "Sample/HardParticle/FormFactorCone.h"
#include "Sample/HardParticle/FormFactorFullSphere.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
#include "Sample/Particle/Particle.h"
-#include "Param/Distrib/Distributions.h"
#include "Tests/GTestWrapper/google_test.h"
class ParticleDistributionTest : public ::testing::Test
diff --git a/Tests/UnitTests/Core/Sample/ParticleLayoutTest.cpp b/Tests/UnitTests/Core/Sample/ParticleLayoutTest.cpp
index ce72686600b6d8514706bf544ea3955d0533c3d8..100bdefa61cf695beaf6a5dd4d90ae96842fe5e9 100644
--- a/Tests/UnitTests/Core/Sample/ParticleLayoutTest.cpp
+++ b/Tests/UnitTests/Core/Sample/ParticleLayoutTest.cpp
@@ -1,8 +1,8 @@
#include "Sample/Aggregate/ParticleLayout.h"
#include "Base/Const/Units.h"
+#include "Core/Export/INodeUtils.h"
#include "Sample/Aggregate/InterferenceFunction1DLattice.h"
#include "Sample/Aggregate/InterferenceFunctionNone.h"
-#include "Core/Export/INodeUtils.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
#include "Sample/Particle/Particle.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/Core/Sample/RTTest.cpp b/Tests/UnitTests/Core/Sample/RTTest.cpp
index 9c9c5307177487d2cc961ddeb9ffaa48a23e61eb..baccb5014f1fb4f636ce93e96f51861869354a5a 100644
--- a/Tests/UnitTests/Core/Sample/RTTest.cpp
+++ b/Tests/UnitTests/Core/Sample/RTTest.cpp
@@ -1,6 +1,6 @@
#include "Base/Const/MathConstants.h"
-#include "Sample/Aggregate/ParticleLayout.h"
#include "Core/Computation/ProcessedSample.h"
+#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/LayerInterface.h"
diff --git a/Tests/UnitTests/GUI/TestFormFactorItems.cpp b/Tests/UnitTests/GUI/TestFormFactorItems.cpp
index eeeecd16298e1f60ab49957b304671c06c56c4b5..3caf55bac263eddbaa92d1d5d0f98aa9f98adc02 100644
--- a/Tests/UnitTests/GUI/TestFormFactorItems.cpp
+++ b/Tests/UnitTests/GUI/TestFormFactorItems.cpp
@@ -1,7 +1,7 @@
#include "Base/Const/Units.h"
#include "Base/Utils/Algorithms.h"
-#include "Sample/HardParticle/FormFactorAnisoPyramid.h"
#include "GUI/coregui/Models/FormFactorItems.h"
+#include "Sample/HardParticle/FormFactorAnisoPyramid.h"
#include "Tests/GTestWrapper/google_test.h"
class TestFormFactorItems : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp b/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp
index dd6d421772a2fd56065099f55f436bc09f25d095..3c4e4d46e5ccfc21c7662a6bde84487860e0e260 100644
--- a/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp
+++ b/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp
@@ -1,9 +1,9 @@
#include "Base/Const/Units.h"
-#include "Sample/Aggregate/InterferenceFunctions.h"
-#include "Sample/HardParticle/HardParticles.h"
#include "GUI/coregui/Models/FormFactorItems.h"
#include "GUI/coregui/Models/InterferenceFunctionItems.h"
#include "Param/Base/ParameterPool.h"
+#include "Sample/Aggregate/InterferenceFunctions.h"
+#include "Sample/HardParticle/HardParticles.h"
#include "Tests/GTestWrapper/google_test.h"
class TestGUICoreObjectCorrespondence : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestParaCrystalItems.cpp b/Tests/UnitTests/GUI/TestParaCrystalItems.cpp
index c69a151f8afef46d9d89ed5ffebbeabb328de7c1..c7f62a945364ed69a01057cea34a97a92a13605f 100644
--- a/Tests/UnitTests/GUI/TestParaCrystalItems.cpp
+++ b/Tests/UnitTests/GUI/TestParaCrystalItems.cpp
@@ -1,11 +1,11 @@
#include "Base/Const/Units.h"
-#include "Sample/Aggregate/InterferenceFunction2DParaCrystal.h"
#include "GUI/coregui/Models/FTDistributionItems.h"
#include "GUI/coregui/Models/InterferenceFunctionItems.h"
#include "GUI/coregui/Models/Lattice2DItems.h"
#include "GUI/coregui/Models/ParticleLayoutItem.h"
#include "GUI/coregui/Models/SampleModel.h"
#include "GUI/coregui/Models/TransformFromDomain.h"
+#include "Sample/Aggregate/InterferenceFunction2DParaCrystal.h"
#include "Tests/GTestWrapper/google_test.h"
class TestParaCrystalItems : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp b/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp
index 4b62e428420ce0f5966cff914c5151bb0be413c2..362ac5da53dea04fbd4928d8a73e92bf7c1682c7 100644
--- a/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp
+++ b/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp
@@ -1,6 +1,3 @@
-#include "Sample/HardParticle/HardParticles.h"
-#include "Sample/Material/MaterialFactoryFuncs.h"
-#include "Sample/Particle/Particle.h"
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/DistributionItems.h"
#include "GUI/coregui/Models/MaterialModel.h"
@@ -11,6 +8,9 @@
#include "GUI/coregui/Models/TransformFromDomain.h"
#include "GUI/coregui/Views/MaterialEditor/MaterialEditor.h"
#include "Param/Distrib/Distributions.h"
+#include "Sample/HardParticle/HardParticles.h"
+#include "Sample/Material/MaterialFactoryFuncs.h"
+#include "Sample/Particle/Particle.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QXmlStreamWriter>
diff --git a/Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.cpp b/Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.cpp
index c2a58a23a0ff005b5974177552eb8dbf62379060..1d0d90bac9b5e5d47cf347febdb70512de55c417 100644
--- a/Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.cpp
+++ b/Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.cpp
@@ -1,4 +1,3 @@
-#include "Sample/Particle/Particle.h"
#include "GUI/coregui/Models/ApplicationModels.h"
#include "GUI/coregui/Models/ParticleItem.h"
#include "GUI/coregui/Models/ParticleLayoutItem.h"
@@ -8,6 +7,7 @@
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h"
#include "GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h"
+#include "Sample/Particle/Particle.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QObject>