diff --git a/Core/Aggregate/FTDecayFunctions.cpp b/Core/Aggregate/FTDecayFunctions.cpp
index 84bf245842b0e1b7b7d66b50f4685765df93b949..23ece081dc1698981ed15e8b60a534ccb604ea42 100644
--- a/Core/Aggregate/FTDecayFunctions.cpp
+++ b/Core/Aggregate/FTDecayFunctions.cpp
@@ -15,9 +15,9 @@
#include "Core/Aggregate/FTDecayFunctions.h"
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/MathFunctions.h"
#include "Core/Parametrization/ParameterPool.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Tools/MathFunctions.h"
#include <algorithm>
//===============1D======================
diff --git a/Core/Aggregate/FTDecayFunctions.h b/Core/Aggregate/FTDecayFunctions.h
index 635d8ea309a9588fe508a3e1d3c697bf281ca91b..5f2bf70cb1fa3a23f8173214827d01be91622ca2 100644
--- a/Core/Aggregate/FTDecayFunctions.h
+++ b/Core/Aggregate/FTDecayFunctions.h
@@ -16,8 +16,8 @@
#define FTDECAYFUNCTIONS_H
#include "Core/Basics/ICloneable.h"
-#include "Core/Parametrization/INode.h"
#include "Core/Basics/MathConstants.h"
+#include "Core/Parametrization/INode.h"
#include <utility>
//! Interface for a one-dimensional decay function,
diff --git a/Core/Aggregate/FTDistributions1D.cpp b/Core/Aggregate/FTDistributions1D.cpp
index 6f0cb905bcd0bb43997eba880350dc9fc06b0a63..4e862db05a3825fcadad5404e3cf9b9daa7182e9 100644
--- a/Core/Aggregate/FTDistributions1D.cpp
+++ b/Core/Aggregate/FTDistributions1D.cpp
@@ -16,9 +16,9 @@
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/MathFunctions.h"
#include "Core/Parametrization/ParameterPool.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Tools/MathFunctions.h"
#include <limits>
namespace
diff --git a/Core/Aggregate/FTDistributions1D.h b/Core/Aggregate/FTDistributions1D.h
index f7fa9cafb61cb246452dce557e6a87bb2ae2af81..ae2b3f9b29b7921839484a922c848bae00c911b8 100644
--- a/Core/Aggregate/FTDistributions1D.h
+++ b/Core/Aggregate/FTDistributions1D.h
@@ -15,8 +15,8 @@
#ifndef FTDISTRIBUTIONS1D_H
#define FTDISTRIBUTIONS1D_H
-#include "Core/Basics/ICloneable.h"
#include "Core/Aggregate/IDistribution1DSampler.h"
+#include "Core/Basics/ICloneable.h"
#include "Core/Parametrization/INode.h"
//! Interface for a one-dimensional distribution, with normalization adjusted so that
diff --git a/Core/Aggregate/FTDistributions2D.cpp b/Core/Aggregate/FTDistributions2D.cpp
index ef8a9d5770f200cb5097c2921008d6953a882031..eee68951352130b710903f71e9e8063f1b6811ed 100644
--- a/Core/Aggregate/FTDistributions2D.cpp
+++ b/Core/Aggregate/FTDistributions2D.cpp
@@ -16,9 +16,9 @@
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/MathFunctions.h"
#include "Core/Parametrization/ParameterPool.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Tools/MathFunctions.h"
#include <limits>
//! Constructor of two-dimensional probability distribution.
diff --git a/Core/Aggregate/FTDistributions2D.h b/Core/Aggregate/FTDistributions2D.h
index 352fcf496b753ed3741a6eeeb65d40dd062ad440..49f91d2c0ef02cfe4ad21734ceac3f3538706591 100644
--- a/Core/Aggregate/FTDistributions2D.h
+++ b/Core/Aggregate/FTDistributions2D.h
@@ -15,11 +15,11 @@
#ifndef FTDISTRIBUTIONS2D_H
#define FTDISTRIBUTIONS2D_H
-#include "Core/Basics/ICloneable.h"
#include "Core/Aggregate/IDistribution2DSampler.h"
+#include "Core/Basics/ICloneable.h"
+#include "Core/Basics/MathConstants.h"
#include "Core/Parametrization/INode.h"
#include "Core/Tools/Integrator.h"
-#include "Core/Basics/MathConstants.h"
//! Interface for two-dimensional distributions in Fourier space.
//! @ingroup distribution_internal
diff --git a/Core/Aggregate/FormFactorCoherentPart.cpp b/Core/Aggregate/FormFactorCoherentPart.cpp
index 35b1756aa621e4869c977504151d346f4350ab22..2dce8959e8d296b14108db13ea19b56f6e7413ac 100644
--- a/Core/Aggregate/FormFactorCoherentPart.cpp
+++ b/Core/Aggregate/FormFactorCoherentPart.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Aggregate/FormFactorCoherentPart.h"
-#include "Core/Scattering/IFormFactor.h"
#include "Core/Multilayer/IFresnelMap.h"
#include "Core/Multilayer/ILayerRTCoefficients.h"
+#include "Core/Scattering/IFormFactor.h"
#include "Core/SimulationElement/SimulationElement.h"
#include "Core/Vector/WavevectorInfo.h"
diff --git a/Core/Aggregate/FormFactorCoherentSum.h b/Core/Aggregate/FormFactorCoherentSum.h
index 00e4b486eac47d49fc6e8cad4fb8e8fa5a8247cd..d2c66121c23625e98240b7d42f4bc61edda03abd 100644
--- a/Core/Aggregate/FormFactorCoherentSum.h
+++ b/Core/Aggregate/FormFactorCoherentSum.h
@@ -15,9 +15,9 @@
#ifndef FORMFACTORCOHERENTSUM_H
#define FORMFACTORCOHERENTSUM_H
+#include "Core/Aggregate/FormFactorCoherentPart.h"
#include "Core/Basics/Complex.h"
#include "Core/Vector/EigenCore.h"
-#include "Core/Aggregate/FormFactorCoherentPart.h"
#include <vector>
class SimulationElement;
diff --git a/Core/Aggregate/InterferenceFunction1DLattice.cpp b/Core/Aggregate/InterferenceFunction1DLattice.cpp
index 2a0606c2e98711bb59d4906673bec71756d86054..e14553061e5eed8baa3682d10ab1f1ca28a9bc08 100644
--- a/Core/Aggregate/InterferenceFunction1DLattice.cpp
+++ b/Core/Aggregate/InterferenceFunction1DLattice.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Aggregate/InterferenceFunction1DLattice.h"
+#include "Core/Aggregate/FTDecayFunctions.h"
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/Exceptions.h"
-#include "Core/Aggregate/FTDecayFunctions.h"
#include "Core/Basics/MathConstants.h"
#include "Core/Parametrization/RealParameter.h"
#include <algorithm>
diff --git a/Core/Aggregate/InterferenceFunction2DLattice.h b/Core/Aggregate/InterferenceFunction2DLattice.h
index 658165548c0ab021fe257662b99523578833aa94..f4607e59e02c5be14a4f0ed5bdfee38fd5f5ec52 100644
--- a/Core/Aggregate/InterferenceFunction2DLattice.h
+++ b/Core/Aggregate/InterferenceFunction2DLattice.h
@@ -17,8 +17,8 @@
#include "Core/Aggregate/FTDecayFunctions.h"
#include "Core/Aggregate/IInterferenceFunction.h"
-#include "Core/Tools/Integrator.h"
#include "Core/Lattice/Lattice2D.h"
+#include "Core/Tools/Integrator.h"
//! Interference function of a 2D lattice.
//! @ingroup interference
diff --git a/Core/Aggregate/InterferenceFunction2DParaCrystal.h b/Core/Aggregate/InterferenceFunction2DParaCrystal.h
index 51d43333affc5b459248424247c56d4b207b8f99..ecbce8553fc9c5c770e25e11e0d3702a6f8b316f 100644
--- a/Core/Aggregate/InterferenceFunction2DParaCrystal.h
+++ b/Core/Aggregate/InterferenceFunction2DParaCrystal.h
@@ -15,11 +15,11 @@
#ifndef INTERFERENCEFUNCTION2DPARACRYSTAL_H
#define INTERFERENCEFUNCTION2DPARACRYSTAL_H
-#include "Core/Basics/Complex.h"
#include "Core/Aggregate/FTDistributions2D.h"
#include "Core/Aggregate/IInterferenceFunction.h"
-#include "Core/Tools/Integrator.h"
+#include "Core/Basics/Complex.h"
#include "Core/Lattice/Lattice2D.h"
+#include "Core/Tools/Integrator.h"
#include <memory>
class IFTDistribution2D;
diff --git a/Core/Aggregate/InterferenceFunction2DSuperLattice.cpp b/Core/Aggregate/InterferenceFunction2DSuperLattice.cpp
index 58437373c154cd57bdb76417360d2ff32cda141d..b1967e1e5b5a5fa89224ca470203b1b7716322ae 100644
--- a/Core/Aggregate/InterferenceFunction2DSuperLattice.cpp
+++ b/Core/Aggregate/InterferenceFunction2DSuperLattice.cpp
@@ -13,12 +13,12 @@
// ************************************************************************** //
#include "Core/Aggregate/InterferenceFunction2DSuperLattice.h"
+#include "Core/Aggregate/InterferenceFunctionNone.h"
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/Exceptions.h"
-#include "Core/Aggregate/InterferenceFunctionNone.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/MathFunctions.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Tools/MathFunctions.h"
#include <limits>
diff --git a/Core/Aggregate/InterferenceFunction2DSuperLattice.h b/Core/Aggregate/InterferenceFunction2DSuperLattice.h
index ac5680e99fd6e399ecfce89431e8b7d34e238ace..20babe949368673a3539236700dbdfdb6d741d18 100644
--- a/Core/Aggregate/InterferenceFunction2DSuperLattice.h
+++ b/Core/Aggregate/InterferenceFunction2DSuperLattice.h
@@ -16,8 +16,8 @@
#define INTERFERENCEFUNCTION2DSUPERLATTICE_H
#include "Core/Aggregate/IInterferenceFunction.h"
-#include "Core/Tools/Integrator.h"
#include "Core/Lattice/Lattice2D.h"
+#include "Core/Tools/Integrator.h"
//! Interference function of a 2D superlattice with a configurable interference function for
//! each lattice site.
diff --git a/Core/Aggregate/InterferenceFunction3DLattice.cpp b/Core/Aggregate/InterferenceFunction3DLattice.cpp
index e50462ce658abb8fabab82239aa0a705ab6babee..9c286695a86f6d7e3a7d1f242e3140ba053fb7ff 100644
--- a/Core/Aggregate/InterferenceFunction3DLattice.cpp
+++ b/Core/Aggregate/InterferenceFunction3DLattice.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Aggregate/InterferenceFunction3DLattice.h"
+#include "Core/Aggregate/IPeakShape.h"
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/Exceptions.h"
-#include "Core/Aggregate/IPeakShape.h"
#include <algorithm>
InterferenceFunction3DLattice::InterferenceFunction3DLattice(const Lattice& lattice)
diff --git a/Core/Aggregate/InterferenceFunctionFinite2DLattice.cpp b/Core/Aggregate/InterferenceFunctionFinite2DLattice.cpp
index ce808224762c5241b79d8224aefbe071c7d05d19..c5721e9aa23b8e4b0edc0472567623b0969ffee1 100644
--- a/Core/Aggregate/InterferenceFunctionFinite2DLattice.cpp
+++ b/Core/Aggregate/InterferenceFunctionFinite2DLattice.cpp
@@ -16,8 +16,8 @@
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/MathFunctions.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Tools/MathFunctions.h"
#include <limits>
diff --git a/Core/Aggregate/InterferenceFunctionFinite2DLattice.h b/Core/Aggregate/InterferenceFunctionFinite2DLattice.h
index 951649afc72982171b7d60ee11734f92663d402a..c27a2606e480da3965d9d69ae31804a060c2b02b 100644
--- a/Core/Aggregate/InterferenceFunctionFinite2DLattice.h
+++ b/Core/Aggregate/InterferenceFunctionFinite2DLattice.h
@@ -16,8 +16,8 @@
#define INTERFERENCEFUNCTIONFINITE2DLATTICE_H
#include "Core/Aggregate/IInterferenceFunction.h"
-#include "Core/Tools/Integrator.h"
#include "Core/Lattice/Lattice2D.h"
+#include "Core/Tools/Integrator.h"
//! Interference function of a finite 2D lattice.
//! @ingroup interference
diff --git a/Core/Aggregate/InterferenceFunctionFinite3DLattice.cpp b/Core/Aggregate/InterferenceFunctionFinite3DLattice.cpp
index 136d2172717d6799ad97ad2f23bf9a875ace4e63..345e4ee8f1c7155a6faa4b249e13d6048a51bca5 100644
--- a/Core/Aggregate/InterferenceFunctionFinite3DLattice.cpp
+++ b/Core/Aggregate/InterferenceFunctionFinite3DLattice.cpp
@@ -16,8 +16,8 @@
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/MathFunctions.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Tools/MathFunctions.h"
#include <limits>
diff --git a/Core/Aggregate/InterferenceFunctionHardDisk.cpp b/Core/Aggregate/InterferenceFunctionHardDisk.cpp
index 17548299a8d1554bc87453a22630a84bf5b5f75f..b4426497f8b5e4cf8cc2e490b349110ced5750fd 100644
--- a/Core/Aggregate/InterferenceFunctionHardDisk.cpp
+++ b/Core/Aggregate/InterferenceFunctionHardDisk.cpp
@@ -14,8 +14,8 @@
#include "Core/Aggregate/InterferenceFunctionHardDisk.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Tools/MathFunctions.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Tools/MathFunctions.h"
#include <cmath>
namespace
diff --git a/Core/Aggregate/InterferenceFunctionRadialParaCrystal.h b/Core/Aggregate/InterferenceFunctionRadialParaCrystal.h
index 8bfb74f00fa66db7539f192d851564619acf7998..861de5a73a6fc092b86a5750e0eb29936b3bfd17 100644
--- a/Core/Aggregate/InterferenceFunctionRadialParaCrystal.h
+++ b/Core/Aggregate/InterferenceFunctionRadialParaCrystal.h
@@ -15,9 +15,9 @@
#ifndef INTERFERENCEFUNCTIONRADIALPARACRYSTAL_H
#define INTERFERENCEFUNCTIONRADIALPARACRYSTAL_H
-#include "Core/Basics/Complex.h"
#include "Core/Aggregate/FTDistributions1D.h"
#include "Core/Aggregate/IInterferenceFunction.h"
+#include "Core/Basics/Complex.h"
#include <memory>
//! Interference function of radial paracrystal.
diff --git a/Core/Aggregate/ParticleLayout.cpp b/Core/Aggregate/ParticleLayout.cpp
index 9226ba4ffed5c59e6ff74331ff73e6f86a2d4650..a1352816e3f4b75ad3ed2b8ff3cb80049483ba23 100644
--- a/Core/Aggregate/ParticleLayout.cpp
+++ b/Core/Aggregate/ParticleLayout.cpp
@@ -13,14 +13,14 @@
// ************************************************************************** //
#include "Core/Aggregate/ParticleLayout.h"
-#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Basics/Exceptions.h"
#include "Core/Aggregate/IInterferenceFunction.h"
#include "Core/Aggregate/InterferenceFunctionNone.h"
+#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/Basics/Exceptions.h"
#include "Core/Parametrization/ParameterPool.h"
+#include "Core/Parametrization/RealParameter.h"
#include "Core/Particle/Particle.h"
#include "Core/Particle/ParticleDistribution.h"
-#include "Core/Parametrization/RealParameter.h"
namespace
{
diff --git a/Core/Basics/Algorithms.h b/Core/Basics/Algorithms.h
index edb605666c5eb4cd392b66a1a2827957a8c0fa91..2f05a861d817ca8cf9535e14e3afbbd3b215f444 100644
--- a/Core/Basics/Algorithms.h
+++ b/Core/Basics/Algorithms.h
@@ -16,30 +16,30 @@
#define ALGORITHMS_H
#include <algorithm>
+#include <cassert>
#include <functional>
#include <vector>
-#include <cassert>
//! Some additions to standard library algorithms.
-namespace algo {
+namespace algo
+{
//! Returns the minimum value of function evaluate as applied to the elements of an iterator range.
-template<typename Evaluator, typename Iterator>
+template <typename Evaluator, typename Iterator>
double min_value(const Iterator& begin, const Iterator& end, const Evaluator& evaluate);
//! Returns the maximum value of function evaluate as applied to the elements of an iterator range.
-template<typename Evaluator, typename Iterator>
+template <typename Evaluator, typename Iterator>
double max_value(const Iterator& begin, const Iterator& end, const Evaluator& evaluate);
} // namespace algo
-
// ************************************************************************** //
// Implementation
// ************************************************************************** //
-template<typename Evaluator, typename Iterator>
+template <typename Evaluator, typename Iterator>
double algo::min_value(const Iterator& begin, const Iterator& end, const Evaluator& evaluate)
{
assert(begin != end);
@@ -50,7 +50,7 @@ double algo::min_value(const Iterator& begin, const Iterator& end, const Evaluat
return ret;
}
-template<typename Evaluator, typename Iterator>
+template <typename Evaluator, typename Iterator>
double algo::max_value(const Iterator& begin, const Iterator& end, const Evaluator& evaluate)
{
assert(begin != end);
@@ -61,5 +61,4 @@ double algo::max_value(const Iterator& begin, const Iterator& end, const Evaluat
return ret;
}
-
#endif // ALGORITHMS_H
diff --git a/Core/Basics/PhysicalConstants.h b/Core/Basics/PhysicalConstants.h
index 6d0847ab875c12b8eb022a4ef4425dadfcc94f8e..2a5dd67cc7a0d52d4990103e151b69c52b56b81f 100644
--- a/Core/Basics/PhysicalConstants.h
+++ b/Core/Basics/PhysicalConstants.h
@@ -17,10 +17,10 @@
namespace PhysConsts
{
-constexpr double m_n = 1.67492749804e-27; //!< Neutron mass, kg
-constexpr double h_bar = 1.054571817e-34; //!< Reduced Plank constant, J s
-constexpr double mu_N = 5.0507837461e-27; //!< Nuclear magneton (\f$ \mu_N \f$), J/T
-constexpr double mu_B = 9.2740100783e-24; //!< Bohr magneton (\f$ \mu_B \f$), J/T
+constexpr double m_n = 1.67492749804e-27; //!< Neutron mass, kg
+constexpr double h_bar = 1.054571817e-34; //!< Reduced Plank constant, J s
+constexpr double mu_N = 5.0507837461e-27; //!< Nuclear magneton (\f$ \mu_N \f$), J/T
+constexpr double mu_B = 9.2740100783e-24; //!< Bohr magneton (\f$ \mu_B \f$), J/T
constexpr double r_e = 2.8179403262e-15; //!< Thomson scattering length (\f$ r_e \f$), m
constexpr double gamma_n = 1.91304272; //!< \f$\gamma\f$ factor for neutron magnetic moment,
//!< \f$\mu_n = \gamma \cdot \mu_N\f$
diff --git a/Core/Beam/Beam.cpp b/Core/Beam/Beam.cpp
index b77a18b95084220bb36103765b1eb68f1a3cf2c7..96fcb8ad73b8fb8b9fd406f57a8c9d85e5d10a22 100644
--- a/Core/Beam/Beam.cpp
+++ b/Core/Beam/Beam.cpp
@@ -16,8 +16,8 @@
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/Complex.h"
#include "Core/Basics/Exceptions.h"
-#include "Core/Beam/FootprintFactorGaussian.h"
#include "Core/Basics/MathConstants.h"
+#include "Core/Beam/FootprintFactorGaussian.h"
#include "Core/Parametrization/RealParameter.h"
// Allow for 90 degrees by adding a relatively small constant to pi/2
diff --git a/Core/Beam/Beam.h b/Core/Beam/Beam.h
index e7161de99772ce25c63a6e5723ebe412c3b13f95..3af62c41dd32667b2d82a61fbffba44ac112fa45 100644
--- a/Core/Beam/Beam.h
+++ b/Core/Beam/Beam.h
@@ -15,8 +15,8 @@
#ifndef BEAM_H
#define BEAM_H
-#include "Core/Vector/EigenCore.h"
#include "Core/Parametrization/INode.h"
+#include "Core/Vector/EigenCore.h"
#include "Core/Vector/Vectors3D.h"
class IFootprintFactor;
diff --git a/Core/Beam/FootprintFactorGaussian.cpp b/Core/Beam/FootprintFactorGaussian.cpp
index 9d2c53e424dd0c85083dadd956429f81c6dc6d4a..48819632614a61087b3f878a2d04d3d68109ef67 100644
--- a/Core/Beam/FootprintFactorGaussian.cpp
+++ b/Core/Beam/FootprintFactorGaussian.cpp
@@ -14,8 +14,8 @@
#include "Core/Beam/FootprintFactorGaussian.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/MathFunctions.h"
#include "Core/Export/PythonFormatting.h"
+#include "Core/Tools/MathFunctions.h"
FootprintFactorGaussian::FootprintFactorGaussian(double width_ratio) : IFootprintFactor(width_ratio)
{
diff --git a/Core/Computation/DWBAComputation.cpp b/Core/Computation/DWBAComputation.cpp
index 100e3601183541067135175a19a1c9edd5c13367..16cfb64df2ad90abad2faf756f3b69a13e9f0bc3 100644
--- a/Core/Computation/DWBAComputation.cpp
+++ b/Core/Computation/DWBAComputation.cpp
@@ -14,13 +14,13 @@
#include "Core/Computation/DWBAComputation.h"
#include "Core/Computation/GISASSpecularComputation.h"
-#include "Core/Multilayer/IFresnelMap.h"
-#include "Core/Multilayer/MultiLayer.h"
#include "Core/Computation/ParticleLayoutComputation.h"
#include "Core/Computation/ProcessedLayout.h"
#include "Core/Computation/ProcessedSample.h"
#include "Core/Computation/ProgressHandler.h"
#include "Core/Computation/RoughMultiLayerComputation.h"
+#include "Core/Multilayer/IFresnelMap.h"
+#include "Core/Multilayer/MultiLayer.h"
#include "Core/SimulationElement/SimulationElement.h"
static_assert(std::is_copy_constructible<DWBAComputation>::value == false,
diff --git a/Core/Computation/DepthProbeComputation.cpp b/Core/Computation/DepthProbeComputation.cpp
index 1533039b2f1f7bc0fd2fccd5b2d5372b62aed590..0a6aa535465444ef172419743a25d5251859fe95 100644
--- a/Core/Computation/DepthProbeComputation.cpp
+++ b/Core/Computation/DepthProbeComputation.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Computation/DepthProbeComputation.h"
-#include "Core/SimulationElement/DepthProbeElement.h"
-#include "Core/Multilayer/MultiLayer.h"
#include "Core/Computation/ProgressHandler.h"
+#include "Core/Multilayer/MultiLayer.h"
+#include "Core/SimulationElement/DepthProbeElement.h"
static_assert(std::is_copy_constructible<DepthProbeComputation>::value == false,
"DepthProbeComputation should not be copy constructible");
diff --git a/Core/Computation/DepthProbeComputationTerm.cpp b/Core/Computation/DepthProbeComputationTerm.cpp
index 23456e1c4ab0ccdf6f92b1c49239fbf5ad91ef15..fb0cef22a23ec6e2c742124a65a661ad9a2fed60 100644
--- a/Core/Computation/DepthProbeComputationTerm.cpp
+++ b/Core/Computation/DepthProbeComputationTerm.cpp
@@ -13,12 +13,12 @@
// ************************************************************************** //
#include "Core/Computation/DepthProbeComputationTerm.h"
-#include "Core/Computation/DelayedProgressCounter.h"
-#include "Core/SimulationElement/DepthProbeElement.h"
#include "Core/Binning/IAxis.h"
+#include "Core/Computation/DelayedProgressCounter.h"
+#include "Core/Computation/ProcessedSample.h"
#include "Core/Multilayer/IFresnelMap.h"
#include "Core/Multilayer/ILayerRTCoefficients.h"
-#include "Core/Computation/ProcessedSample.h"
+#include "Core/SimulationElement/DepthProbeElement.h"
DepthProbeComputationTerm::DepthProbeComputationTerm(const ProcessedSample* p_sample)
: mp_sample{p_sample}
diff --git a/Core/Computation/IComputation.cpp b/Core/Computation/IComputation.cpp
index a1ce60cd4a895144a4715877a76a97213d919739..97a2618dd9fe27b32e29eef8c65ff518528e0c15 100644
--- a/Core/Computation/IComputation.cpp
+++ b/Core/Computation/IComputation.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Computation/IComputation.h"
-#include "Core/Multilayer/MultiLayer.h"
#include "Core/Computation/ProcessedSample.h"
#include "Core/Computation/ProgressHandler.h"
+#include "Core/Multilayer/MultiLayer.h"
#include "Core/SimulationElement/SimulationElement.h"
IComputation::IComputation(const MultiLayer& sample, const SimulationOptions& options,
diff --git a/Core/Computation/MultiLayerUtils.cpp b/Core/Computation/MultiLayerUtils.cpp
index 2610213a4100802f105eaca75a410f4faf742920..e0db218a7ad6e94e6d965ab39fac9d43a94cd84f 100644
--- a/Core/Computation/MultiLayerUtils.cpp
+++ b/Core/Computation/MultiLayerUtils.cpp
@@ -14,10 +14,10 @@
#include "Core/Computation/MultiLayerUtils.h"
#include "Core/Aggregate/ILayout.h"
+#include "Core/Material/MaterialUtils.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerFillLimits.h"
#include "Core/Multilayer/LayerInterface.h"
-#include "Core/Material/MaterialUtils.h"
#include "Core/Multilayer/MultiLayer.h"
namespace
diff --git a/Core/Computation/ParticleLayoutComputation.cpp b/Core/Computation/ParticleLayoutComputation.cpp
index 80deef7d70192636f969db20d8a6fedc7acb5a5d..63006fb23215db5dd327d494d107fa4733635251 100644
--- a/Core/Computation/ParticleLayoutComputation.cpp
+++ b/Core/Computation/ParticleLayoutComputation.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Computation/ParticleLayoutComputation.h"
+#include "Core/Computation/ProcessedLayout.h"
#include "Core/Multilayer/IInterferenceFunctionStrategy.h"
#include "Core/Multilayer/LayoutStrategyBuilder.h"
-#include "Core/Computation/ProcessedLayout.h"
#include "Core/SimulationElement/SimulationElement.h"
ParticleLayoutComputation::ParticleLayoutComputation(const ProcessedLayout* p_layout,
diff --git a/Core/Computation/ProcessedLayout.cpp b/Core/Computation/ProcessedLayout.cpp
index 8203d18955a06856fa38aa4c6b2cf3a6c2b59709..db554f234457bdf84a2019946a1d0206eba44eeb 100644
--- a/Core/Computation/ProcessedLayout.cpp
+++ b/Core/Computation/ProcessedLayout.cpp
@@ -13,14 +13,14 @@
// ************************************************************************** //
#include "Core/Computation/ProcessedLayout.h"
-#include "Core/Multilayer/FormFactorBAPol.h"
#include "Core/Aggregate/FormFactorCoherentSum.h"
-#include "Core/Multilayer/FormFactorDWBA.h"
-#include "Core/Multilayer/FormFactorDWBAPol.h"
#include "Core/Aggregate/IInterferenceFunction.h"
#include "Core/Aggregate/ILayout.h"
-#include "Core/Particle/IParticle.h"
#include "Core/Computation/Slice.h"
+#include "Core/Multilayer/FormFactorBAPol.h"
+#include "Core/Multilayer/FormFactorDWBA.h"
+#include "Core/Multilayer/FormFactorDWBAPol.h"
+#include "Core/Particle/IParticle.h"
#include "Core/Particle/SlicedFormFactorList.h"
namespace
diff --git a/Core/Computation/ProcessedSample.cpp b/Core/Computation/ProcessedSample.cpp
index c3df40bbe054d058ab6d5f32b6d681879b9b045b..dd9a0802be004be3d8fd8a562009ab5c9a289919 100644
--- a/Core/Computation/ProcessedSample.cpp
+++ b/Core/Computation/ProcessedSample.cpp
@@ -13,18 +13,18 @@
// ************************************************************************** //
#include "Core/Computation/ProcessedSample.h"
-#include "Core/Particle/HomogeneousRegion.h"
+#include "Core/Computation/MultiLayerUtils.h"
+#include "Core/Computation/ProcessedLayout.h"
+#include "Core/Computation/Slice.h"
+#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerRoughness.h"
-#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/MatrixFresnelMap.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Computation/MultiLayerUtils.h"
-#include "Core/Computation/ProcessedLayout.h"
#include "Core/Multilayer/ScalarFresnelMap.h"
-#include "Core/Parametrization/SimulationOptions.h"
-#include "Core/Computation/Slice.h"
#include "Core/Multilayer/SpecularStrategyBuilder.h"
+#include "Core/Parametrization/SimulationOptions.h"
+#include "Core/Particle/HomogeneousRegion.h"
namespace
{
diff --git a/Core/Computation/ProcessedSample.h b/Core/Computation/ProcessedSample.h
index c92d90896c923d939c2316a0196502ace502c4e2..73f46df33bd728807d6edc04646935608fe65772 100644
--- a/Core/Computation/ProcessedSample.h
+++ b/Core/Computation/ProcessedSample.h
@@ -15,8 +15,8 @@
#ifndef PROCESSEDSAMPLE_H
#define PROCESSEDSAMPLE_H
-#include "Core/Material/Material.h"
#include "Core/Computation/Slice.h"
+#include "Core/Material/Material.h"
#include "Core/Vector/Vectors3D.h"
#include <map>
#include <memory>
diff --git a/Core/Computation/ProfileHelper.cpp b/Core/Computation/ProfileHelper.cpp
index a9659132db4beb3a1ec9156b0ed93997a2d2ba32..17f7a68798ffd0d8cb66e83d177b038cc7a8556a 100644
--- a/Core/Computation/ProfileHelper.cpp
+++ b/Core/Computation/ProfileHelper.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Core/Computation/ProfileHelper.h"
-#include "Core/Multilayer/LayerRoughness.h"
#include "Core/Computation/ProcessedSample.h"
+#include "Core/Multilayer/LayerRoughness.h"
namespace
{
diff --git a/Core/Computation/RoughMultiLayerComputation.cpp b/Core/Computation/RoughMultiLayerComputation.cpp
index 073a063aec108692894b8d80f6e7ab44ac53fd58..e3dba1aed59fe3deedd9c972f258d890eeaa6865 100644
--- a/Core/Computation/RoughMultiLayerComputation.cpp
+++ b/Core/Computation/RoughMultiLayerComputation.cpp
@@ -13,17 +13,17 @@
// ************************************************************************** //
#include "Core/Computation/RoughMultiLayerComputation.h"
-#include "Faddeeva.hh"
+#include "Core/Basics/MathConstants.h"
+#include "Core/Computation/ProcessedSample.h"
+#include "Core/Computation/Slice.h"
#include "Core/Multilayer/IFresnelMap.h"
#include "Core/Multilayer/ILayerRTCoefficients.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerInterface.h"
#include "Core/Multilayer/LayerRoughness.h"
-#include "Core/Basics/MathConstants.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Computation/ProcessedSample.h"
#include "Core/SimulationElement/SimulationElement.h"
-#include "Core/Computation/Slice.h"
+#include "Faddeeva.hh"
// Diffuse scattering from rough interfaces is modelled after
// Phys. Rev. B, vol. 51 (4), p. 2311 (1995)
diff --git a/Core/Computation/Slice.cpp b/Core/Computation/Slice.cpp
index 305586f15aa4aea26a63c0a3016889e6b943de9b..32816e13a5ff0bc8f5f7548af47dc1120a8d6462 100644
--- a/Core/Computation/Slice.cpp
+++ b/Core/Computation/Slice.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Core/Computation/Slice.h"
-#include "Core/Multilayer/LayerRoughness.h"
#include "Core/Material/MaterialUtils.h"
+#include "Core/Multilayer/LayerRoughness.h"
Slice::Slice(double thickness, const Material& material)
: m_thickness{thickness}, m_material{material}, m_B_field{}, mP_top_roughness{nullptr}
diff --git a/Core/Computation/SpecularComputation.cpp b/Core/Computation/SpecularComputation.cpp
index eaf76ddc96ccf66c4fac0a12a17df145d339b960..9be9a34b7b169141b789cf52a0747f9eb4c4e17c 100644
--- a/Core/Computation/SpecularComputation.cpp
+++ b/Core/Computation/SpecularComputation.cpp
@@ -13,11 +13,11 @@
// ************************************************************************** //
#include "Core/Computation/SpecularComputation.h"
-#include "Core/Multilayer/MultiLayer.h"
#include "Core/Computation/ProcessedSample.h"
#include "Core/Computation/ProgressHandler.h"
-#include "Core/SimulationElement/SpecularSimulationElement.h"
+#include "Core/Multilayer/MultiLayer.h"
#include "Core/Multilayer/SpecularStrategyBuilder.h"
+#include "Core/SimulationElement/SpecularSimulationElement.h"
static_assert(std::is_copy_constructible<SpecularComputation>::value == false,
"SpecularComputation should not be copy constructible");
diff --git a/Core/Computation/SpecularComputation.h b/Core/Computation/SpecularComputation.h
index 4f0e1043e3bc552655bdba69ff6f36b981ac4f1f..3044d928a88cec9427b282f1b50e777bcc636d02 100644
--- a/Core/Computation/SpecularComputation.h
+++ b/Core/Computation/SpecularComputation.h
@@ -16,8 +16,8 @@
#define SPECULARCOMPUTATION_H_
#include "Core/Computation/IComputation.h"
-#include "Core/Parametrization/SimulationOptions.h"
#include "Core/Computation/SpecularComputationTerm.h"
+#include "Core/Parametrization/SimulationOptions.h"
class MultiLayer;
class SpecularSimulationElement;
diff --git a/Core/DecoratedFormFactor/FormFactorDecoratorMaterial.cpp b/Core/DecoratedFormFactor/FormFactorDecoratorMaterial.cpp
index a90a7ef874d46f8fecad5d58bb7c1fed91aba8bd..622595d440da5343e483f00a7fde2b1482ebf4c9 100644
--- a/Core/DecoratedFormFactor/FormFactorDecoratorMaterial.cpp
+++ b/Core/DecoratedFormFactor/FormFactorDecoratorMaterial.cpp
@@ -14,8 +14,8 @@
#include "Core/DecoratedFormFactor/FormFactorDecoratorMaterial.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Basics/MathConstants.h"
+#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Vector/WavevectorInfo.h"
FormFactorDecoratorMaterial::FormFactorDecoratorMaterial(const IFormFactor& form_factor)
diff --git a/Core/Export/ExportToPython.cpp b/Core/Export/ExportToPython.cpp
index c9feddf2a11c72eecb5f55cd75fabf794dc66cea..956ba44e64b3f0c3212f6497158e186274b5471a 100644
--- a/Core/Export/ExportToPython.cpp
+++ b/Core/Export/ExportToPython.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Export/ExportToPython.h"
-#include "Core/Simulation/GISASSimulation.h"
#include "Core/Export/SampleToPython.h"
#include "Core/Export/SimulationToPython.h"
+#include "Core/Simulation/GISASSimulation.h"
namespace
{
diff --git a/Core/Export/PythonFormatting.cpp b/Core/Export/PythonFormatting.cpp
index bf5e405e0d5530a74db7c02db4ffad22deae8b00..da30f06a83b84dcd19e41f4738d0ffc0bea591f2 100644
--- a/Core/Export/PythonFormatting.cpp
+++ b/Core/Export/PythonFormatting.cpp
@@ -14,22 +14,22 @@
#include "Core/Export/PythonFormatting.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Parametrization/Distributions.h"
-#include "Core/Mask/Ellipse.h"
+#include "Core/Basics/MathConstants.h"
#include "Core/Binning/FixedBinAxis.h"
-#include "Core/Parametrization/IParameterized.h"
+#include "Core/Binning/PointwiseAxis.h"
+#include "Core/Mask/Ellipse.h"
#include "Core/Mask/InfinitePlane.h"
#include "Core/Mask/Line.h"
-#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/Numeric.h"
+#include "Core/Mask/Polygon.h"
+#include "Core/Mask/Rectangle.h"
+#include "Core/Parametrization/Distributions.h"
+#include "Core/Parametrization/IParameterized.h"
#include "Core/Parametrization/ParameterDistribution.h"
#include "Core/Parametrization/ParameterPool.h"
-#include "Core/Binning/PointwiseAxis.h"
-#include "Core/Mask/Polygon.h"
#include "Core/Parametrization/RealParameter.h"
-#include "Core/Mask/Rectangle.h"
-#include "Fit/Tools/StringUtils.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Tools/Numeric.h"
+#include "Fit/Tools/StringUtils.h"
#include <iomanip>
namespace PythonFormatting
diff --git a/Core/Export/SampleLabelHandler.cpp b/Core/Export/SampleLabelHandler.cpp
index 58f9f223e0a1a519b5b39a8496a284fe3cb7abde..aa12f1ddfa1c85c34858e3b2aeff3b1cd8dba2c3 100644
--- a/Core/Export/SampleLabelHandler.cpp
+++ b/Core/Export/SampleLabelHandler.cpp
@@ -14,10 +14,10 @@
#include "Core/Export/SampleLabelHandler.h"
#include "Core/Aggregate/IInterferenceFunction.h"
-#include "Core/Multilayer/LayerRoughness.h"
#include "Core/Material/Material.h"
-#include "Core/Particle/MesoCrystal.h"
+#include "Core/Multilayer/LayerRoughness.h"
#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Particle/MesoCrystal.h"
#include "Core/Particle/Particle.h"
#include "Core/Particle/ParticleComposition.h"
#include "Core/Particle/ParticleCoreShell.h"
diff --git a/Core/Export/SampleToPython.cpp b/Core/Export/SampleToPython.cpp
index 5bbc95fd2759599cbc25dc31c01c5b31e0b74407..dff72233b94364c058158a12bd907f163679b62b 100644
--- a/Core/Export/SampleToPython.cpp
+++ b/Core/Export/SampleToPython.cpp
@@ -13,25 +13,25 @@
// ************************************************************************** //
#include "Core/Export/SampleToPython.h"
-#include "Core/Particle/Crystal.h"
-#include "Core/Scattering/IFormFactor.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Export/INodeUtils.h"
-#include "Core/includeIncludes/InterferenceFunctions.h"
+#include "Core/Export/PythonFormatting.h"
+#include "Core/Export/SampleLabelHandler.h"
#include "Core/Lattice/Lattice.h"
+#include "Core/Material/Material.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerInterface.h"
#include "Core/Multilayer/LayerRoughness.h"
-#include "Core/Material/Material.h"
-#include "Core/Particle/MesoCrystal.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Parametrization/ParameterUtils.h"
+#include "Core/Particle/Crystal.h"
+#include "Core/Particle/MesoCrystal.h"
#include "Core/Particle/Particle.h"
#include "Core/Particle/ParticleComposition.h"
#include "Core/Particle/ParticleCoreShell.h"
#include "Core/Particle/ParticleDistribution.h"
-#include "Core/Aggregate/ParticleLayout.h"
-#include "Core/Export/PythonFormatting.h"
-#include "Core/Export/SampleLabelHandler.h"
+#include "Core/Scattering/IFormFactor.h"
+#include "Core/includeIncludes/InterferenceFunctions.h"
#include <iomanip>
#include <map>
#include <set>
diff --git a/Core/Export/SimulationToPython.cpp b/Core/Export/SimulationToPython.cpp
index 7b63a987bdee1f390e0aed76d2ce735e73ef9e34..a44c98f0c44fcb0e16f96ab8e5644e3bc6cea5b6 100644
--- a/Core/Export/SimulationToPython.cpp
+++ b/Core/Export/SimulationToPython.cpp
@@ -13,23 +13,23 @@
// ************************************************************************** //
#include "Core/Export/SimulationToPython.h"
-#include "Core/Computation/ConstantBackground.h"
-#include "Core/Instrument/ConvolutionDetectorResolution.h"
#include "Core/Beam/FootprintFactorGaussian.h"
#include "Core/Beam/FootprintFactorSquare.h"
-#include "Core/Simulation/GISASSimulation.h"
-#include "Core/Export/INodeUtils.h"
-#include "Core/Instrument/ISpecularScan.h"
-#include "Core/Simulation/OffSpecSimulation.h"
-#include "Core/Parametrization/ParameterUtils.h"
+#include "Core/Computation/ConstantBackground.h"
#include "Core/Computation/PoissonNoiseBackground.h"
+#include "Core/Export/INodeUtils.h"
#include "Core/Export/PythonFormatting.h"
+#include "Core/Export/SampleToPython.h"
+#include "Core/Instrument/ConvolutionDetectorResolution.h"
+#include "Core/Instrument/ISpecularScan.h"
#include "Core/Instrument/RectangularDetector.h"
#include "Core/Instrument/RegionOfInterest.h"
#include "Core/Instrument/ResolutionFunction2DGaussian.h"
-#include "Core/Export/SampleToPython.h"
-#include "Core/Simulation/SpecularSimulation.h"
#include "Core/Instrument/SphericalDetector.h"
+#include "Core/Parametrization/ParameterUtils.h"
+#include "Core/Simulation/GISASSimulation.h"
+#include "Core/Simulation/OffSpecSimulation.h"
+#include "Core/Simulation/SpecularSimulation.h"
#include <iomanip>
using namespace PythonFormatting;
diff --git a/Core/Fitting/FitObjective.cpp b/Core/Fitting/FitObjective.cpp
index 14d705966f24f12597052dbebdc79bab7ed444c3..9f2e14158237f1c404d38d6693e4a1fa6d638fc8 100644
--- a/Core/Fitting/FitObjective.cpp
+++ b/Core/Fitting/FitObjective.cpp
@@ -13,15 +13,15 @@
// ************************************************************************** //
#include "Core/Fitting/FitObjective.h"
-#include "Core/Instrument/ArrayUtils.h"
-#include "Core/Instrument/ChiSquaredModule.h"
#include "Core/Fitting/FitStatus.h"
-#include "Fit/Kernel/MinimizerResult.h"
#include "Core/Fitting/ObjectiveMetric.h"
#include "Core/Fitting/ObjectiveMetricUtils.h"
-#include "Fit/Kernel/Parameters.h"
#include "Core/Fitting/PyFittingCallbacks.h"
+#include "Core/Instrument/ArrayUtils.h"
+#include "Core/Instrument/ChiSquaredModule.h"
#include "Core/Simulation/Simulation.h"
+#include "Fit/Kernel/MinimizerResult.h"
+#include "Fit/Kernel/Parameters.h"
#include <stdexcept>
class IMetricWrapper
diff --git a/Core/Fitting/FitObjective.h b/Core/Fitting/FitObjective.h
index f71c5b0f18eb9b7922b997397608fcb999ed66b1..bb9e5176736203b7df8908df9ac9d8d9af87eded 100644
--- a/Core/Fitting/FitObjective.h
+++ b/Core/Fitting/FitObjective.h
@@ -15,12 +15,12 @@
#ifndef FITOBJECTIVE_H
#define FITOBJECTIVE_H
-#include "Core/Instrument/ArrayUtils.h"
#include "Core/Fitting/FitTypes.h"
#include "Core/Fitting/IterationInfo.h"
-#include "Fit/Kernel/MinimizerResult.h"
-#include "Core/Instrument/OutputData.h"
#include "Core/Fitting/SimDataPair.h"
+#include "Core/Instrument/ArrayUtils.h"
+#include "Core/Instrument/OutputData.h"
+#include "Fit/Kernel/MinimizerResult.h"
class FitStatus;
class IChiSquaredModule;
diff --git a/Core/Fitting/ObjectiveMetric.cpp b/Core/Fitting/ObjectiveMetric.cpp
index b610df940f4007669875903fa7bd397100808c49..d322771ea97338cf5c6e5542728fc801cc30aba3 100644
--- a/Core/Fitting/ObjectiveMetric.cpp
+++ b/Core/Fitting/ObjectiveMetric.cpp
@@ -14,8 +14,8 @@
#include "Core/Fitting/ObjectiveMetric.h"
#include "Core/Fitting/ObjectiveMetricUtils.h"
-#include "Core/Instrument/OutputData.h"
#include "Core/Fitting/SimDataPair.h"
+#include "Core/Instrument/OutputData.h"
#include <cmath>
#include <limits>
diff --git a/Core/Fitting/SimDataPair.cpp b/Core/Fitting/SimDataPair.cpp
index d51530bd9e8b2fd9383b9080a4b266b6ffc3f9c2..f95bfd7df54fe0af8a92b5adc4d40f76390fb02f 100644
--- a/Core/Fitting/SimDataPair.cpp
+++ b/Core/Fitting/SimDataPair.cpp
@@ -14,10 +14,10 @@
#include "Core/Fitting/SimDataPair.h"
#include "Core/Instrument/IntensityDataFunctions.h"
-#include "Core/Tools/Numeric.h"
#include "Core/Instrument/OutputData.h"
-#include "Core/Simulation/Simulation.h"
#include "Core/Instrument/UnitConverterUtils.h"
+#include "Core/Simulation/Simulation.h"
+#include "Core/Tools/Numeric.h"
namespace
{
diff --git a/Core/HardParticle/FormFactorAnisoPyramid.cpp b/Core/HardParticle/FormFactorAnisoPyramid.cpp
index 05c234e6f27239782245c689728d94caf6ab178e..092d0a078b0d8965b35111abfef839c02482cad7 100644
--- a/Core/HardParticle/FormFactorAnisoPyramid.cpp
+++ b/Core/HardParticle/FormFactorAnisoPyramid.cpp
@@ -16,8 +16,8 @@
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/MathFunctions.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Tools/MathFunctions.h"
const PolyhedralTopology FormFactorAnisoPyramid::topology = {{{{3, 2, 1, 0}, true},
{{0, 1, 5, 4}, false},
diff --git a/Core/HardParticle/FormFactorBox.cpp b/Core/HardParticle/FormFactorBox.cpp
index c0c575116564fbd92b8f3df3bfa365490dd6b464..4ee4c424c514b4a24ec0113d2f3967b34fc85152 100644
--- a/Core/HardParticle/FormFactorBox.cpp
+++ b/Core/HardParticle/FormFactorBox.cpp
@@ -14,8 +14,8 @@
#include "Core/HardParticle/FormFactorBox.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Tools/MathFunctions.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Tools/MathFunctions.h"
//! Constructor of a rectangular cuboid.
//! @param length: length of the base in nanometers
@@ -49,8 +49,8 @@ IFormFactor* FormFactorBox::sliceFormFactor(ZLimits limits, const IRotation& rot
void FormFactorBox::onChange()
{
- double a = m_length/2;
- double b = m_width/2;
+ double a = m_length / 2;
+ double b = m_width / 2;
std::vector<kvector_t> V{{a, b, 0.}, {-a, b, 0.}, {-a, -b, 0.}, {a, -b, 0}};
setPrism(true, V);
}
diff --git a/Core/HardParticle/FormFactorBox.h b/Core/HardParticle/FormFactorBox.h
index e7c33f3dec6cfbf2fd45404a119c01737b548fa3..c18b5a4b1b969caac8bc1faede2a279e1d57af77 100644
--- a/Core/HardParticle/FormFactorBox.h
+++ b/Core/HardParticle/FormFactorBox.h
@@ -35,7 +35,7 @@ public:
double getLength() const { return m_length; }
double getWidth() const { return m_width; }
- double volume() const override final { return m_length*m_height*m_width; }
+ double volume() const override final { return m_length * m_height * m_width; }
double radialExtension() const override final { return m_length / 2.0; }
complex_t evaluate_for_q(cvector_t q) const override final;
diff --git a/Core/HardParticle/FormFactorCantellatedCube.cpp b/Core/HardParticle/FormFactorCantellatedCube.cpp
index 621f17f8d20e631eb1cef4ccf29a9d6552b7e51c..5b4f9974793f94c37af5f9e690556b9cd942bb78 100644
--- a/Core/HardParticle/FormFactorCantellatedCube.cpp
+++ b/Core/HardParticle/FormFactorCantellatedCube.cpp
@@ -19,32 +19,32 @@
const PolyhedralTopology FormFactorCantellatedCube::topology = {
{
-/* 0 */ {{0, 1, 2, 3}, true},
-/* 1 */ {{0, 8, 5, 1}, true},
-/* 2 */ {{1, 9, 6, 2}, true},
-/* 3 */ {{2, 10, 7, 3}, true},
-/* 4 */ {{3, 11, 4, 0}, true},
-/* 5 */ {{0, 4, 8}, false},
-/* 6 */ {{1, 5, 9}, false},
-/* 7 */ {{2, 6, 10}, false},
-/* 8 */ {{3, 7, 11}, false},
-/* 9 */ {{4, 12, 16, 8}, true},
-/* 10 */ {{5, 13, 17, 9}, true},
-/* 11 */ {{4, 11, 19, 12}, true},
-/* 12 */ {{5, 8, 16, 13}, true},
-/* 13 */ {{7, 10, 18, 15}, true},
-/* 14 */ {{6, 9, 17, 14}, true},
-/* 15 */ {{7, 15, 19, 11}, true},
-/* 16 */ {{6, 14, 18, 10}, true},
-/* 17 */ {{13, 21, 17}, false},
-/* 18 */ {{12, 20, 16}, false},
-/* 19 */ {{15, 23, 19}, false},
-/* 20 */ {{14, 22, 18}, false},
-/* 21 */ {{14, 17, 21, 22}, true},
-/* 22 */ {{13, 16, 20, 21}, true},
-/* 23 */ {{12, 19, 23, 20}, true},
-/* 24 */ {{15, 18, 22, 23}, true},
-/* 25 */ {{20, 23, 22, 21}, true},
+ /* 0 */ {{0, 1, 2, 3}, true},
+ /* 1 */ {{0, 8, 5, 1}, true},
+ /* 2 */ {{1, 9, 6, 2}, true},
+ /* 3 */ {{2, 10, 7, 3}, true},
+ /* 4 */ {{3, 11, 4, 0}, true},
+ /* 5 */ {{0, 4, 8}, false},
+ /* 6 */ {{1, 5, 9}, false},
+ /* 7 */ {{2, 6, 10}, false},
+ /* 8 */ {{3, 7, 11}, false},
+ /* 9 */ {{4, 12, 16, 8}, true},
+ /* 10 */ {{5, 13, 17, 9}, true},
+ /* 11 */ {{4, 11, 19, 12}, true},
+ /* 12 */ {{5, 8, 16, 13}, true},
+ /* 13 */ {{7, 10, 18, 15}, true},
+ /* 14 */ {{6, 9, 17, 14}, true},
+ /* 15 */ {{7, 15, 19, 11}, true},
+ /* 16 */ {{6, 14, 18, 10}, true},
+ /* 17 */ {{13, 21, 17}, false},
+ /* 18 */ {{12, 20, 16}, false},
+ /* 19 */ {{15, 23, 19}, false},
+ /* 20 */ {{14, 22, 18}, false},
+ /* 21 */ {{14, 17, 21, 22}, true},
+ /* 22 */ {{13, 16, 20, 21}, true},
+ /* 23 */ {{12, 19, 23, 20}, true},
+ /* 24 */ {{15, 18, 22, 23}, true},
+ /* 25 */ {{20, 23, 22, 21}, true},
},
true};
@@ -75,29 +75,16 @@ void FormFactorCantellatedCube::onChange()
double a = m_length / 2;
double b = m_removed_length;
- setPolyhedron(topology, -a,
- {{-a+b, -a+b, +a}, // point 0
- {+a-b, -a+b, +a},
- {+a-b, +a-b, +a},
- {-a+b, +a-b, +a},
- {-a , -a+b, +a-b}, // point 4
- {+a-b, -a , +a-b},
- {+a , +a-b, +a-b},
- {-a+b, +a , +a-b},
- {-a+b, -a , +a-b}, // point 8
- {+a , -a+b, +a-b},
- {+a-b, +a , +a-b},
- {-a , +a-b, +a-b},
- {-a , -a+b, -a+b}, // point 12
- {+a-b, -a , -a+b},
- {+a , +a-b, -a+b},
- {-a+b, +a , -a+b},
- {-a+b, -a , -a+b}, // point 16
- {+a , -a+b, -a+b},
- {+a-b, +a , -a+b},
- {-a , +a-b, -a+b},
- {-a+b, -a+b, -a}, // point 20
- {+a-b, -a+b, -a},
- {+a-b, +a-b, -a},
- {-a+b, +a-b, -a}});
+ setPolyhedron(topology, -a, {{-a + b, -a + b, +a}, // point 0
+ {+a - b, -a + b, +a}, {+a - b, +a - b, +a}, {-a + b, +a - b, +a},
+ {-a, -a + b, +a - b}, // point 4
+ {+a - b, -a, +a - b}, {+a, +a - b, +a - b}, {-a + b, +a, +a - b},
+ {-a + b, -a, +a - b}, // point 8
+ {+a, -a + b, +a - b}, {+a - b, +a, +a - b}, {-a, +a - b, +a - b},
+ {-a, -a + b, -a + b}, // point 12
+ {+a - b, -a, -a + b}, {+a, +a - b, -a + b}, {-a + b, +a, -a + b},
+ {-a + b, -a, -a + b}, // point 16
+ {+a, -a + b, -a + b}, {+a - b, +a, -a + b}, {-a, +a - b, -a + b},
+ {-a + b, -a + b, -a}, // point 20
+ {+a - b, -a + b, -a}, {+a - b, +a - b, -a}, {-a + b, +a - b, -a}});
}
diff --git a/Core/HardParticle/FormFactorCone.cpp b/Core/HardParticle/FormFactorCone.cpp
index bf8ad89e9186ec79978db11a6a50d3a768722cc2..b3609f31ea35d74f20ed635524901ad478be2d74 100644
--- a/Core/HardParticle/FormFactorCone.cpp
+++ b/Core/HardParticle/FormFactorCone.cpp
@@ -14,11 +14,11 @@
#include "Core/HardParticle/FormFactorCone.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Shapes/DoubleEllipse.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/MathFunctions.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Shapes/DoubleEllipse.h"
+#include "Core/Tools/MathFunctions.h"
#include <limits>
//! Constructor of a truncated cone with circular base.
diff --git a/Core/HardParticle/FormFactorCone6.cpp b/Core/HardParticle/FormFactorCone6.cpp
index f6aeb836ed106c8d5d1364df7e1e225d21c390f5..53fe93f2bad32bb452ecdef1ed61e50fc1774e9a 100644
--- a/Core/HardParticle/FormFactorCone6.cpp
+++ b/Core/HardParticle/FormFactorCone6.cpp
@@ -16,8 +16,8 @@
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/MathFunctions.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Tools/MathFunctions.h"
const PolyhedralTopology FormFactorCone6::topology = {{{{5, 4, 3, 2, 1, 0}, true},
{{0, 1, 7, 6}, false},
diff --git a/Core/HardParticle/FormFactorCuboctahedron.cpp b/Core/HardParticle/FormFactorCuboctahedron.cpp
index ab34166561fdff8f10b6ac8036257924bf16e5c1..5276a8000990746090608b3c3b895c32cd966b75 100644
--- a/Core/HardParticle/FormFactorCuboctahedron.cpp
+++ b/Core/HardParticle/FormFactorCuboctahedron.cpp
@@ -15,10 +15,10 @@
#include "Core/HardParticle/FormFactorCuboctahedron.h"
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/Exceptions.h"
-#include "Core/HardParticle/FormFactorPyramid.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/MathFunctions.h"
+#include "Core/HardParticle/FormFactorPyramid.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Tools/MathFunctions.h"
const PolyhedralTopology FormFactorCuboctahedron::topology = {{{{3, 2, 1, 0}, true},
{{0, 1, 5, 4}, false},
diff --git a/Core/HardParticle/FormFactorCylinder.cpp b/Core/HardParticle/FormFactorCylinder.cpp
index 2afb0284543e0ca37c0875155468314f46e3586a..698c8f446597dfbbc49b99d7e1401c54f39612ee 100644
--- a/Core/HardParticle/FormFactorCylinder.cpp
+++ b/Core/HardParticle/FormFactorCylinder.cpp
@@ -14,10 +14,10 @@
#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Shapes/DoubleEllipse.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/MathFunctions.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Shapes/DoubleEllipse.h"
+#include "Core/Tools/MathFunctions.h"
//! Constructor of a cylinder with a circular base.
//! @param radius: radius of the circular base in nanometers
diff --git a/Core/HardParticle/FormFactorEllipsoidalCylinder.cpp b/Core/HardParticle/FormFactorEllipsoidalCylinder.cpp
index 2f9e60cea4a1c8081d0ce7fa09edcb0fee75af11..d6854ad3c13ed5ce7651075d0c104cedb44e6048 100644
--- a/Core/HardParticle/FormFactorEllipsoidalCylinder.cpp
+++ b/Core/HardParticle/FormFactorEllipsoidalCylinder.cpp
@@ -14,10 +14,10 @@
#include "Core/HardParticle/FormFactorEllipsoidalCylinder.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Shapes/DoubleEllipse.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/MathFunctions.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Shapes/DoubleEllipse.h"
+#include "Core/Tools/MathFunctions.h"
//! Constructor of a cylinder with an ellipse cross section.
//! @param radius_x: radius of the ellipse base in the x-direction, in nanometers
diff --git a/Core/HardParticle/FormFactorFullSphere.cpp b/Core/HardParticle/FormFactorFullSphere.cpp
index 50b97232425416f97d87d63c945e75c60b971c60..9be7f181855f1cf08737dbbfeef15b95ffd3665b 100644
--- a/Core/HardParticle/FormFactorFullSphere.cpp
+++ b/Core/HardParticle/FormFactorFullSphere.cpp
@@ -14,10 +14,10 @@
#include "Core/HardParticle/FormFactorFullSphere.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/HardParticle/FormFactorTruncatedSphere.h"
-#include "Core/Particle/FormFactorWeighted.h"
#include "Core/Basics/MathConstants.h"
+#include "Core/HardParticle/FormFactorTruncatedSphere.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Particle/FormFactorWeighted.h"
#include "Core/Scattering/Rotations.h"
//! Constructor of a full sphere.
diff --git a/Core/HardParticle/FormFactorFullSpheroid.cpp b/Core/HardParticle/FormFactorFullSpheroid.cpp
index 2744fbdf979c5526e0c289aa5f2157b24d3b08be..c778cef7dd2665d4eac2e6919ffa83fbe39da2e6 100644
--- a/Core/HardParticle/FormFactorFullSpheroid.cpp
+++ b/Core/HardParticle/FormFactorFullSpheroid.cpp
@@ -14,11 +14,11 @@
#include "Core/HardParticle/FormFactorFullSpheroid.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/HardParticle/FormFactorTruncatedSpheroid.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/MathFunctions.h"
+#include "Core/HardParticle/FormFactorTruncatedSpheroid.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/TruncatedEllipsoid.h"
+#include "Core/Tools/MathFunctions.h"
#include <limits>
//! Constructor of full spheroid.
diff --git a/Core/HardParticle/FormFactorHemiEllipsoid.cpp b/Core/HardParticle/FormFactorHemiEllipsoid.cpp
index 4aae41e93e98abaf4b8c37a3a6f8e880742cc619..4b4b8ba1e011fc95548011ebfebe5aa319d9a871 100644
--- a/Core/HardParticle/FormFactorHemiEllipsoid.cpp
+++ b/Core/HardParticle/FormFactorHemiEllipsoid.cpp
@@ -15,9 +15,9 @@
#include "Core/HardParticle/FormFactorHemiEllipsoid.h"
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/MathFunctions.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/TruncatedEllipsoid.h"
+#include "Core/Tools/MathFunctions.h"
#include <limits>
//! Constructor of horizontally oriented ellipsoid, truncated at the central plane.
diff --git a/Core/HardParticle/FormFactorLongBoxGauss.cpp b/Core/HardParticle/FormFactorLongBoxGauss.cpp
index 8dfd9cf8ed2c8b3f5f5ca2265f61026f029c4acb..77c5672e87f002738f745b8b3f22d50af9b9740a 100644
--- a/Core/HardParticle/FormFactorLongBoxGauss.cpp
+++ b/Core/HardParticle/FormFactorLongBoxGauss.cpp
@@ -14,9 +14,9 @@
#include "Core/HardParticle/FormFactorLongBoxGauss.h"
#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/Box.h"
#include "Core/Tools/MathFunctions.h"
-#include "Core/Parametrization/RealParameter.h"
FormFactorLongBoxGauss::FormFactorLongBoxGauss(double length, double width, double height)
: m_length(length), m_width(width), m_height(height)
diff --git a/Core/HardParticle/FormFactorLongBoxLorentz.cpp b/Core/HardParticle/FormFactorLongBoxLorentz.cpp
index a7be020c0b8256a93a015ad48c86cbcebd8bdf40..e037ff530d1a67e56b1928c96f72cdfa0b2398d3 100644
--- a/Core/HardParticle/FormFactorLongBoxLorentz.cpp
+++ b/Core/HardParticle/FormFactorLongBoxLorentz.cpp
@@ -14,9 +14,9 @@
#include "Core/HardParticle/FormFactorLongBoxLorentz.h"
#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/Box.h"
#include "Core/Tools/MathFunctions.h"
-#include "Core/Parametrization/RealParameter.h"
FormFactorLongBoxLorentz::FormFactorLongBoxLorentz(double length, double width, double height)
: m_length(length), m_width(width), m_height(height)
diff --git a/Core/HardParticle/FormFactorPolyhedron.cpp b/Core/HardParticle/FormFactorPolyhedron.cpp
index eafe34aedea87984a1e0f06b996aabeb595d87f3..6675ccaec05e4f9a657ca8860d231c61f25e8793 100644
--- a/Core/HardParticle/FormFactorPolyhedron.cpp
+++ b/Core/HardParticle/FormFactorPolyhedron.cpp
@@ -17,10 +17,10 @@
//! "Form factor (Fourier shape transform) of polygon and polyhedron."
#include "Core/HardParticle/FormFactorPolyhedron.h"
-#include "Core/Tools/MathFunctions.h"
-#include "Core/Tools/Precomputed.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Scattering/Rotations.h"
+#include "Core/Tools/MathFunctions.h"
+#include "Core/Tools/Precomputed.h"
#include <iomanip>
#include <stdexcept> // need overlooked by g++ 5.4
@@ -426,7 +426,7 @@ void FormFactorPolyhedron::setPolyhedron(const PolyhedralTopology& topology, dou
const std::vector<kvector_t>& vertices)
{
m_vertices.clear();
- for (const kvector_t& vertex: vertices)
+ for (const kvector_t& vertex : vertices)
m_vertices.push_back(vertex - kvector_t{0, 0, z_bottom});
try {
@@ -603,7 +603,7 @@ void FormFactorPolyhedron::assert_platonic() const
void FormFactorPolygonalPrism::setPrism(bool symmetry_Ci, const std::vector<kvector_t>& vertices)
{
m_vertices.clear();
- for (const kvector_t& vertex: vertices) {
+ for (const kvector_t& vertex : vertices) {
m_vertices.push_back(vertex);
m_vertices.push_back(vertex + kvector_t{0, 0, m_height});
}
diff --git a/Core/HardParticle/FormFactorPyramid.cpp b/Core/HardParticle/FormFactorPyramid.cpp
index e18a6783d33fae935320cf53d2700081e8fd3590..544eea279e3dc5ba224098cb36a2660e55f55b8b 100644
--- a/Core/HardParticle/FormFactorPyramid.cpp
+++ b/Core/HardParticle/FormFactorPyramid.cpp
@@ -16,8 +16,8 @@
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/MathFunctions.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Tools/MathFunctions.h"
const PolyhedralTopology FormFactorPyramid::topology = {{
{{3, 2, 1, 0}, true}, // TODO -> true
diff --git a/Core/HardParticle/FormFactorRipple2.cpp b/Core/HardParticle/FormFactorRipple2.cpp
index 04677dcb9c6f68561997239450aebbce461989cd..39ce79d7230b2a1f34ba1ea0bc653d16f84c48e0 100644
--- a/Core/HardParticle/FormFactorRipple2.cpp
+++ b/Core/HardParticle/FormFactorRipple2.cpp
@@ -19,8 +19,8 @@
// class FormFactorRipple2Box
// ************************************************************************** //
-FormFactorRipple2Box::FormFactorRipple2Box(
- double length, double width, double height, double asymmetry)
+FormFactorRipple2Box::FormFactorRipple2Box(double length, double width, double height,
+ double asymmetry)
: ProfileRipple2{length, width, height, asymmetry}
{
setName(BornAgain::FFRipple2BoxType);
@@ -45,8 +45,8 @@ complex_t FormFactorRipple2Box::factor_x(complex_t qx) const
// class FormFactorRipple2Gauss
// ************************************************************************** //
-FormFactorRipple2Gauss::FormFactorRipple2Gauss(
- double length, double width, double height, double asymmetry)
+FormFactorRipple2Gauss::FormFactorRipple2Gauss(double length, double width, double height,
+ double asymmetry)
: ProfileRipple2{length, width, height, asymmetry}
{
setName(BornAgain::FFRipple2GaussType);
@@ -71,8 +71,8 @@ complex_t FormFactorRipple2Gauss::factor_x(complex_t qx) const
// class FormFactorRipple2Lorentz
// ************************************************************************** //
-FormFactorRipple2Lorentz::FormFactorRipple2Lorentz(
- double length, double width, double height, double asymmetry)
+FormFactorRipple2Lorentz::FormFactorRipple2Lorentz(double length, double width, double height,
+ double asymmetry)
: ProfileRipple2{length, width, height, asymmetry}
{
setName(BornAgain::FFRipple2LorentzType);
diff --git a/Core/HardParticle/FormFactorTetrahedron.cpp b/Core/HardParticle/FormFactorTetrahedron.cpp
index 613780933073842f60c15ae5931971bf8ddd2848..36bf2080ebf1f0866ee9fda3a86ca2ac6fe34d04 100644
--- a/Core/HardParticle/FormFactorTetrahedron.cpp
+++ b/Core/HardParticle/FormFactorTetrahedron.cpp
@@ -16,8 +16,8 @@
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/MathFunctions.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Tools/MathFunctions.h"
const PolyhedralTopology FormFactorTetrahedron::topology = {{{{2, 1, 0}, false},
{{0, 1, 4, 3}, false},
diff --git a/Core/HardParticle/FormFactorTriangle.cpp b/Core/HardParticle/FormFactorTriangle.cpp
index 7991f7320b10e69339910a2be37d9f175b550afc..b42d626d6fc7a76e84a4c23def147daea0ac77ba 100644
--- a/Core/HardParticle/FormFactorTriangle.cpp
+++ b/Core/HardParticle/FormFactorTriangle.cpp
@@ -14,8 +14,8 @@
#include "Core/HardParticle/FormFactorTriangle.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Fit/Tools/RealLimits.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Fit/Tools/RealLimits.h"
FormFactorTriangle::FormFactorTriangle(const double base_edge) : m_base_edge(base_edge)
{
diff --git a/Core/HardParticle/FormFactorTruncatedSphere.cpp b/Core/HardParticle/FormFactorTruncatedSphere.cpp
index 7db083db1c641eb804c7f690f3e7011559ce8299..0306243f75fbeabb9431901f5d79868541e189b2 100644
--- a/Core/HardParticle/FormFactorTruncatedSphere.cpp
+++ b/Core/HardParticle/FormFactorTruncatedSphere.cpp
@@ -16,10 +16,10 @@
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/MathFunctions.h"
-#include "Fit/Tools/RealLimits.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/TruncatedEllipsoid.h"
+#include "Core/Tools/MathFunctions.h"
+#include "Fit/Tools/RealLimits.h"
#include <limits>
//! Constructor of a spherical dome.
diff --git a/Core/HardParticle/FormFactorTruncatedSpheroid.cpp b/Core/HardParticle/FormFactorTruncatedSpheroid.cpp
index db57c8af4d824ad068050b5c482a96010116feb3..abc013e05deac0f2a9a43572a26e24596e78e219 100644
--- a/Core/HardParticle/FormFactorTruncatedSpheroid.cpp
+++ b/Core/HardParticle/FormFactorTruncatedSpheroid.cpp
@@ -16,9 +16,9 @@
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/MathFunctions.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/TruncatedEllipsoid.h"
+#include "Core/Tools/MathFunctions.h"
#include <limits>
//! Constructor of a spheroidal dome.
diff --git a/Core/HardParticle/ProfileBar.cpp b/Core/HardParticle/ProfileBar.cpp
index f0255377227efc4e16514e5d1c21f51fc658297c..d8c22edadecd72f3b3f5bf7292f20d9482bb311a 100644
--- a/Core/HardParticle/ProfileBar.cpp
+++ b/Core/HardParticle/ProfileBar.cpp
@@ -16,10 +16,10 @@
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/MathFunctions.h"
-#include "Fit/Tools/RealLimits.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/Box.h" // from Shapes/
+#include "Core/Tools/MathFunctions.h"
+#include "Fit/Tools/RealLimits.h"
//! @brief Constructor of elongated bar
//! @param length: length of the rectangular base in nanometers
@@ -61,8 +61,8 @@ complex_t ProfileBar::factor_yz(complex_t qy, complex_t qz) const
const complex_t qyWdiv2 = m_width * qy / 2.0;
const complex_t qzHdiv2 = m_height * qz / 2.0;
- return m_height * m_width * exp_I(qzHdiv2)
- * MathFunctions::sinc(qyWdiv2) * MathFunctions::sinc(qzHdiv2);
+ return m_height * m_width * exp_I(qzHdiv2) * MathFunctions::sinc(qyWdiv2)
+ * MathFunctions::sinc(qzHdiv2);
}
void ProfileBar::onChange()
diff --git a/Core/HardParticle/ProfileRipple1.cpp b/Core/HardParticle/ProfileRipple1.cpp
index cdc37bfeb801d9786ae78cf8abfe161ce8742628..95b27f62f7cda11cf9c36a18f91ebddb03a74b82 100644
--- a/Core/HardParticle/ProfileRipple1.cpp
+++ b/Core/HardParticle/ProfileRipple1.cpp
@@ -16,10 +16,10 @@
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/MathFunctions.h"
-#include "Fit/Tools/RealLimits.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/RippleCosine.h" // from Shapes/
+#include "Core/Tools/MathFunctions.h"
+#include "Fit/Tools/RealLimits.h"
//! @brief Constructor of cosine ripple.
//! @param length: length of the rectangular base in nanometers
diff --git a/Core/HardParticle/ProfileRipple2.cpp b/Core/HardParticle/ProfileRipple2.cpp
index 3c7a72d1c92b7d6e5213e8b60c0ff46bbe7279cf..30427c761c44d66ca3a7f5004bec987d7bbdbaeb 100644
--- a/Core/HardParticle/ProfileRipple2.cpp
+++ b/Core/HardParticle/ProfileRipple2.cpp
@@ -16,10 +16,10 @@
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Tools/MathFunctions.h"
-#include "Fit/Tools/RealLimits.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/RippleSawtooth.h" // from Shapes/
+#include "Core/Tools/MathFunctions.h"
+#include "Fit/Tools/RealLimits.h"
//! @brief Constructor of triangular ripple.
//! @param length: length of the rectangular base in nanometers
diff --git a/Core/InputOutput/DataFormatUtils.cpp b/Core/InputOutput/DataFormatUtils.cpp
index a1f029a2664cbfb5c6a2ad292425fbf47c0aefe9..8790182750f66d722c4efaf2fbbf1015443b7aae 100644
--- a/Core/InputOutput/DataFormatUtils.cpp
+++ b/Core/InputOutput/DataFormatUtils.cpp
@@ -15,9 +15,9 @@
#include "Core/InputOutput/DataFormatUtils.h"
#include "Core/Binning/ConstKBinAxis.h"
#include "Core/Binning/CustomBinAxis.h"
-#include "Core/Tools/FileSystemUtils.h"
-#include "Core/Instrument/OutputData.h"
#include "Core/Binning/PointwiseAxis.h"
+#include "Core/Instrument/OutputData.h"
+#include "Core/Tools/FileSystemUtils.h"
#include "Fit/Tools/StringUtils.h"
#include <iostream>
#include <iterator>
diff --git a/Core/InputOutput/IntensityDataIOFactory.cpp b/Core/InputOutput/IntensityDataIOFactory.cpp
index f31a98da52756d33cc9470c6d8b3ffa844011edf..9123c5eb6a01105974c7e0ddb848c9a8095893dd 100644
--- a/Core/InputOutput/IntensityDataIOFactory.cpp
+++ b/Core/InputOutput/IntensityDataIOFactory.cpp
@@ -13,11 +13,11 @@
// ************************************************************************** //
#include "Core/InputOutput/IntensityDataIOFactory.h"
-#include "Core/Tools/FileSystemUtils.h"
-#include "Core/Instrument/IHistogram.h"
#include "Core/InputOutput/OutputDataReadFactory.h"
#include "Core/InputOutput/OutputDataWriteFactory.h"
+#include "Core/Instrument/IHistogram.h"
#include "Core/Instrument/SimulationResult.h"
+#include "Core/Tools/FileSystemUtils.h"
#include <fstream>
#include <memory>
diff --git a/Core/InputOutput/OutputDataReadFactory.cpp b/Core/InputOutput/OutputDataReadFactory.cpp
index 9d700bc12791c5a68b25587c4d7e1dc7f98363b3..82514ae3a3ca50dfa36e2c418d7195ac5d77b12e 100644
--- a/Core/InputOutput/OutputDataReadFactory.cpp
+++ b/Core/InputOutput/OutputDataReadFactory.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Core/InputOutput/OutputDataReadFactory.h"
-#include "Core/InputOutput/DataFormatUtils.h"
#include "Core/Basics/Exceptions.h"
+#include "Core/InputOutput/DataFormatUtils.h"
OutputDataReader* OutputDataReadFactory::getReader(const std::string& file_name)
{
diff --git a/Core/InputOutput/OutputDataReadStrategy.cpp b/Core/InputOutput/OutputDataReadStrategy.cpp
index 41c64c04191cbe5823b94a2f7b13a59ec9e25005..75da0736857833ff72e549f0edfa6114c46b2f72 100644
--- a/Core/InputOutput/OutputDataReadStrategy.cpp
+++ b/Core/InputOutput/OutputDataReadStrategy.cpp
@@ -13,11 +13,11 @@
// ************************************************************************** //
#include "Core/InputOutput/OutputDataReadStrategy.h"
-#include "Core/Instrument/ArrayUtils.h"
-#include "Core/InputOutput/DataFormatUtils.h"
-#include "Core/Instrument/OutputData.h"
#include "Core/Binning/PointwiseAxis.h"
+#include "Core/InputOutput/DataFormatUtils.h"
#include "Core/InputOutput/TiffHandler.h"
+#include "Core/Instrument/ArrayUtils.h"
+#include "Core/Instrument/OutputData.h"
#include <map>
#include <stdexcept> // need overlooked by g++ 5.4
diff --git a/Core/InputOutput/OutputDataWriteFactory.cpp b/Core/InputOutput/OutputDataWriteFactory.cpp
index f19bb513c9552fcd822eb6c03c769f7ff0a4c33d..87b1ed9e03a7e733a026296121f5b4d9724ab4b2 100644
--- a/Core/InputOutput/OutputDataWriteFactory.cpp
+++ b/Core/InputOutput/OutputDataWriteFactory.cpp
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
#include "Core/InputOutput/OutputDataWriteFactory.h"
-#include "Core/InputOutput/DataFormatUtils.h"
#include "Core/Basics/Exceptions.h"
+#include "Core/InputOutput/DataFormatUtils.h"
OutputDataWriter* OutputDataWriteFactory::getWriter(const std::string& file_name)
{
diff --git a/Core/InputOutput/OutputDataWriteStrategy.cpp b/Core/InputOutput/OutputDataWriteStrategy.cpp
index ff46dc5e2ebf4c077813bb869d8d7beef677fd1f..d52324aa812112de083de2a8e89f955bc4d5af64 100644
--- a/Core/InputOutput/OutputDataWriteStrategy.cpp
+++ b/Core/InputOutput/OutputDataWriteStrategy.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "Core/InputOutput/OutputDataWriteStrategy.h"
-#include "Core/Instrument/ArrayUtils.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Instrument/OutputData.h" // needed by some compilers
#include "Core/InputOutput/TiffHandler.h"
+#include "Core/Instrument/ArrayUtils.h"
+#include "Core/Instrument/OutputData.h" // needed by some compilers
#include <cmath>
#include <iomanip>
diff --git a/Core/Instrument/AngularSpecScan.cpp b/Core/Instrument/AngularSpecScan.cpp
index bdf2c06f6a8b0a4b28d4aa356f3be85a521777ee..fe1c3cb9a72cf367f474e795cbd523a422ba936b 100644
--- a/Core/Instrument/AngularSpecScan.cpp
+++ b/Core/Instrument/AngularSpecScan.cpp
@@ -13,15 +13,15 @@
// ************************************************************************** //
#include "Core/Instrument/AngularSpecScan.h"
-#include "Core/Binning/FixedBinAxis.h"
#include "Core/Beam/IFootprintFactor.h"
-#include "Core/Parametrization/ParameterSample.h"
+#include "Core/Binning/FixedBinAxis.h"
#include "Core/Binning/PointwiseAxis.h"
#include "Core/Export/PythonFormatting.h"
-#include "Core/Parametrization/RangedDistributions.h"
-#include "Fit/Tools/RealLimits.h"
#include "Core/Instrument/ScanResolution.h"
+#include "Core/Parametrization/ParameterSample.h"
+#include "Core/Parametrization/RangedDistributions.h"
#include "Core/SimulationElement/SpecularSimulationElement.h"
+#include "Fit/Tools/RealLimits.h"
namespace
{
diff --git a/Core/Instrument/DetectionProperties.h b/Core/Instrument/DetectionProperties.h
index ac96522e9f6ba52a2150d1f06fb269a988199425..f24b955af110637965d16668083e8059105f6642 100644
--- a/Core/Instrument/DetectionProperties.h
+++ b/Core/Instrument/DetectionProperties.h
@@ -15,8 +15,8 @@
#ifndef DETECTIONPROPERTIES_H
#define DETECTIONPROPERTIES_H
-#include "Core/Vector/EigenCore.h"
#include "Core/Parametrization/INode.h"
+#include "Core/Vector/EigenCore.h"
#include "Core/Vector/Vectors3D.h"
#include "Wrap/WinDllMacros.h"
diff --git a/Core/Instrument/DetectorContext.h b/Core/Instrument/DetectorContext.h
index 3ba8f5bde9d8e1078e8a95fc9559d9d213d3d13a..8633b409141447c284b34bbf67bd3ab15a75d74c 100644
--- a/Core/Instrument/DetectorContext.h
+++ b/Core/Instrument/DetectorContext.h
@@ -15,8 +15,8 @@
#ifndef DETECTORCONTEXT_H
#define DETECTORCONTEXT_H
-#include "Core/Vector/EigenCore.h"
#include "Core/Binning/IPixel.h"
+#include "Core/Vector/EigenCore.h"
#include "Wrap/WinDllMacros.h"
#include <memory>
#include <vector>
diff --git a/Core/Instrument/DetectorMask.h b/Core/Instrument/DetectorMask.h
index ec65120d80d80ec7dd3b333d089d3df6e9dca4a2..364cfbf1a437a6ce3f85cd6d41ed7dd2fb2a1127 100644
--- a/Core/Instrument/DetectorMask.h
+++ b/Core/Instrument/DetectorMask.h
@@ -15,8 +15,8 @@
#ifndef DETECTORMASK_H
#define DETECTORMASK_H
-#include "Core/Mask/IShape2D.h"
#include "Core/Instrument/OutputData.h"
+#include "Core/Mask/IShape2D.h"
class IDetector2D;
template <class T> class OutputData;
diff --git a/Core/Instrument/Histogram1D.cpp b/Core/Instrument/Histogram1D.cpp
index 4387b9c0f72b77bc95f7108a5b06dae9d63ff4f0..fb99d8832934b2e06853f7788d32824906293007 100644
--- a/Core/Instrument/Histogram1D.cpp
+++ b/Core/Instrument/Histogram1D.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Core/Instrument/Histogram1D.h"
-#include "Core/Instrument/ArrayUtils.h"
#include "Core/Binning/VariableBinAxis.h"
+#include "Core/Instrument/ArrayUtils.h"
#include <memory>
Histogram1D::Histogram1D(int nbinsx, double xlow, double xup)
diff --git a/Core/Instrument/Histogram2D.cpp b/Core/Instrument/Histogram2D.cpp
index a9971c903a5f76edac39193997babf70773af1c4..e6a9e8a60d0c39498365a8a4586837e3304601a3 100644
--- a/Core/Instrument/Histogram2D.cpp
+++ b/Core/Instrument/Histogram2D.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "Core/Instrument/Histogram2D.h"
-#include "Core/Instrument/ArrayUtils.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Instrument/Histogram1D.h"
#include "Core/Binning/VariableBinAxis.h"
+#include "Core/Instrument/ArrayUtils.h"
+#include "Core/Instrument/Histogram1D.h"
#include <memory>
Histogram2D::Histogram2D(int nbinsx, double xlow, double xup, int nbinsy, double ylow, double yup)
diff --git a/Core/Instrument/IDetector.h b/Core/Instrument/IDetector.h
index 4ffef7aaf01b8d6e18560d9c1678745e330afe1a..69cdc436dfac2a1cc7ac38eb06c969a13e55ad46 100644
--- a/Core/Instrument/IDetector.h
+++ b/Core/Instrument/IDetector.h
@@ -15,13 +15,13 @@
#ifndef IDETECTOR_H_
#define IDETECTOR_H_
-#include "Core/Instrument/DetectionProperties.h"
-#include "Core/Binning/IAxis.h"
#include "Core/Basics/ICloneable.h"
-#include "Core/Parametrization/INode.h"
+#include "Core/Binning/IAxis.h"
+#include "Core/Instrument/DetectionProperties.h"
#include "Core/Instrument/IUnitConverter.h"
-#include "Core/Tools/SafePointerVector.h"
#include "Core/Instrument/SimulationAreaIterator.h"
+#include "Core/Parametrization/INode.h"
+#include "Core/Tools/SafePointerVector.h"
class Beam;
class DetectorMask;
diff --git a/Core/Instrument/IDetector2D.cpp b/Core/Instrument/IDetector2D.cpp
index 3691421d332ac7799339a162f6bfb3110c55c9dc..7b1e745c65cea55fd0d5b755439c57fd8c98f755 100644
--- a/Core/Instrument/IDetector2D.cpp
+++ b/Core/Instrument/IDetector2D.cpp
@@ -13,15 +13,15 @@
// ************************************************************************** //
#include "Core/Instrument/IDetector2D.h"
-#include "Core/Beam/Beam.h"
#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/Beam/Beam.h"
#include "Core/Instrument/DetectorContext.h"
#include "Core/Instrument/DetectorFunctions.h"
-#include "Core/Mask/InfinitePlane.h"
#include "Core/Instrument/RegionOfInterest.h"
#include "Core/Instrument/SimulationArea.h"
-#include "Core/SimulationElement/SimulationElement.h"
+#include "Core/Mask/InfinitePlane.h"
#include "Core/Parametrization/Units.h"
+#include "Core/SimulationElement/SimulationElement.h"
IDetector2D::IDetector2D() = default;
diff --git a/Core/Instrument/IDetectorResolution.h b/Core/Instrument/IDetectorResolution.h
index 3ec39ce952cc219bd88cdc93aafecf5117ea4843..80755477ca997722d7ba7461763cf89349a4388e 100644
--- a/Core/Instrument/IDetectorResolution.h
+++ b/Core/Instrument/IDetectorResolution.h
@@ -16,8 +16,8 @@
#define IDETECTORRESOLUTION_H
#include "Core/Basics/ICloneable.h"
-#include "Core/Parametrization/INode.h"
#include "Core/Instrument/OutputData.h"
+#include "Core/Parametrization/INode.h"
//! Interface for detector resolution algorithms
//! @ingroup algorithms_internal
diff --git a/Core/Instrument/IHistogram.cpp b/Core/Instrument/IHistogram.cpp
index 1adf2833718fd6c603d5b6803f0cef4fbd80dd6a..77311dd4587d68c6e8e9677da0fb8217cb6ec297 100644
--- a/Core/Instrument/IHistogram.cpp
+++ b/Core/Instrument/IHistogram.cpp
@@ -12,9 +12,9 @@
//
// ************************************************************************** //
+#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Instrument/Histogram1D.h"
#include "Core/Instrument/Histogram2D.h"
-#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Tools/Numeric.h"
#include <memory>
diff --git a/Core/Instrument/IIntensityNormalizer.h b/Core/Instrument/IIntensityNormalizer.h
index e20a91aa29ec072681efea389ed147778e663bc7..584c2db1885503d493eabeb09f16f0b92ba09ec7 100644
--- a/Core/Instrument/IIntensityNormalizer.h
+++ b/Core/Instrument/IIntensityNormalizer.h
@@ -17,8 +17,8 @@
#define IINTENSITYNORMALIZER_H
#include "Core/Basics/ICloneable.h"
-#include "Core/Parametrization/INode.h"
#include "Core/Instrument/OutputData.h"
+#include "Core/Parametrization/INode.h"
//! Interface to OutputData normalizers.
//! @ingroup algorithms_internal
diff --git a/Core/Instrument/Instrument.cpp b/Core/Instrument/Instrument.cpp
index 074e6f3845e779364da8ab4af12a8bd2e30d950d..ea0a9d4a07d289835d299f1da3435e67b25083ca 100644
--- a/Core/Instrument/Instrument.cpp
+++ b/Core/Instrument/Instrument.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "Core/Instrument/Instrument.h"
-#include "Core/Beam/Beam.h"
#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/Beam/Beam.h"
#include "Core/Instrument/DetectorFunctions.h"
#include "Core/Instrument/Histogram2D.h"
#include "Core/Instrument/IResolutionFunction2D.h"
-#include "Core/SimulationElement/SimulationElement.h"
#include "Core/Instrument/SphericalDetector.h"
+#include "Core/SimulationElement/SimulationElement.h"
Instrument::Instrument() : mP_detector(new SphericalDetector)
{
diff --git a/Core/Instrument/IntensityDataFunctions.cpp b/Core/Instrument/IntensityDataFunctions.cpp
index e3e0b9f126cde9cf9689437bb31439208b867dc2..59b242b2b8b0075f5c68bd3718852833c92bb7a4 100644
--- a/Core/Instrument/IntensityDataFunctions.cpp
+++ b/Core/Instrument/IntensityDataFunctions.cpp
@@ -13,18 +13,18 @@
// ************************************************************************** //
#include "Core/Instrument/IntensityDataFunctions.h"
-#include "Core/Instrument/ArrayUtils.h"
#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/Instrument/ArrayUtils.h"
#include "Core/Instrument/ConvolutionDetectorResolution.h"
#include "Core/Instrument/DetectorFunctions.h"
#include "Core/Instrument/FourierTransform.h"
#include "Core/Instrument/IDetector.h"
#include "Core/Instrument/IHistogram.h"
#include "Core/Instrument/Instrument.h"
-#include "Core/Tools/Numeric.h"
-#include "Core/Simulation/Simulation.h"
#include "Core/Instrument/SimulationResult.h"
#include "Core/Instrument/UnitConverterUtils.h"
+#include "Core/Simulation/Simulation.h"
+#include "Core/Tools/Numeric.h"
#include <math.h>
//! Returns sum of relative differences between each pair of elements:
diff --git a/Core/Instrument/LLData.h b/Core/Instrument/LLData.h
index 43a57530f58787c52f56a894fdf48ed11f45b35a..af79d473e02d137ad77f062bbeb2f9b011d2a1cb 100644
--- a/Core/Instrument/LLData.h
+++ b/Core/Instrument/LLData.h
@@ -15,8 +15,8 @@
#ifndef LLDATA_H
#define LLDATA_H
-#include "Core/Vector/EigenCore.h"
#include "Core/Basics/Exceptions.h"
+#include "Core/Vector/EigenCore.h"
#include <algorithm>
#include <limits>
#include <numeric>
diff --git a/Core/Instrument/OutputData.h b/Core/Instrument/OutputData.h
index ab6f4523e462135d1439cc4268acb274af13ec41..19643c763dbc1c071f4694d84a9450776f7a6aee 100644
--- a/Core/Instrument/OutputData.h
+++ b/Core/Instrument/OutputData.h
@@ -18,9 +18,9 @@
#include "Core/Binning/FixedBinAxis.h"
#include "Core/Instrument/LLData.h"
#include "Core/Instrument/OutputDataIterator.h"
+#include "Core/Parametrization/ThreadInfo.h"
#include "Core/Tools/PyObject.h"
#include "Core/Tools/SafePointerVector.h"
-#include "Core/Parametrization/ThreadInfo.h"
#include <cassert>
#include <sstream>
diff --git a/Core/Instrument/QSpecScan.cpp b/Core/Instrument/QSpecScan.cpp
index d5dea0c81cf1331d099e809fa04d521d1c99c393..f30a40203645a04ae021ce2c760f7fa779db756c 100644
--- a/Core/Instrument/QSpecScan.cpp
+++ b/Core/Instrument/QSpecScan.cpp
@@ -15,13 +15,13 @@
#include "Core/Instrument/QSpecScan.h"
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Binning/FixedBinAxis.h"
-#include "Core/Parametrization/ParameterSample.h"
#include "Core/Binning/PointwiseAxis.h"
#include "Core/Export/PythonFormatting.h"
-#include "Core/Parametrization/RangedDistributions.h"
-#include "Fit/Tools/RealLimits.h"
#include "Core/Instrument/ScanResolution.h"
+#include "Core/Parametrization/ParameterSample.h"
+#include "Core/Parametrization/RangedDistributions.h"
#include "Core/SimulationElement/SpecularSimulationElement.h"
+#include "Fit/Tools/RealLimits.h"
namespace
{
diff --git a/Core/Instrument/RectangularDetector.cpp b/Core/Instrument/RectangularDetector.cpp
index b5fec37b2c00d6739c84ef980bb336426693500e..21d1054bdbb0a6d451cff9f1ff45a5eeff4fe02b 100644
--- a/Core/Instrument/RectangularDetector.cpp
+++ b/Core/Instrument/RectangularDetector.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "Core/Instrument/RectangularDetector.h"
-#include "Core/Beam/Beam.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Instrument/IDetectorResolution.h"
#include "Core/Basics/MathConstants.h"
+#include "Core/Beam/Beam.h"
+#include "Core/Instrument/IDetectorResolution.h"
#include "Core/Instrument/RegionOfInterest.h"
-#include "Core/SimulationElement/SimulationElement.h"
#include "Core/Parametrization/Units.h"
+#include "Core/SimulationElement/SimulationElement.h"
RectangularDetector::RectangularDetector(size_t nxbins, double width, size_t nybins, double height)
: m_u0(0.0), m_v0(0.0), m_direction(kvector_t(0.0, -1.0, 0.0)), m_distance(0.0),
diff --git a/Core/Instrument/RectangularDetector.h b/Core/Instrument/RectangularDetector.h
index 3ccd8cc87830b908e1a357262fb841738b551c50..428d82ced972a8a82a473d6d2afadcd9963bcee4 100644
--- a/Core/Instrument/RectangularDetector.h
+++ b/Core/Instrument/RectangularDetector.h
@@ -15,8 +15,8 @@
#ifndef RECTANGULARDETECTOR_H
#define RECTANGULARDETECTOR_H
-#include "Core/Instrument/IDetector2D.h"
#include "Core/Binning/IPixel.h"
+#include "Core/Instrument/IDetector2D.h"
//! A pixel in a RectangularDetector.
diff --git a/Core/Instrument/ResolutionFunction2DGaussian.cpp b/Core/Instrument/ResolutionFunction2DGaussian.cpp
index ff31d9d7c9730e72f036fc6199a0ca8413958b1b..1af710c00f4082cc39b168f9eb8dd48a90dc9c17 100644
--- a/Core/Instrument/ResolutionFunction2DGaussian.cpp
+++ b/Core/Instrument/ResolutionFunction2DGaussian.cpp
@@ -14,8 +14,8 @@
#include "Core/Instrument/ResolutionFunction2DGaussian.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Tools/MathFunctions.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Tools/MathFunctions.h"
ResolutionFunction2DGaussian::ResolutionFunction2DGaussian(double sigma_x, double sigma_y)
: m_sigma_x(sigma_x), m_sigma_y(sigma_y)
diff --git a/Core/Instrument/SimpleUnitConverters.cpp b/Core/Instrument/SimpleUnitConverters.cpp
index e362ce5ec159b45ce9fedca78b4f8eea467748ee..39424fe00a42af1f1746aaa457df26bcd6d0034c 100644
--- a/Core/Instrument/SimpleUnitConverters.cpp
+++ b/Core/Instrument/SimpleUnitConverters.cpp
@@ -16,10 +16,10 @@
#include <cmath>
#include <stdexcept>
-#include "Core/Instrument/AxisNames.h"
-#include "Core/Beam/Beam.h"
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/MathConstants.h"
+#include "Core/Beam/Beam.h"
+#include "Core/Instrument/AxisNames.h"
#include "Core/Instrument/RectangularDetector.h"
#include "Core/Instrument/RegionOfInterest.h"
#include "Core/Instrument/SimpleUnitConverters.h"
diff --git a/Core/Instrument/SimulationArea.cpp b/Core/Instrument/SimulationArea.cpp
index 9023440f8bb996124e1671aa0c2718c92085ebd2..b412ea7b063f1d7232206f767eda9cd4942af5d8 100644
--- a/Core/Instrument/SimulationArea.cpp
+++ b/Core/Instrument/SimulationArea.cpp
@@ -14,12 +14,12 @@
#include "Core/Instrument/SimulationArea.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Instrument/DetectorMask.h"
#include "Core/Basics/Exceptions.h"
+#include "Core/Instrument/DetectorMask.h"
#include "Core/Instrument/IDetector.h"
#include "Core/Instrument/IntensityDataFunctions.h"
-#include "Core/Mask/Rectangle.h"
#include "Core/Instrument/RegionOfInterest.h"
+#include "Core/Mask/Rectangle.h"
#include <sstream>
SimulationArea::SimulationArea(const IDetector* detector) : m_detector(detector), m_max_index(0)
diff --git a/Core/Instrument/SphericalDetector.cpp b/Core/Instrument/SphericalDetector.cpp
index a90404f762c681cd3072022199b30a4b08fbbf71..bc35f28a614e21ef1023b53a4b3de76dcaa97808 100644
--- a/Core/Instrument/SphericalDetector.cpp
+++ b/Core/Instrument/SphericalDetector.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "Core/Instrument/SphericalDetector.h"
-#include "Core/Beam/Beam.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Instrument/IDetectorResolution.h"
-#include "Core/Binning/IPixel.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/SimulationElement/SimulationElement.h"
+#include "Core/Beam/Beam.h"
+#include "Core/Binning/IPixel.h"
+#include "Core/Instrument/IDetectorResolution.h"
#include "Core/Parametrization/Units.h"
+#include "Core/SimulationElement/SimulationElement.h"
SphericalDetector::SphericalDetector()
{
diff --git a/Core/Instrument/SphericalDetector.h b/Core/Instrument/SphericalDetector.h
index 4a2e4bb0113650e854cfc2cba93fe6d88eab6375..5b45a29de961037fe8e9e8def77ba45ccc4f169e 100644
--- a/Core/Instrument/SphericalDetector.h
+++ b/Core/Instrument/SphericalDetector.h
@@ -15,8 +15,8 @@
#ifndef SPHERICALDETECTOR_H
#define SPHERICALDETECTOR_H
-#include "Core/Instrument/IDetector2D.h"
#include "Core/Binning/IPixel.h"
+#include "Core/Instrument/IDetector2D.h"
//! A pixel in a SphericalDetector
diff --git a/Core/Instrument/UnitConverter1D.cpp b/Core/Instrument/UnitConverter1D.cpp
index a656336fc9b993e79c22795510cf7f8f1f239584..8e872bad1a3240b22457574b82abeca404986c72 100644
--- a/Core/Instrument/UnitConverter1D.cpp
+++ b/Core/Instrument/UnitConverter1D.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "Core/Instrument/UnitConverter1D.h"
-#include "Core/Instrument/AngularSpecScan.h"
-#include "Core/Instrument/AxisNames.h"
+#include "Core/Basics/MathConstants.h"
#include "Core/Beam/Beam.h"
#include "Core/Binning/FixedBinAxis.h"
-#include "Core/Basics/MathConstants.h"
-#include "Core/Instrument/OutputData.h"
#include "Core/Binning/PointwiseAxis.h"
+#include "Core/Instrument/AngularSpecScan.h"
+#include "Core/Instrument/AxisNames.h"
+#include "Core/Instrument/OutputData.h"
#include "Core/Instrument/QSpecScan.h"
#include "Core/Instrument/UnitConverterUtils.h"
#include "Core/Parametrization/Units.h"
diff --git a/Core/Instrument/UnitConverterUtils.cpp b/Core/Instrument/UnitConverterUtils.cpp
index d1f3681f68ed5938926fff2cfad224c4ad802891..31d0caf78b5647004b9674960fb659a4c5c7db01 100644
--- a/Core/Instrument/UnitConverterUtils.cpp
+++ b/Core/Instrument/UnitConverterUtils.cpp
@@ -13,16 +13,16 @@
// ************************************************************************** //
#include "Core/Instrument/UnitConverterUtils.h"
-#include "Core/Simulation/DepthProbeSimulation.h"
-#include "Core/Simulation/GISASSimulation.h"
#include "Core/Instrument/Instrument.h"
-#include "Core/Simulation/OffSpecSimulation.h"
#include "Core/Instrument/OutputData.h"
#include "Core/Instrument/RectangularDetector.h"
#include "Core/Instrument/SimpleUnitConverters.h"
-#include "Core/Simulation/SpecularSimulation.h"
#include "Core/Instrument/SphericalDetector.h"
#include "Core/Instrument/UnitConverter1D.h"
+#include "Core/Simulation/DepthProbeSimulation.h"
+#include "Core/Simulation/GISASSimulation.h"
+#include "Core/Simulation/OffSpecSimulation.h"
+#include "Core/Simulation/SpecularSimulation.h"
std::unique_ptr<OutputData<double>>
UnitConverterUtils::createOutputData(const IUnitConverter& converter, AxesUnits units)
diff --git a/Core/Lattice/Lattice.cpp b/Core/Lattice/Lattice.cpp
index 0696116aed50d7234966861a6e690fafec0a2ec1..5b9a0284efea6f70b0aa843042ed0cf7cd44e819 100644
--- a/Core/Lattice/Lattice.cpp
+++ b/Core/Lattice/Lattice.cpp
@@ -14,8 +14,8 @@
#include "Core/Lattice/Lattice.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Lattice/ISelectionRule.h"
#include "Core/Basics/MathConstants.h"
+#include "Core/Lattice/ISelectionRule.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Vector/Transform3D.h"
#include <gsl/gsl_linalg.h>
diff --git a/Core/Mask/Ellipse.cpp b/Core/Mask/Ellipse.cpp
index 6a9ea991bb7f74598197e5445cc79e38f7ee512b..4cc93f322efc863846b2f8355b7b516f69ff313e 100644
--- a/Core/Mask/Ellipse.cpp
+++ b/Core/Mask/Ellipse.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Core/Mask/Ellipse.h"
-#include "Core/Binning/Bin.h"
#include "Core/Basics/Exceptions.h"
+#include "Core/Binning/Bin.h"
//! @param xcenter x-coordinate of Ellipse's center
//! @param ycenter y-coordinate of Ellipse's center
diff --git a/Core/Mask/Line.cpp b/Core/Mask/Line.cpp
index 6cfd4b06e56aaff9f066a41bf801719348a6972d..b1f634caead83bed811072ff5175ddcf503fb18b 100644
--- a/Core/Mask/Line.cpp
+++ b/Core/Mask/Line.cpp
@@ -16,10 +16,10 @@
#include "Core/Binning/Bin.h"
#include "Core/Tools/Numeric.h"
-#include <limits>
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/linestring.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
+#include <limits>
using namespace boost::geometry;
typedef model::d2::point_xy<double> point_t;
diff --git a/Core/Mask/Polygon.cpp b/Core/Mask/Polygon.cpp
index 0019f1bdc89bf0182fb2999e33707f74ad9879ef..c2447ab4b67b4623c4f4a533e0cf1a789626a443 100644
--- a/Core/Mask/Polygon.cpp
+++ b/Core/Mask/Polygon.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Core/Mask/Polygon.h"
-#include "Core/Binning/Bin.h"
#include "Core/Basics/Exceptions.h"
+#include "Core/Binning/Bin.h"
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
diff --git a/Core/Mask/Rectangle.cpp b/Core/Mask/Rectangle.cpp
index c3b65ba349c7e4c87d8b53f5677d957d3df884ea..fe0bd078056e9a45108dddac027c48eb5a983617 100644
--- a/Core/Mask/Rectangle.cpp
+++ b/Core/Mask/Rectangle.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Core/Mask/Rectangle.h"
-#include "Core/Binning/Bin.h"
#include "Core/Basics/Exceptions.h"
+#include "Core/Binning/Bin.h"
//! @param xlow x-coordinate of lower left corner
//! @param ylow y-coordinate of lower left corner
diff --git a/Core/Material/BaseMaterialImpl.h b/Core/Material/BaseMaterialImpl.h
index 908ff686f6fb07cc7912a2be9bb7948d772c5ecc..6154c424085713543386405e046193c96c14fe4f 100644
--- a/Core/Material/BaseMaterialImpl.h
+++ b/Core/Material/BaseMaterialImpl.h
@@ -16,8 +16,8 @@
#define BASEMATERIALIMPL_H_
#include "Core/Basics/Complex.h"
-#include "Core/Vector/EigenCore.h"
#include "Core/Basics/INamed.h"
+#include "Core/Vector/EigenCore.h"
#include "Core/Vector/Vectors3D.h"
class Transform3D;
diff --git a/Core/Material/MagneticMaterialImpl.cpp b/Core/Material/MagneticMaterialImpl.cpp
index afef6a7b5689795de95ec383d8d55fdcc8f8f968..e57172b112115736f7194547865d3d9b317a6102 100644
--- a/Core/Material/MagneticMaterialImpl.cpp
+++ b/Core/Material/MagneticMaterialImpl.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Core/Material/MagneticMaterialImpl.h"
-#include "Core/Material/MaterialUtils.h"
#include "Core/Basics/PhysicalConstants.h"
+#include "Core/Material/MaterialUtils.h"
#include "Core/Vector/Transform3D.h"
#include "Core/Vector/WavevectorInfo.h"
#include <memory>
diff --git a/Core/Material/MagneticMaterialImpl.h b/Core/Material/MagneticMaterialImpl.h
index d0612bc041cee89dc50c11d667a186d4ee7fca54..68a3721528adc08a22b1f25d04424745f3fef5a2 100644
--- a/Core/Material/MagneticMaterialImpl.h
+++ b/Core/Material/MagneticMaterialImpl.h
@@ -15,8 +15,8 @@
#ifndef MAGNETICMATERIALIMPL_H_
#define MAGNETICMATERIALIMPL_H_
-#include "Core/Material/BaseMaterialImpl.h"
#include "Core/Basics/Complex.h"
+#include "Core/Material/BaseMaterialImpl.h"
#include "Core/Vector/EigenCore.h"
#include "Core/Vector/Vectors3D.h"
diff --git a/Core/Material/Material.cpp b/Core/Material/Material.cpp
index 2a604083bc49670c87a8b9169b5decac7abb254b..9d2c7dfb6a40c9dd4143239cb12f7f9fe4750a14 100644
--- a/Core/Material/Material.cpp
+++ b/Core/Material/Material.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Core/Material/Material.h"
-#include "Core/Material/BaseMaterialImpl.h"
#include "Core/Basics/Exceptions.h"
+#include "Core/Material/BaseMaterialImpl.h"
#include "Core/Vector/Transform3D.h"
#include "Core/Vector/WavevectorInfo.h"
#include <typeinfo>
diff --git a/Core/Material/Material.h b/Core/Material/Material.h
index 3c3ca2912a3d4be5ca4403b3fc0290b9608965e7..43d4d2a6b21f4af3284803a1e118758111924285 100644
--- a/Core/Material/Material.h
+++ b/Core/Material/Material.h
@@ -15,8 +15,8 @@
#ifndef MATERIAL_H_
#define MATERIAL_H_
-#include "Core/Material/BaseMaterialImpl.h"
#include "Core/Basics/Complex.h"
+#include "Core/Material/BaseMaterialImpl.h"
#include "Core/Vector/EigenCore.h"
#include "Core/Vector/Vectors3D.h"
#include <memory>
diff --git a/Core/Material/MaterialFactoryFuncs.cpp b/Core/Material/MaterialFactoryFuncs.cpp
index f353238ab3087ee087cd24dbd9dbccbfe3d8ca2c..2b4a998dc116abe3a5d8c3a9198d10ca30c23f00 100644
--- a/Core/Material/MaterialFactoryFuncs.cpp
+++ b/Core/Material/MaterialFactoryFuncs.cpp
@@ -13,11 +13,11 @@
// ************************************************************************** //
#include "Core/Material/MaterialFactoryFuncs.h"
-#include "Core/Particle/HomogeneousRegion.h"
#include "Core/Material/MaterialBySLDImpl.h"
#include "Core/Material/MaterialUtils.h"
#include "Core/Material/RefractiveMaterialImpl.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/HomogeneousRegion.h"
#include <functional>
namespace
diff --git a/Core/Material/MaterialUtils.cpp b/Core/Material/MaterialUtils.cpp
index 4e5e9c2fe57588094ff202f9217c0cbbb16ceb66..82d5dccb24672fd7f54627e9cb74246c627c593e 100644
--- a/Core/Material/MaterialUtils.cpp
+++ b/Core/Material/MaterialUtils.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Core/Material/MaterialUtils.h"
-#include "Core/Material/Material.h"
#include "Core/Basics/PhysicalConstants.h"
+#include "Core/Material/Material.h"
using PhysConsts::g_factor_n;
using PhysConsts::h_bar;
diff --git a/Core/Material/MaterialUtils.h b/Core/Material/MaterialUtils.h
index 722872bd73a8bf47b14dac97da4c3dbdcc7aaa86..089b70d43da978256d0d79d1af2f618e542fed66 100644
--- a/Core/Material/MaterialUtils.h
+++ b/Core/Material/MaterialUtils.h
@@ -16,8 +16,8 @@
#define MATERIALUTILS_H_
#include "Core/Basics/Complex.h"
-#include "Core/Vector/EigenCore.h"
#include "Core/Material/Material.h"
+#include "Core/Vector/EigenCore.h"
#include "Core/Vector/Vectors3D.h"
//! A number of materials-related helper functions for internal use
diff --git a/Core/Multilayer/DecouplingApproximationStrategy.cpp b/Core/Multilayer/DecouplingApproximationStrategy.cpp
index be15ae02e26e7bab4439a752cd6cc4790181fcdc..ffb09d9a39d1c50f1199ea5eb06f5f6841747dc7 100644
--- a/Core/Multilayer/DecouplingApproximationStrategy.cpp
+++ b/Core/Multilayer/DecouplingApproximationStrategy.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "Core/Multilayer/DecouplingApproximationStrategy.h"
-#include "Core/Basics/Exceptions.h"
#include "Core/Aggregate/FormFactorCoherentSum.h"
#include "Core/Aggregate/IInterferenceFunction.h"
+#include "Core/Basics/Exceptions.h"
#include "Core/Multilayer/InterferenceFunctionUtils.h"
-#include "Core/Tools/MathFunctions.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/SimulationElement/SimulationElement.h"
+#include "Core/Tools/MathFunctions.h"
using InterferenceFunctionUtils::PrecomputePolarizedFormFactors;
using InterferenceFunctionUtils::PrecomputeScalarFormFactors;
diff --git a/Core/Multilayer/IFresnelMap.h b/Core/Multilayer/IFresnelMap.h
index 978acb02147f7b7c766e7c990adf5487aa1e193c..098c30c6d4951b16c5bda3ed21dccb1f9637a618 100644
--- a/Core/Multilayer/IFresnelMap.h
+++ b/Core/Multilayer/IFresnelMap.h
@@ -15,9 +15,9 @@
#ifndef IFRESNELMAP_H
#define IFRESNELMAP_H
+#include "Core/Computation/Slice.h"
#include "Core/Multilayer/ILayerRTCoefficients.h"
#include "Core/Multilayer/ISpecularStrategy.h"
-#include "Core/Computation/Slice.h"
#include "Core/Vector/Vectors3D.h"
#include "Wrap/WinDllMacros.h"
#include <memory>
diff --git a/Core/Multilayer/IInterferenceFunctionStrategy.cpp b/Core/Multilayer/IInterferenceFunctionStrategy.cpp
index 48632a46b294a21f42fee69911ab8042be62baff..1b624ed4bae79c1b241e1fbcf316d6a51220778c 100644
--- a/Core/Multilayer/IInterferenceFunctionStrategy.cpp
+++ b/Core/Multilayer/IInterferenceFunctionStrategy.cpp
@@ -13,11 +13,11 @@
// ************************************************************************** //
#include "Core/Multilayer/IInterferenceFunctionStrategy.h"
-#include "Core/Basics/Exceptions.h"
#include "Core/Aggregate/FormFactorCoherentSum.h"
-#include "Core/Tools/IntegratorMCMiser.h"
#include "Core/Aggregate/InterferenceFunctionNone.h"
+#include "Core/Basics/Exceptions.h"
#include "Core/SimulationElement/SimulationElement.h"
+#include "Core/Tools/IntegratorMCMiser.h"
IInterferenceFunctionStrategy::IInterferenceFunctionStrategy(const SimulationOptions& sim_params,
bool polarized)
diff --git a/Core/Multilayer/ILayerRTCoefficients.h b/Core/Multilayer/ILayerRTCoefficients.h
index afa7368b2e056de14d498b84abc611c2af87fbe2..f258448d5d34fc8f182acd7df6d417d69ca92828 100644
--- a/Core/Multilayer/ILayerRTCoefficients.h
+++ b/Core/Multilayer/ILayerRTCoefficients.h
@@ -16,8 +16,8 @@
#define ILAYERRTCOEFFICIENTS_H
#include "Core/Basics/Complex.h"
-#include "Core/Vector/EigenCore.h"
#include "Core/Basics/Exceptions.h"
+#include "Core/Vector/EigenCore.h"
//! Interface to access reflection/transmission coefficients.
//! @ingroup algorithms_internal
diff --git a/Core/Multilayer/ISpecularStrategy.h b/Core/Multilayer/ISpecularStrategy.h
index 9d811ab99ffdfd051f8f92909472abd65392ee49..4f0cec717ecf8d31904788109f2b1eb4f6b8a36f 100644
--- a/Core/Multilayer/ISpecularStrategy.h
+++ b/Core/Multilayer/ISpecularStrategy.h
@@ -15,8 +15,8 @@
#ifndef ISPECULARSTRATEGY_H
#define ISPECULARSTRATEGY_H
-#include "Core/Multilayer/ILayerRTCoefficients.h"
#include "Core/Computation/Slice.h"
+#include "Core/Multilayer/ILayerRTCoefficients.h"
//! Interface for the Fresnel computations, both in the scalar and magnetic case
//!
diff --git a/Core/Multilayer/KzComputation.cpp b/Core/Multilayer/KzComputation.cpp
index 6263f1ade07ef4f237656c9b1b3ee4209c0db3cf..31c4c958c01cebb4761bffc34993b6409d4dbd77 100644
--- a/Core/Multilayer/KzComputation.cpp
+++ b/Core/Multilayer/KzComputation.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Multilayer/KzComputation.h"
+#include "Core/Computation/Slice.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Computation/Slice.h"
#include "Core/Parametrization/Units.h"
namespace
diff --git a/Core/Multilayer/Layer.cpp b/Core/Multilayer/Layer.cpp
index 38010cec68427190abce250c4550cf929c1452a5..05ed1e0e1227e5ee423e5c29e4c433f9202662a3 100644
--- a/Core/Multilayer/Layer.cpp
+++ b/Core/Multilayer/Layer.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Multilayer/Layer.h"
+#include "Core/Aggregate/ILayout.h"
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/Exceptions.h"
-#include "Core/Aggregate/ILayout.h"
#include "Core/Parametrization/ParameterPool.h"
#include "Core/Parametrization/RealParameter.h"
diff --git a/Core/Multilayer/Layer.h b/Core/Multilayer/Layer.h
index 6ad97d702be41880b6111f003cab2ddae00ff227..e2b09acc3ef8b63e4a1554a32c55244f7931bc48 100644
--- a/Core/Multilayer/Layer.h
+++ b/Core/Multilayer/Layer.h
@@ -15,8 +15,8 @@
#ifndef LAYER_H
#define LAYER_H
-#include "Core/Scattering/ISample.h"
#include "Core/Material/Material.h"
+#include "Core/Scattering/ISample.h"
#include "Core/Tools/SafePointerVector.h"
class ILayout;
diff --git a/Core/Multilayer/LayoutStrategyBuilder.cpp b/Core/Multilayer/LayoutStrategyBuilder.cpp
index 3e6fd12ae83a615060d9c55502e9f3f9961fcc72..e8c0bf8b00b7c6bcefc1cb4f92dc3217945f4251 100644
--- a/Core/Multilayer/LayoutStrategyBuilder.cpp
+++ b/Core/Multilayer/LayoutStrategyBuilder.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "Core/Multilayer/LayoutStrategyBuilder.h"
-#include "Core/Multilayer/DecouplingApproximationStrategy.h"
-#include "Core/Basics/Exceptions.h"
#include "Core/Aggregate/InterferenceFunctionRadialParaCrystal.h"
+#include "Core/Basics/Exceptions.h"
#include "Core/Computation/ProcessedLayout.h"
+#include "Core/Multilayer/DecouplingApproximationStrategy.h"
#include "Core/Multilayer/SSCApproximationStrategy.h"
LayoutStrategyBuilder::LayoutStrategyBuilder(const ProcessedLayout* p_layout,
diff --git a/Core/Multilayer/MatrixFresnelMap.cpp b/Core/Multilayer/MatrixFresnelMap.cpp
index c5d564577e6e1e49c1c7fb4c70fcf1259eb00879..5f6de9d40ca58e16b3bc20170999cbae2d858594 100644
--- a/Core/Multilayer/MatrixFresnelMap.cpp
+++ b/Core/Multilayer/MatrixFresnelMap.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "Core/Multilayer/MatrixFresnelMap.h"
-#include "Core/SimulationElement/SimulationElement.h"
#include "Core/Computation/Slice.h"
#include "Core/Multilayer/SpecularMagneticOldStrategy.h"
#include "Core/Multilayer/SpecularMagneticStrategy.h"
+#include "Core/SimulationElement/SimulationElement.h"
#include <functional>
MatrixFresnelMap::MatrixFresnelMap(std::unique_ptr<ISpecularStrategy> strategy)
diff --git a/Core/Multilayer/MultiLayer.cpp b/Core/Multilayer/MultiLayer.cpp
index 14d1fb641b9767f8387f06d1fe9bf8b0ea5084dd..dd2b2a57f6ed5f986ebaf94d3851f68f3b28220e 100644
--- a/Core/Multilayer/MultiLayer.cpp
+++ b/Core/Multilayer/MultiLayer.cpp
@@ -13,15 +13,15 @@
// ************************************************************************** //
#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Aggregate/ILayout.h"
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/Exceptions.h"
-#include "Core/Aggregate/ILayout.h"
+#include "Core/Computation/MultiLayerUtils.h"
+#include "Core/Material/MaterialUtils.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerFillLimits.h"
#include "Core/Multilayer/LayerInterface.h"
#include "Core/Multilayer/LayerRoughness.h"
-#include "Core/Material/MaterialUtils.h"
-#include "Core/Computation/MultiLayerUtils.h"
#include "Core/Parametrization/ParameterPool.h"
#include "Core/Parametrization/RealParameter.h"
diff --git a/Core/Multilayer/MultiLayer.h b/Core/Multilayer/MultiLayer.h
index c998c544bc2efc91a6baf1ca12aacd8d43bc674e..f8c038bb14c8088777e8d42140a7a6a370c0a1a3 100644
--- a/Core/Multilayer/MultiLayer.h
+++ b/Core/Multilayer/MultiLayer.h
@@ -15,11 +15,11 @@
#ifndef MULTILAYER_H
#define MULTILAYER_H
-#include "Core/Scattering/ISample.h"
#include "Core/Multilayer/RoughnessModels.h"
+#include "Core/Particle/ZLimits.h"
+#include "Core/Scattering/ISample.h"
#include "Core/Tools/SafePointerVector.h"
#include "Core/Vector/Vectors3D.h"
-#include "Core/Particle/ZLimits.h"
#include <functional>
diff --git a/Core/Multilayer/SSCAHelper.cpp b/Core/Multilayer/SSCAHelper.cpp
index abb68440c64b114a6856b67f89922b8382317d09..34e46f148ad919cb111564cbb445e2e38173a8e4 100644
--- a/Core/Multilayer/SSCAHelper.cpp
+++ b/Core/Multilayer/SSCAHelper.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Multilayer/SSCAHelper.h"
-#include "Core/Basics/Exceptions.h"
#include "Core/Aggregate/FormFactorCoherentSum.h"
#include "Core/Aggregate/InterferenceFunctionRadialParaCrystal.h"
+#include "Core/Basics/Exceptions.h"
SSCAHelper::SSCAHelper(double kappa) : m_kappa(kappa), m_mean_radius{} {}
diff --git a/Core/Multilayer/SampleProvider.h b/Core/Multilayer/SampleProvider.h
index 3653ceca66e7678dc8b7042f0070d3acdf5b4808..5d4bd04eeae0a9d03edcc63c22fe3e10bc5c082a 100644
--- a/Core/Multilayer/SampleProvider.h
+++ b/Core/Multilayer/SampleProvider.h
@@ -15,8 +15,8 @@
#ifndef SAMPLEPROVIDER_H
#define SAMPLEPROVIDER_H
-#include "Core/Parametrization/INode.h"
#include "Core/Multilayer/SampleBuilderNode.h"
+#include "Core/Parametrization/INode.h"
class MultiLayer;
diff --git a/Core/Multilayer/ScalarFresnelMap.cpp b/Core/Multilayer/ScalarFresnelMap.cpp
index 470ae5b922939f368dd17c3065d7500dd486c3ce..32fbcc722c32a2da019c54df63aa768810d7edd3 100644
--- a/Core/Multilayer/ScalarFresnelMap.cpp
+++ b/Core/Multilayer/ScalarFresnelMap.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Multilayer/ScalarFresnelMap.h"
+#include "Core/Computation/Slice.h"
#include "Core/Multilayer/ScalarRTCoefficients.h"
#include "Core/SimulationElement/SimulationElement.h"
-#include "Core/Computation/Slice.h"
#include "Core/Vector/Vectors3D.h"
#include <functional>
@@ -27,8 +27,8 @@ ScalarFresnelMap::ScalarFresnelMap(std::unique_ptr<ISpecularStrategy> strategy)
ScalarFresnelMap::~ScalarFresnelMap() = default;
//! Returns hash value of a pair of doubles, computed by exclusive-or of the component hash values.
-size_t
-ScalarFresnelMap::Hash2Doubles::operator()(const std::pair<double, double>& doubles) const noexcept
+size_t ScalarFresnelMap::Hash2Doubles::operator()(const std::pair<double, double>& doubles) const
+ noexcept
{
return std::hash<double>{}(doubles.first) ^ std::hash<double>{}(doubles.second);
}
diff --git a/Core/Multilayer/ScalarRTCoefficients.h b/Core/Multilayer/ScalarRTCoefficients.h
index 26cf75c69cbb4aa8b4c8defc24168beb0ec04a03..a90e713f0740b8d6f1d01b63f64801cd052b6a07 100644
--- a/Core/Multilayer/ScalarRTCoefficients.h
+++ b/Core/Multilayer/ScalarRTCoefficients.h
@@ -16,8 +16,8 @@
#define SCALARRTCOEFFICIENTS_H
#include "Core/Basics/Complex.h"
-#include "Core/Vector/EigenCore.h"
#include "Core/Multilayer/ILayerRTCoefficients.h"
+#include "Core/Vector/EigenCore.h"
//! Specular reflection and transmission coefficients in a layer in case
//! of scalar interactions between the layers and the scattered particle.
diff --git a/Core/Multilayer/SpecularMagneticOldStrategy.cpp b/Core/Multilayer/SpecularMagneticOldStrategy.cpp
index 20d3275271fbdd237a4a66110bf52c1aedbc673d..f7b5e9e818aff5d43b9a78c383e284512e2e7b11 100644
--- a/Core/Multilayer/SpecularMagneticOldStrategy.cpp
+++ b/Core/Multilayer/SpecularMagneticOldStrategy.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "Core/Multilayer/SpecularMagneticOldStrategy.h"
+#include "Core/Computation/Slice.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerInterface.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Computation/Slice.h"
#include "Core/Vector/WavevectorInfo.h"
#include <Eigen/LU>
@@ -46,8 +46,7 @@ ISpecularStrategy::coeffs_t SpecularMagneticOldStrategy::Execute(const std::vect
}
ISpecularStrategy::coeffs_t
-SpecularMagneticOldStrategy::Execute(const std::vector<Slice>&,
- const std::vector<complex_t>&) const
+SpecularMagneticOldStrategy::Execute(const std::vector<Slice>&, const std::vector<complex_t>&) const
{
throw std::runtime_error("Not implemented");
}
diff --git a/Core/Multilayer/SpecularMagneticStrategy.cpp b/Core/Multilayer/SpecularMagneticStrategy.cpp
index 439b20358ba5ca77c7d86fc14c6d3c382dedcd7f..5446d33eef1bd2b3de15179b519f8fdf32ae3031 100644
--- a/Core/Multilayer/SpecularMagneticStrategy.cpp
+++ b/Core/Multilayer/SpecularMagneticStrategy.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Multilayer/SpecularMagneticStrategy.h"
-#include "Core/Multilayer/KzComputation.h"
#include "Core/Basics/PhysicalConstants.h"
#include "Core/Computation/Slice.h"
+#include "Core/Multilayer/KzComputation.h"
namespace
{
diff --git a/Core/Multilayer/SpecularScalarStrategy.cpp b/Core/Multilayer/SpecularScalarStrategy.cpp
index fe11f647fd3c15e1d83d3d10fc77b0431e6a3026..55da5b0abe50c752b675b1621ca5bfa2504211ab 100644
--- a/Core/Multilayer/SpecularScalarStrategy.cpp
+++ b/Core/Multilayer/SpecularScalarStrategy.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "Core/Multilayer/SpecularScalarStrategy.h"
+#include "Core/Computation/Slice.h"
#include "Core/Multilayer/KzComputation.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerRoughness.h"
-#include "Core/Computation/Slice.h"
#include <Eigen/Dense>
#include <stdexcept>
diff --git a/Core/Parametrization/DistributionHandler.cpp b/Core/Parametrization/DistributionHandler.cpp
index 439a3b1f8e7e982673e61085937f6a6b329485cf..26a52ccdb234b8de01125b94b1580f7059835b18 100644
--- a/Core/Parametrization/DistributionHandler.cpp
+++ b/Core/Parametrization/DistributionHandler.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Core/Parametrization/DistributionHandler.h"
-#include "Core/Parametrization/Distributions.h"
#include "Core/Basics/Exceptions.h"
+#include "Core/Parametrization/Distributions.h"
#include "Core/Parametrization/ParameterPool.h"
#include "Core/Parametrization/ParameterSample.h"
diff --git a/Core/Parametrization/IParameterized.cpp b/Core/Parametrization/IParameterized.cpp
index 54362ce9606b67b42db1daab7a7b8c4a852eeba4..d4812f05c8786d76a966c95e0d1dac1cb60583fb 100644
--- a/Core/Parametrization/IParameterized.cpp
+++ b/Core/Parametrization/IParameterized.cpp
@@ -15,8 +15,8 @@
#include "Core/Parametrization/IParameterized.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Parametrization/ParameterPool.h"
-#include "Fit/Tools/RealLimits.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Fit/Tools/RealLimits.h"
#include <iostream>
#include <memory>
#include <sstream>
diff --git a/Core/Parametrization/ParameterDistribution.cpp b/Core/Parametrization/ParameterDistribution.cpp
index 7717387c40f4aa702b6256829a0b6f70cb06b2c6..ea429334efecda8fe76ec45e1db9173b79d5c056 100644
--- a/Core/Parametrization/ParameterDistribution.cpp
+++ b/Core/Parametrization/ParameterDistribution.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Core/Parametrization/ParameterDistribution.h"
-#include "Core/Parametrization/Distributions.h"
#include "Core/Basics/Exceptions.h"
+#include "Core/Parametrization/Distributions.h"
#include "Core/Parametrization/ParameterSample.h"
ParameterDistribution::ParameterDistribution(const std::string& par_name,
diff --git a/Core/Parametrization/ParameterPool.cpp b/Core/Parametrization/ParameterPool.cpp
index 5ff803078ac3ab163076a7a5cf96ee9052d22b29..66113359cc88eeaebd4f6a8bfaf9e8034210894e 100644
--- a/Core/Parametrization/ParameterPool.cpp
+++ b/Core/Parametrization/ParameterPool.cpp
@@ -14,8 +14,8 @@
#include "Core/Parametrization/ParameterPool.h"
#include "Core/Basics/Exceptions.h"
-#include "Fit/Tools/RealLimits.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Fit/Tools/RealLimits.h"
#include "Fit/Tools/StringUtils.h"
#include <algorithm>
#include <cassert>
diff --git a/Core/Parametrization/ParameterUtils.cpp b/Core/Parametrization/ParameterUtils.cpp
index 74804bc3799d460cbc8a2ac4e4c759ed87b19f71..386291c629825f0a4d25e0260b4f74516690766a 100644
--- a/Core/Parametrization/ParameterUtils.cpp
+++ b/Core/Parametrization/ParameterUtils.cpp
@@ -16,9 +16,9 @@
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Parametrization/ParameterDistribution.h"
#include "Core/Parametrization/ParameterPool.h"
+#include "Core/Parametrization/RealParameter.h"
#include "Core/Particle/Particle.h"
#include "Core/Particle/ParticleDistribution.h"
-#include "Core/Parametrization/RealParameter.h"
namespace
{
diff --git a/Core/Parametrization/RangedDistributions.cpp b/Core/Parametrization/RangedDistributions.cpp
index a8b13638d13a457c48324e8b73cdcd6c70a749b2..e93d5f533369292b7879b0bd113959f94a5a6c1b 100644
--- a/Core/Parametrization/RangedDistributions.cpp
+++ b/Core/Parametrization/RangedDistributions.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Parametrization/RangedDistributions.h"
+#include "Core/Export/PythonFormatting.h"
#include "Core/Parametrization/Distributions.h"
#include "Core/Parametrization/ParameterSample.h"
-#include "Core/Export/PythonFormatting.h"
#include <limits>
namespace
diff --git a/Core/Parametrization/RealParameter.h b/Core/Parametrization/RealParameter.h
index d3b85f090a955cb9b3159771a02c4ec1c1b024db..382e90b0daefedb16d6136299fcb7c30ec09e689 100644
--- a/Core/Parametrization/RealParameter.h
+++ b/Core/Parametrization/RealParameter.h
@@ -15,10 +15,10 @@
#ifndef REALPARAMETER_H
#define REALPARAMETER_H
-#include "Fit/Tools/Attributes.h"
#include "Core/Parametrization/IParameter.h"
-#include "Fit/Tools/RealLimits.h"
#include "Core/Parametrization/Unit.h"
+#include "Fit/Tools/Attributes.h"
+#include "Fit/Tools/RealLimits.h"
#include <string>
class ParameterPool;
diff --git a/Core/Particle/Crystal.h b/Core/Particle/Crystal.h
index d15d2802d6043bd779010bdfdbb52988ece67c38..84dcfd74c958f747037be39a5e82278a3be22fd2 100644
--- a/Core/Particle/Crystal.h
+++ b/Core/Particle/Crystal.h
@@ -15,8 +15,8 @@
#ifndef CRYSTAL_H
#define CRYSTAL_H
-#include "Core/Particle/IClusteredParticles.h"
#include "Core/Lattice/Lattice.h"
+#include "Core/Particle/IClusteredParticles.h"
#include "Core/Vector/Vectors3D.h"
//! A crystal structure with a ParticleComposition as a basis.
diff --git a/Core/Particle/FormFactorCrystal.h b/Core/Particle/FormFactorCrystal.h
index 47887bb2858283206d7430452e413940dbf5b420..5bb4b05ec53ca6ae19e9048d369f0c426f97774d 100644
--- a/Core/Particle/FormFactorCrystal.h
+++ b/Core/Particle/FormFactorCrystal.h
@@ -15,8 +15,8 @@
#ifndef FORMFACTORCRYSTAL_H
#define FORMFACTORCRYSTAL_H
-#include "Core/Scattering/IFormFactorBorn.h"
#include "Core/Lattice/Lattice.h"
+#include "Core/Scattering/IFormFactorBorn.h"
//! The form factor of a MesoCrystal.
//! @ingroup formfactors
diff --git a/Core/Particle/IParticle.h b/Core/Particle/IParticle.h
index 168d1002e24f83c12c689f8ad0643da365e94840..d94a1e767501d4e9efaaeef213a310b69af99a06 100644
--- a/Core/Particle/IParticle.h
+++ b/Core/Particle/IParticle.h
@@ -16,11 +16,11 @@
#define IPARTICLE_H
#include "Core/Particle/IAbstractParticle.h"
+#include "Core/Particle/SlicedParticle.h"
+#include "Core/Particle/ZLimits.h"
#include "Core/Scattering/Rotations.h"
#include "Core/Tools/SafePointerVector.h"
-#include "Core/Particle/SlicedParticle.h"
#include "Core/Vector/Vectors3D.h"
-#include "Core/Particle/ZLimits.h"
#include <memory>
//! Vertical extension of a particle, specified by bottom and top z coordinate.
diff --git a/Core/Particle/Particle.h b/Core/Particle/Particle.h
index 65b04d313d946a7554bd83cb5d84ab4836113035..564db074ca7f8456fac56880052b5a8af1315a18 100644
--- a/Core/Particle/Particle.h
+++ b/Core/Particle/Particle.h
@@ -17,8 +17,8 @@
#include "Core/DecoratedFormFactor/FormFactorDecoratorMaterial.h"
#include "Core/DecoratedFormFactor/FormFactorDecoratorRotation.h"
-#include "Core/Particle/IParticle.h"
#include "Core/Material/Material.h"
+#include "Core/Particle/IParticle.h"
//! A particle with a form factor and refractive index.
//! @ingroup samples
diff --git a/Core/Particle/ParticleDistribution.cpp b/Core/Particle/ParticleDistribution.cpp
index 162449b7442dbeda56db596d994aad9935dabc23..cc85f96f3886f5037b3f9df3082e9e42b6a3a02a 100644
--- a/Core/Particle/ParticleDistribution.cpp
+++ b/Core/Particle/ParticleDistribution.cpp
@@ -14,12 +14,12 @@
#include "Core/Particle/ParticleDistribution.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Parametrization/Distributions.h"
#include "Core/Basics/Exceptions.h"
-#include "Core/Particle/IParticle.h"
+#include "Core/Parametrization/Distributions.h"
#include "Core/Parametrization/ParameterPool.h"
#include "Core/Parametrization/ParameterSample.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Particle/IParticle.h"
#include <map>
ParticleDistribution::ParticleDistribution(const IParticle& prototype,
diff --git a/Core/Particle/ParticleDistribution.h b/Core/Particle/ParticleDistribution.h
index ed4afe35e930ae3122665078e011b3e6f6e834d4..fdf17cd62fcb53bed20354a514b50ffed650ce69 100644
--- a/Core/Particle/ParticleDistribution.h
+++ b/Core/Particle/ParticleDistribution.h
@@ -15,8 +15,8 @@
#ifndef PARTICLEDISTRIBUTION_H
#define PARTICLEDISTRIBUTION_H
-#include "Core/Particle/IAbstractParticle.h"
#include "Core/Parametrization/ParameterDistribution.h"
+#include "Core/Particle/IAbstractParticle.h"
#include "Core/Tools/SafePointerVector.h"
class IParticle;
diff --git a/Core/Particle/SlicedFormFactorList.cpp b/Core/Particle/SlicedFormFactorList.cpp
index 5089cd9a2151f9640a81bb713af778f5daa04772..7bc55dbde4cee6d61c1302cb4d602cbb86cee71e 100644
--- a/Core/Particle/SlicedFormFactorList.cpp
+++ b/Core/Particle/SlicedFormFactorList.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "Core/Particle/SlicedFormFactorList.h"
-#include "Core/Particle/IParticle.h"
+#include "Core/Computation/Slice.h"
#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Particle/IParticle.h"
#include "Core/Scattering/Rotations.h"
-#include "Core/Computation/Slice.h"
#include <utility>
namespace
diff --git a/Core/Scattering/IFormFactor.h b/Core/Scattering/IFormFactor.h
index 8c95eddc0f6ee0c7c7aa2ad524ffa40d06379c85..e65d5674027727712ab236c2e78c98b753b438cc 100644
--- a/Core/Scattering/IFormFactor.h
+++ b/Core/Scattering/IFormFactor.h
@@ -16,11 +16,11 @@
#define IFORMFACTOR_H
#include "Core/Basics/Complex.h"
-#include "Core/Vector/EigenCore.h"
-#include "Core/Scattering/ISample.h"
#include "Core/Material/Material.h"
-#include "Core/Vector/Vectors3D.h"
#include "Core/Particle/ZLimits.h"
+#include "Core/Scattering/ISample.h"
+#include "Core/Vector/EigenCore.h"
+#include "Core/Vector/Vectors3D.h"
class ILayerRTCoefficients;
class IRotation;
diff --git a/Core/Scattering/IFormFactorBorn.cpp b/Core/Scattering/IFormFactorBorn.cpp
index 2062fd06302aa5fb1a6c17b16b1f381a1deda07e..15a30708abcbd1b0b6fd581d5874cb69677d9c03 100644
--- a/Core/Scattering/IFormFactorBorn.cpp
+++ b/Core/Scattering/IFormFactorBorn.cpp
@@ -90,22 +90,20 @@ SlicingEffects IFormFactorBorn::computeSlicingEffects(ZLimits limits, const kvec
return {new_position, dz_bottom, dz_top};
}
-
-
double IFormFactorBorn::BottomZ(const std::vector<kvector_t>& vertices, const Transform3D& rotation)
{
if (vertices.size() == 0)
throw std::runtime_error("BottomZ() error: no vertices passed!");
- return algo::min_value(vertices.begin(), vertices.end(),
- [&](const kvector_t& vertex) -> double
- { return rotation.transformed(vertex).z(); });
+ return algo::min_value(
+ vertices.begin(), vertices.end(),
+ [&](const kvector_t& vertex) -> double { return rotation.transformed(vertex).z(); });
}
double IFormFactorBorn::TopZ(const std::vector<kvector_t>& vertices, const Transform3D& rotation)
{
if (vertices.size() == 0)
throw std::runtime_error("TopZ() error: no vertices passed!");
- return algo::max_value(vertices.begin(), vertices.end(),
- [&](const kvector_t& vertex) -> double
- { return rotation.transformed(vertex).z(); });
+ return algo::max_value(
+ vertices.begin(), vertices.end(),
+ [&](const kvector_t& vertex) -> double { return rotation.transformed(vertex).z(); });
}
diff --git a/Core/Simulation/DepthProbeSimulation.cpp b/Core/Simulation/DepthProbeSimulation.cpp
index fa6a9b5ea8dae2985ee5905279c728b150157cc3..ac18898264b5751fe5fbf10b5c70591e99deeb1b 100644
--- a/Core/Simulation/DepthProbeSimulation.cpp
+++ b/Core/Simulation/DepthProbeSimulation.cpp
@@ -13,19 +13,19 @@
// ************************************************************************** //
#include "Core/Simulation/DepthProbeSimulation.h"
+#include "Core/Basics/MathConstants.h"
+#include "Core/Beam/IFootprintFactor.h"
#include "Core/Computation/DepthProbeComputation.h"
-#include "Core/Parametrization/Distributions.h"
-#include "Core/Instrument/Histogram1D.h"
#include "Core/Computation/IBackground.h"
-#include "Core/Beam/IFootprintFactor.h"
-#include "Core/Multilayer/IMultiLayerBuilder.h"
+#include "Core/Instrument/Histogram1D.h"
+#include "Core/Instrument/SimpleUnitConverters.h"
+#include "Core/Instrument/SpecularDetector1D.h"
#include "Core/Material/MaterialUtils.h"
-#include "Core/Basics/MathConstants.h"
+#include "Core/Multilayer/IMultiLayerBuilder.h"
#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Parametrization/Distributions.h"
#include "Core/Parametrization/ParameterPool.h"
#include "Core/Parametrization/RealParameter.h"
-#include "Core/Instrument/SimpleUnitConverters.h"
-#include "Core/Instrument/SpecularDetector1D.h"
namespace
{
diff --git a/Core/Simulation/DepthProbeSimulation.h b/Core/Simulation/DepthProbeSimulation.h
index 0ad3f6dba29cb6eeb19a0cbb64122b9990587a85..fc0385e5666d110fecbc2296edd0b82140772976 100644
--- a/Core/Simulation/DepthProbeSimulation.h
+++ b/Core/Simulation/DepthProbeSimulation.h
@@ -15,10 +15,10 @@
#ifndef DEPTHPROBESIMULATION_H
#define DEPTHPROBESIMULATION_H
-#include "Core/SimulationElement/DepthProbeElement.h"
-#include "Core/Multilayer/ILayerRTCoefficients.h"
#include "Core/Instrument/OutputData.h"
+#include "Core/Multilayer/ILayerRTCoefficients.h"
#include "Core/Simulation/Simulation.h"
+#include "Core/SimulationElement/DepthProbeElement.h"
#include <vector>
diff --git a/Core/Simulation/GISASSimulation.cpp b/Core/Simulation/GISASSimulation.cpp
index 6a4251904ceb3c2f177fd310dd0f887e7881125c..f9972371bdc383957c6f546c77115e2f4e9bffe9 100644
--- a/Core/Simulation/GISASSimulation.cpp
+++ b/Core/Simulation/GISASSimulation.cpp
@@ -15,12 +15,12 @@
#include "Core/Simulation/GISASSimulation.h"
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Computation/DWBAComputation.h"
-#include "Core/Instrument/Histogram2D.h"
#include "Core/Computation/IBackground.h"
+#include "Core/Instrument/Histogram2D.h"
+#include "Core/Instrument/UnitConverterUtils.h"
#include "Core/Multilayer/IMultiLayerBuilder.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/SimulationElement/SimulationElement.h"
-#include "Core/Instrument/UnitConverterUtils.h"
GISASSimulation::GISASSimulation()
{
diff --git a/Core/Simulation/OffSpecSimulation.cpp b/Core/Simulation/OffSpecSimulation.cpp
index c333566f559c7e3204b7926a3214b13d8a4ed643..176fb4286b516164d002ad2eecbffeed25921dcb 100644
--- a/Core/Simulation/OffSpecSimulation.cpp
+++ b/Core/Simulation/OffSpecSimulation.cpp
@@ -15,13 +15,13 @@
#include "Core/Simulation/OffSpecSimulation.h"
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Computation/DWBAComputation.h"
-#include "Core/Parametrization/Distributions.h"
#include "Core/Instrument/Histogram2D.h"
+#include "Core/Instrument/SimpleUnitConverters.h"
#include "Core/Multilayer/IMultiLayerBuilder.h"
#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Parametrization/Distributions.h"
#include "Core/Parametrization/ParameterPool.h"
#include "Core/Parametrization/RealParameter.h"
-#include "Core/Instrument/SimpleUnitConverters.h"
#include "Core/SimulationElement/SimulationElement.h"
OffSpecSimulation::OffSpecSimulation()
diff --git a/Core/Simulation/Simulation.cpp b/Core/Simulation/Simulation.cpp
index 33199d74f024ed9753e4dc4552a8a4db1a52e8ae..5b53bfe2569e6f7c9c10052b9e5d3c8f417992c2 100644
--- a/Core/Simulation/Simulation.cpp
+++ b/Core/Simulation/Simulation.cpp
@@ -15,12 +15,12 @@
#include "Core/Simulation/Simulation.h"
#include "Core/Computation/IBackground.h"
#include "Core/Computation/IComputation.h"
+#include "Core/Computation/MultiLayerUtils.h"
#include "Core/Multilayer/IMultiLayerBuilder.h"
-#include "Core/Simulation/MPISimulation.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Computation/MultiLayerUtils.h"
#include "Core/Parametrization/ParameterPool.h"
#include "Core/Parametrization/ParameterSample.h"
+#include "Core/Simulation/MPISimulation.h"
#include "Fit/Tools/StringUtils.h"
#include <gsl/gsl_errno.h>
#include <iomanip>
diff --git a/Core/Simulation/Simulation.h b/Core/Simulation/Simulation.h
index 4ae314506f3b2bc99c3f8e5497f68e2b2f8f8897..5e1cffa866b3af156144509201ca13fd19e9c625 100644
--- a/Core/Simulation/Simulation.h
+++ b/Core/Simulation/Simulation.h
@@ -15,14 +15,14 @@
#ifndef SIMULATION_H
#define SIMULATION_H
-#include "Core/Parametrization/DistributionHandler.h"
+#include "Core/Computation/ProgressHandler.h"
#include "Core/Instrument/IDetector2D.h"
-#include "Core/Parametrization/INode.h"
#include "Core/Instrument/Instrument.h"
-#include "Core/Computation/ProgressHandler.h"
+#include "Core/Instrument/SimulationResult.h"
#include "Core/Multilayer/SampleProvider.h"
+#include "Core/Parametrization/DistributionHandler.h"
+#include "Core/Parametrization/INode.h"
#include "Core/Parametrization/SimulationOptions.h"
-#include "Core/Instrument/SimulationResult.h"
template <class T> class OutputData;
class IBackground;
diff --git a/Core/Simulation/Simulation2D.cpp b/Core/Simulation/Simulation2D.cpp
index c32a72345af060c48461427466e3b79547549469..32a2b36d05c36e4b2690a5c14ef1540390526c75 100644
--- a/Core/Simulation/Simulation2D.cpp
+++ b/Core/Simulation/Simulation2D.cpp
@@ -14,10 +14,10 @@
#include "Core/Simulation/Simulation2D.h"
#include "Core/Computation/DWBAComputation.h"
+#include "Core/Computation/IBackground.h"
#include "Core/Instrument/DetectorContext.h"
#include "Core/Instrument/DetectorFunctions.h"
#include "Core/Instrument/Histogram2D.h"
-#include "Core/Computation/IBackground.h"
#include "Core/SimulationElement/SimulationElement.h"
namespace
diff --git a/Core/Simulation/Simulation2D.h b/Core/Simulation/Simulation2D.h
index 83629bc1c24ec25f50b11b029f407c4073d5830b..6ff9a3a08e7ae79beb04120ba3c238ba46183d60 100644
--- a/Core/Simulation/Simulation2D.h
+++ b/Core/Simulation/Simulation2D.h
@@ -15,8 +15,8 @@
#ifndef SIMULATION2D_H
#define SIMULATION2D_H
-#include "Core/Simulation/Simulation.h"
#include "Core/Instrument/SimulationResult.h"
+#include "Core/Simulation/Simulation.h"
class DetectorContext;
diff --git a/Core/Simulation/SpecularSimulation.cpp b/Core/Simulation/SpecularSimulation.cpp
index b4b99678ccbf5700daec4cedeec9914933e271d9..447a5ada9f7f4340f379e83934ba82e9c1f9c445 100644
--- a/Core/Simulation/SpecularSimulation.cpp
+++ b/Core/Simulation/SpecularSimulation.cpp
@@ -13,23 +13,23 @@
// ************************************************************************** //
#include "Core/Simulation/SpecularSimulation.h"
+#include "Core/Basics/MathConstants.h"
+#include "Core/Beam/IFootprintFactor.h"
+#include "Core/Binning/PointwiseAxis.h"
+#include "Core/Computation/IBackground.h"
+#include "Core/Computation/SpecularComputation.h"
#include "Core/Instrument/AngularSpecScan.h"
-#include "Core/Parametrization/Distributions.h"
#include "Core/Instrument/Histogram1D.h"
-#include "Core/Computation/IBackground.h"
-#include "Core/Beam/IFootprintFactor.h"
-#include "Core/Multilayer/IMultiLayerBuilder.h"
#include "Core/Instrument/ISpecularScan.h"
+#include "Core/Instrument/SpecularDetector1D.h"
+#include "Core/Instrument/UnitConverter1D.h"
#include "Core/Material/MaterialUtils.h"
-#include "Core/Basics/MathConstants.h"
+#include "Core/Multilayer/IMultiLayerBuilder.h"
#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Parametrization/Distributions.h"
#include "Core/Parametrization/ParameterPool.h"
-#include "Core/Binning/PointwiseAxis.h"
#include "Core/Parametrization/RealParameter.h"
-#include "Core/Computation/SpecularComputation.h"
-#include "Core/Instrument/SpecularDetector1D.h"
#include "Core/SimulationElement/SpecularSimulationElement.h"
-#include "Core/Instrument/UnitConverter1D.h"
namespace
{
diff --git a/Core/Simulation/SpecularSimulation.h b/Core/Simulation/SpecularSimulation.h
index 1723b90040c126ba341e2d31b5ee6f07563ee8a0..c4b0aaffcd514a6e7bedc8de8731fb97b7465278 100644
--- a/Core/Simulation/SpecularSimulation.h
+++ b/Core/Simulation/SpecularSimulation.h
@@ -15,8 +15,8 @@
#ifndef SPECULARSIMULATION_H
#define SPECULARSIMULATION_H
-#include "Core/Multilayer/ILayerRTCoefficients.h"
#include "Core/Instrument/OutputData.h"
+#include "Core/Multilayer/ILayerRTCoefficients.h"
#include "Core/Simulation/Simulation.h"
class IAxis;
diff --git a/Core/SoftParticle/FormFactorGauss.cpp b/Core/SoftParticle/FormFactorGauss.cpp
index 91798d90d61f64cd957d22cd3cdcb23ae4f509c5..45a7ea2786082fa76c1a73b26d01fa8a7d0ec679 100644
--- a/Core/SoftParticle/FormFactorGauss.cpp
+++ b/Core/SoftParticle/FormFactorGauss.cpp
@@ -14,9 +14,9 @@
#include "Core/SoftParticle/FormFactorGauss.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Shapes/Box.h"
#include "Core/Basics/MathConstants.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Shapes/Box.h"
#include <limits>
FormFactorGauss::FormFactorGauss(double length) : FormFactorGauss(length, length) {}
diff --git a/Core/SoftParticle/FormFactorLorentz.cpp b/Core/SoftParticle/FormFactorLorentz.cpp
index f227923fc82ca757c593d02a81eb4f7c4ea6b034..acabd0c38563833e6a8a0c09e40f0e4b65d7e73b 100644
--- a/Core/SoftParticle/FormFactorLorentz.cpp
+++ b/Core/SoftParticle/FormFactorLorentz.cpp
@@ -14,10 +14,10 @@
#include "Core/SoftParticle/FormFactorLorentz.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Shapes/Box.h"
#include "Core/Basics/MathConstants.h"
-#include "Fit/Tools/RealLimits.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Shapes/Box.h"
+#include "Fit/Tools/RealLimits.h"
FormFactorLorentz::FormFactorLorentz(double width, double height)
{
diff --git a/Core/SoftParticle/FormFactorSphereGaussianRadius.cpp b/Core/SoftParticle/FormFactorSphereGaussianRadius.cpp
index 83795ac88a975f1da3c735e4110cb11ff145dfb1..07382bee4e3330671bf11fd72b2374618717cc57 100644
--- a/Core/SoftParticle/FormFactorSphereGaussianRadius.cpp
+++ b/Core/SoftParticle/FormFactorSphereGaussianRadius.cpp
@@ -14,9 +14,9 @@
#include "Core/SoftParticle/FormFactorSphereGaussianRadius.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Fit/Tools/RealLimits.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/TruncatedEllipsoid.h"
+#include "Fit/Tools/RealLimits.h"
FormFactorSphereGaussianRadius::FormFactorSphereGaussianRadius(double mean, double sigma)
: m_mean(mean), m_sigma(sigma), m_mean_r3(0.0)
diff --git a/Core/SoftParticle/FormFactorSphereLogNormalRadius.h b/Core/SoftParticle/FormFactorSphereLogNormalRadius.h
index ab704e83979d6228308a41b9cd358216e87d55d8..775210e96709accaa4b7d49a438d8b8cd8f60d9f 100644
--- a/Core/SoftParticle/FormFactorSphereLogNormalRadius.h
+++ b/Core/SoftParticle/FormFactorSphereLogNormalRadius.h
@@ -15,8 +15,8 @@
#ifndef FORMFACTORSPHERELOGNORMALRADIUS_H
#define FORMFACTORSPHERELOGNORMALRADIUS_H
-#include "Core/Parametrization/Distributions.h"
#include "Core/HardParticle/FormFactorFullSphere.h"
+#include "Core/Parametrization/Distributions.h"
#include "Core/Tools/SafePointerVector.h"
#include <memory>
diff --git a/Core/StandardSamples/BoxCompositionBuilder.cpp b/Core/StandardSamples/BoxCompositionBuilder.cpp
index 578d4d0d86380f4b7be91feed4731e8667c5002e..ab6d96f0b8027115f19fc5181bc28ddcc3feb2d6 100644
--- a/Core/StandardSamples/BoxCompositionBuilder.cpp
+++ b/Core/StandardSamples/BoxCompositionBuilder.cpp
@@ -13,15 +13,15 @@
// ************************************************************************** //
#include "Core/StandardSamples/BoxCompositionBuilder.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/HardParticle/FormFactorBox.h"
-#include "Core/Multilayer/Layer.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Particle/ParticleComposition.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
+#include "Core/Particle/ParticleComposition.h"
BoxCompositionBuilder::BoxCompositionBuilder()
: m_particleMaterial(HomogeneousMaterial("Ag", 1.245e-5, 5.419e-7)),
diff --git a/Core/StandardSamples/BoxCompositionBuilder.h b/Core/StandardSamples/BoxCompositionBuilder.h
index bbfe2712661713c6fc0a9bfed35c36fbe13a5ad8..0e3f11e3799ca7b3b2bc3fa7ec6194a3d26e8909 100644
--- a/Core/StandardSamples/BoxCompositionBuilder.h
+++ b/Core/StandardSamples/BoxCompositionBuilder.h
@@ -15,8 +15,8 @@
#ifndef BOXCOMPOSITIONBUILDER_H
#define BOXCOMPOSITIONBUILDER_H
-#include "Core/Multilayer/IMultiLayerBuilder.h"
#include "Core/Material/Material.h"
+#include "Core/Multilayer/IMultiLayerBuilder.h"
class MultiLayer;
class ParticleComposition;
diff --git a/Core/StandardSamples/BoxesSquareLatticeBuilder.cpp b/Core/StandardSamples/BoxesSquareLatticeBuilder.cpp
index 4922311ec364e80c1e0b8147b8ea82400a1d4783..4c5605c4eb66ca11bdb1007d3c03a88c4b6283be 100644
--- a/Core/StandardSamples/BoxesSquareLatticeBuilder.cpp
+++ b/Core/StandardSamples/BoxesSquareLatticeBuilder.cpp
@@ -13,16 +13,16 @@
// ************************************************************************** //
#include "Core/StandardSamples/BoxesSquareLatticeBuilder.h"
+#include "Core/Aggregate/InterferenceFunction2DLattice.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/HardParticle/FormFactorBox.h"
-#include "Core/Aggregate/InterferenceFunction2DLattice.h"
-#include "Core/Multilayer/Layer.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
// -----------------------------------------------------------------------------
// Boxes in square lattice
diff --git a/Core/StandardSamples/CoreShellParticleBuilder.cpp b/Core/StandardSamples/CoreShellParticleBuilder.cpp
index f81ab77fd11135c425e88ac250c82b110df951a3..260edec6416f4cba762a681700843e69df50028d 100644
--- a/Core/StandardSamples/CoreShellParticleBuilder.cpp
+++ b/Core/StandardSamples/CoreShellParticleBuilder.cpp
@@ -13,15 +13,15 @@
// ************************************************************************** //
#include "Core/StandardSamples/CoreShellParticleBuilder.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/HardParticle/FormFactorBox.h"
-#include "Core/Multilayer/Layer.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Particle/ParticleCoreShell.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
+#include "Core/Particle/ParticleCoreShell.h"
// --- CoreShellParticleBuilder ---
diff --git a/Core/StandardSamples/CustomMorphologyBuilder.cpp b/Core/StandardSamples/CustomMorphologyBuilder.cpp
index 8d6ac02146f96b86b53b50b501120a1708515d79..15fe0889b13fbf79d6ae0ca9247f69eedb7ffb5c 100644
--- a/Core/StandardSamples/CustomMorphologyBuilder.cpp
+++ b/Core/StandardSamples/CustomMorphologyBuilder.cpp
@@ -13,14 +13,14 @@
// ************************************************************************** //
#include "Core/StandardSamples/CustomMorphologyBuilder.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/HardParticle/FormFactorBox.h"
-#include "Core/Multilayer/Layer.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
MultiLayer* CustomMorphologyBuilder::buildSample() const
{
diff --git a/Core/StandardSamples/CylindersAndPrismsBuilder.cpp b/Core/StandardSamples/CylindersAndPrismsBuilder.cpp
index 84c2b792de8198be403b576978cf19af81f0d2c1..021c7e6546ccc433f8fe70bc1efdb3778c3d6319 100644
--- a/Core/StandardSamples/CylindersAndPrismsBuilder.cpp
+++ b/Core/StandardSamples/CylindersAndPrismsBuilder.cpp
@@ -13,16 +13,16 @@
// ************************************************************************** //
#include "Core/StandardSamples/CylindersAndPrismsBuilder.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/HardParticle/FormFactorPrism3.h"
-#include "Core/Multilayer/Layer.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
CylindersAndPrismsBuilder::CylindersAndPrismsBuilder() {}
diff --git a/Core/StandardSamples/CylindersBuilder.cpp b/Core/StandardSamples/CylindersBuilder.cpp
index e8e53a552f4df487dc4c94a8895f848991e54298..700a313eec48ac46a69fc066af2a253081d00f07 100644
--- a/Core/StandardSamples/CylindersBuilder.cpp
+++ b/Core/StandardSamples/CylindersBuilder.cpp
@@ -13,17 +13,17 @@
// ************************************************************************** //
#include "Core/StandardSamples/CylindersBuilder.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/HardParticle/FormFactorCylinder.h"
+#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerInterface.h"
-#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/RealParameter.h"
-#include "Core/Scattering/Rotations.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
+#include "Core/Scattering/Rotations.h"
// -----------------------------------------------------------------------------
// Cylinders in DWBA
diff --git a/Core/StandardSamples/HomogeneousMultilayerBuilder.cpp b/Core/StandardSamples/HomogeneousMultilayerBuilder.cpp
index 1b19a2e71159d7aba505d1f0bf2084419ffe87d2..f15a97488547251b22b182f6bc4f5d73bf1ac6a8 100644
--- a/Core/StandardSamples/HomogeneousMultilayerBuilder.cpp
+++ b/Core/StandardSamples/HomogeneousMultilayerBuilder.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Core/StandardSamples/HomogeneousMultilayerBuilder.h"
-#include "Core/Multilayer/Layer.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
HomogeneousMultilayerBuilder::HomogeneousMultilayerBuilder()
diff --git a/Core/StandardSamples/LatticeBuilder.cpp b/Core/StandardSamples/LatticeBuilder.cpp
index beb2ac9bf99d9a41b26b9f107abea72197f494b6..cddc6871b478227ccd6a157288f4c21b3e556177 100644
--- a/Core/StandardSamples/LatticeBuilder.cpp
+++ b/Core/StandardSamples/LatticeBuilder.cpp
@@ -13,17 +13,17 @@
// ************************************************************************** //
#include "Core/StandardSamples/LatticeBuilder.h"
-#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Aggregate/FTDecayFunctions.h"
-#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/Aggregate/InterferenceFunction1DLattice.h"
-#include "Core/Multilayer/Layer.h"
+#include "Core/Aggregate/ParticleLayout.h"
+#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
Lattice1DBuilder::Lattice1DBuilder()
: m_length(20.0 * Units::nanometer), m_xi(10.0 * Units::deg),
diff --git a/Core/StandardSamples/LayersWithAbsorptionBuilder.cpp b/Core/StandardSamples/LayersWithAbsorptionBuilder.cpp
index 164d8598e7a1e8e436753c4aef1908e2b3ff7ddd..28aaa503c49015c680a3353aebdc2f4cb16849d2 100644
--- a/Core/StandardSamples/LayersWithAbsorptionBuilder.cpp
+++ b/Core/StandardSamples/LayersWithAbsorptionBuilder.cpp
@@ -13,18 +13,18 @@
// ************************************************************************** //
#include "Core/StandardSamples/LayersWithAbsorptionBuilder.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Basics/Exceptions.h"
-#include "Core/includeIncludes/FormFactors.h"
+#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerInterface.h"
#include "Core/Multilayer/LayerRoughness.h"
-#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/RealParameter.h"
-#include "Core/StandardSamples/SampleComponents.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
+#include "Core/StandardSamples/SampleComponents.h"
+#include "Core/includeIncludes/FormFactors.h"
LayersWithAbsorptionBuilder::LayersWithAbsorptionBuilder()
: m_ff(new FormFactorFullSphere(5.0 * Units::nanometer))
diff --git a/Core/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp b/Core/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp
index 9847c75cc1be56aedbb2dbc327039cd28e851e86..af935a201bd61324ec4addfcad13f86784ee0a4b 100644
--- a/Core/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp
+++ b/Core/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "Core/StandardSamples/LayersWithAbsorptionBySLDBuilder.h"
-#include "Core/includeIncludes/FormFactors.h"
-#include "Core/Multilayer/Layer.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
+#include "Core/includeIncludes/FormFactors.h"
const double middle_layer_thickness(60.0 * Units::nanometer);
diff --git a/Core/StandardSamples/MagneticLayersBuilder.cpp b/Core/StandardSamples/MagneticLayersBuilder.cpp
index c127545685dad7e929ce072b32f1104ca938932e..2b6969ad07bfd821bab1249d3081a7b874a9ec8c 100644
--- a/Core/StandardSamples/MagneticLayersBuilder.cpp
+++ b/Core/StandardSamples/MagneticLayersBuilder.cpp
@@ -13,15 +13,15 @@
// ************************************************************************** //
#include "Core/StandardSamples/MagneticLayersBuilder.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/HardParticle/FormFactorFullSphere.h"
-#include "Core/Multilayer/Layer.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
MagneticSubstrateZeroFieldBuilder::MagneticSubstrateZeroFieldBuilder()
: m_sphere_radius(5 * Units::nanometer)
diff --git a/Core/StandardSamples/MagneticParticlesBuilder.cpp b/Core/StandardSamples/MagneticParticlesBuilder.cpp
index 25b227299b982cb4bb92b80a73c3a3781498f700..ae8ab6b9f207fa67bea5f3dd00dfcb393494333f 100644
--- a/Core/StandardSamples/MagneticParticlesBuilder.cpp
+++ b/Core/StandardSamples/MagneticParticlesBuilder.cpp
@@ -13,18 +13,18 @@
// ************************************************************************** //
#include "Core/StandardSamples/MagneticParticlesBuilder.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/HardParticle/FormFactorFullSphere.h"
+#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerInterface.h"
#include "Core/Multilayer/LayerRoughness.h"
-#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
// ----------------------------------------------------------------------------
// Magnetic cylinders and zero magnetic field
diff --git a/Core/StandardSamples/MesoCrystalBuilder.cpp b/Core/StandardSamples/MesoCrystalBuilder.cpp
index ad91a6620fb18005fcf33e7bcd69e161a878f3a0..e9149b7034882e9f30587cecc3f2e66291d73648 100644
--- a/Core/StandardSamples/MesoCrystalBuilder.cpp
+++ b/Core/StandardSamples/MesoCrystalBuilder.cpp
@@ -13,23 +13,23 @@
// ************************************************************************** //
#include "Core/StandardSamples/MesoCrystalBuilder.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Particle/Crystal.h"
+#include "Core/Basics/MathConstants.h"
#include "Core/HardParticle/FormFactorCylinder.h"
-#include "Core/SoftParticle/FormFactorSphereGaussianRadius.h"
#include "Core/Lattice/ISelectionRule.h"
+#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerInterface.h"
#include "Core/Multilayer/LayerRoughness.h"
-#include "Core/Material/MaterialFactoryFuncs.h"
-#include "Core/Basics/MathConstants.h"
-#include "Core/Particle/MesoCrystal.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Particle/ParticleComposition.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Crystal.h"
+#include "Core/Particle/MesoCrystal.h"
+#include "Core/Particle/Particle.h"
+#include "Core/Particle/ParticleComposition.h"
+#include "Core/SoftParticle/FormFactorSphereGaussianRadius.h"
MesoCrystalBuilder::MesoCrystalBuilder() {}
diff --git a/Core/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp b/Core/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp
index bdb4b525bbe5c868df8f930411f792a051f85a8a..7dbb7efe1130e813767d3585ef96f096d1ebd55e 100644
--- a/Core/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp
+++ b/Core/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp
@@ -14,9 +14,9 @@
#include "Core/StandardSamples/MultiLayerWithNCRoughnessBuilder.h"
#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerRoughness.h"
-#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
diff --git a/Core/StandardSamples/MultiLayerWithRoughnessBuilder.cpp b/Core/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
index 1de2651489e62cd0324cf4b6435d38d392b22ba7..d4a81a630dc318d21d8d0ded9adf4bbe1b189352 100644
--- a/Core/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
+++ b/Core/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
@@ -14,9 +14,9 @@
#include "Core/StandardSamples/MultiLayerWithRoughnessBuilder.h"
#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerRoughness.h"
-#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
diff --git a/Core/StandardSamples/MultipleLayoutBuilder.cpp b/Core/StandardSamples/MultipleLayoutBuilder.cpp
index 729a619d4a3c1afa0f68e6d4e58f6ffa715b9d84..a0776c0305ca036e9f8ed4eff2dc6a99e667bfa4 100644
--- a/Core/StandardSamples/MultipleLayoutBuilder.cpp
+++ b/Core/StandardSamples/MultipleLayoutBuilder.cpp
@@ -13,16 +13,16 @@
// ************************************************************************** //
#include "Core/StandardSamples/MultipleLayoutBuilder.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/HardParticle/FormFactorPrism3.h"
-#include "Core/Multilayer/Layer.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
MultipleLayoutBuilder::MultipleLayoutBuilder()
: m_cylinder_height(5 * Units::nanometer), m_cylinder_radius(5 * Units::nanometer),
diff --git a/Core/StandardSamples/ParaCrystalBuilder.cpp b/Core/StandardSamples/ParaCrystalBuilder.cpp
index 089ac3865cc88a02e853cee0d2214be422ebb067..bbf5224e9ac78fc6c010032e6fe00efaf18164a6 100644
--- a/Core/StandardSamples/ParaCrystalBuilder.cpp
+++ b/Core/StandardSamples/ParaCrystalBuilder.cpp
@@ -13,18 +13,18 @@
// ************************************************************************** //
#include "Core/StandardSamples/ParaCrystalBuilder.h"
-#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/Aggregate/InterferenceFunction2DParaCrystal.h"
#include "Core/Aggregate/InterferenceFunctionRadialParaCrystal.h"
-#include "Core/Multilayer/Layer.h"
+#include "Core/Aggregate/ParticleLayout.h"
+#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/RealParameter.h"
-#include "Core/StandardSamples/SampleComponents.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
+#include "Core/StandardSamples/SampleComponents.h"
RadialParaCrystalBuilder::RadialParaCrystalBuilder()
: m_corr_peak_distance(20.0 * Units::nanometer), m_corr_width(7 * Units::nanometer),
diff --git a/Core/StandardSamples/ParticleCompositionBuilder.cpp b/Core/StandardSamples/ParticleCompositionBuilder.cpp
index 7978666756a02bb10e4e42ad3a83489a3797a5b1..92838ac313ba242a6c46e10ceeef13d6d71d6371 100644
--- a/Core/StandardSamples/ParticleCompositionBuilder.cpp
+++ b/Core/StandardSamples/ParticleCompositionBuilder.cpp
@@ -13,16 +13,16 @@
// ************************************************************************** //
#include "Core/StandardSamples/ParticleCompositionBuilder.h"
-#include "Core/HardParticle/FormFactorFullSphere.h"
#include "Core/Aggregate/InterferenceFunction2DLattice.h"
-#include "Core/Multilayer/Layer.h"
+#include "Core/Aggregate/ParticleLayout.h"
+#include "Core/HardParticle/FormFactorFullSphere.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Particle/ParticleComposition.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
+#include "Core/Particle/ParticleComposition.h"
// --- ParticleCompositionBuilder ---
diff --git a/Core/StandardSamples/ParticleDistributionsBuilder.cpp b/Core/StandardSamples/ParticleDistributionsBuilder.cpp
index 156dc7587082b45e44c1d217d2bbd74fa662aa5d..11876e57bbb72143e2e32f6f80e42edec82e9e49 100644
--- a/Core/StandardSamples/ParticleDistributionsBuilder.cpp
+++ b/Core/StandardSamples/ParticleDistributionsBuilder.cpp
@@ -13,23 +13,23 @@
// ************************************************************************** //
#include "Core/StandardSamples/ParticleDistributionsBuilder.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Parametrization/Distributions.h"
#include "Core/HardParticle/FormFactorBox.h"
#include "Core/HardParticle/FormFactorCone.h"
#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/HardParticle/FormFactorFullSphere.h"
#include "Core/HardParticle/FormFactorPyramid.h"
-#include "Core/Multilayer/Layer.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Parametrization/Distributions.h"
#include "Core/Parametrization/ParameterPattern.h"
#include "Core/Parametrization/ParameterSample.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Particle/ParticleDistribution.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
+#include "Core/Particle/ParticleDistribution.h"
CylindersWithSizeDistributionBuilder::CylindersWithSizeDistributionBuilder()
: m_height(5 * Units::nanometer), m_radius(5 * Units::nanometer)
diff --git a/Core/StandardSamples/ParticleInTheAirBuilder.cpp b/Core/StandardSamples/ParticleInTheAirBuilder.cpp
index c3515a1337ba60d31a4d02c1327bcc6474aecb74..b7a9f8470a3df85aa218fe6de9a9c072430e373f 100644
--- a/Core/StandardSamples/ParticleInTheAirBuilder.cpp
+++ b/Core/StandardSamples/ParticleInTheAirBuilder.cpp
@@ -13,16 +13,16 @@
// ************************************************************************** //
#include "Core/StandardSamples/ParticleInTheAirBuilder.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Basics/Exceptions.h"
-#include "Core/includeIncludes/FormFactors.h"
-#include "Core/Multilayer/Layer.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/RealParameter.h"
-#include "Core/StandardSamples/SampleComponents.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
+#include "Core/StandardSamples/SampleComponents.h"
+#include "Core/includeIncludes/FormFactors.h"
ParticleInTheAirBuilder::ParticleInTheAirBuilder()
: m_ff(new FormFactorFullSphere(5.0 * Units::nanometer))
diff --git a/Core/StandardSamples/PercusYevickBuilder.cpp b/Core/StandardSamples/PercusYevickBuilder.cpp
index fdace3bb79416dd900128e6726ee516f5dd80987..ca15f80b01df6767e9ae37a63afa2068e5487c42 100644
--- a/Core/StandardSamples/PercusYevickBuilder.cpp
+++ b/Core/StandardSamples/PercusYevickBuilder.cpp
@@ -13,14 +13,14 @@
// ************************************************************************** //
#include "Core/StandardSamples/PercusYevickBuilder.h"
-#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/Aggregate/InterferenceFunctionHardDisk.h"
-#include "Core/Multilayer/Layer.h"
+#include "Core/Aggregate/ParticleLayout.h"
+#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
HardDiskBuilder::HardDiskBuilder()
: m_cylinder_height(5 * Units::nanometer), m_cylinder_radius(5 * Units::nanometer),
diff --git a/Core/StandardSamples/PlainMultiLayerBySLDBuilder.cpp b/Core/StandardSamples/PlainMultiLayerBySLDBuilder.cpp
index 95e0a38b45a15afa9831c41a9d931a97a99e8587..9bc28d6bea8e8f307e5f01940c8422fbdf9ad39f 100644
--- a/Core/StandardSamples/PlainMultiLayerBySLDBuilder.cpp
+++ b/Core/StandardSamples/PlainMultiLayerBySLDBuilder.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Core/StandardSamples/PlainMultiLayerBySLDBuilder.h"
-#include "Core/Multilayer/Layer.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Parametrization/Units.h"
diff --git a/Core/StandardSamples/ResonatorBuilder.cpp b/Core/StandardSamples/ResonatorBuilder.cpp
index 5c7b1124715cd5c6afae01fe4d9a88b4fa12a9a6..60fcbc87e39291179eb876d02356c01b81908094 100644
--- a/Core/StandardSamples/ResonatorBuilder.cpp
+++ b/Core/StandardSamples/ResonatorBuilder.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/StandardSamples/ResonatorBuilder.h"
+#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerRoughness.h"
-#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Parametrization/Units.h"
#include <memory>
diff --git a/Core/StandardSamples/RipplesBuilder.cpp b/Core/StandardSamples/RipplesBuilder.cpp
index 3707d8a8233f8220720ca6ad79f882d5094684bf..e1be177cff585817ebfe5a5028ca383c2d837910 100644
--- a/Core/StandardSamples/RipplesBuilder.cpp
+++ b/Core/StandardSamples/RipplesBuilder.cpp
@@ -13,17 +13,17 @@
// ************************************************************************** //
#include "Core/StandardSamples/RipplesBuilder.h"
+#include "Core/Aggregate/InterferenceFunctionRadialParaCrystal.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/HardParticle/FormFactorRipple1.h"
#include "Core/HardParticle/FormFactorRipple2.h"
-#include "Core/Aggregate/InterferenceFunctionRadialParaCrystal.h"
-#include "Core/Multilayer/Layer.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
CosineRippleBuilder::CosineRippleBuilder() {}
diff --git a/Core/StandardSamples/RotatedPyramidsBuilder.cpp b/Core/StandardSamples/RotatedPyramidsBuilder.cpp
index ceaf6e931d0458339d18ac71a765d53da9d37a89..d0e38a7a90803b414ebc5e578aaca67b3e8cdc94 100644
--- a/Core/StandardSamples/RotatedPyramidsBuilder.cpp
+++ b/Core/StandardSamples/RotatedPyramidsBuilder.cpp
@@ -13,15 +13,15 @@
// ************************************************************************** //
#include "Core/StandardSamples/RotatedPyramidsBuilder.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/HardParticle/FormFactorPyramid.h"
-#include "Core/Multilayer/Layer.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
RotatedPyramidsBuilder::RotatedPyramidsBuilder()
: m_length(10 * Units::nanometer), m_height(5 * Units::nanometer),
diff --git a/Core/StandardSamples/SampleBuilderFactory.cpp b/Core/StandardSamples/SampleBuilderFactory.cpp
index 9820d94db5528ec48cc252bf60f814ea095fbb1c..78adea7ba596fb1687aa393f2906791d05d52937 100644
--- a/Core/StandardSamples/SampleBuilderFactory.cpp
+++ b/Core/StandardSamples/SampleBuilderFactory.cpp
@@ -13,6 +13,7 @@
// ************************************************************************** //
#include "Core/StandardSamples/SampleBuilderFactory.h"
+#include "Core/Parametrization/RealParameter.h"
#include "Core/StandardSamples/BoxCompositionBuilder.h"
#include "Core/StandardSamples/BoxesSquareLatticeBuilder.h"
#include "Core/StandardSamples/CoreShellParticleBuilder.h"
@@ -35,7 +36,6 @@
#include "Core/StandardSamples/ParticleInTheAirBuilder.h"
#include "Core/StandardSamples/PercusYevickBuilder.h"
#include "Core/StandardSamples/PlainMultiLayerBySLDBuilder.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/StandardSamples/ResonatorBuilder.h"
#include "Core/StandardSamples/RipplesBuilder.h"
#include "Core/StandardSamples/RotatedPyramidsBuilder.h"
diff --git a/Core/StandardSamples/SampleBuilderFactory.h b/Core/StandardSamples/SampleBuilderFactory.h
index 9c2aa505d35f4c3f4b1dfae34af16dac7c0a825a..06731641b5671fc572b12a7dcb299f0f26f80666 100644
--- a/Core/StandardSamples/SampleBuilderFactory.h
+++ b/Core/StandardSamples/SampleBuilderFactory.h
@@ -15,8 +15,8 @@
#ifndef SAMPLEBUILDERFACTORY_H
#define SAMPLEBUILDERFACTORY_H
-#include "Core/StandardSamples/IFactory.h"
#include "Core/Multilayer/IMultiLayerBuilder.h"
+#include "Core/StandardSamples/IFactory.h"
class MultiLayer;
diff --git a/Core/StandardSamples/SampleComponents.cpp b/Core/StandardSamples/SampleComponents.cpp
index f87273f8418fc9dd0b123f00315c3977b71a2b4e..c9d5a7fd6c717937250f80939e1ccba04786c9c8 100644
--- a/Core/StandardSamples/SampleComponents.cpp
+++ b/Core/StandardSamples/SampleComponents.cpp
@@ -14,8 +14,8 @@
#include "Core/StandardSamples/SampleComponents.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/includeIncludes/HardParticles.h"
#include "Core/Parametrization/Units.h"
+#include "Core/includeIncludes/HardParticles.h"
// ************************************************************************** //
FTDistribution2DComponents::FTDistribution2DComponents()
@@ -37,8 +37,8 @@ FormFactorComponents::FormFactorComponents()
add(BornAgain::FFBoxType, new FormFactorBox(10.0, 20.0, 5.0));
-// TODO: activate this when supported by GUI
-// add("CantellatedCube", new FormFactorCantellatedCube(15.0, 6.0));
+ // TODO: activate this when supported by GUI
+ // add("CantellatedCube", new FormFactorCantellatedCube(15.0, 6.0));
add(BornAgain::FFConeType, new FormFactorCone(5.0, 6.0, Units::deg2rad(54.73)));
diff --git a/Core/StandardSamples/SimulationFactory.cpp b/Core/StandardSamples/SimulationFactory.cpp
index 37955bb21e817c87e7ecf69cd2a485fae1ecede5..9d9ae7b46ee9a09289ded34a6593d23314621314 100644
--- a/Core/StandardSamples/SimulationFactory.cpp
+++ b/Core/StandardSamples/SimulationFactory.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "Core/StandardSamples/SimulationFactory.h"
+#include "Core/Parametrization/RealParameter.h"
#include "Core/Simulation/DepthProbeSimulation.h"
#include "Core/Simulation/GISASSimulation.h"
#include "Core/Simulation/OffSpecSimulation.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Simulation/SpecularSimulation.h"
#include "Core/StandardSamples/StandardSimulations.h"
diff --git a/Core/StandardSamples/SizeDistributionModelsBuilder.cpp b/Core/StandardSamples/SizeDistributionModelsBuilder.cpp
index 495cb2c857ee9c0361cecd87d2a07de5fe19cedc..9acddfbce4eb18671664c5a0c246ef741cae188e 100644
--- a/Core/StandardSamples/SizeDistributionModelsBuilder.cpp
+++ b/Core/StandardSamples/SizeDistributionModelsBuilder.cpp
@@ -13,19 +13,19 @@
// ************************************************************************** //
#include "Core/StandardSamples/SizeDistributionModelsBuilder.h"
+#include "Core/Aggregate/InterferenceFunctionRadialParaCrystal.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Parametrization/Distributions.h"
#include "Core/HardParticle/FormFactorCylinder.h"
-#include "Core/Aggregate/InterferenceFunctionRadialParaCrystal.h"
-#include "Core/Multilayer/Layer.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Parametrization/Distributions.h"
#include "Core/Parametrization/ParameterPattern.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Particle/ParticleDistribution.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
+#include "Core/Particle/ParticleDistribution.h"
MultiLayer* SizeDistributionDAModelBuilder::buildSample() const
{
diff --git a/Core/StandardSamples/SlicedCylindersBuilder.cpp b/Core/StandardSamples/SlicedCylindersBuilder.cpp
index f7e38785d028af22ec9647705512deb12a2509d2..261fa318db55a46038fa2a11824bd4162fe039da 100644
--- a/Core/StandardSamples/SlicedCylindersBuilder.cpp
+++ b/Core/StandardSamples/SlicedCylindersBuilder.cpp
@@ -13,14 +13,14 @@
// ************************************************************************** //
#include "Core/StandardSamples/SlicedCylindersBuilder.h"
+#include "Core/Aggregate/ParticleLayout.h"
+#include "Core/Basics/MathConstants.h"
#include "Core/HardParticle/FormFactorCylinder.h"
-#include "Core/Multilayer/Layer.h"
#include "Core/Material/MaterialFactoryFuncs.h"
-#include "Core/Basics/MathConstants.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
namespace
{
diff --git a/Core/StandardSamples/SlicedParticleBuilder.cpp b/Core/StandardSamples/SlicedParticleBuilder.cpp
index 9e5a53bd1a43d37366a9fae3cd28d65f21b652a3..ceb70bbe647b1bcad4c1d6d9fb7ae375cfdae123 100644
--- a/Core/StandardSamples/SlicedParticleBuilder.cpp
+++ b/Core/StandardSamples/SlicedParticleBuilder.cpp
@@ -13,16 +13,16 @@
// ************************************************************************** //
#include "Core/StandardSamples/SlicedParticleBuilder.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/HardParticle/FormFactorFullSphere.h"
#include "Core/HardParticle/FormFactorTruncatedSphere.h"
-#include "Core/Multilayer/Layer.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Parametrization/Units.h"
#include "Core/Particle/Particle.h"
#include "Core/Particle/ParticleComposition.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Vector/Transform3D.h"
-#include "Core/Parametrization/Units.h"
MultiLayer* SlicedCompositionBuilder::buildSample() const
{
diff --git a/Core/StandardSamples/StandardSimulations.cpp b/Core/StandardSamples/StandardSimulations.cpp
index c015bb8f71065b0d2622b98abe1b6b85e12a4b3f..5d606aab8faa8ada402686ef53430405b65f159d 100644
--- a/Core/StandardSamples/StandardSimulations.cpp
+++ b/Core/StandardSamples/StandardSimulations.cpp
@@ -13,31 +13,31 @@
// ************************************************************************** //
#include "Core/StandardSamples/StandardSimulations.h"
-#include "Core/Instrument/AngularSpecScan.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Computation/ConstantBackground.h"
-#include "Core/Simulation/DepthProbeSimulation.h"
-#include "Core/Parametrization/Distributions.h"
-#include "Core/Mask/Ellipse.h"
-#include "Core/Binning/FixedBinAxis.h"
#include "Core/Beam/FootprintFactorGaussian.h"
#include "Core/Beam/FootprintFactorSquare.h"
-#include "Core/Simulation/GISASSimulation.h"
+#include "Core/Binning/FixedBinAxis.h"
+#include "Core/Computation/ConstantBackground.h"
+#include "Core/Instrument/AngularSpecScan.h"
#include "Core/Instrument/IsGISAXSDetector.h"
-#include "Core/Mask/Line.h"
-#include "Core/Simulation/OffSpecSimulation.h"
-#include "Core/Parametrization/ParameterPattern.h"
-#include "Core/Mask/Polygon.h"
#include "Core/Instrument/QSpecScan.h"
-#include "Core/Parametrization/RangedDistributions.h"
-#include "Core/Parametrization/RealParameter.h"
-#include "Core/Mask/Rectangle.h"
#include "Core/Instrument/RectangularDetector.h"
#include "Core/Instrument/ResolutionFunction2DGaussian.h"
-#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "Core/Instrument/ScanResolution.h"
-#include "Core/Simulation/SpecularSimulation.h"
+#include "Core/Mask/Ellipse.h"
+#include "Core/Mask/Line.h"
+#include "Core/Mask/Polygon.h"
+#include "Core/Mask/Rectangle.h"
+#include "Core/Parametrization/Distributions.h"
+#include "Core/Parametrization/ParameterPattern.h"
+#include "Core/Parametrization/RangedDistributions.h"
+#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Simulation/DepthProbeSimulation.h"
+#include "Core/Simulation/GISASSimulation.h"
+#include "Core/Simulation/OffSpecSimulation.h"
+#include "Core/Simulation/SpecularSimulation.h"
+#include "Core/StandardSamples/SampleBuilderFactory.h"
#include <memory>
namespace
diff --git a/Core/StandardSamples/ThickAbsorptiveSampleBuilder.cpp b/Core/StandardSamples/ThickAbsorptiveSampleBuilder.cpp
index 6ee5fbca1361ff9d6bc21707ded87ff9e3944396..4c0dd7744923da5d8a9c37739015c4bbba314598 100644
--- a/Core/StandardSamples/ThickAbsorptiveSampleBuilder.cpp
+++ b/Core/StandardSamples/ThickAbsorptiveSampleBuilder.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/StandardSamples/ThickAbsorptiveSampleBuilder.h"
+#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerRoughness.h"
-#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Parametrization/Units.h"
diff --git a/Core/StandardSamples/TransformationsBuilder.cpp b/Core/StandardSamples/TransformationsBuilder.cpp
index 90654927d71b42b3d8155cd19311b2294adbcd97..afc05612aa93c1fe98ecb3a75c3d7362ad53cd7b 100644
--- a/Core/StandardSamples/TransformationsBuilder.cpp
+++ b/Core/StandardSamples/TransformationsBuilder.cpp
@@ -13,14 +13,14 @@
// ************************************************************************** //
#include "Core/StandardSamples/TransformationsBuilder.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/HardParticle/FormFactorBox.h"
-#include "Core/Multilayer/Layer.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
MultiLayer* TransformBoxBuilder::buildSample() const
{
diff --git a/Core/StandardSamples/TwoDimLatticeBuilder.cpp b/Core/StandardSamples/TwoDimLatticeBuilder.cpp
index 61d68c7268b0746c7d59b9fafcb2f7c7364ea83f..2316d9b13593f3b6d1247a332dce53369af10f5a 100644
--- a/Core/StandardSamples/TwoDimLatticeBuilder.cpp
+++ b/Core/StandardSamples/TwoDimLatticeBuilder.cpp
@@ -13,18 +13,18 @@
// ************************************************************************** //
#include "Core/StandardSamples/TwoDimLatticeBuilder.h"
-#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/Aggregate/InterferenceFunction2DLattice.h"
#include "Core/Aggregate/InterferenceFunction2DSuperLattice.h"
#include "Core/Aggregate/InterferenceFunctionFinite2DLattice.h"
-#include "Core/Multilayer/Layer.h"
+#include "Core/Aggregate/ParticleLayout.h"
+#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Particle/ParticleComposition.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
+#include "Core/Particle/ParticleComposition.h"
MultiLayer* Basic2DLatticeBuilder::buildSample() const
{
diff --git a/Core/StandardSamples/TwoLayerRoughnessBuilder.cpp b/Core/StandardSamples/TwoLayerRoughnessBuilder.cpp
index 13a9516cb1268c64394875c7eea08adc300e42e2..cca370a18bccf9563fba78dace843bc028d99e61 100644
--- a/Core/StandardSamples/TwoLayerRoughnessBuilder.cpp
+++ b/Core/StandardSamples/TwoLayerRoughnessBuilder.cpp
@@ -14,9 +14,9 @@
#include "Core/StandardSamples/TwoLayerRoughnessBuilder.h"
#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerRoughness.h"
-#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
diff --git a/Core/Tools/Integrator.h b/Core/Tools/Integrator.h
index 5807388f874dec832e9f03801db55edc78942f56..1d9393a53d4e581f65607436d20a8122f1a103b5 100644
--- a/Core/Tools/Integrator.h
+++ b/Core/Tools/Integrator.h
@@ -15,8 +15,8 @@
#ifndef INTEGRATOR_H
#define INTEGRATOR_H
-#include "Wrap/WinDllMacros.h"
#include "Core/Basics/Complex.h"
+#include "Wrap/WinDllMacros.h"
#include <functional>
#include <gsl/gsl_integration.h>
diff --git a/Core/Tools/PyEmbeddedUtils.cpp b/Core/Tools/PyEmbeddedUtils.cpp
index e66c752e149bcac381fcb5144335741d212400e1..80867a0a439134407d159945356a40218063db61 100644
--- a/Core/Tools/PyEmbeddedUtils.cpp
+++ b/Core/Tools/PyEmbeddedUtils.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Tools/PyEmbeddedUtils.h"
+#include "Core/Export/PythonFormatting.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Tools/PythonCore.h"
-#include "Core/Export/PythonFormatting.h"
#include "Core/Tools/SysUtils.h"
#include <iostream>
#include <stdexcept>
diff --git a/Examples/cpp/CylindersAndPrisms/CylindersAndPrisms.cpp b/Examples/cpp/CylindersAndPrisms/CylindersAndPrisms.cpp
index abaabb255169a14ca56e755a5b4a9194142c96da..e87ed3d5f41afff5a0518cab7e307746e592873d 100644
--- a/Examples/cpp/CylindersAndPrisms/CylindersAndPrisms.cpp
+++ b/Examples/cpp/CylindersAndPrisms/CylindersAndPrisms.cpp
@@ -13,18 +13,18 @@
//
// ********************************************************************************************** //
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/HardParticle/FormFactorPrism3.h"
-#include "Core/Simulation/GISASSimulation.h"
-#include "Core/Instrument/Histogram2D.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
-#include "Core/Multilayer/Layer.h"
+#include "Core/Instrument/Histogram2D.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Parametrization/Units.h"
#include "Core/Particle/Particle.h"
-#include "Core/Aggregate/ParticleLayout.h"
+#include "Core/Simulation/GISASSimulation.h"
#include "Core/Simulation/Simulation.h"
-#include "Core/Parametrization/Units.h"
int main()
{
@@ -39,11 +39,11 @@ int main()
Material particle_material = HomogeneousMaterial("Particle", 6e-4, 2e-8);
Particle cylinder(particle_material,
- FormFactorCylinder(5*Units::nanometer, 5*Units::nanometer));
+ FormFactorCylinder(5 * Units::nanometer, 5 * Units::nanometer));
particle_layout.addParticle(cylinder, 0.5);
Particle prism(particle_material,
- FormFactorPrism3(10*Units::nanometer, 5*Units::nanometer));
+ FormFactorPrism3(10 * Units::nanometer, 5 * Units::nanometer));
particle_layout.addParticle(prism, 0.5);
air_layer.addLayout(particle_layout);
@@ -54,9 +54,9 @@ int main()
// Define the simulation
GISASSimulation simulation;
- simulation.setDetectorParameters(400, -1.0*Units::degree, 1.0*Units::degree,
- 400, 0.0*Units::degree, 2.0*Units::degree);
- simulation.setBeamParameters(1.0*Units::angstrom, 0.2*Units::degree, 0.0*Units::degree);
+ simulation.setDetectorParameters(400, -1.0 * Units::degree, 1.0 * Units::degree, 400,
+ 0.0 * Units::degree, 2.0 * Units::degree);
+ simulation.setBeamParameters(1.0 * Units::angstrom, 0.2 * Units::degree, 0.0 * Units::degree);
simulation.setSample(sample);
// Run the simulation, and store the result
diff --git a/Fit/Minimizer/MinimizerFactory.cpp b/Fit/Minimizer/MinimizerFactory.cpp
index 16a0d2a5767f62be77e98f3c0898cf4130f6af09..8071a154fbab334a071d0f3b89dfcf50cb1615b3 100644
--- a/Fit/Minimizer/MinimizerFactory.cpp
+++ b/Fit/Minimizer/MinimizerFactory.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "Fit/Minimizer/MinimizerFactory.h"
+#include "Fit/Minimizer/MinimizerCatalogue.h"
+#include "Fit/Minimizer/TestMinimizer.h"
#include "Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h"
#include "Fit/RootAdapter/GSLMultiMinimizer.h"
#include "Fit/RootAdapter/GeneticMinimizer.h"
-#include "Fit/Minimizer/MinimizerCatalogue.h"
#include "Fit/RootAdapter/Minuit2Minimizer.h"
#include "Fit/RootAdapter/SimAnMinimizer.h"
-#include "Fit/Minimizer/TestMinimizer.h"
#include <boost/format.hpp>
#include <iomanip>
#include <iostream>
diff --git a/Fit/Minimizer/TestMinimizer.cpp b/Fit/Minimizer/TestMinimizer.cpp
index 43b629268a42d67f31510b5f438610763acd1e97..2766e10a9c8e8971617117f33052361044e42ba8 100644
--- a/Fit/Minimizer/TestMinimizer.cpp
+++ b/Fit/Minimizer/TestMinimizer.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Fit/Minimizer/TestMinimizer.h"
-#include "Fit/Minimizer/MinimizerConstants.h"
#include "Fit/Kernel/Parameters.h"
+#include "Fit/Minimizer/MinimizerConstants.h"
#include <sstream>
using namespace Fit;
diff --git a/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.cpp b/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.cpp
index ba831932e253a9c5a9df1a841472e2b7a6117dc4..439fad4ce21a75ff9c712fd75e1a988698bf4101 100644
--- a/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.cpp
+++ b/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h"
-#include "Fit/Tools/AttLimits.h"
#include "Fit/RootAdapter/GSLMultiMinimizer.h"
+#include "Fit/Tools/AttLimits.h"
#include "Fit/Tools/MinimizerUtils.h"
#include "Fit/Tools/StringUtils.h"
#include <stdexcept>
diff --git a/Fit/RootAdapter/GeneticMinimizer.cpp b/Fit/RootAdapter/GeneticMinimizer.cpp
index e668de197ed331c69df386ca093b14d2bbaf1cdf..3fbb3018912cd33fe8c36c2cd01bdec5fcf2a77c 100644
--- a/Fit/RootAdapter/GeneticMinimizer.cpp
+++ b/Fit/RootAdapter/GeneticMinimizer.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Fit/RootAdapter/GeneticMinimizer.h"
-#include "Math/GeneticMinimizer.h"
-#include "Fit/Minimizer/MinimizerConstants.h"
#include "Fit/Kernel/Parameter.h"
+#include "Fit/Minimizer/MinimizerConstants.h"
+#include "Math/GeneticMinimizer.h"
namespace
{
diff --git a/Fit/RootAdapter/MinimizerResultUtils.cpp b/Fit/RootAdapter/MinimizerResultUtils.cpp
index b4f71ce0b889e0610b02d09befdec518197fb2fa..bf89141dc5bcfa7735b6d345b6d0eb1d71aad567 100644
--- a/Fit/RootAdapter/MinimizerResultUtils.cpp
+++ b/Fit/RootAdapter/MinimizerResultUtils.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Fit/RootAdapter/MinimizerResultUtils.h"
-#include "Fit/Tools/MinimizerUtils.h"
#include "Fit/Kernel/Parameters.h"
#include "Fit/RootAdapter/RootMinimizerAdapter.h"
+#include "Fit/Tools/MinimizerUtils.h"
#include <boost/format.hpp>
#include <iomanip>
#include <sstream>
diff --git a/Fit/RootAdapter/Minuit2Minimizer.cpp b/Fit/RootAdapter/Minuit2Minimizer.cpp
index 71fcefdde98c6a370eb4d7f581c4d7105515c838..bf35a125de217a34f97fda3a675752ba8b505b84 100644
--- a/Fit/RootAdapter/Minuit2Minimizer.cpp
+++ b/Fit/RootAdapter/Minuit2Minimizer.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Fit/RootAdapter/Minuit2Minimizer.h"
-#include "Minuit2/Minuit2Minimizer.h"
#include "Fit/Tools/StringUtils.h"
+#include "Minuit2/Minuit2Minimizer.h"
namespace
{
diff --git a/Fit/RootAdapter/RootMinimizerAdapter.cpp b/Fit/RootAdapter/RootMinimizerAdapter.cpp
index 7b5497584e496894afbcf6a93f4463cd8329b07f..51fcbf15eed04e29f94ecaf4b98f960bd089be23 100644
--- a/Fit/RootAdapter/RootMinimizerAdapter.cpp
+++ b/Fit/RootAdapter/RootMinimizerAdapter.cpp
@@ -13,14 +13,14 @@
// ************************************************************************** //
#include "Fit/RootAdapter/RootMinimizerAdapter.h"
-#include "Math/Minimizer.h"
-#include "Fit/RootAdapter/MinimizerResultUtils.h"
-#include "Fit/RootAdapter/ObjectiveFunctionAdapter.h"
#include "Fit/Kernel/Parameter.h"
#include "Fit/Kernel/Parameters.h"
+#include "Fit/RootAdapter/MinimizerResultUtils.h"
+#include "Fit/RootAdapter/ObjectiveFunctionAdapter.h"
#include "Fit/RootAdapter/RootResidualFunction.h"
#include "Fit/RootAdapter/RootScalarFunction.h"
#include "Fit/Tools/StringUtils.h"
+#include "Math/Minimizer.h"
using namespace Fit;
diff --git a/Fit/RootAdapter/SimAnMinimizer.cpp b/Fit/RootAdapter/SimAnMinimizer.cpp
index 408527b5449239e5dba16d7f408938aa49ae8d6e..8f8053500e60165fffe86fc94d5524c9d36c741c 100644
--- a/Fit/RootAdapter/SimAnMinimizer.cpp
+++ b/Fit/RootAdapter/SimAnMinimizer.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Fit/RootAdapter/SimAnMinimizer.h"
-#include "Fit/RootAdapter/GSLMultiMinimizer.h"
#include "Fit/Minimizer/MinimizerConstants.h"
+#include "Fit/RootAdapter/GSLMultiMinimizer.h"
#ifdef _WIN32
#pragma warning(push)
diff --git a/Fit/Tools/WallclockTimer.cpp b/Fit/Tools/WallclockTimer.cpp
index a4cb6fafd32b35e110b7a7b7184acfe8f9d975e8..dddd8dfd0b2793e553a8f74188aedbcd228901df 100644
--- a/Fit/Tools/WallclockTimer.cpp
+++ b/Fit/Tools/WallclockTimer.cpp
@@ -20,11 +20,10 @@ using duration_unit = std::chrono::seconds;
//! Internal state of a WallclockTimer object.
-struct WallclockTimerState
-{
+struct WallclockTimerState {
std::chrono::time_point<clock_used> m_start_time;
std::chrono::time_point<clock_used> m_end_time;
- bool m_is_running {false};
+ bool m_is_running{false};
};
WallclockTimer::WallclockTimer() : m_state(new WallclockTimerState) {}
@@ -47,8 +46,8 @@ double WallclockTimer::runTime() const
duration_unit diff =
m_state->m_is_running
? std::chrono::duration_cast<duration_unit>(clock_used::now() - m_state->m_start_time)
- : std::chrono::duration_cast<duration_unit>(
- m_state->m_end_time - m_state->m_start_time);
+ : std::chrono::duration_cast<duration_unit>(m_state->m_end_time
+ - m_state->m_start_time);
return diff.count();
}
diff --git a/GUI/ba3d/model/model.cpp b/GUI/ba3d/model/model.cpp
index 96c26213a6c4fabf938b9edbfb297c758141197f..40aac8c97ada7cc660f879c55a62428d6144d551 100644
--- a/GUI/ba3d/model/model.cpp
+++ b/GUI/ba3d/model/model.cpp
@@ -57,9 +57,9 @@ Particles::Particle* Model::newParticle(Particles::EShape k, float R)
case EShape::None:
return nullptr;
case EShape::BarGauss:
- return new BarGauss(D, D, 5*D);
+ return new BarGauss(D, D, 5 * D);
case EShape::BarLorentz:
- return new BarLorentz(D, D, 5*D);
+ return new BarLorentz(D, D, 5 * D);
case EShape::Box:
return new Box(D, D, D);
case EShape::FullSphere:
diff --git a/GUI/ba3d/model/model.h b/GUI/ba3d/model/model.h
index a77ff5773931cf63325ac1e769a1e5a9310d1b05..29b7c2fa3884e8612b9d226f3bb6130da631c1b1 100644
--- a/GUI/ba3d/model/model.h
+++ b/GUI/ba3d/model/model.h
@@ -17,8 +17,8 @@
#include "GUI/ba3d/model/object.h"
#include "GUI/ba3d/model/particles.h"
-#include <QVector>
#include "GUI/ba3d/view/camera.h"
+#include <QVector>
namespace RealSpace
{
diff --git a/GUI/coregui/Models/ApplicationModels.cpp b/GUI/coregui/Models/ApplicationModels.cpp
index b3c91478f4dd1a064373d2b08d25df5cdc5c7180..08e7be06765318865aa8d0e845384723cb8a05a8 100644
--- a/GUI/coregui/Models/ApplicationModels.cpp
+++ b/GUI/coregui/Models/ApplicationModels.cpp
@@ -13,26 +13,26 @@
// ************************************************************************** //
#include "GUI/coregui/Models/ApplicationModels.h"
+#include "Core/InputOutput/IntensityDataIOFactory.h"
+#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Scattering/ISample.h"
+#include "Core/Simulation/OffSpecSimulation.h"
+#include "Core/StandardSamples/SampleBuilderFactory.h"
+#include "Core/StandardSamples/StandardSimulations.h"
#include "GUI/coregui/Models/DocumentModel.h"
#include "GUI/coregui/Models/GUIObjectBuilder.h"
-#include "Core/Scattering/ISample.h"
-#include "GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/InstrumentModel.h"
-#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Models/JobModel.h"
#include "GUI/coregui/Models/MaterialModel.h"
#include "GUI/coregui/Models/MaterialPropertyController.h"
-#include "GUI/coregui/utils/MessageService.h"
-#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Simulation/OffSpecSimulation.h"
#include "GUI/coregui/Models/RealDataItem.h"
#include "GUI/coregui/Models/RealDataModel.h"
-#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "GUI/coregui/Models/SampleModel.h"
-#include "Core/StandardSamples/StandardSimulations.h"
+#include "GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h"
+#include "GUI/coregui/utils/MessageService.h"
#include <QtCore/QXmlStreamWriter>
ApplicationModels::ApplicationModels(QObject* parent)
diff --git a/GUI/coregui/Models/BeamDistributionItem.cpp b/GUI/coregui/Models/BeamDistributionItem.cpp
index 9b736fc60a69b41983c1e11949f9d75a25d11ac5..f111ce088f725f24187d6ae6d0f22c68ae68efb8 100644
--- a/GUI/coregui/Models/BeamDistributionItem.cpp
+++ b/GUI/coregui/Models/BeamDistributionItem.cpp
@@ -14,11 +14,11 @@
#include "GUI/coregui/Models/BeamDistributionItem.h"
#include "Core/Parametrization/Distributions.h"
-#include "GUI/coregui/Models/GroupItem.h"
#include "Core/Parametrization/ParameterDistribution.h"
+#include "Core/Parametrization/Units.h"
+#include "GUI/coregui/Models/GroupItem.h"
#include "GUI/coregui/Models/ParameterTranslators.h"
#include "GUI/coregui/Models/RealLimitsItems.h"
-#include "Core/Parametrization/Units.h"
const QString BeamDistributionItem::P_DISTRIBUTION = "Distribution";
diff --git a/GUI/coregui/Models/BeamItems.cpp b/GUI/coregui/Models/BeamItems.cpp
index 0fe65c738c7ba2da4264fbcdd4e4dcde586a0d1a..bf3166d6707842f9fbaef344efbebc3b0d43276e 100644
--- a/GUI/coregui/Models/BeamItems.cpp
+++ b/GUI/coregui/Models/BeamItems.cpp
@@ -13,21 +13,21 @@
// ************************************************************************** //
#include "GUI/coregui/Models/BeamItems.h"
-#include "GUI/coregui/Models/AxesItems.h"
+#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Beam/Beam.h"
+#include "Core/Binning/IAxis.h"
+#include "Core/Parametrization/Units.h"
+#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/BeamAngleItems.h"
#include "GUI/coregui/Models/BeamDistributionItem.h"
#include "GUI/coregui/Models/BeamWavelengthItem.h"
-#include "Core/Basics/BornAgainNamespace.h"
#include "GUI/coregui/Models/FootprintItems.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/GroupItem.h"
-#include "Core/Binning/IAxis.h"
#include "GUI/coregui/Models/ParameterTranslators.h"
#include "GUI/coregui/Models/PointwiseAxisItem.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "GUI/coregui/Models/SpecularBeamInclinationItem.h"
-#include "Core/Parametrization/Units.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <cmath>
using SessionItemUtils::GetVectorItem;
diff --git a/GUI/coregui/Models/ComponentProxyStrategy.cpp b/GUI/coregui/Models/ComponentProxyStrategy.cpp
index 4859a4431c079be5614a91d74fad518eba06efa9..9f541250cbd754576ea5b0dd2bab6e081f1c6aa8 100644
--- a/GUI/coregui/Models/ComponentProxyStrategy.cpp
+++ b/GUI/coregui/Models/ComponentProxyStrategy.cpp
@@ -14,12 +14,12 @@
#include "GUI/coregui/Models/ComponentProxyStrategy.h"
#include "GUI/coregui/Models/ComponentProxyModel.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentUtils.h"
#include "GUI/coregui/Models/GroupItem.h"
#include "GUI/coregui/Models/ModelPath.h"
#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentUtils.h"
void ComponentProxyStrategy::onDataChanged(SessionModel* source, ComponentProxyModel* proxy)
{
diff --git a/GUI/coregui/Models/Data1DViewItem.cpp b/GUI/coregui/Models/Data1DViewItem.cpp
index 900de3bd064d5317cfc0428837e9276729febfa2..bb7e75d4d178cbab0568a0d72cabcb5159e4aad5 100644
--- a/GUI/coregui/Models/Data1DViewItem.cpp
+++ b/GUI/coregui/Models/Data1DViewItem.cpp
@@ -13,15 +13,15 @@
// ************************************************************************** //
#include "GUI/coregui/Models/Data1DViewItem.h"
-#include "GUI/coregui/Models/AxesItems.h"
#include "Core/Basics/BornAgainNamespace.h"
+#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/DataItem.h"
#include "GUI/coregui/Models/DataProperties.h"
#include "GUI/coregui/Models/DataPropertyContainer.h"
#include "GUI/coregui/Models/DataViewUtils.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/JobItem.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
namespace
{
diff --git a/GUI/coregui/Models/DataItem.cpp b/GUI/coregui/Models/DataItem.cpp
index 0ef14c99f0745fce2d6e37916ec95d77e359e835..7639fda0340ee1fe6742b32264e395a6bb8fe4c0 100644
--- a/GUI/coregui/Models/DataItem.cpp
+++ b/GUI/coregui/Models/DataItem.cpp
@@ -14,10 +14,10 @@
#include "GUI/coregui/Models/DataItem.h"
#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/utils/ImportDataInfo.h"
-#include "Core/InputOutput/IntensityDataIOFactory.h"
const QString DataItem::P_FILE_NAME = "FileName";
const QString DataItem::P_AXES_UNITS = "Axes Units";
diff --git a/GUI/coregui/Models/DataItem.h b/GUI/coregui/Models/DataItem.h
index 6affe8b5003895ce09c5d5b758b9c37d94a2ac6b..e0f374e695ff62f3b1eb89c4cb767ac84ff5ad0a 100644
--- a/GUI/coregui/Models/DataItem.h
+++ b/GUI/coregui/Models/DataItem.h
@@ -16,8 +16,8 @@
#define DATAITEM_H
#include "Core/Instrument/OutputData.h"
-#include "GUI/coregui/mainwindow/SaveLoadInterface.h"
#include "GUI/coregui/Models/SessionItem.h"
+#include "GUI/coregui/mainwindow/SaveLoadInterface.h"
#include <QDateTime>
#include <mutex>
diff --git a/GUI/coregui/Models/DataItemUtils.cpp b/GUI/coregui/Models/DataItemUtils.cpp
index d53adab71c80b480b38ca5ce5eadb5ac845448f6..a0be9c955c3532009a556e8801a9bd4a6a9ff3f8 100644
--- a/GUI/coregui/Models/DataItemUtils.cpp
+++ b/GUI/coregui/Models/DataItemUtils.cpp
@@ -13,11 +13,11 @@
// ************************************************************************** //
#include "GUI/coregui/Models/DataItemUtils.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Models/RealDataItem.h"
#include "GUI/coregui/Models/SpecularDataItem.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
namespace
{
diff --git a/GUI/coregui/Models/DataProperties.cpp b/GUI/coregui/Models/DataProperties.cpp
index 4c49fa0c18f7eca1f7900ee42f643db057a1336f..9000cef6fd7465ac57f6061a3beb47f1aa387428 100644
--- a/GUI/coregui/Models/DataProperties.cpp
+++ b/GUI/coregui/Models/DataProperties.cpp
@@ -15,9 +15,9 @@
#include "GUI/coregui/Models/DataProperties.h"
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/DataItem.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/ModelPath.h"
#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
namespace
{
diff --git a/GUI/coregui/Models/DataViewUtils.cpp b/GUI/coregui/Models/DataViewUtils.cpp
index 65ca84877e66deee624c0344a704b06a12b38384..b8e2de3e7c0d8eae1327c6187b03061511571287 100644
--- a/GUI/coregui/Models/DataViewUtils.cpp
+++ b/GUI/coregui/Models/DataViewUtils.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "GUI/coregui/Models/DataViewUtils.h"
+#include "Core/Instrument/UnitConverterUtils.h"
#include "GUI/coregui/Models/Data1DViewItem.h"
#include "GUI/coregui/Models/DataItem.h"
#include "GUI/coregui/Models/DataPropertyContainer.h"
#include "GUI/coregui/Models/DomainObjectBuilder.h"
#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Models/JobItemUtils.h"
-#include "Core/Instrument/UnitConverterUtils.h"
namespace
{
diff --git a/GUI/coregui/Models/DepthProbeInstrumentItem.cpp b/GUI/coregui/Models/DepthProbeInstrumentItem.cpp
index 159c00df20b09e2662e8961fa475cdd8c69d5623..2ce9bb315b68ea8135924b1e6c5e331bdbaaec19 100644
--- a/GUI/coregui/Models/DepthProbeInstrumentItem.cpp
+++ b/GUI/coregui/Models/DepthProbeInstrumentItem.cpp
@@ -13,14 +13,14 @@
// ************************************************************************** //
#include "GUI/coregui/Models/DepthProbeInstrumentItem.h"
+#include "Core/Instrument/SimpleUnitConverters.h"
+#include "Core/Parametrization/Units.h"
+#include "Core/Simulation/DepthProbeSimulation.h"
#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/BeamDistributionItem.h"
#include "GUI/coregui/Models/BeamWavelengthItem.h"
-#include "Core/Simulation/DepthProbeSimulation.h"
-#include "Core/Instrument/SimpleUnitConverters.h"
#include "GUI/coregui/Models/SpecularBeamInclinationItem.h"
#include "GUI/coregui/Models/TransformToDomain.h"
-#include "Core/Parametrization/Units.h"
const QString DepthProbeInstrumentItem::P_BEAM = "Beam";
const QString DepthProbeInstrumentItem::P_ZAXIS = "Z axis";
diff --git a/GUI/coregui/Models/DetectorItems.cpp b/GUI/coregui/Models/DetectorItems.cpp
index f2b5f0284f5ff5de358768958d237beeef9e6f5c..6fbba1a95688b7f1440bd6c44ccad024dd60efdc 100644
--- a/GUI/coregui/Models/DetectorItems.cpp
+++ b/GUI/coregui/Models/DetectorItems.cpp
@@ -14,9 +14,9 @@
#include "GUI/coregui/Models/DetectorItems.h"
#include "Core/Instrument/IDetector2D.h"
+#include "Core/Instrument/ResolutionFunction2DGaussian.h"
#include "GUI/coregui/Models/MaskItems.h"
#include "GUI/coregui/Models/ParameterTranslators.h"
-#include "Core/Instrument/ResolutionFunction2DGaussian.h"
#include "GUI/coregui/Models/ResolutionFunctionItems.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "GUI/coregui/Models/SessionModel.h"
diff --git a/GUI/coregui/Models/DomainObjectBuilder.cpp b/GUI/coregui/Models/DomainObjectBuilder.cpp
index 1b715d712c56381ba82331721f87b37c931bb892..d832ce4f59a2c5b370672f875dffb28a0fec5426 100644
--- a/GUI/coregui/Models/DomainObjectBuilder.cpp
+++ b/GUI/coregui/Models/DomainObjectBuilder.cpp
@@ -13,23 +13,23 @@
// ************************************************************************** //
#include "GUI/coregui/Models/DomainObjectBuilder.h"
+#include "Core/Instrument/IDetector2D.h"
+#include "Core/Instrument/SimpleUnitConverters.h"
+#include "Core/Instrument/UnitConverter1D.h"
+#include "Core/Instrument/UnitConverterUtils.h"
+#include "Core/Parametrization/Units.h"
#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/BeamItems.h"
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/DepthProbeInstrumentItem.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "Core/Instrument/IDetector2D.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/InterferenceFunctionItems.h"
#include "GUI/coregui/Models/LayerItem.h"
#include "GUI/coregui/Models/ParticleDistributionItem.h"
#include "GUI/coregui/Models/ParticleLayoutItem.h"
-#include "Core/Instrument/SimpleUnitConverters.h"
#include "GUI/coregui/Models/SpecularBeamInclinationItem.h"
#include "GUI/coregui/Models/TransformToDomain.h"
-#include "Core/Instrument/UnitConverter1D.h"
-#include "Core/Instrument/UnitConverterUtils.h"
-#include "Core/Parametrization/Units.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
std::unique_ptr<MultiLayer> DomainObjectBuilder::buildMultiLayer(const SessionItem& multilayer_item)
{
diff --git a/GUI/coregui/Models/DomainSimulationBuilder.cpp b/GUI/coregui/Models/DomainSimulationBuilder.cpp
index 14600caf446bf0419a174580ca6c5a7158943c26..f378dea7e8dab51da1a32cb070c6b414ca6dbefe 100644
--- a/GUI/coregui/Models/DomainSimulationBuilder.cpp
+++ b/GUI/coregui/Models/DomainSimulationBuilder.cpp
@@ -13,28 +13,28 @@
// ************************************************************************** //
#include "GUI/coregui/Models/DomainSimulationBuilder.h"
+#include "Core/Beam/IFootprintFactor.h"
+#include "Core/Computation/IBackground.h"
#include "Core/Instrument/AngularSpecScan.h"
+#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Parametrization/Units.h"
+#include "Core/Simulation/DepthProbeSimulation.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/BeamItems.h"
#include "GUI/coregui/Models/DepthProbeInstrumentItem.h"
-#include "Core/Simulation/DepthProbeSimulation.h"
#include "GUI/coregui/Models/DetectorItems.h"
#include "GUI/coregui/Models/DomainObjectBuilder.h"
#include "GUI/coregui/Models/FootprintItems.h"
-#include "Core/Simulation/GISASSimulation.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "Core/Computation/IBackground.h"
-#include "Core/Beam/IFootprintFactor.h"
#include "GUI/coregui/Models/InstrumentItems.h"
-#include "Core/Multilayer/MultiLayer.h"
#include "GUI/coregui/Models/MultiLayerItem.h"
-#include "Core/Simulation/OffSpecSimulation.h"
#include "GUI/coregui/Models/SimulationOptionsItem.h"
#include "GUI/coregui/Models/SpecularBeamInclinationItem.h"
-#include "Core/Simulation/SpecularSimulation.h"
#include "GUI/coregui/Models/TransformToDomain.h"
-#include "Core/Parametrization/Units.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
namespace
{
diff --git a/GUI/coregui/Models/FitParameterItems.cpp b/GUI/coregui/Models/FitParameterItems.cpp
index 777f45fdbc2838dfea04b2dc2e2b3ec9f16eb0e9..7a8d5c342425c78fa0d8fdb02e8a65c1201a89b3 100644
--- a/GUI/coregui/Models/FitParameterItems.cpp
+++ b/GUI/coregui/Models/FitParameterItems.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "GUI/coregui/Models/FitParameterItems.h"
+#include "Fit/Kernel/Parameter.h"
+#include "Fit/Kernel/Parameters.h"
#include "GUI/coregui/Models/ComboProperty.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Models/ModelPath.h"
-#include "Fit/Kernel/Parameter.h"
#include "GUI/coregui/Models/ParameterTreeItems.h"
-#include "Fit/Kernel/Parameters.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <cmath>
namespace
diff --git a/GUI/coregui/Models/FitParameterProxyModel.cpp b/GUI/coregui/Models/FitParameterProxyModel.cpp
index d36b0c8c8d77992caea8f2c5f9febf5278a952f0..4003ccc40319942b75cd013fc5abbbaeca0a8d36 100644
--- a/GUI/coregui/Models/FitParameterProxyModel.cpp
+++ b/GUI/coregui/Models/FitParameterProxyModel.cpp
@@ -15,10 +15,10 @@
#include "GUI/coregui/Models/FitParameterProxyModel.h"
#include "GUI/coregui/Models/FitParameterHelper.h"
#include "GUI/coregui/Models/FitParameterItems.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/JobModel.h"
#include "GUI/coregui/Models/ModelPath.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QMimeData>
using SessionItemUtils::ParentRow;
diff --git a/GUI/coregui/Models/FormFactorItems.cpp b/GUI/coregui/Models/FormFactorItems.cpp
index e4e263815aa22794b87bec6dab0dd1fa5a5d78a5..ca7f3d1d4a5e24b39cbe0eeddf0efd72e0011c19 100644
--- a/GUI/coregui/Models/FormFactorItems.cpp
+++ b/GUI/coregui/Models/FormFactorItems.cpp
@@ -14,8 +14,8 @@
#include "GUI/coregui/Models/FormFactorItems.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/includeIncludes/FormFactors.h"
#include "Core/Parametrization/Units.h"
+#include "Core/includeIncludes/FormFactors.h"
/* ------------------------------------------------ */
@@ -60,8 +60,8 @@ BarGaussItem::BarGaussItem() : FormFactorItem(Constants::BarGaussType)
std::unique_ptr<IFormFactor> BarGaussItem::createFormFactor() const
{
return std::make_unique<FormFactorBarGauss>(getItemValue(P_LENGTH).toDouble(),
- getItemValue(P_WIDTH).toDouble(),
- getItemValue(P_HEIGHT).toDouble());
+ getItemValue(P_WIDTH).toDouble(),
+ getItemValue(P_HEIGHT).toDouble());
}
/* ------------------------------------------------ */
@@ -81,8 +81,8 @@ BarLorentzItem::BarLorentzItem() : FormFactorItem(Constants::BarLorentzType)
std::unique_ptr<IFormFactor> BarLorentzItem::createFormFactor() const
{
return std::make_unique<FormFactorBarLorentz>(getItemValue(P_LENGTH).toDouble(),
- getItemValue(P_WIDTH).toDouble(),
- getItemValue(P_HEIGHT).toDouble());
+ getItemValue(P_WIDTH).toDouble(),
+ getItemValue(P_HEIGHT).toDouble());
}
/* ------------------------------------------------ */
@@ -222,8 +222,8 @@ const QString DotItem::P_RADIUS = QString::fromStdString(BornAgain::Radius);
DotItem::DotItem() : FormFactorItem(Constants::DotType)
{
setToolTip(QStringLiteral("A dot, with constant formfactor F(q)=4pi/3 R^3"));
- addProperty(P_RADIUS, 8.0)->setToolTip(QStringLiteral(
- "Radius of reference sphere in nanometers"));
+ addProperty(P_RADIUS, 8.0)
+ ->setToolTip(QStringLiteral("Radius of reference sphere in nanometers"));
}
std::unique_ptr<IFormFactor> DotItem::createFormFactor() const
@@ -439,8 +439,8 @@ Ripple1GaussItem::Ripple1GaussItem() : FormFactorItem(Constants::Ripple1GaussTyp
std::unique_ptr<IFormFactor> Ripple1GaussItem::createFormFactor() const
{
return std::make_unique<FormFactorRipple1Gauss>(getItemValue(P_LENGTH).toDouble(),
- getItemValue(P_WIDTH).toDouble(),
- getItemValue(P_HEIGHT).toDouble());
+ getItemValue(P_WIDTH).toDouble(),
+ getItemValue(P_HEIGHT).toDouble());
}
/* ------------------------------------------------ */
@@ -462,8 +462,8 @@ Ripple1LorentzItem::Ripple1LorentzItem() : FormFactorItem(Constants::Ripple1Lore
std::unique_ptr<IFormFactor> Ripple1LorentzItem::createFormFactor() const
{
return std::make_unique<FormFactorRipple1Lorentz>(getItemValue(P_LENGTH).toDouble(),
- getItemValue(P_WIDTH).toDouble(),
- getItemValue(P_HEIGHT).toDouble());
+ getItemValue(P_WIDTH).toDouble(),
+ getItemValue(P_HEIGHT).toDouble());
}
/* ------------------------------------------------ */
diff --git a/GUI/coregui/Models/GUIDomainSampleVisitor.cpp b/GUI/coregui/Models/GUIDomainSampleVisitor.cpp
index 112feadd3e0ec948eb65f7a8052ae782fbc6edda..da06bcc4e9f796aa4016c2676f56d5f588c67f7d 100644
--- a/GUI/coregui/Models/GUIDomainSampleVisitor.cpp
+++ b/GUI/coregui/Models/GUIDomainSampleVisitor.cpp
@@ -13,36 +13,36 @@
// ************************************************************************** //
#include "GUI/coregui/Models/GUIDomainSampleVisitor.h"
-#include "GUI/coregui/Models/ComboProperty.h"
+#include "Core/Aggregate/ParticleLayout.h"
+#include "Core/Computation/MultiLayerUtils.h"
+#include "Core/Material/Material.h"
+#include "Core/Multilayer/Layer.h"
+#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Parametrization/Units.h"
#include "Core/Particle/Crystal.h"
-#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
-#include "GUI/coregui/Models/FormFactorItems.h"
+#include "Core/Particle/MesoCrystal.h"
+#include "Core/Particle/Particle.h"
+#include "Core/Particle/ParticleComposition.h"
+#include "Core/Particle/ParticleCoreShell.h"
+#include "Core/Particle/ParticleDistribution.h"
#include "Core/includeIncludes/FormFactors.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "Core/Multilayer/Layer.h"
+#include "GUI/coregui/Models/ComboProperty.h"
+#include "GUI/coregui/Models/FormFactorItems.h"
#include "GUI/coregui/Models/LayerItem.h"
-#include "Core/Material/Material.h"
-#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
#include "GUI/coregui/Models/MaterialModel.h"
-#include "Core/Particle/MesoCrystal.h"
#include "GUI/coregui/Models/MesoCrystalItem.h"
-#include "Core/Multilayer/MultiLayer.h"
#include "GUI/coregui/Models/MultiLayerItem.h"
-#include "Core/Computation/MultiLayerUtils.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Particle/ParticleComposition.h"
-#include "Core/Particle/ParticleCoreShell.h"
#include "GUI/coregui/Models/ParticleCoreShellItem.h"
-#include "Core/Particle/ParticleDistribution.h"
#include "GUI/coregui/Models/ParticleItem.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "GUI/coregui/Models/ParticleLayoutItem.h"
#include "GUI/coregui/Models/RotationItems.h"
#include "GUI/coregui/Models/SampleModel.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "GUI/coregui/Models/TransformFromDomain.h"
#include "GUI/coregui/Models/TransformationItem.h"
-#include "Core/Parametrization/Units.h"
+#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
+#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
using SessionItemUtils::SetVectorItem;
diff --git a/GUI/coregui/Models/GUIExamplesFactory.cpp b/GUI/coregui/Models/GUIExamplesFactory.cpp
index b23da6482bde05195a2b14881f902a65b46580fa..25bf5dbeec30174d74ff0896e38847ecd40e126e 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 "Core/Multilayer/MultiLayer.h"
#include "Core/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 a2720a69a4e23aa144aedeb957a0133f859a5306..430c030560f936e33069a12b6b84838b88bb9039 100644
--- a/GUI/coregui/Models/GUIObjectBuilder.cpp
+++ b/GUI/coregui/Models/GUIObjectBuilder.cpp
@@ -13,21 +13,21 @@
// ************************************************************************** //
#include "GUI/coregui/Models/GUIObjectBuilder.h"
+#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Parametrization/Units.h"
+#include "Core/Simulation/GISASSimulation.h"
+#include "Core/Simulation/OffSpecSimulation.h"
+#include "Core/Simulation/Simulation.h"
+#include "Core/Simulation/SpecularSimulation.h"
#include "GUI/coregui/Models/BeamItems.h"
#include "GUI/coregui/Models/DocumentModel.h"
-#include "Core/Simulation/GISASSimulation.h"
#include "GUI/coregui/Models/GUIDomainSampleVisitor.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/InstrumentModel.h"
-#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Simulation/OffSpecSimulation.h"
#include "GUI/coregui/Models/SampleModel.h"
-#include "Core/Simulation/Simulation.h"
#include "GUI/coregui/Models/SimulationOptionsItem.h"
-#include "Core/Simulation/SpecularSimulation.h"
#include "GUI/coregui/Models/TransformFromDomain.h"
-#include "Core/Parametrization/Units.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
namespace
{
diff --git a/GUI/coregui/Models/GroupInfoCatalogue.cpp b/GUI/coregui/Models/GroupInfoCatalogue.cpp
index e965fb20885a846b2cc1398d28573cd4536769d9..ecf9dd6b9f699a66c6837b2342cdd4cb384839bd 100644
--- a/GUI/coregui/Models/GroupInfoCatalogue.cpp
+++ b/GUI/coregui/Models/GroupInfoCatalogue.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Models/GroupInfoCatalogue.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/item_constants.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
GroupInfoCatalogue::GroupInfoCatalogue()
{
diff --git a/GUI/coregui/Models/GroupItem.cpp b/GUI/coregui/Models/GroupItem.cpp
index 65c13ae8c293eb5975c3bd0233dc6cbcf421f1dd..2c6aea9d4850416446f330c6814764f542b51814 100644
--- a/GUI/coregui/Models/GroupItem.cpp
+++ b/GUI/coregui/Models/GroupItem.cpp
@@ -14,8 +14,8 @@
#include "GUI/coregui/Models/GroupItem.h"
#include "GUI/coregui/Models/ComboProperty.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/GroupItemController.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
const QString GroupItem::T_ITEMS = "Item tag";
diff --git a/GUI/coregui/Models/InstrumentItems.cpp b/GUI/coregui/Models/InstrumentItems.cpp
index 4c14240a15fcc2151db0bca453f9531c6c327182..0d29aa6613e09f14f37d8fa1fae7aca5d279b220 100644
--- a/GUI/coregui/Models/InstrumentItems.cpp
+++ b/GUI/coregui/Models/InstrumentItems.cpp
@@ -13,22 +13,22 @@
// ************************************************************************** //
#include "GUI/coregui/Models/InstrumentItems.h"
+#include "Core/Instrument/IDetector2D.h"
+#include "Core/Instrument/Instrument.h"
+#include "Core/Instrument/UnitConverter1D.h"
#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/BackgroundItems.h"
#include "GUI/coregui/Models/BeamItems.h"
#include "GUI/coregui/Models/DataItem.h"
#include "GUI/coregui/Models/DetectorItems.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/GroupItem.h"
-#include "Core/Instrument/IDetector2D.h"
-#include "Core/Instrument/Instrument.h"
#include "GUI/coregui/Models/ItemFileNameUtils.h"
#include "GUI/coregui/Models/JobItemUtils.h"
#include "GUI/coregui/Models/MaskItems.h"
#include "GUI/coregui/Models/PointwiseAxisItem.h"
#include "GUI/coregui/Models/RealDataItem.h"
#include "GUI/coregui/Models/SessionModel.h"
-#include "Core/Instrument/UnitConverter1D.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
namespace
{
diff --git a/GUI/coregui/Models/IntensityDataItem.cpp b/GUI/coregui/Models/IntensityDataItem.cpp
index b20be3de7e419b622d49414b7a82d0fbe4901f59..704db73cbb30be0539def36c030953f9233ac915 100644
--- a/GUI/coregui/Models/IntensityDataItem.cpp
+++ b/GUI/coregui/Models/IntensityDataItem.cpp
@@ -13,15 +13,15 @@
// ************************************************************************** //
#include "GUI/coregui/Models/IntensityDataItem.h"
-#include "GUI/coregui/Models/AxesItems.h"
#include "Core/Basics/BornAgainNamespace.h"
+#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/ComboProperty.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h"
#include "GUI/coregui/Models/JobItemUtils.h"
#include "GUI/coregui/Models/MaskItems.h"
-#include "GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.h"
#include "GUI/coregui/Models/ProjectionItems.h"
+#include "GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h"
+#include "GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
namespace
{
diff --git a/GUI/coregui/Models/InterferenceFunctionItems.cpp b/GUI/coregui/Models/InterferenceFunctionItems.cpp
index 116d5552b858cf79ecfaa753632118b354e0ad5b..90e0454aec7cbdc0bf8d60e17545cafddd786731 100644
--- a/GUI/coregui/Models/InterferenceFunctionItems.cpp
+++ b/GUI/coregui/Models/InterferenceFunctionItems.cpp
@@ -13,16 +13,16 @@
// ************************************************************************** //
#include "GUI/coregui/Models/InterferenceFunctionItems.h"
+#include "Core/Aggregate/FTDecayFunctions.h"
+#include "Core/Aggregate/FTDistributions2D.h"
#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/Parametrization/Units.h"
+#include "Core/includeIncludes/InterferenceFunctions.h"
#include "GUI/coregui/Models/FTDecayFunctionItems.h"
-#include "Core/Aggregate/FTDecayFunctions.h"
#include "GUI/coregui/Models/FTDistributionItems.h"
-#include "Core/Aggregate/FTDistributions2D.h"
#include "GUI/coregui/Models/GroupItem.h"
-#include "Core/includeIncludes/InterferenceFunctions.h"
#include "GUI/coregui/Models/Lattice2DItems.h"
#include "GUI/coregui/Models/ModelPath.h"
-#include "Core/Parametrization/Units.h"
namespace
{
diff --git a/GUI/coregui/Models/ItemCatalogue.cpp b/GUI/coregui/Models/ItemCatalogue.cpp
index 35e59aad6a294b8c99324e6df99c5c79d9467845..dd3266e25ce7ca786b402012cd665657409d1a93 100644
--- a/GUI/coregui/Models/ItemCatalogue.cpp
+++ b/GUI/coregui/Models/ItemCatalogue.cpp
@@ -29,7 +29,6 @@
#include "GUI/coregui/Models/FitSuiteItem.h"
#include "GUI/coregui/Models/FootprintItems.h"
#include "GUI/coregui/Models/FormFactorItems.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/GroupItem.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
@@ -65,6 +64,7 @@
#include "GUI/coregui/Models/SphericalDetectorItem.h"
#include "GUI/coregui/Models/TransformationItem.h"
#include "GUI/coregui/Models/VectorItem.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
ItemCatalogue::ItemCatalogue()
{
diff --git a/GUI/coregui/Models/ItemFactory.cpp b/GUI/coregui/Models/ItemFactory.cpp
index dda2263d9240bf19bff43341e640afa9aca57347..2f40e1e8edd50dc353c52eaa38935243a2a455dc 100644
--- a/GUI/coregui/Models/ItemFactory.cpp
+++ b/GUI/coregui/Models/ItemFactory.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Models/ItemFactory.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/ItemCatalogue.h"
#include "GUI/coregui/Models/SessionItem.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
namespace
{
diff --git a/GUI/coregui/Models/ItemFileNameUtils.cpp b/GUI/coregui/Models/ItemFileNameUtils.cpp
index 0240ee3120483b4e73ac924d18b8d438a8991fa7..d71e1b203c3ae37c6a18fdae8a6daa1580f2882a 100644
--- a/GUI/coregui/Models/ItemFileNameUtils.cpp
+++ b/GUI/coregui/Models/ItemFileNameUtils.cpp
@@ -13,11 +13,11 @@
// ************************************************************************** //
#include "GUI/coregui/Models/ItemFileNameUtils.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Models/RealDataItem.h"
#include "GUI/coregui/Models/item_constants.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
namespace
{
diff --git a/GUI/coregui/Models/JobItem.cpp b/GUI/coregui/Models/JobItem.cpp
index 41b6e7caf926643683e7022586f12b2da0e149a8..1110a7860f9fee0a9cbb6366014511feb6cd0be9 100644
--- a/GUI/coregui/Models/JobItem.cpp
+++ b/GUI/coregui/Models/JobItem.cpp
@@ -16,12 +16,10 @@
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/Data1DViewItem.h"
#include "GUI/coregui/Models/FitSuiteItem.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/ItemFileNameUtils.h"
#include "GUI/coregui/Models/JobItemUtils.h"
-#include "GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.h"
#include "GUI/coregui/Models/MaterialItemContainer.h"
#include "GUI/coregui/Models/MultiLayerItem.h"
#include "GUI/coregui/Models/ParameterTreeItems.h"
@@ -29,6 +27,8 @@
#include "GUI/coregui/Models/SimulationOptionsItem.h"
#include "GUI/coregui/Models/SpecularDataItem.h"
#include "GUI/coregui/Models/item_constants.h"
+#include "GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
const QString JobItem::P_IDENTIFIER = "Identifier";
const QString JobItem::P_SAMPLE_NAME = "Sample";
diff --git a/GUI/coregui/Models/JobItemUtils.cpp b/GUI/coregui/Models/JobItemUtils.cpp
index 00e1e11b1dad5e2863a5f7b5c56981874730d172..b8c6421a047892405b282c3d34a024fd7ed084a2 100644
--- a/GUI/coregui/Models/JobItemUtils.cpp
+++ b/GUI/coregui/Models/JobItemUtils.cpp
@@ -13,15 +13,15 @@
// ************************************************************************** //
#include "GUI/coregui/Models/JobItemUtils.h"
+#include "Core/Instrument/UnitConverterUtils.h"
+#include "Core/Simulation/Simulation.h"
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/DataItem.h"
#include "GUI/coregui/Models/DomainObjectBuilder.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Models/RealDataItem.h"
-#include "Core/Simulation/Simulation.h"
-#include "Core/Instrument/UnitConverterUtils.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QDebug>
#include <QFileInfo>
diff --git a/GUI/coregui/Models/JobItemUtils.h b/GUI/coregui/Models/JobItemUtils.h
index 6241d48e555426b94b9090f4247b89ef5854dbb8..718e8d5fb4d3d7eb60f91b91887bde51acc40da6 100644
--- a/GUI/coregui/Models/JobItemUtils.h
+++ b/GUI/coregui/Models/JobItemUtils.h
@@ -15,8 +15,8 @@
#ifndef JOBITEMUTILS_H
#define JOBITEMUTILS_H
-#include "GUI/coregui/Models/ComboProperty.h"
#include "Core/Instrument/IDetector.h"
+#include "GUI/coregui/Models/ComboProperty.h"
#include <QMap>
class DataItem;
diff --git a/GUI/coregui/Models/JobModel.cpp b/GUI/coregui/Models/JobModel.cpp
index a497c751a5ca0e59f5093a4192d4c0fdaf777ebd..90491e760f5aec679b9bf71043f4da6b979009e8 100644
--- a/GUI/coregui/Models/JobModel.cpp
+++ b/GUI/coregui/Models/JobModel.cpp
@@ -15,7 +15,6 @@
#include "GUI/coregui/Models/JobModel.h"
#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/FitSuiteItem.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/GroupItem.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
@@ -28,6 +27,7 @@
#include "GUI/coregui/Models/ParameterTreeUtils.h"
#include "GUI/coregui/Models/RealDataItem.h"
#include "GUI/coregui/Models/SimulationOptionsItem.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
JobModel::JobModel(QObject* parent)
: SessionModel(SessionXML::JobModelTag, parent), m_queue_data(nullptr)
diff --git a/GUI/coregui/Models/JobModelFunctions.cpp b/GUI/coregui/Models/JobModelFunctions.cpp
index c7cb9f6cb3322ddb8e768822fcff03c2d5f7d7f4..b586e88b30d6f8fbfe61337ca729726f302fe7ed 100644
--- a/GUI/coregui/Models/JobModelFunctions.cpp
+++ b/GUI/coregui/Models/JobModelFunctions.cpp
@@ -13,16 +13,15 @@
// ************************************************************************** //
#include "GUI/coregui/Models/JobModelFunctions.h"
+#include "Core/Instrument/DetectorFunctions.h"
+#include "Core/Instrument/IDetector2D.h"
+#include "Core/Instrument/Instrument.h"
#include "GUI/coregui/Models/Data1DViewItem.h"
#include "GUI/coregui/Models/DataPropertyContainer.h"
-#include "Core/Instrument/DetectorFunctions.h"
#include "GUI/coregui/Models/DetectorItems.h"
#include "GUI/coregui/Models/DomainObjectBuilder.h"
#include "GUI/coregui/Models/FitSuiteItem.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/GroupItem.h"
-#include "Core/Instrument/IDetector2D.h"
-#include "Core/Instrument/Instrument.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/ItemFileNameUtils.h"
@@ -30,12 +29,13 @@
#include "GUI/coregui/Models/JobItemUtils.h"
#include "GUI/coregui/Models/JobModel.h"
#include "GUI/coregui/Models/MaskItems.h"
-#include "GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.h"
#include "GUI/coregui/Models/MaterialItemContainer.h"
-#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
#include "GUI/coregui/Models/MultiLayerItem.h"
#include "GUI/coregui/Models/PointwiseAxisItem.h"
#include "GUI/coregui/Models/RealDataItem.h"
+#include "GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.h"
+#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <map>
namespace
diff --git a/GUI/coregui/Models/JobQueueData.cpp b/GUI/coregui/Models/JobQueueData.cpp
index bd874c9bf3a75cd646ea76d0ab7d07659ce41c9d..41a795b8ac6fc188920aa1dfd0f95e816bff5733 100644
--- a/GUI/coregui/Models/JobQueueData.cpp
+++ b/GUI/coregui/Models/JobQueueData.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "GUI/coregui/Models/JobQueueData.h"
-#include "GUI/coregui/Models/DomainSimulationBuilder.h"
#include "Core/Simulation/GISASSimulation.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
+#include "GUI/coregui/Models/DomainSimulationBuilder.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Models/JobModel.h"
#include "GUI/coregui/Models/JobWorker.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QThread>
namespace
diff --git a/GUI/coregui/Models/MaskItems.cpp b/GUI/coregui/Models/MaskItems.cpp
index d211d2a83992529bc55c92847f977a0c1b6defb3..e60a782ce4aaf714a46348f042aeb04a7665aa47 100644
--- a/GUI/coregui/Models/MaskItems.cpp
+++ b/GUI/coregui/Models/MaskItems.cpp
@@ -14,11 +14,11 @@
#include "GUI/coregui/Models/MaskItems.h"
#include "Core/Mask/Ellipse.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "Core/Mask/InfinitePlane.h"
#include "Core/Mask/Line.h"
#include "Core/Mask/Polygon.h"
#include "Core/Mask/Rectangle.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
MaskContainerItem::MaskContainerItem() : SessionItem(Constants::MaskContainerType)
{
diff --git a/GUI/coregui/Models/MaterialItem.cpp b/GUI/coregui/Models/MaterialItem.cpp
index 2032431efaef1b8254a60e3738002bb75a539ae0..ff75e3b4e6aec68c525288a8632992d4425facfd 100644
--- a/GUI/coregui/Models/MaterialItem.cpp
+++ b/GUI/coregui/Models/MaterialItem.cpp
@@ -13,12 +13,12 @@
// ************************************************************************** //
#include "GUI/coregui/Models/MaterialItem.h"
-#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "GUI/coregui/Models/MaterialDataItems.h"
#include "Core/Material/MaterialFactoryFuncs.h"
-#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
+#include "GUI/coregui/Models/MaterialDataItems.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
+#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
+#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
using SessionItemUtils::GetVectorItem;
diff --git a/GUI/coregui/Models/MaterialItemContainer.cpp b/GUI/coregui/Models/MaterialItemContainer.cpp
index a06a6cb5a833c4f01a50ea1555a1e7dc85b0e84f..912ceec2a3f9c4d58b22dbbeb2d055d179df3d11 100644
--- a/GUI/coregui/Models/MaterialItemContainer.cpp
+++ b/GUI/coregui/Models/MaterialItemContainer.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Models/MaterialItemContainer.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/MaterialItem.h"
#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
const QString MaterialItemContainer::T_MATERIALS = "MaterialVector";
diff --git a/GUI/coregui/Models/MaterialModel.cpp b/GUI/coregui/Models/MaterialModel.cpp
index 1ac239afd9c5f061e4beac8bb18a8dab80902d34..97e83659fd4ab3c5803f72bf6c37e1f0b571e44e 100644
--- a/GUI/coregui/Models/MaterialModel.cpp
+++ b/GUI/coregui/Models/MaterialModel.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "GUI/coregui/Models/MaterialModel.h"
-#include "GUI/coregui/mainwindow/AppSvc.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/MaterialDataItems.h"
#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
+#include "GUI/coregui/mainwindow/AppSvc.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
MaterialModel::MaterialModel(QObject* parent) : SessionModel(SessionXML::MaterialModelTag, parent)
{
diff --git a/GUI/coregui/Models/MaterialPropertyController.cpp b/GUI/coregui/Models/MaterialPropertyController.cpp
index dff5ce8c6f94c915c4f01fe13bec774a190f76c8..aab6e4e7ca755666b9a7b92d9e34e7bc1ef0503c 100644
--- a/GUI/coregui/Models/MaterialPropertyController.cpp
+++ b/GUI/coregui/Models/MaterialPropertyController.cpp
@@ -13,11 +13,11 @@
// ************************************************************************** //
#include "GUI/coregui/Models/MaterialPropertyController.h"
-#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
#include "GUI/coregui/Models/MaterialModel.h"
#include "GUI/coregui/Models/ModelPath.h"
#include "GUI/coregui/Models/ModelUtils.h"
#include "GUI/coregui/Models/SampleModel.h"
+#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
#include <QVector>
MaterialPropertyController::MaterialPropertyController(QObject* parent)
diff --git a/GUI/coregui/Models/MesoCrystalItem.cpp b/GUI/coregui/Models/MesoCrystalItem.cpp
index 8c798a33a06f1a9e81051500a9b0ea3b19f6aa69..c4687e79e67b83b260119e54359c12d89fb2896f 100644
--- a/GUI/coregui/Models/MesoCrystalItem.cpp
+++ b/GUI/coregui/Models/MesoCrystalItem.cpp
@@ -14,20 +14,20 @@
#include "GUI/coregui/Models/MesoCrystalItem.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "GUI/coregui/Models/ComboProperty.h"
#include "Core/Particle/Crystal.h"
-#include "GUI/coregui/Models/FormFactorItems.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "Core/Particle/MesoCrystal.h"
-#include "GUI/coregui/Models/ModelPath.h"
#include "Core/Particle/Particle.h"
-#include "GUI/coregui/Models/ParticleCompositionItem.h"
#include "Core/Particle/ParticleCoreShell.h"
+#include "GUI/coregui/Models/ComboProperty.h"
+#include "GUI/coregui/Models/FormFactorItems.h"
+#include "GUI/coregui/Models/ModelPath.h"
+#include "GUI/coregui/Models/ParticleCompositionItem.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 "GUI/coregui/Models/VectorItem.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
using SessionItemUtils::GetVectorItem;
diff --git a/GUI/coregui/Models/MinimizerItem.cpp b/GUI/coregui/Models/MinimizerItem.cpp
index c0fde3a2c17f15b708b7befab7d0b34782a82445..5adf56bc2960fb84201e2fe5c426c5e28a7373a8 100644
--- a/GUI/coregui/Models/MinimizerItem.cpp
+++ b/GUI/coregui/Models/MinimizerItem.cpp
@@ -13,16 +13,16 @@
// ************************************************************************** //
#include "GUI/coregui/Models/MinimizerItem.h"
+#include "Core/Fitting/ObjectiveMetric.h"
+#include "Core/Fitting/ObjectiveMetricUtils.h"
+#include "Fit/Minimizer/MinimizerConstants.h"
+#include "Fit/Minimizer/TestMinimizer.h"
#include "Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h"
#include "Fit/RootAdapter/GSLMultiMinimizer.h"
#include "Fit/RootAdapter/GeneticMinimizer.h"
-#include "Fit/Minimizer/MinimizerConstants.h"
-#include "GUI/coregui/Models/MinimizerItemCatalogue.h"
#include "Fit/RootAdapter/Minuit2Minimizer.h"
-#include "Core/Fitting/ObjectiveMetric.h"
-#include "Core/Fitting/ObjectiveMetricUtils.h"
#include "Fit/RootAdapter/SimAnMinimizer.h"
-#include "Fit/Minimizer/TestMinimizer.h"
+#include "GUI/coregui/Models/MinimizerItemCatalogue.h"
MinimizerItem::MinimizerItem(const QString& model_type) : SessionItem(model_type) {}
diff --git a/GUI/coregui/Models/MinimizerItemCatalogue.cpp b/GUI/coregui/Models/MinimizerItemCatalogue.cpp
index c35e7d525a96ef2442ef4998a62b540cac51d58a..24461fb871fa6999df2dcf333a1de67db0a58982 100644
--- a/GUI/coregui/Models/MinimizerItemCatalogue.cpp
+++ b/GUI/coregui/Models/MinimizerItemCatalogue.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Models/MinimizerItemCatalogue.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "Fit/Minimizer/MinimizerFactory.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
//! Returns ComboProperty representing list of algorithms defined for given minimizerType.
diff --git a/GUI/coregui/Models/ParameterTranslators.cpp b/GUI/coregui/Models/ParameterTranslators.cpp
index eb4f80d13a3c9f52bc41796b07c38b81746621cf..4a6c47931b9d93c21bc406f4b9dae0c3c0255bd8 100644
--- a/GUI/coregui/Models/ParameterTranslators.cpp
+++ b/GUI/coregui/Models/ParameterTranslators.cpp
@@ -14,10 +14,10 @@
#include "GUI/coregui/Models/ParameterTranslators.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/MesoCrystalItem.h"
#include "GUI/coregui/Models/ParticleItem.h"
#include "GUI/coregui/Models/VectorItem.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
namespace
{
diff --git a/GUI/coregui/Models/ParameterTreeUtils.cpp b/GUI/coregui/Models/ParameterTreeUtils.cpp
index 128c54fd227ded08d59d56393efd387fbaf83621..c54b63fc3f3acec5b21ac528e8e4a6463ef77404 100644
--- a/GUI/coregui/Models/ParameterTreeUtils.cpp
+++ b/GUI/coregui/Models/ParameterTreeUtils.cpp
@@ -14,13 +14,13 @@
#include "GUI/coregui/Models/ParameterTreeUtils.h"
#include "GUI/coregui/Models/FitParameterHelper.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/GroupItem.h"
#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Models/ModelPath.h"
#include "GUI/coregui/Models/MultiLayerItem.h"
#include "GUI/coregui/Models/ParameterTreeItems.h"
#include "GUI/coregui/Models/SampleModel.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QStack>
namespace
diff --git a/GUI/coregui/Models/ParticleCompositionItem.cpp b/GUI/coregui/Models/ParticleCompositionItem.cpp
index d0d24578aea1e7a368cf23aa38f2fba68005f7d6..aeedc350c8cefb9c91ce515deb2cb27cb12cea93 100644
--- a/GUI/coregui/Models/ParticleCompositionItem.cpp
+++ b/GUI/coregui/Models/ParticleCompositionItem.cpp
@@ -14,10 +14,10 @@
#include "GUI/coregui/Models/ParticleCompositionItem.h"
#include "Core/Particle/MesoCrystal.h"
-#include "GUI/coregui/Models/MesoCrystalItem.h"
-#include "GUI/coregui/Models/ModelPath.h"
#include "Core/Particle/Particle.h"
#include "Core/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"
diff --git a/GUI/coregui/Models/ParticleCoreShellItem.cpp b/GUI/coregui/Models/ParticleCoreShellItem.cpp
index 5186722740be14577bfcb5dfe2f3842d0a929d81..d6f90b2db1561c6c629a05a3c61018244f3419be 100644
--- a/GUI/coregui/Models/ParticleCoreShellItem.cpp
+++ b/GUI/coregui/Models/ParticleCoreShellItem.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "GUI/coregui/Models/ParticleCoreShellItem.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "GUI/coregui/Models/ModelPath.h"
#include "Core/Particle/Particle.h"
#include "Core/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"
namespace
{
diff --git a/GUI/coregui/Models/ParticleDistributionItem.cpp b/GUI/coregui/Models/ParticleDistributionItem.cpp
index efb4f0b1544af3510781358c33bb4522e37c2f3a..ea508354520eec824b1230d8e4ea79ec909546a9 100644
--- a/GUI/coregui/Models/ParticleDistributionItem.cpp
+++ b/GUI/coregui/Models/ParticleDistributionItem.cpp
@@ -13,17 +13,17 @@
// ************************************************************************** //
#include "GUI/coregui/Models/ParticleDistributionItem.h"
+#include "Core/Parametrization/Distributions.h"
+#include "Core/Parametrization/ParameterUtils.h"
+#include "Core/Parametrization/Units.h"
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/DistributionItems.h"
-#include "Core/Parametrization/Distributions.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/ParameterTreeUtils.h"
-#include "Core/Parametrization/ParameterUtils.h"
#include "GUI/coregui/Models/ParticleItem.h"
#include "GUI/coregui/Models/RealLimitsItems.h"
#include "GUI/coregui/Models/TransformFromDomain.h"
#include "GUI/coregui/Models/TransformToDomain.h"
-#include "Core/Parametrization/Units.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
namespace
{
diff --git a/GUI/coregui/Models/ParticleItem.cpp b/GUI/coregui/Models/ParticleItem.cpp
index 120dbcce115fe5b913797de8f529fce8a2367865..8c776f78ca5529efa2eaea2eccedb32cab0db735 100644
--- a/GUI/coregui/Models/ParticleItem.cpp
+++ b/GUI/coregui/Models/ParticleItem.cpp
@@ -14,15 +14,15 @@
#include "GUI/coregui/Models/ParticleItem.h"
#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/Particle/Particle.h"
#include "GUI/coregui/Models/FormFactorItems.h"
-#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
#include "GUI/coregui/Models/ModelPath.h"
-#include "Core/Particle/Particle.h"
#include "GUI/coregui/Models/ParticleCoreShellItem.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/Models/TransformToDomain.h"
#include "GUI/coregui/Models/VectorItem.h"
+#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
using SessionItemUtils::SetVectorItem;
diff --git a/GUI/coregui/Models/PointwiseAxisItem.cpp b/GUI/coregui/Models/PointwiseAxisItem.cpp
index 75488eec1cf61403646b7dc041beb70c61b528c9..5e868d0ea5024424a184b29037c346158ed00faa 100644
--- a/GUI/coregui/Models/PointwiseAxisItem.cpp
+++ b/GUI/coregui/Models/PointwiseAxisItem.cpp
@@ -13,11 +13,11 @@
// ************************************************************************** //
#include "GUI/coregui/Models/PointwiseAxisItem.h"
-#include "Core/Instrument/IUnitConverter.h"
-#include "GUI/coregui/Models/InstrumentItems.h"
+#include "Core/Binning/PointwiseAxis.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
+#include "Core/Instrument/IUnitConverter.h"
#include "Core/Instrument/OutputData.h"
-#include "Core/Binning/PointwiseAxis.h"
+#include "GUI/coregui/Models/InstrumentItems.h"
namespace
{
diff --git a/GUI/coregui/Models/RealDataItem.cpp b/GUI/coregui/Models/RealDataItem.cpp
index f2edd8507e59213e3c180a3849cdab57f7681e93..4cb00b1468ed93ee446ea232f7b2ca9753466520 100644
--- a/GUI/coregui/Models/RealDataItem.cpp
+++ b/GUI/coregui/Models/RealDataItem.cpp
@@ -13,14 +13,14 @@
// ************************************************************************** //
#include "GUI/coregui/Models/RealDataItem.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "GUI/coregui/utils/ImportDataInfo.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/ItemFileNameUtils.h"
#include "GUI/coregui/Models/JobItemUtils.h"
#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/Models/SpecularDataItem.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
+#include "GUI/coregui/utils/ImportDataInfo.h"
const QString RealDataItem::P_INSTRUMENT_ID = "Instrument Id";
const QString RealDataItem::P_INSTRUMENT_NAME = "Instrument";
diff --git a/GUI/coregui/Models/RectangularDetectorItem.cpp b/GUI/coregui/Models/RectangularDetectorItem.cpp
index 7b9d12864d9e94bdc8f5e989ffcf7c4cb144d1c3..a9f00e18d2439d787bf0f901a9e8a09462567fb6 100644
--- a/GUI/coregui/Models/RectangularDetectorItem.cpp
+++ b/GUI/coregui/Models/RectangularDetectorItem.cpp
@@ -13,12 +13,12 @@
// ************************************************************************** //
#include "GUI/coregui/Models/RectangularDetectorItem.h"
+#include "Core/Instrument/RectangularDetector.h"
#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/ComboProperty.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "Core/Instrument/RectangularDetector.h"
#include "GUI/coregui/Models/ResolutionFunctionItems.h"
#include "GUI/coregui/Models/VectorItem.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
namespace
{
diff --git a/GUI/coregui/Models/RectangularDetectorItem.h b/GUI/coregui/Models/RectangularDetectorItem.h
index 56001f4ae0ca81f46f63bb0602165d40d6231e75..5a387f60a7cd8f0f33638674e271810dbbfd88ac 100644
--- a/GUI/coregui/Models/RectangularDetectorItem.h
+++ b/GUI/coregui/Models/RectangularDetectorItem.h
@@ -15,8 +15,8 @@
#ifndef RECTANGULARDETECTORITEM_H
#define RECTANGULARDETECTORITEM_H
-#include "GUI/coregui/Models/DetectorItems.h"
#include "Core/Vector/Vectors3D.h"
+#include "GUI/coregui/Models/DetectorItems.h"
class BA_CORE_API_ RectangularDetectorItem : public DetectorItem
{
diff --git a/GUI/coregui/Models/RotationItems.cpp b/GUI/coregui/Models/RotationItems.cpp
index 285ab558d273b937d0e89e1efaa5e1920cae6fe5..80f3da2e31fdb25e20edab6d01a9d864331f2512 100644
--- a/GUI/coregui/Models/RotationItems.cpp
+++ b/GUI/coregui/Models/RotationItems.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Models/RotationItems.h"
-#include "Core/Scattering/Rotations.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Scattering/Rotations.h"
// ----------------------------------------------------------------------------
diff --git a/GUI/coregui/Models/SessionItem.cpp b/GUI/coregui/Models/SessionItem.cpp
index 5d45591e1c26c59b74c274debb90c96dd5a23d4f..5b8e7b797587ec9fe34ea207ad21c7985aa4e1d3 100644
--- a/GUI/coregui/Models/SessionItem.cpp
+++ b/GUI/coregui/Models/SessionItem.cpp
@@ -12,7 +12,6 @@
//
// ************************************************************************** //
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/GroupItem.h"
#include "GUI/coregui/Models/ItemFactory.h"
#include "GUI/coregui/Models/ParameterTranslators.h"
@@ -20,6 +19,7 @@
#include "GUI/coregui/Models/SessionItemTags.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
const QString SessionItem::P_NAME = "Name";
diff --git a/GUI/coregui/Models/SessionItem.h b/GUI/coregui/Models/SessionItem.h
index f68abf913fa523158036a4cbdf3076da6cdb8c60..65da9b9e82b9bc8aad38a312943e8b2f1e7f1e7d 100644
--- a/GUI/coregui/Models/SessionItem.h
+++ b/GUI/coregui/Models/SessionItem.h
@@ -15,8 +15,8 @@
#ifndef SESSIONITEM_H
#define SESSIONITEM_H
-#include "GUI/coregui/Models/ModelMapper.h"
#include "Fit/Tools/RealLimits.h"
+#include "GUI/coregui/Models/ModelMapper.h"
#include "GUI/coregui/Models/item_constants.h"
#include <QStringList>
#include <memory>
diff --git a/GUI/coregui/Models/SessionItemUtils.cpp b/GUI/coregui/Models/SessionItemUtils.cpp
index 64ba19a12a6a57077aaf6ccb44ebac70db5189ac..885b6999325b3599b3455dccdbbda96da5d13cdd 100644
--- a/GUI/coregui/Models/SessionItemUtils.cpp
+++ b/GUI/coregui/Models/SessionItemUtils.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "GUI/coregui/Models/SessionItemUtils.h"
-#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/GroupInfoCatalogue.h"
#include "GUI/coregui/Models/MaterialItem.h"
#include "GUI/coregui/Models/SessionGraphicsItem.h"
#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Models/VectorItem.h"
+#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QColor>
#include <QIcon>
#include <QPixmap>
diff --git a/GUI/coregui/Models/SessionModel.cpp b/GUI/coregui/Models/SessionModel.cpp
index 91cfb2478403710797ca42b4763a590086fbd890..96f9d89e176273db445338b7fce9c02016d0d70d 100644
--- a/GUI/coregui/Models/SessionModel.cpp
+++ b/GUI/coregui/Models/SessionModel.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "GUI/coregui/Models/SessionModel.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/ItemFactory.h"
#include "GUI/coregui/Models/SessionItemTags.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QFile>
#include <QMimeData>
#include <QtCore/QXmlStreamWriter>
diff --git a/GUI/coregui/Models/SessionModelDelegate.cpp b/GUI/coregui/Models/SessionModelDelegate.cpp
index 599451fb926197d0f0ddf31014f6562ca62d5883..75820cd728fc83f476b70f761ae1bc2f752e3e4b 100644
--- a/GUI/coregui/Models/SessionModelDelegate.cpp
+++ b/GUI/coregui/Models/SessionModelDelegate.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "GUI/coregui/Models/SessionModelDelegate.h"
+#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Views/PropertyEditor/CustomEditors.h"
-#include "GUI/coregui/utils/CustomEventFilters.h"
#include "GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.h"
-#include "GUI/coregui/Models/SessionItem.h"
+#include "GUI/coregui/utils/CustomEventFilters.h"
#include <QApplication>
namespace
diff --git a/GUI/coregui/Models/SessionXML.cpp b/GUI/coregui/Models/SessionXML.cpp
index 73d956616af7aa6bc99846580d84aaa4ecf5da9d..a1cf5042161b3f634819cb7cebdf0fbe5ecd8bd7 100644
--- a/GUI/coregui/Models/SessionXML.cpp
+++ b/GUI/coregui/Models/SessionXML.cpp
@@ -13,14 +13,14 @@
// ************************************************************************** //
#include "GUI/coregui/Models/ComboProperty.h"
-#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/GroupItem.h"
#include "GUI/coregui/Models/GroupItemController.h"
#include "GUI/coregui/Models/ItemFactory.h"
-#include "GUI/coregui/utils/MessageService.h"
#include "GUI/coregui/Models/SessionItemTags.h"
#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
+#include "GUI/coregui/utils/MessageService.h"
#include <QtCore/QXmlStreamWriter>
namespace
diff --git a/GUI/coregui/Models/SpecularBeamInclinationItem.cpp b/GUI/coregui/Models/SpecularBeamInclinationItem.cpp
index acb77c13617f998127f356b8ff8d0264bc81632a..0e21ed9213fe8e2a0a0f2d243b0069e06bf9e29d 100644
--- a/GUI/coregui/Models/SpecularBeamInclinationItem.cpp
+++ b/GUI/coregui/Models/SpecularBeamInclinationItem.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "GUI/coregui/Models/SpecularBeamInclinationItem.h"
+#include "Core/Parametrization/Units.h"
#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/GroupItem.h"
#include "GUI/coregui/Models/PointwiseAxisItem.h"
-#include "Core/Parametrization/Units.h"
namespace
{
diff --git a/GUI/coregui/Models/SpecularDataItem.cpp b/GUI/coregui/Models/SpecularDataItem.cpp
index 607495f8683ed960bce767fb6b4dd5cd21fb0764..9cb7455df052cb9534e5148ca2a2572ec436bdf8 100644
--- a/GUI/coregui/Models/SpecularDataItem.cpp
+++ b/GUI/coregui/Models/SpecularDataItem.cpp
@@ -13,12 +13,12 @@
// ************************************************************************** //
#include "GUI/coregui/Models/SpecularDataItem.h"
-#include "GUI/coregui/Models/AxesItems.h"
#include "Core/Basics/BornAgainNamespace.h"
+#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/ComboProperty.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h"
#include "GUI/coregui/Models/JobItemUtils.h"
+#include "GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
const QString SpecularDataItem::P_TITLE = "Title";
const QString SpecularDataItem::P_XAXIS = "x-axis";
diff --git a/GUI/coregui/Models/SphericalDetectorItem.cpp b/GUI/coregui/Models/SphericalDetectorItem.cpp
index 87006feb7d762aec6f0f63293cb56a000a7d8bbf..d9b64f31869e8c0d7e9a3ab7013965362976f857 100644
--- a/GUI/coregui/Models/SphericalDetectorItem.cpp
+++ b/GUI/coregui/Models/SphericalDetectorItem.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Models/SphericalDetectorItem.h"
-#include "GUI/coregui/Models/AxesItems.h"
#include "Core/Instrument/SphericalDetector.h"
#include "Core/Parametrization/Units.h"
+#include "GUI/coregui/Models/AxesItems.h"
const QString SphericalDetectorItem::P_PHI_AXIS = "Phi axis";
const QString SphericalDetectorItem::P_ALPHA_AXIS = "Alpha axis";
diff --git a/GUI/coregui/Models/TransformFromDomain.cpp b/GUI/coregui/Models/TransformFromDomain.cpp
index 8b917883b14b3aa353487ccd10c0d660d7f27a79..8ec17c8068dd4b7e3edf3f69aa67b1c4f45eeacd 100644
--- a/GUI/coregui/Models/TransformFromDomain.cpp
+++ b/GUI/coregui/Models/TransformFromDomain.cpp
@@ -13,63 +13,63 @@
// ************************************************************************** //
#include "GUI/coregui/Models/TransformFromDomain.h"
+#include "Core/Aggregate/FTDistributions1D.h"
+#include "Core/Aggregate/FTDistributions2D.h"
+#include "Core/Beam/Beam.h"
+#include "Core/Beam/FootprintFactorGaussian.h"
+#include "Core/Beam/FootprintFactorSquare.h"
+#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/Instrument/ConvolutionDetectorResolution.h"
+#include "Core/Instrument/RectangularDetector.h"
+#include "Core/Instrument/RegionOfInterest.h"
+#include "Core/Instrument/ResolutionFunction2DGaussian.h"
+#include "Core/Instrument/ScanResolution.h"
+#include "Core/Instrument/SphericalDetector.h"
+#include "Core/Mask/Ellipse.h"
+#include "Core/Mask/InfinitePlane.h"
+#include "Core/Mask/Line.h"
+#include "Core/Mask/Polygon.h"
+#include "Core/Mask/Rectangle.h"
+#include "Core/Multilayer/Layer.h"
+#include "Core/Multilayer/LayerInterface.h"
+#include "Core/Multilayer/LayerRoughness.h"
+#include "Core/Parametrization/Distributions.h"
+#include "Core/Parametrization/ParameterPattern.h"
+#include "Core/Parametrization/ParameterUtils.h"
+#include "Core/Parametrization/RangedDistributions.h"
+#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
+#include "Core/Particle/ParticleDistribution.h"
+#include "Core/Simulation/GISASSimulation.h"
+#include "Core/Simulation/OffSpecSimulation.h"
+#include "Core/Simulation/SpecularSimulation.h"
+#include "Core/includeIncludes/InterferenceFunctions.h"
#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/BackgroundItems.h"
-#include "Core/Beam/Beam.h"
#include "GUI/coregui/Models/BeamAngleItems.h"
#include "GUI/coregui/Models/BeamItems.h"
-#include "Core/Computation/ConstantBackground.h"
-#include "Core/Instrument/ConvolutionDetectorResolution.h"
#include "GUI/coregui/Models/DetectorItems.h"
-#include "Core/Parametrization/Distributions.h"
-#include "Core/Mask/Ellipse.h"
#include "GUI/coregui/Models/FTDecayFunctionItems.h"
#include "GUI/coregui/Models/FTDistributionItems.h"
-#include "Core/Aggregate/FTDistributions1D.h"
-#include "Core/Aggregate/FTDistributions2D.h"
-#include "Core/Binning/FixedBinAxis.h"
-#include "Core/Beam/FootprintFactorGaussian.h"
-#include "Core/Beam/FootprintFactorSquare.h"
#include "GUI/coregui/Models/FootprintItems.h"
-#include "Core/Simulation/GISASSimulation.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "Core/Export/INodeUtils.h"
-#include "Core/Mask/InfinitePlane.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/InterferenceFunctionItems.h"
-#include "Core/includeIncludes/InterferenceFunctions.h"
#include "GUI/coregui/Models/Lattice2DItems.h"
-#include "Core/Multilayer/Layer.h"
-#include "Core/Multilayer/LayerInterface.h"
#include "GUI/coregui/Models/LayerItem.h"
-#include "Core/Multilayer/LayerRoughness.h"
#include "GUI/coregui/Models/LayerRoughnessItems.h"
-#include "Core/Mask/Line.h"
#include "GUI/coregui/Models/MaskItems.h"
-#include "Core/Simulation/OffSpecSimulation.h"
-#include "Core/Parametrization/ParameterPattern.h"
-#include "Core/Parametrization/ParameterUtils.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Particle/ParticleDistribution.h"
#include "GUI/coregui/Models/ParticleDistributionItem.h"
#include "GUI/coregui/Models/ParticleItem.h"
-#include "Core/Computation/PoissonNoiseBackground.h"
-#include "Core/Mask/Polygon.h"
-#include "Core/Parametrization/RangedDistributions.h"
-#include "Core/Mask/Rectangle.h"
-#include "Core/Instrument/RectangularDetector.h"
#include "GUI/coregui/Models/RectangularDetectorItem.h"
-#include "Core/Instrument/RegionOfInterest.h"
-#include "Core/Instrument/ResolutionFunction2DGaussian.h"
#include "GUI/coregui/Models/ResolutionFunctionItems.h"
-#include "Core/Instrument/ScanResolution.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "GUI/coregui/Models/SpecularBeamInclinationItem.h"
-#include "Core/Simulation/SpecularSimulation.h"
-#include "Core/Instrument/SphericalDetector.h"
#include "GUI/coregui/Models/SphericalDetectorItem.h"
-#include "Core/Parametrization/Units.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
using namespace INodeUtils;
using SessionItemUtils::SetVectorItem;
diff --git a/GUI/coregui/Models/TransformToDomain.cpp b/GUI/coregui/Models/TransformToDomain.cpp
index db8c18d01d5386772338dee365f658f218404385..0c1787d4e0828a819c1c28a5fd9e03c71d7edcfe 100644
--- a/GUI/coregui/Models/TransformToDomain.cpp
+++ b/GUI/coregui/Models/TransformToDomain.cpp
@@ -13,48 +13,48 @@
// ************************************************************************** //
#include "GUI/coregui/Models/TransformToDomain.h"
+#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Instrument/AngularSpecScan.h"
+#include "Core/Instrument/ScanResolution.h"
+#include "Core/Parametrization/Distributions.h"
+#include "Core/Parametrization/ParameterPattern.h"
+#include "Core/Parametrization/RangedDistributions.h"
+#include "Core/Parametrization/Units.h"
+#include "Core/Particle/MesoCrystal.h"
+#include "Core/Particle/Particle.h"
+#include "Core/Particle/ParticleCoreShell.h"
+#include "Core/Simulation/GISASSimulation.h"
+#include "Core/includeIncludes/InterferenceFunctions.h"
#include "GUI/coregui/Models/BeamAngleItems.h"
#include "GUI/coregui/Models/BeamItems.h"
#include "GUI/coregui/Models/BeamWavelengthItem.h"
-#include "Core/Basics/BornAgainNamespace.h"
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/DetectorItems.h"
-#include "Core/Parametrization/Distributions.h"
#include "GUI/coregui/Models/FTDecayFunctionItems.h"
#include "GUI/coregui/Models/FTDistributionItems.h"
-#include "Core/Simulation/GISASSimulation.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "Core/includeIncludes/InterferenceFunctions.h"
#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Models/JobModelFunctions.h"
#include "GUI/coregui/Models/Lattice2DItems.h"
#include "GUI/coregui/Models/LayerItem.h"
#include "GUI/coregui/Models/LayerRoughnessItems.h"
#include "GUI/coregui/Models/MaskItems.h"
-#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
-#include "Core/Particle/MesoCrystal.h"
#include "GUI/coregui/Models/MesoCrystalItem.h"
#include "GUI/coregui/Models/MultiLayerItem.h"
-#include "Core/Parametrization/ParameterPattern.h"
-#include "Core/Particle/Particle.h"
#include "GUI/coregui/Models/ParticleCompositionItem.h"
-#include "Core/Particle/ParticleCoreShell.h"
#include "GUI/coregui/Models/ParticleCoreShellItem.h"
#include "GUI/coregui/Models/ParticleDistributionItem.h"
#include "GUI/coregui/Models/ParticleItem.h"
#include "GUI/coregui/Models/ParticleLayoutItem.h"
-#include "Core/Parametrization/RangedDistributions.h"
#include "GUI/coregui/Models/RectangularDetectorItem.h"
#include "GUI/coregui/Models/RotationItems.h"
-#include "Core/Instrument/ScanResolution.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "GUI/coregui/Models/SimulationOptionsItem.h"
#include "GUI/coregui/Models/SpecularBeamInclinationItem.h"
#include "GUI/coregui/Models/SphericalDetectorItem.h"
#include "GUI/coregui/Models/TransformationItem.h"
-#include "Core/Parametrization/Units.h"
#include "GUI/coregui/Models/VectorItem.h"
+#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
using SessionItemUtils::GetVectorItem;
diff --git a/GUI/coregui/Models/TransformToDomain.h b/GUI/coregui/Models/TransformToDomain.h
index e8c09040b3d316f9f1817e2724024a573deb6463..5d69a9c3fdf1fe7fab1fe769d657f0fcb61ee0a9 100644
--- a/GUI/coregui/Models/TransformToDomain.h
+++ b/GUI/coregui/Models/TransformToDomain.h
@@ -15,16 +15,16 @@
#ifndef TRANSFORMTODOMAIN_H
#define TRANSFORMTODOMAIN_H
-#include "Core/Beam/Beam.h"
-#include "Core/Parametrization/Distributions.h" // for IDistribution1D
#include "Core/Aggregate/IInterferenceFunction.h"
-#include "Core/Particle/IParticle.h"
+#include "Core/Aggregate/ParticleLayout.h"
+#include "Core/Beam/Beam.h"
#include "Core/Instrument/Instrument.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerRoughness.h"
#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Parametrization/Distributions.h" // for IDistribution1D
+#include "Core/Particle/IParticle.h"
#include "Core/Particle/ParticleDistribution.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include <memory>
class AngularSpecScan;
diff --git a/GUI/coregui/Models/VectorItem.h b/GUI/coregui/Models/VectorItem.h
index b51cf93c98e3712cc565027309a991519978cf06..082c4c60a1b51ec31f7918bc46f7450a12ca8822 100644
--- a/GUI/coregui/Models/VectorItem.h
+++ b/GUI/coregui/Models/VectorItem.h
@@ -15,8 +15,8 @@
#ifndef VECTORITEM_H
#define VECTORITEM_H
-#include "GUI/coregui/Models/SessionItem.h"
#include "Core/Vector/Vectors3D.h"
+#include "GUI/coregui/Models/SessionItem.h"
class BA_CORE_API_ VectorItem : public SessionItem
{
diff --git a/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp
index 574c95e30071232ce02557fb001cd9cc92b70f74..4d507b8fd7633b99887186de492e72af3a267ada 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Views/CommonWidgets/ItemComboWidget.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Views/CommonWidgets/ItemComboToolBar.h"
#include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QComboBox>
#include <QEvent>
#include <QStackedWidget>
diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
index 6171f9d354cdbbc2d0a1c7b3af6594b73d183948..dc2bebce103b110dbbb5340cb79ec174be798386 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/CommonWidgets/ItemStackWidget.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QStackedWidget>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/CommonWidgets/ModelTreeView.cpp b/GUI/coregui/Views/CommonWidgets/ModelTreeView.cpp
index 5753620db805313e5749ca9053d02d19525eac91..db70f0bb30aecba9c3c3b94b07a3d447fa3353aa 100644
--- a/GUI/coregui/Views/CommonWidgets/ModelTreeView.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ModelTreeView.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Views/CommonWidgets/ModelTreeView.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/SessionDecorationModel.h"
#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/utils/StyleUtils.h"
#include <QTreeView>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/CommonWidgets/SessionItemController.cpp b/GUI/coregui/Views/CommonWidgets/SessionItemController.cpp
index 3f00501ea42c36937fcaba7a86659aac27455dcf..d76f3d13e77ea8cccbcc5691ec84cd9c265c6a88 100644
--- a/GUI/coregui/Views/CommonWidgets/SessionItemController.cpp
+++ b/GUI/coregui/Views/CommonWidgets/SessionItemController.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/CommonWidgets/SessionItemController.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/SessionItem.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
SessionItemController::SessionItemController(QObject* prt)
: QObject(prt), m_item(nullptr), m_parent_subscribed(false)
diff --git a/GUI/coregui/Views/CommonWidgets/StatusLabel.cpp b/GUI/coregui/Views/CommonWidgets/StatusLabel.cpp
index c32c37dd9e02d1541a788fd68cd4b8253ca32bc7..cd99c56b342304459eeed77b7f95d71d8364b670 100644
--- a/GUI/coregui/Views/CommonWidgets/StatusLabel.cpp
+++ b/GUI/coregui/Views/CommonWidgets/StatusLabel.cpp
@@ -13,19 +13,20 @@
// ************************************************************************** //
#include "GUI/coregui/Views/CommonWidgets/StatusLabel.h"
+#include "GUI/coregui/utils/StyleUtils.h"
#include <QColor>
#include <QFont>
#include <QPainter>
-#include "GUI/coregui/utils/StyleUtils.h"
namespace
{
-int default_text_size() {
+int default_text_size()
+{
return StyleUtils::SystemPointSize();
}
int default_label_height()
{
- return StyleUtils::SizeOfLetterM().height()*1.75;
+ return StyleUtils::SizeOfLetterM().height() * 1.75;
}
} // namespace
diff --git a/GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp b/GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp
index fe8163bca304f7f90f0cb77a71869f5bdcb2ab01..f6129f9156c763ed4c7d06759459129152653a7b 100644
--- a/GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "GUI/coregui/Views/FitWidgets/FitActivityPanel.h"
+#include "GUI/coregui/Models/JobItem.h"
+#include "GUI/coregui/Models/JobModel.h"
#include "GUI/coregui/Views/FitWidgets/FitSessionManager.h"
#include "GUI/coregui/Views/FitWidgets/FitSessionWidget.h"
-#include "GUI/coregui/Models/JobItem.h"
+#include "GUI/coregui/Views/FitWidgets/RunFitControlWidget.h"
#include "GUI/coregui/Views/JobWidgets/JobMessagePanel.h"
-#include "GUI/coregui/Models/JobModel.h"
#include "GUI/coregui/Views/JobWidgets/JobRealTimeWidget.h"
-#include "GUI/coregui/Views/FitWidgets/RunFitControlWidget.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
#include <QPushButton>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonController.cpp b/GUI/coregui/Views/FitWidgets/FitComparisonController.cpp
index 4b5ea62ce2f6adb24f3683355a6099f5ad4b9e8d..f4765052effdbdcd6a14f9bc8a65cffedc9e371f 100644
--- a/GUI/coregui/Views/FitWidgets/FitComparisonController.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitComparisonController.cpp
@@ -13,14 +13,14 @@
// ************************************************************************** //
#include "GUI/coregui/Views/FitWidgets/FitComparisonController.h"
-#include "GUI/coregui/Models/AxesItems.h"
#include "Core/Instrument/IntensityDataFunctions.h"
+#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/JobItem.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.h"
#include "GUI/coregui/Models/RealDataItem.h"
#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/Models/SpecularDataItem.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.h"
namespace
{
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonViewController.cpp b/GUI/coregui/Views/FitWidgets/FitComparisonViewController.cpp
index 1338c1add343f397ec7dc8e62518e1b272024a6d..4e7237e9c2e4153c738fffd85731ea3d19f067d0 100644
--- a/GUI/coregui/Views/FitWidgets/FitComparisonViewController.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitComparisonViewController.cpp
@@ -13,15 +13,15 @@
// ************************************************************************** //
#include "GUI/coregui/Views/FitWidgets/FitComparisonViewController.h"
+#include "Core/Instrument/IntensityDataFunctions.h"
#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/Data1DViewItem.h"
#include "GUI/coregui/Models/DataItem.h"
#include "GUI/coregui/Models/DataPropertyContainer.h"
-#include "Core/Instrument/IntensityDataFunctions.h"
#include "GUI/coregui/Models/JobItem.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.h"
#include "GUI/coregui/Models/RealDataItem.h"
#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.h"
namespace
{
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
index 78c43bd706c3f85b5d5afe170af0838ccd5fb6ad..ac48f33bb34aab54abc7a121bfc0c9ac96dc3caa 100644
--- a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
@@ -13,16 +13,16 @@
// ************************************************************************** //
#include "GUI/coregui/Views/FitWidgets/FitComparisonWidget.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/ColorMap.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h"
-#include "GUI/coregui/Views/FitWidgets/FitComparisonController.h"
-#include "GUI/coregui/Views/FitWidgets/FitFlowWidget.h"
#include "GUI/coregui/Models/FitSuiteItem.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h"
#include "GUI/coregui/Models/JobItem.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/PlotStatusLabel.h"
#include "GUI/coregui/Models/RealDataItem.h"
+#include "GUI/coregui/Views/FitWidgets/FitComparisonController.h"
+#include "GUI/coregui/Views/FitWidgets/FitFlowWidget.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/ColorMap.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/PlotStatusLabel.h"
#include <QAction>
#include <QGridLayout>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonWidget1D.cpp b/GUI/coregui/Views/FitWidgets/FitComparisonWidget1D.cpp
index 8c0e2cfc30075b892637efa9bf225e4fcda49fe9..1d45f29a234b10eaf06433a65ac7a5c782b9c64b 100644
--- a/GUI/coregui/Views/FitWidgets/FitComparisonWidget1D.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitComparisonWidget1D.cpp
@@ -14,16 +14,16 @@
#include "GUI/coregui/Views/FitWidgets/FitComparisonWidget1D.h"
#include "GUI/coregui/Models/Data1DViewItem.h"
+#include "GUI/coregui/Models/FitSuiteItem.h"
+#include "GUI/coregui/Models/JobItem.h"
+#include "GUI/coregui/Models/RealDataItem.h"
+#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/Views/FitWidgets/FitComparisonViewController.h"
#include "GUI/coregui/Views/FitWidgets/FitFlowWidget.h"
-#include "GUI/coregui/Models/FitSuiteItem.h"
#include "GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h"
-#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Views/IntensityDataWidgets/Plot1D.h"
-#include "GUI/coregui/Views/SpecularDataWidgets/Plot1DCanvas.h"
#include "GUI/coregui/Views/IntensityDataWidgets/PlotStatusLabel.h"
-#include "GUI/coregui/Models/RealDataItem.h"
-#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/Views/SpecularDataWidgets/Plot1DCanvas.h"
#include <QAction>
#include <QGridLayout>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.cpp b/GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.cpp
index 7a550f8cea6e7c5a2f100f18aa3d11f99047e06e..657d56390b19f5d9a02c52eb4220f93f6d60c51a 100644
--- a/GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.cpp
@@ -13,27 +13,27 @@
// ************************************************************************** //
#include "GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.h"
+#include "Core/Fitting/FitObjective.h"
+#include "Core/Fitting/ObjectiveMetric.h"
#include "Core/Instrument/ChiSquaredModule.h"
+#include "Core/Instrument/IIntensityFunction.h"
+#include "Core/Instrument/OutputData.h"
+#include "Core/Instrument/VarianceFunctions.h"
+#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Simulation/Simulation.h"
+#include "Fit/Kernel/KernelTypes.h"
+#include "Fit/Kernel/Minimizer.h"
+#include "Fit/Kernel/Parameters.h"
+#include "Fit/Minimizer/IMinimizer.h"
#include "GUI/coregui/Models/DataItem.h"
#include "GUI/coregui/Models/DomainSimulationBuilder.h"
-#include "Core/Fitting/FitObjective.h"
#include "GUI/coregui/Models/FitParameterItems.h"
#include "GUI/coregui/Models/FitSuiteItem.h"
-#include "GUI/coregui/Views/FitWidgets/GUIFitObserver.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "Core/Instrument/IIntensityFunction.h"
-#include "Fit/Minimizer/IMinimizer.h"
#include "GUI/coregui/Models/JobItem.h"
-#include "Fit/Kernel/KernelTypes.h"
-#include "Fit/Kernel/Minimizer.h"
#include "GUI/coregui/Models/MinimizerItem.h"
-#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Fitting/ObjectiveMetric.h"
-#include "Core/Instrument/OutputData.h"
-#include "Fit/Kernel/Parameters.h"
#include "GUI/coregui/Models/RealDataItem.h"
-#include "Core/Simulation/Simulation.h"
-#include "Core/Instrument/VarianceFunctions.h"
+#include "GUI/coregui/Views/FitWidgets/GUIFitObserver.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
FitObjectiveBuilder::FitObjectiveBuilder(JobItem* jobItem) : m_jobItem(jobItem)
{
diff --git a/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp b/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
index f1fada162123e5a410e0ebc2293845b904fb8220..cd99b3ad9b422efbce34dec4bf2c3f241ce476f2 100644
--- a/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "GUI/coregui/Views/FitWidgets/FitParameterWidget.h"
-#include "GUI/coregui/utils/CustomEventFilters.h"
#include "GUI/coregui/Models/FilterPropertyProxy.h"
#include "GUI/coregui/Models/FitParameterHelper.h"
#include "GUI/coregui/Models/FitParameterItems.h"
@@ -21,11 +20,12 @@
#include "GUI/coregui/Models/FitSuiteItem.h"
#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Models/JobModel.h"
-#include "GUI/coregui/Views/InfoWidgets/OverlayLabelController.h"
#include "GUI/coregui/Models/ParameterTreeItems.h"
-#include "GUI/coregui/Views/JobWidgets/ParameterTuningWidget.h"
#include "GUI/coregui/Models/SessionModelDelegate.h"
+#include "GUI/coregui/Views/InfoWidgets/OverlayLabelController.h"
+#include "GUI/coregui/Views/JobWidgets/ParameterTuningWidget.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
+#include "GUI/coregui/utils/CustomEventFilters.h"
#include <QAction>
#include <QMenu>
#include <QTreeView>
diff --git a/GUI/coregui/Views/FitWidgets/FitSessionController.cpp b/GUI/coregui/Views/FitWidgets/FitSessionController.cpp
index faccfb5710cd42cadfbf80db78c37c0ab06e61c0..4699e843776bb42fbcaf7cd5567c9166adb12f2a 100644
--- a/GUI/coregui/Views/FitWidgets/FitSessionController.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitSessionController.cpp
@@ -13,16 +13,16 @@
// ************************************************************************** //
#include "GUI/coregui/Views/FitWidgets/FitSessionController.h"
+#include "GUI/coregui/Models/FitParameterItems.h"
+#include "GUI/coregui/Models/FitSuiteItem.h"
+#include "GUI/coregui/Models/IntensityDataItem.h"
+#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Views/FitWidgets/FitLog.h"
#include "GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.h"
-#include "GUI/coregui/Models/FitParameterItems.h"
#include "GUI/coregui/Views/FitWidgets/FitProgressInfo.h"
-#include "GUI/coregui/Models/FitSuiteItem.h"
#include "GUI/coregui/Views/FitWidgets/FitWorkerLauncher.h"
#include "GUI/coregui/Views/FitWidgets/GUIFitObserver.h"
#include "GUI/coregui/utils/GUIHelpers.h"
-#include "GUI/coregui/Models/IntensityDataItem.h"
-#include "GUI/coregui/Models/JobItem.h"
namespace
{
diff --git a/GUI/coregui/Views/FitWidgets/FitSessionManager.cpp b/GUI/coregui/Views/FitWidgets/FitSessionManager.cpp
index 4746347e4d556708f6d5ee88479a3b07bc17926b..29aa5eb752537191b2a1e8ce996fc1f068f331f9 100644
--- a/GUI/coregui/Views/FitWidgets/FitSessionManager.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitSessionManager.cpp
@@ -13,11 +13,11 @@
// ************************************************************************** //
#include "GUI/coregui/Views/FitWidgets/FitSessionManager.h"
+#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Views/FitWidgets/FitLog.h"
#include "GUI/coregui/Views/FitWidgets/FitSessionController.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Views/JobWidgets/JobMessagePanel.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
FitSessionManager::FitSessionManager(QObject* parent)
: QObject(parent), m_activeController(nullptr), m_jobMessagePanel(nullptr)
diff --git a/GUI/coregui/Views/FitWidgets/FitSessionWidget.cpp b/GUI/coregui/Views/FitWidgets/FitSessionWidget.cpp
index 2b8b64a9a64c1c7df74b3ded0e4fa6522661ea2f..ec37c2a57109315ea2c6c7602b7e4c56f65fd34d 100644
--- a/GUI/coregui/Views/FitWidgets/FitSessionWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitSessionWidget.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "GUI/coregui/Views/FitWidgets/FitSessionWidget.h"
+#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Views/FitWidgets/FitParameterWidget.h"
#include "GUI/coregui/Views/FitWidgets/FitResultsWidget.h"
#include "GUI/coregui/Views/FitWidgets/FitSessionController.h"
-#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h"
#include "GUI/coregui/Views/FitWidgets/RunFitControlWidget.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
diff --git a/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp b/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
index f9f1359619d5a90f84630d85bf676127a4e8836e..cd2b2fb0dfdb5643b664ebf206db4231ed0aa827 100644
--- a/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
+++ b/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
@@ -14,10 +14,10 @@
#include "GUI/coregui/Views/FitWidgets/GUIFitObserver.h"
#include "Core/Fitting/FitObjective.h"
-#include "GUI/coregui/Views/FitWidgets/FitProgressInfo.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "Fit/Kernel/MinimizerResult.h"
#include "Fit/Tools/MinimizerUtils.h"
+#include "GUI/coregui/Views/FitWidgets/FitProgressInfo.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
GUIFitObserver::GUIFitObserver(QObject* parent)
: QObject(parent), m_block_update_plots(false), m_update_interval(1)
diff --git a/GUI/coregui/Views/FitWidgets/HistogramPlot.cpp b/GUI/coregui/Views/FitWidgets/HistogramPlot.cpp
index 6d9880c16b61d989ed9bdbe821604ef1b34eb006..53e825fabd6f0e2c51be5a4cacc8fe433f82ee68 100644
--- a/GUI/coregui/Views/FitWidgets/HistogramPlot.cpp
+++ b/GUI/coregui/Views/FitWidgets/HistogramPlot.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/FitWidgets/HistogramPlot.h"
-#include "GUI/coregui/utils/StyleUtils.h"
#include "GUI/coregui/Views/FitWidgets/plot_constants.h"
+#include "GUI/coregui/utils/StyleUtils.h"
HistogramPlot::HistogramPlot(QWidget* parent) : QWidget(parent), m_customPlot(new QCustomPlot)
@@ -29,8 +29,10 @@ HistogramPlot::HistogramPlot(QWidget* parent) : QWidget(parent), m_customPlot(ne
initGraph();
- m_customPlot->xAxis->setTickLabelFont(QFont(QFont().family(), Constants::plot_tick_label_size()));
- m_customPlot->yAxis->setTickLabelFont(QFont(QFont().family(), Constants::plot_tick_label_size()));
+ m_customPlot->xAxis->setTickLabelFont(
+ QFont(QFont().family(), Constants::plot_tick_label_size()));
+ m_customPlot->yAxis->setTickLabelFont(
+ QFont(QFont().family(), Constants::plot_tick_label_size()));
m_customPlot->yAxis->setScaleType(QCPAxis::stLogarithmic);
m_customPlot->yAxis->setNumberFormat("eb");
diff --git a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
index 4fde4c352c96c86ff7308600f827cd5a323e106f..36a19d6880e90d89a32365742ad6c3035e07d047 100644
--- a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/coregui/Models/FitSuiteItem.h"
#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Models/MinimizerItem.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include <QPushButton>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp b/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
index 725ae6dddfe5cbb722a4e5b34d6901c8ef1f73c6..291345886b687f7ef03363f79ab44e8b56a70e43 100644
--- a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "GUI/coregui/Views/FitWidgets/RunFitControlWidget.h"
-#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
#include "GUI/coregui/Models/FitSuiteItem.h"
#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Views/InfoWidgets/WarningSign.h"
+#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
#include <QFont>
#include <QHBoxLayout>
diff --git a/GUI/coregui/Views/ImportDataView.cpp b/GUI/coregui/Views/ImportDataView.cpp
index 695e6cf36c8bc7468244c8bca8c5dc7066b88d88..4ff299574a9ce006cb0e874708b3b8975ea228f7 100644
--- a/GUI/coregui/Views/ImportDataView.cpp
+++ b/GUI/coregui/Views/ImportDataView.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/ImportDataView.h"
-#include "GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h"
#include "GUI/coregui/Models/RealDataModel.h"
+#include "GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h"
#include "GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h"
#include "GUI/coregui/mainwindow/mainwindow.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvDataColumn.h b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvDataColumn.h
index 70c4786a75998df1df16df1fe2225eaf4cfd1647..8b95c54f9fda03d241e7c530b07b42b2b6a0866f 100644
--- a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvDataColumn.h
+++ b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvDataColumn.h
@@ -15,8 +15,8 @@
#ifndef CSVDATACOLUMN_H
#define CSVDATACOLUMN_H
-#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvNamespace.h"
#include "Core/Instrument/IUnitConverter.h"
+#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvNamespace.h"
class CsvIntensityColumn
{
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.cpp b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.cpp
index d3d976f0003a6ec8085b4a5b8ed2d3aedf00a4db..53cf871b57f4b0295802ab0757245cf3f932730b 100644
--- a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.cpp
@@ -15,9 +15,9 @@
#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.h"
#include "DataFormatUtils.cpp"
#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.h"
+#include "GUI/coregui/mainwindow/mainwindow_constants.h"
#include "GUI/coregui/utils/ImportDataInfo.h"
#include "GUI/coregui/utils/StyleUtils.h"
-#include "GUI/coregui/mainwindow/mainwindow_constants.h"
#include <QFileDialog>
#include <QFormLayout>
#include <QMenu>
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.h b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.h
index 3d191244e4aeaaf5b0bd2f40fb959208ffa0cb81..072003346cc20da25332a6b4a538e1e9f67ddf7d 100644
--- a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.h
+++ b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.h
@@ -15,9 +15,9 @@
#ifndef CSVIMPORTASSISTANT_H
#define CSVIMPORTASSISTANT_H
+#include "Core/InputOutput/DataFormatUtils.h"
#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvDataColumn.h"
#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvReader.h"
-#include "Core/InputOutput/DataFormatUtils.h"
#include "GUI/coregui/utils/ImportDataInfo.h"
#include "Wrap/WinDllMacros.h"
#include <QStringList>
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.cpp b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.cpp
index 3113a228a6f1d93dc22da59ed216113c6dae851a..a265062d3750d233347a7b2e09332465c5fc072a 100644
--- a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.cpp
@@ -14,10 +14,10 @@
#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.h"
#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.h"
-#include "GUI/coregui/utils/ImportDataInfo.h"
-#include "GUI/coregui/utils/StyleUtils.h"
#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/TableContextMenu.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
+#include "GUI/coregui/utils/ImportDataInfo.h"
+#include "GUI/coregui/utils/StyleUtils.h"
#include <QFileDialog>
#include <QFormLayout>
#include <QGroupBox>
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/TableContextMenu.h b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/TableContextMenu.h
index 698fe661865a418b22d9490463acd8cc1692a1e3..13f0d999ac628913e3e29180db3877f756ffa053 100644
--- a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/TableContextMenu.h
+++ b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/TableContextMenu.h
@@ -15,8 +15,8 @@
#ifndef TABLECONTEXTMENU_H
#define TABLECONTEXTMENU_H
-#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvNamespace.h"
#include "Core/Instrument/IUnitConverter.h"
+#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvNamespace.h"
#include <QMenu>
#include <QStringList>
#include <QTableWidget>
diff --git a/GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.cpp b/GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.cpp
index 046f0183b985c09f6ba84f56bc379dbd61ae4d76..bb20d66934a1cf844af07249b6d293b1a9404494 100644
--- a/GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.cpp
@@ -13,17 +13,17 @@
// ************************************************************************** //
#include "GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h"
-#include "GUI/coregui/mainwindow/AppSvc.h"
-#include "GUI/coregui/Models/AxesItems.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "GUI/coregui/Models/InstrumentItems.h"
+#include "Core/Binning/PointwiseAxis.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
+#include "GUI/coregui/Models/AxesItems.h"
+#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
-#include "Core/Binning/PointwiseAxis.h"
#include "GUI/coregui/Models/RealDataItem.h"
+#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.h"
+#include "GUI/coregui/mainwindow/AppSvc.h"
#include "GUI/coregui/mainwindow/projectmanager.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QFileDialog>
#include <QFileInfo>
#include <QMessageBox>
diff --git a/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp b/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp
index 5c01b3f9ffea1b52a86b04a2ad0e1c388325e4a8..d522c79366d6af67e6a22c6e7a1f582e86103df8 100644
--- a/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp
@@ -15,12 +15,12 @@
#include "GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.h"
#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/DetectorItems.h"
-#include "GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/InstrumentModel.h"
#include "GUI/coregui/Models/MaskItems.h"
#include "GUI/coregui/Models/RealDataItem.h"
#include "GUI/coregui/Models/RealDataModel.h"
+#include "GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h"
#include <QMessageBox>
#include <QPushButton>
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.cpp
index ead9a7190e5fc7d25e57f1cbf3b0ccaa5df7223a..249f969444d383be598974244b5e9b2b579e1ad2 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.cpp
@@ -14,10 +14,10 @@
#include "GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
-#include "GUI/coregui/Views/MaskWidgets/MaskEditor.h"
#include "GUI/coregui/Models/MaskItems.h"
#include "GUI/coregui/Models/RealDataItem.h"
#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/Views/MaskWidgets/MaskEditor.h"
#include <QAction>
#include <QBoxLayout>
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.cpp
index c189bccc015041eb9f0cad55aac6438bbc5eb075..0f6b17423474bff88c5d81a81c4a3c125ca5bd9b 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h"
#include "GUI/coregui/Models/RealDataItem.h"
+#include "GUI/coregui/Models/item_constants.h"
#include "GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h"
#include "GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.h"
-#include "GUI/coregui/Models/item_constants.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QAction>
#include <cassert>
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
index d7165198a716c4b433a4cea64797ca68161ab544..5d93d96352f05e072dbeb6beb6011e5fb6754e05 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.h"
-#include "GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.h"
#include "GUI/coregui/Models/RealDataItem.h"
#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.h"
#include <QComboBox>
#include <QDataWidgetMapper>
#include <QLabel>
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.cpp
index 93383b3edfd59e4de2d7d089502328a0322f4912..d7b667e1028b3b7ce9e5c3bf3207cb978bb2570d 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.cpp
@@ -13,18 +13,18 @@
// ************************************************************************** //
#include "GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.h"
-#include "GUI/coregui/mainwindow/AppSvc.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "GUI/coregui/utils/ImportDataInfo.h"
-#include "GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h"
#include "Core/Instrument/IntensityDataFunctions.h"
+#include "Core/Instrument/OutputData.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/MaskItems.h"
-#include "Core/Instrument/OutputData.h"
#include "GUI/coregui/Models/ProjectionItems.h"
#include "GUI/coregui/Models/RealDataItem.h"
#include "GUI/coregui/Models/RealDataModel.h"
+#include "GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h"
+#include "GUI/coregui/mainwindow/AppSvc.h"
#include "GUI/coregui/mainwindow/projectmanager.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
+#include "GUI/coregui/utils/ImportDataInfo.h"
#include <QAction>
#include <QApplication>
#include <QFileDialog>
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
index 73a733b67f210a1e7178e555738e124c82888a0f..f6071a15ef16530ae3f45970349fef851e3dc71b 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h"
-#include "GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h"
#include "GUI/coregui/Models/RealDataModel.h"
+#include "GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h"
#include "GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.h"
#include "GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.h"
#include "GUI/coregui/Views/ImportDataWidgets/RealDataSelectorHBar.h"
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp b/GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp
index baf7fd79cb1852e1aa48ba8ad88172cf65835977..0644ad5d2a3ef09af6fadc4904d7b2d05ce87423 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp
+++ b/GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/InfoWidgets/DistributionDialog.h"
-#include "GUI/coregui/Views/InfoWidgets/DistributionEditor.h"
#include "GUI/coregui/Models/SessionItem.h"
+#include "GUI/coregui/Views/InfoWidgets/DistributionEditor.h"
#include "GUI/coregui/utils/StyleUtils.h"
#include <QHBoxLayout>
#include <QPushButton>
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp b/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
index 8494dff496d6270a02c8daa73391481b25e15d8c..70ff7a791f567967114ae2464ba80d777a00c73a 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
+++ b/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
@@ -13,11 +13,11 @@
// ************************************************************************** //
#include "GUI/coregui/Views/InfoWidgets/DistributionEditor.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentFlatView.h"
#include "GUI/coregui/Models/DistributionItems.h"
-#include "GUI/coregui/Views/InfoWidgets/DistributionWidget.h"
#include "GUI/coregui/Models/GroupItem.h"
#include "GUI/coregui/Models/SessionItem.h"
+#include "GUI/coregui/Views/InfoWidgets/DistributionWidget.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentFlatView.h"
#include <QBoxLayout>
namespace
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp b/GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp
index 0d9b3809411f92ff30c2114e7785254011c23ae7..c2e85926320d4ff5f5e0f2be8d9408e6e5f5e377 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/InfoWidgets/DistributionWidget.h"
-#include "GUI/coregui/Models/DistributionItems.h"
#include "Core/Parametrization/Distributions.h"
+#include "GUI/coregui/Models/DistributionItems.h"
#include "GUI/coregui/Models/RealLimitsItems.h"
#include "GUI/coregui/Views/InfoWidgets/WarningSign.h"
#include "qcustomplot.h"
diff --git a/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp b/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
index 79f1bd5d8473e907e17f3e6b91375e3f20b9f592..f0cf245147ded4d3fdf69a8047376a9a4023dc42 100644
--- a/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
@@ -13,16 +13,16 @@
// ************************************************************************** //
#include "GUI/coregui/Views/InfoWidgets/PySampleWidget.h"
-#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
-#include "GUI/coregui/Models/DomainObjectBuilder.h"
#include "Core/Export/ExportToPython.h"
#include "Core/Multilayer/MultiLayer.h"
+#include "GUI/coregui/Models/DomainObjectBuilder.h"
#include "GUI/coregui/Models/MultiLayerItem.h"
-#include "GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h"
#include "GUI/coregui/Models/SampleModel.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "GUI/coregui/Views/CommonWidgets/UpdateTimer.h"
+#include "GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h"
#include "GUI/coregui/Views/InfoWidgets/WarningSign.h"
+#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
#include <QScrollBar>
#include <QTextEdit>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/InstrumentView.cpp b/GUI/coregui/Views/InstrumentView.cpp
index 72ff599682d6cc52bf07a8227983fdc80ec2fe7c..5c5938dc7beac6cafbaf79763b306b86eb3d3b4d 100644
--- a/GUI/coregui/Views/InstrumentView.cpp
+++ b/GUI/coregui/Views/InstrumentView.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Views/InstrumentView.h"
+#include "GUI/coregui/Models/InstrumentModel.h"
#include "GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.h"
#include "GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h"
-#include "GUI/coregui/Models/InstrumentModel.h"
#include "GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.h"
#include "GUI/coregui/Views/InstrumentWidgets/InstrumentViewActions.h"
#include "GUI/coregui/Views/InstrumentWidgets/InstrumentViewToolBar.h"
diff --git a/GUI/coregui/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp b/GUI/coregui/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
index 7b1bda375f7e12232fcce959b9db190b1c207898..f5e3e0f2bd3a89a9838a44547a563747a1461a8f 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
@@ -15,11 +15,11 @@
#include "GUI/coregui/Views/InstrumentWidgets/DepthProbeInstrumentEditor.h"
#include "GUI/coregui/Models/BeamDistributionItem.h"
#include "GUI/coregui/Models/BeamItems.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/coregui/Models/DepthProbeInstrumentItem.h"
+#include "GUI/coregui/Models/SpecularBeamInclinationItem.h"
#include "GUI/coregui/Views/InfoWidgets/DistributionDialog.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/coregui/utils/LayoutUtils.h"
-#include "GUI/coregui/Models/SpecularBeamInclinationItem.h"
#include "GUI/coregui/utils/StyleUtils.h"
#include <QGridLayout>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
index ed889b2b740cde5904c86cac26a2b92c791163f3..da3d669c7071b0c7905404fb846ea0905625b97a 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
@@ -20,9 +20,9 @@
#include "GUI/coregui/Models/InstrumentModel.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/JobItemUtils.h"
-#include "GUI/coregui/Views/MaskWidgets/MaskEditor.h"
#include "GUI/coregui/Models/MaskItems.h"
#include "GUI/coregui/Models/ModelPath.h"
+#include "GUI/coregui/Views/MaskWidgets/MaskEditor.h"
DetectorMaskDelegate::DetectorMaskDelegate(QObject* parent)
: QObject(parent), m_tempIntensityDataModel(new SessionModel("TempIntensityDataModel", this)),
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorPresenter.cpp b/GUI/coregui/Views/InstrumentWidgets/DetectorPresenter.cpp
index cddc44adc2c9d5dbcd0560712daf831e27bf224b..fd9df849e4b41aa6c3bb5bd4da6d0ecee0b00662 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorPresenter.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorPresenter.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "GUI/coregui/Views/InstrumentWidgets/DetectorPresenter.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "GUI/coregui/Views/InstrumentWidgets/RectangularDetectorEditor.h"
#include "GUI/coregui/Models/SessionItem.h"
+#include "GUI/coregui/Views/InstrumentWidgets/RectangularDetectorEditor.h"
#include "GUI/coregui/Views/InstrumentWidgets/SphericalDetectorEditor.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
namespace
{
diff --git a/GUI/coregui/Views/InstrumentWidgets/EnvironmentEditor.cpp b/GUI/coregui/Views/InstrumentWidgets/EnvironmentEditor.cpp
index 40fd3bfdd077e2ded5dee8cec4ade213883d3103..6264c1b5ba8b3f4c7c956bc23b33948545e668bd 100644
--- a/GUI/coregui/Views/InstrumentWidgets/EnvironmentEditor.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/EnvironmentEditor.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "GUI/coregui/Views/InstrumentWidgets/EnvironmentEditor.h"
-#include "GUI/coregui/Views/CommonWidgets/ColumnResizer.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/coregui/Models/GroupItem.h"
#include "GUI/coregui/Models/InstrumentItems.h"
+#include "GUI/coregui/Views/CommonWidgets/ColumnResizer.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/coregui/utils/LayoutUtils.h"
#include <QGridLayout>
#include <QSpacerItem>
diff --git a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp b/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
index f25435433dda3ac7c5aca2a0d550553f0c3cd19e..fdf148462389d3b62851c729a096a6ccb6dea722 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.h"
-#include "GUI/coregui/utils/CustomEventFilters.h"
#include "GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h"
#include "GUI/coregui/Views/MaskWidgets/MaskEditor.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
+#include "GUI/coregui/utils/CustomEventFilters.h"
#include <QPushButton>
#include <QSettings>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/InstrumentWidgets/GISASBeamEditor.cpp b/GUI/coregui/Views/InstrumentWidgets/GISASBeamEditor.cpp
index 797739ae0e026a0a1532fefac5c470b16823ce27..74abaad110b7e7ba10d853182fdb99a73b7495cf 100644
--- a/GUI/coregui/Views/InstrumentWidgets/GISASBeamEditor.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/GISASBeamEditor.cpp
@@ -15,10 +15,10 @@
#include "GUI/coregui/Views/InstrumentWidgets/GISASBeamEditor.h"
#include "GUI/coregui/Models/BeamDistributionItem.h"
#include "GUI/coregui/Models/BeamItems.h"
+#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Views/CommonWidgets/ColumnResizer.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/coregui/Views/InfoWidgets/DistributionDialog.h"
-#include "GUI/coregui/Models/InstrumentItems.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include <QGridLayout>
#include <QGroupBox>
diff --git a/GUI/coregui/Views/InstrumentWidgets/GISASDetectorEditor.cpp b/GUI/coregui/Views/InstrumentWidgets/GISASDetectorEditor.cpp
index d5f39028469c507f6efeadac52de4c3d08bc8d9f..c709662780fcea894866bd69779767f442c78e4b 100644
--- a/GUI/coregui/Views/InstrumentWidgets/GISASDetectorEditor.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/GISASDetectorEditor.cpp
@@ -13,11 +13,11 @@
// ************************************************************************** //
#include "GUI/coregui/Views/InstrumentWidgets/GISASDetectorEditor.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/coregui/Models/DetectorItems.h"
-#include "GUI/coregui/Views/InstrumentWidgets/DetectorPresenter.h"
#include "GUI/coregui/Models/GroupItem.h"
#include "GUI/coregui/Models/InstrumentItems.h"
+#include "GUI/coregui/Views/InstrumentWidgets/DetectorPresenter.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include <QVBoxLayout>
GISASDetectorEditor::GISASDetectorEditor(QWidget* parent)
diff --git a/GUI/coregui/Views/InstrumentWidgets/GISASInstrumentEditor.cpp b/GUI/coregui/Views/InstrumentWidgets/GISASInstrumentEditor.cpp
index 583336089f36b9eea77f477b5c00cddfcd8bfce8..dfdab242cd47315d6b85a6903560e1f874b4e504 100644
--- a/GUI/coregui/Views/InstrumentWidgets/GISASInstrumentEditor.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/GISASInstrumentEditor.cpp
@@ -13,11 +13,11 @@
// ************************************************************************** //
#include "GUI/coregui/Views/InstrumentWidgets/GISASInstrumentEditor.h"
+#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Views/CommonWidgets/ColumnResizer.h"
#include "GUI/coregui/Views/InstrumentWidgets/EnvironmentEditor.h"
#include "GUI/coregui/Views/InstrumentWidgets/GISASBeamEditor.h"
#include "GUI/coregui/Views/InstrumentWidgets/GISASDetectorEditor.h"
-#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Views/InstrumentWidgets/PolarizationAnalysisEditor.h"
#include "GUI/coregui/utils/StyleUtils.h"
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
index 57772d94ecf6f9db49913df183f268b6fa867a38..c81147bb1e99bdbfedc91de1aecf15ce80289146 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h"
-#include "GUI/coregui/Views/CommonWidgets/AdjustingScrollArea.h"
#include "GUI/coregui/Models/DetectorItems.h"
#include "GUI/coregui/Models/InstrumentItems.h"
+#include "GUI/coregui/Views/CommonWidgets/AdjustingScrollArea.h"
#include "GUI/coregui/Views/InstrumentWidgets/InstrumentPresenter.h"
#include <QBoxLayout>
#include <QGroupBox>
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentPresenter.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentPresenter.cpp
index dfbee34ac2c6bef722757988e7ec0b7349c67a8c..09c06e3e6828826a384e43977e2c1cafdac995ba 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentPresenter.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentPresenter.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "GUI/coregui/Views/InstrumentWidgets/InstrumentPresenter.h"
+#include "GUI/coregui/Models/SessionItem.h"
+#include "GUI/coregui/Models/item_constants.h"
#include "GUI/coregui/Views/InstrumentWidgets/DepthProbeInstrumentEditor.h"
#include "GUI/coregui/Views/InstrumentWidgets/GISASInstrumentEditor.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Views/InstrumentWidgets/OffSpecInstrumentEditor.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Views/InstrumentWidgets/SpecularInstrumentEditor.h"
-#include "GUI/coregui/Models/item_constants.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
namespace
{
diff --git a/GUI/coregui/Views/InstrumentWidgets/OffSpecBeamEditor.cpp b/GUI/coregui/Views/InstrumentWidgets/OffSpecBeamEditor.cpp
index 1ae14df69b1c43e752e978fe144852674c436bc7..f0e2a03e063dbf86ec4a5458ac0fd5271146ddd3 100644
--- a/GUI/coregui/Views/InstrumentWidgets/OffSpecBeamEditor.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/OffSpecBeamEditor.cpp
@@ -15,10 +15,10 @@
#include "GUI/coregui/Views/InstrumentWidgets/OffSpecBeamEditor.h"
#include "GUI/coregui/Models/BeamDistributionItem.h"
#include "GUI/coregui/Models/BeamItems.h"
+#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Views/CommonWidgets/ColumnResizer.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/coregui/Views/InfoWidgets/DistributionDialog.h"
-#include "GUI/coregui/Models/InstrumentItems.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include <QGridLayout>
#include <QGroupBox>
diff --git a/GUI/coregui/Views/InstrumentWidgets/OffSpecInstrumentEditor.cpp b/GUI/coregui/Views/InstrumentWidgets/OffSpecInstrumentEditor.cpp
index d4adf16385272973775597d554ff12dc0c4eafd0..2e3ac60a764ea6c1df2af396ccd9b5df75801375 100644
--- a/GUI/coregui/Views/InstrumentWidgets/OffSpecInstrumentEditor.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/OffSpecInstrumentEditor.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "GUI/coregui/Views/InstrumentWidgets/OffSpecInstrumentEditor.h"
+#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Views/CommonWidgets/ColumnResizer.h"
#include "GUI/coregui/Views/InstrumentWidgets/EnvironmentEditor.h"
#include "GUI/coregui/Views/InstrumentWidgets/GISASDetectorEditor.h"
-#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Views/InstrumentWidgets/OffSpecBeamEditor.h"
#include "GUI/coregui/Views/InstrumentWidgets/PolarizationAnalysisEditor.h"
#include "GUI/coregui/utils/StyleUtils.h"
diff --git a/GUI/coregui/Views/InstrumentWidgets/PolarizationAnalysisEditor.cpp b/GUI/coregui/Views/InstrumentWidgets/PolarizationAnalysisEditor.cpp
index 977daa79d90d44b7f489fb2b5ead7a11fd50be43..fb0857bcc2305c6a2457eee3ee9db6317cd4f661 100644
--- a/GUI/coregui/Views/InstrumentWidgets/PolarizationAnalysisEditor.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/PolarizationAnalysisEditor.cpp
@@ -14,10 +14,10 @@
#include "GUI/coregui/Views/InstrumentWidgets/PolarizationAnalysisEditor.h"
#include "GUI/coregui/Models/BeamItems.h"
-#include "GUI/coregui/Views/CommonWidgets/ColumnResizer.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/coregui/Models/DetectorItems.h"
#include "GUI/coregui/Models/InstrumentItems.h"
+#include "GUI/coregui/Views/CommonWidgets/ColumnResizer.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/coregui/utils/LayoutUtils.h"
#include <QGridLayout>
#include <QSpacerItem>
diff --git a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorEditor.cpp b/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorEditor.cpp
index b6614b2e9f64998e687b971567a60421718a5963..b7f7dd34c887d397a93fb37099a67094f171c6e6 100644
--- a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorEditor.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorEditor.cpp
@@ -14,8 +14,8 @@
#include "GUI/coregui/Views/InstrumentWidgets/RectangularDetectorEditor.h"
#include "GUI/coregui/Models/ComboProperty.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/coregui/Models/RectangularDetectorItem.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include <QGridLayout>
RectangularDetectorEditor::RectangularDetectorEditor(QWidget* parent)
diff --git a/GUI/coregui/Views/InstrumentWidgets/SpecularBeamEditor.cpp b/GUI/coregui/Views/InstrumentWidgets/SpecularBeamEditor.cpp
index b7bf1f6e26041a0cb963fe28f90c7e9d2f96539f..e3bf615ccfe6e66e82505aa9c90f1337cf950dc1 100644
--- a/GUI/coregui/Views/InstrumentWidgets/SpecularBeamEditor.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/SpecularBeamEditor.cpp
@@ -15,12 +15,12 @@
#include "GUI/coregui/Views/InstrumentWidgets/SpecularBeamEditor.h"
#include "GUI/coregui/Models/BeamDistributionItem.h"
#include "GUI/coregui/Models/BeamItems.h"
+#include "GUI/coregui/Models/InstrumentItems.h"
+#include "GUI/coregui/Models/SpecularBeamInclinationItem.h"
#include "GUI/coregui/Views/CommonWidgets/ColumnResizer.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/coregui/Views/InfoWidgets/DistributionDialog.h"
-#include "GUI/coregui/Models/InstrumentItems.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/coregui/utils/LayoutUtils.h"
-#include "GUI/coregui/Models/SpecularBeamInclinationItem.h"
#include <QGridLayout>
#include <QGroupBox>
diff --git a/GUI/coregui/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp b/GUI/coregui/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp
index cc20e356ed8ed071cf84c872837c5efa21f48199..77b6e856bf242a3388e372159ab9a9d2a3f696a3 100644
--- a/GUI/coregui/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Views/InstrumentWidgets/SpecularInstrumentEditor.h"
+#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Views/CommonWidgets/ColumnResizer.h"
#include "GUI/coregui/Views/InstrumentWidgets/EnvironmentEditor.h"
-#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Views/InstrumentWidgets/PolarizationAnalysisEditor.h"
#include "GUI/coregui/Views/InstrumentWidgets/SpecularBeamEditor.h"
#include "GUI/coregui/utils/StyleUtils.h"
diff --git a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorEditor.cpp b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorEditor.cpp
index bf06bac62a5872ea04e66d3884be24b489c5dfe1..fa49920901cab4a01e5b2c39ea7a2e9b3954a5a5 100644
--- a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorEditor.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorEditor.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/InstrumentWidgets/SphericalDetectorEditor.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/coregui/Models/SphericalDetectorItem.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include <QGridLayout>
namespace
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp
index 528ccd83c4e3fc2beb0017660f99d6c9e48609fa..3f63f0c83f1c434e7baade845fc977c107dc26b7 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp
@@ -13,14 +13,14 @@
// ************************************************************************** //
#include "GUI/coregui/Views/IntensityDataWidgets/ColorMap.h"
+#include "Core/Basics/MathConstants.h"
#include "GUI/coregui/Models/AxesItems.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
-#include "Core/Basics/MathConstants.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/PlotEventInfo.h"
#include "GUI/coregui/Views/CommonWidgets/UpdateTimer.h"
-#include "GUI/coregui/utils/StyleUtils.h"
#include "GUI/coregui/Views/FitWidgets/plot_constants.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/PlotEventInfo.h"
+#include "GUI/coregui/utils/StyleUtils.h"
namespace
{
@@ -238,7 +238,7 @@ void ColorMap::initColorMap()
m_colorBarLayout->addElement(0, 0, m_colorScale);
m_colorBarLayout->setMinimumSize(colorbar_width_logz, 10);
- auto base_size = StyleUtils::SizeOfLetterM(this).width()*0.5;
+ auto base_size = StyleUtils::SizeOfLetterM(this).width() * 0.5;
m_colorBarLayout->setMargins(QMargins(base_size, 0, base_size, 0));
m_colorScale->axis()->axisRect()->setMargins(QMargins(0, 0, 0, 0));
@@ -247,8 +247,10 @@ void ColorMap::initColorMap()
m_colorScale->setBarWidth(Constants::plot_colorbar_size());
m_colorScale->axis()->setTickLabelFont(
QFont(QFont().family(), Constants::plot_tick_label_size()));
- m_customPlot->xAxis->setTickLabelFont(QFont(QFont().family(), Constants::plot_tick_label_size()));
- m_customPlot->yAxis->setTickLabelFont(QFont(QFont().family(), Constants::plot_tick_label_size()));
+ m_customPlot->xAxis->setTickLabelFont(
+ QFont(QFont().family(), Constants::plot_tick_label_size()));
+ m_customPlot->yAxis->setTickLabelFont(
+ QFont(QFont().family(), Constants::plot_tick_label_size()));
connect(m_customPlot, SIGNAL(afterReplot()), this, SLOT(marginsChangedNotify()));
}
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp
index 57673bdb30988da7c063617f9c298db37c7056b9..d5f3e796f04ef1e441ffd52de3d5ab3058269b32 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h"
+#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Views/IntensityDataWidgets/ColorMap.h"
#include "GUI/coregui/Views/IntensityDataWidgets/FontScalingEvent.h"
-#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Views/IntensityDataWidgets/PlotStatusLabel.h"
#include <QLabel>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.cpp
index 0057811472db01cbb842c1c22b36d37369cd3703..f485d8a02b6c99c88cad748f591c11c0cb00cf50 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/ColorMap.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/item_constants.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/ColorMap.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/utils/StyleUtils.h"
using gradient_map_t = QMap<QString, QCPColorGradient::GradientPreset>;
@@ -54,10 +54,10 @@ QCPRange qcpRange(double xmin, double xmax, int nbins)
QMargins defaultMargins(const QWidget& widget)
{
auto base_size = StyleUtils::SizeOfLetterM(&widget);
- int left = static_cast<int>(base_size.width()*6.0);
+ int left = static_cast<int>(base_size.width() * 6.0);
int top = static_cast<int>(base_size.height() * 1.5);
int right = static_cast<int>(base_size.width() * 1.2);
- int bottom = static_cast<int>(base_size.height()* 4.5);
+ int bottom = static_cast<int>(base_size.height() * 4.5);
return QMargins(left, top, right, bottom);
}
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.cpp b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
index 71726ed43f072bdbd9ab4a246d65600dc897c059..07d90f439d17ecaf84761d2493dc0e5fd0340dbe 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.h"
-#include "GUI/coregui/mainwindow/AppSvc.h"
+#include "GUI/coregui/Models/ComboProperty.h"
+#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Views/IntensityDataWidgets/ColorMap.h"
#include "GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h"
-#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Views/IntensityDataWidgets/IntensityDataFFTPresenter.h"
-#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h"
+#include "GUI/coregui/mainwindow/AppSvc.h"
#include "GUI/coregui/mainwindow/projectmanager.h"
#include <QAction>
#include <QMouseEvent>
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataFFTPresenter.cpp b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataFFTPresenter.cpp
index 9a332432c344055a8be9e39ec96000d082bea152..4669d006213738b3f3e4f754e18e8a8e01a9c713 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataFFTPresenter.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataFFTPresenter.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "GUI/coregui/Views/IntensityDataWidgets/IntensityDataFFTPresenter.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "Core/Instrument/IntensityDataFunctions.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QAction>
#include <QApplication>
#include <QWidget>
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.cpp
index d4545a348972ce4ebed3035518ebe070ee048aa1..6ac60aa9024277d5657fb3a8c6d11028da177049 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.cpp
@@ -17,8 +17,8 @@
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Models/ProjectionItems.h"
-#include "GUI/coregui/Views/JobWidgets/ProjectionsEditor.h"
#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/Views/JobWidgets/ProjectionsEditor.h"
#include <QVBoxLayout>
IntensityDataProjectionsWidget::IntensityDataProjectionsWidget(QWidget* parent)
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
index 4ccf82087565f3291aeece543e6bf682290256c0..3ff6c95fff556c1486266588c5fa1c2b04370eb5 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/JobModel.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/coregui/utils/StyleUtils.h"
#include <QAction>
#include <QVBoxLayout>
@@ -43,12 +43,12 @@ IntensityDataPropertyWidget::IntensityDataPropertyWidget(QWidget* parent)
QSize IntensityDataPropertyWidget::sizeHint() const
{
- return QSize(StyleUtils::PropertyPanelWidth()*1.2, StyleUtils::PropertyPanelWidth()*2);
+ return QSize(StyleUtils::PropertyPanelWidth() * 1.2, StyleUtils::PropertyPanelWidth() * 2);
}
QSize IntensityDataPropertyWidget::minimumSizeHint() const
{
- return QSize(StyleUtils::PropertyPanelWidth()*1.2, StyleUtils::PropertyPanelWidth());
+ return QSize(StyleUtils::PropertyPanelWidth() * 1.2, StyleUtils::PropertyPanelWidth());
}
QList<QAction*> IntensityDataPropertyWidget::actionList()
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp
index cf8ee2bd3471ee29e7aa8e8665e6a31483a52c13..dc1b25407237fd28bcb0a1a762ad2a6c86a0971d 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp
@@ -14,11 +14,11 @@
#include "GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h"
#include "GUI/coregui/Models/DataItemUtils.h"
+#include "GUI/coregui/Models/IntensityDataItem.h"
+#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.h"
#include "GUI/coregui/Views/IntensityDataWidgets/IntensityDataFFTPresenter.h"
-#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h"
-#include "GUI/coregui/Models/JobItem.h"
#include <QBoxLayout>
#include <QMenu>
diff --git a/GUI/coregui/Views/IntensityDataWidgets/Plot1D.cpp b/GUI/coregui/Views/IntensityDataWidgets/Plot1D.cpp
index 4f654ee37a06ef132978db2beb7b13a086ad3f49..4265aa5cde076118e0e300fa0c595a56922b1659 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/Plot1D.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/Plot1D.cpp
@@ -13,16 +13,16 @@
// ************************************************************************** //
#include "GUI/coregui/Views/IntensityDataWidgets/Plot1D.h"
+#include "Core/Basics/MathConstants.h"
#include "GUI/coregui/Models/AxesItems.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.h"
#include "GUI/coregui/Models/Data1DViewItem.h"
#include "GUI/coregui/Models/DataItem.h"
#include "GUI/coregui/Models/DataProperties.h"
#include "GUI/coregui/Models/DataPropertyContainer.h"
-#include "Core/Basics/MathConstants.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/PlotEventInfo.h"
#include "GUI/coregui/Views/CommonWidgets/UpdateTimer.h"
#include "GUI/coregui/Views/FitWidgets/plot_constants.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/PlotEventInfo.h"
namespace
{
diff --git a/GUI/coregui/Views/IntensityDataWidgets/PlotEventInfo.cpp b/GUI/coregui/Views/IntensityDataWidgets/PlotEventInfo.cpp
index fbb529a3c6f69af38e26346aeb5a49d270e16bbc..9a969813a9ebaa8a23a32c97ccfc0b294863bdd5 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/PlotEventInfo.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/PlotEventInfo.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/IntensityDataWidgets/PlotEventInfo.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "Core/Export/PythonFormatting.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
PlotEventInfo::PlotEventInfo(PLOT_TYPE type)
: m_in_axes_range(false), m_log_valued_axis(false), m_x(0.0), m_y(0.0), m_value(0.0), m_nx(0),
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.cpp b/GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.cpp
index 73920d1af1ccff4206e42955abcd5a5346e093e8..79275b1a6c58d9fed204abe8cedab7b1ed89dc15 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.cpp
@@ -13,16 +13,16 @@
// ************************************************************************** //
#include "GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.h"
-#include "GUI/coregui/Models/AxesItems.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.h"
#include "Core/Instrument/Histogram1D.h"
#include "Core/Instrument/Histogram2D.h"
+#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/MaskItems.h"
#include "GUI/coregui/Models/ModelMapper.h"
#include "GUI/coregui/Models/ProjectionItems.h"
#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Views/FitWidgets/plot_constants.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.h"
#include "qcustomplot.h"
ProjectionsPlot::ProjectionsPlot(const QString& projectionType, QWidget* parent)
@@ -35,8 +35,10 @@ ProjectionsPlot::ProjectionsPlot(const QString& projectionType, QWidget* parent)
vlayout->addWidget(m_customPlot);
setLayout(vlayout);
- m_customPlot->xAxis->setTickLabelFont(QFont(QFont().family(), Constants::plot_tick_label_size()));
- m_customPlot->yAxis->setTickLabelFont(QFont(QFont().family(), Constants::plot_tick_label_size()));
+ m_customPlot->xAxis->setTickLabelFont(
+ QFont(QFont().family(), Constants::plot_tick_label_size()));
+ m_customPlot->yAxis->setTickLabelFont(
+ QFont(QFont().family(), Constants::plot_tick_label_size()));
ColorMapUtils::setDefaultMargins(m_customPlot);
}
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
index ff0099c59d09cde129f146ad102788c20d729c0d..22c23511213507cfc1ca036c615a0065fda9c696 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/ColorMap.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/ColorMap.h"
#include <QFileDialog>
#include <QMessageBox>
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp b/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp
index 3efe10e647fe73dcc683f9412d5fd827e5723f57..e8c242ca5d1e3f2a4f398d9ac6870ba32d51af4a 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp
@@ -13,15 +13,15 @@
// ************************************************************************** //
#include "GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
+#include "Core/Export/PythonFormatting.h"
#include "Core/Instrument/Histogram1D.h"
#include "Core/Instrument/Histogram2D.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/MaskItems.h"
-#include "GUI/coregui/mainwindow/ProjectUtils.h"
#include "GUI/coregui/Models/ProjectionItems.h"
-#include "Core/Export/PythonFormatting.h"
#include "GUI/coregui/Models/item_constants.h"
+#include "GUI/coregui/mainwindow/ProjectUtils.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QFileDialog>
#include <QTextStream>
diff --git a/GUI/coregui/Views/JobWidgets/JobListWidget.cpp b/GUI/coregui/Views/JobWidgets/JobListWidget.cpp
index 219027c47be60b4839bfc58341bcea1a614eee2e..26043412918ded082e1d5db90ba2f9e5b5a6e580 100644
--- a/GUI/coregui/Views/JobWidgets/JobListWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobListWidget.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "GUI/coregui/Views/JobWidgets/JobListWidget.h"
-#include "GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h"
#include "GUI/coregui/Models/JobItem.h"
-#include "GUI/coregui/Views/JobWidgets/JobListViewDelegate.h"
#include "GUI/coregui/Models/JobModel.h"
+#include "GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h"
+#include "GUI/coregui/Views/JobWidgets/JobListViewDelegate.h"
#include "GUI/coregui/utils/StyleUtils.h"
#include <QItemSelectionModel>
#include <QListView>
@@ -78,7 +78,7 @@ const JobItem* JobListWidget::currentJobItem() const
QSize JobListWidget::sizeHint() const
{
- return QSize(StyleUtils::PropertyPanelWidth(), StyleUtils::PropertyPanelWidth()*2);
+ return QSize(StyleUtils::PropertyPanelWidth(), StyleUtils::PropertyPanelWidth() * 2);
}
QSize JobListWidget::minimumSizeHint() const
diff --git a/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp b/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp
index 64d333e10a623d62ae6012c0da3a362e537cea69..e17845e4abfaccb590d3435aa7408f35641af906 100644
--- a/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/coregui/Models/JobItem.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
#include "GUI/coregui/utils/StyleUtils.h"
#include <QTabBar>
diff --git a/GUI/coregui/Views/JobWidgets/JobResultsPresenter.cpp b/GUI/coregui/Views/JobWidgets/JobResultsPresenter.cpp
index 6b4ebd86c82f9e2b71f2f6d4d4d38efb4791d502..25afcc8e0c4e9ecdb6e54466b7ef4b05a8f6b410 100644
--- a/GUI/coregui/Views/JobWidgets/JobResultsPresenter.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobResultsPresenter.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "GUI/coregui/Views/JobWidgets/JobResultsPresenter.h"
+#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Views/FitWidgets/FitComparisonWidget.h"
#include "GUI/coregui/Views/FitWidgets/FitComparisonWidget1D.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.h"
#include "GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h"
-#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
namespace
{
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp b/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp
index 95941af60516db8313dadc6b1106da37a01879f9..0a9e4770efa241f1604dcc06ef12c1a490ff21d2 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp
@@ -14,15 +14,15 @@
#include "GUI/coregui/Views/JobWidgets/JobSelectorWidget.h"
#include "GUI/coregui/Models/JobItem.h"
-#include "GUI/coregui/Views/JobWidgets/JobListWidget.h"
#include "GUI/coregui/Models/JobModel.h"
+#include "GUI/coregui/Views/JobWidgets/JobListWidget.h"
#include "GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h"
#include "GUI/coregui/Views/JobWidgets/JobSelectorActions.h"
#include "GUI/coregui/Views/JobWidgets/JobSelectorToolBar.h"
#include "GUI/coregui/mainwindow/StyledToolBar.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
-#include "minisplitter.h"
#include "GUI/coregui/utils/StyleUtils.h"
+#include "minisplitter.h"
#include <QHBoxLayout>
JobSelectorWidget::JobSelectorWidget(JobModel* jobModel, QWidget* parent)
@@ -68,7 +68,7 @@ void JobSelectorWidget::setModel(JobModel* jobModel)
QSize JobSelectorWidget::sizeHint() const
{
- return QSize(StyleUtils::PropertyPanelWidth(), StyleUtils::PropertyPanelWidth()*2);
+ return QSize(StyleUtils::PropertyPanelWidth(), StyleUtils::PropertyPanelWidth() * 2);
}
QSize JobSelectorWidget::minimumSizeHint() const
diff --git a/GUI/coregui/Views/JobWidgets/JobViewActivities.cpp b/GUI/coregui/Views/JobWidgets/JobViewActivities.cpp
index 8fbe3e605fff32bcc9c2b43047710d50545612ff..281f605a147b6b4fff293645eea44a908572a9a9 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewActivities.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobViewActivities.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/JobWidgets/JobViewActivities.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
namespace
{
diff --git a/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp b/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp
index 8434e7008ba5e44377de38fde9b911a639725573..246af0e2e3db310ca5994cf8660915ad6a953e27 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "GUI/coregui/Views/JobWidgets/JobViewDocks.h"
+#include "GUI/coregui/Models/JobModel.h"
#include "GUI/coregui/Views/FitWidgets/FitActivityPanel.h"
+#include "GUI/coregui/Views/JobView.h"
#include "GUI/coregui/Views/JobWidgets/JobMessagePanel.h"
-#include "GUI/coregui/Models/JobModel.h"
#include "GUI/coregui/Views/JobWidgets/JobOutputDataWidget.h"
#include "GUI/coregui/Views/JobWidgets/JobRealTimeWidget.h"
#include "GUI/coregui/Views/JobWidgets/JobSelectorWidget.h"
-#include "GUI/coregui/Views/JobView.h"
#include "GUI/coregui/Views/JobWidgets/JobViewActivities.h"
#include "GUI/coregui/Views/JobWidgets/JobViewFlags.h"
#include <QDockWidget>
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp b/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
index fd550c9d374a209a56cd401c0257f72b4ed809f4..d50b00da3f26444f5308b72d51162289c01727b5 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
@@ -16,9 +16,9 @@
#include "GUI/coregui/Models/ModelPath.h"
#include "GUI/coregui/Models/ParameterTreeItems.h"
#include "GUI/coregui/Models/ParameterTuningModel.h"
-#include "GUI/coregui/Views/JobWidgets/ScientificSpinBox.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/Views/JobWidgets/ScientificSpinBox.h"
#include <QAbstractItemModel>
#include <QApplication>
#include <QHBoxLayout>
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
index b1d33175946e9257803b12c43607aa6c3e77dc1d..ec596c695209abfd478bada37614345622b7dc7a 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
@@ -13,16 +13,16 @@
// ************************************************************************** //
#include "GUI/coregui/Views/JobWidgets/ParameterTuningWidget.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Models/JobModel.h"
-#include "GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h"
#include "GUI/coregui/Models/ParameterTreeItems.h"
-#include "GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.h"
#include "GUI/coregui/Models/ParameterTuningModel.h"
-#include "GUI/coregui/Views/JobWidgets/SliderSettingsWidget.h"
#include "GUI/coregui/Views/InfoWidgets/WarningSign.h"
+#include "GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h"
+#include "GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.h"
+#include "GUI/coregui/Views/JobWidgets/SliderSettingsWidget.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QTreeView>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsEditor.cpp b/GUI/coregui/Views/JobWidgets/ProjectionsEditor.cpp
index 6fc16ee6f6a2bb3db61b29f11993e8301b6ddbca..98f692d28d01c3d1a16263ef0365a5cfed90f5c0 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsEditor.cpp
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsEditor.cpp
@@ -14,12 +14,12 @@
#include "GUI/coregui/Views/JobWidgets/ProjectionsEditor.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
+#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.h"
#include "GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.h"
#include "GUI/coregui/Views/JobWidgets/ProjectionsPropertyPanel.h"
#include "GUI/coregui/Views/JobWidgets/ProjectionsToolBar.h"
#include "GUI/coregui/Views/JobWidgets/ProjectionsWidget.h"
-#include "GUI/coregui/Models/SessionModel.h"
#include "minisplitter.h"
#include <QItemSelectionModel>
#include <QSplitter>
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.cpp b/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.cpp
index 39bdb695ce623f8f926d5e6eb6fd736e03100687..5e3a7086e3fb223ea7b45fa16e9770576d2ccae9 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.cpp
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.h"
#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.h"
#include <QAction>
#include <QItemSelectionModel>
#include <QModelIndexList>
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.cpp b/GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.cpp
index 8b2ac320c205109725faf5f5436d61244e8936d7..ddd77641b580cba46cda61e227831a7f0baa9ae6 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.cpp
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.cpp
@@ -13,14 +13,14 @@
// ************************************************************************** //
#include "GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/ColorMap.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
-#include "GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h"
-#include "GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h"
#include "GUI/coregui/Models/MaskItems.h"
+#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/ColorMap.h"
#include "GUI/coregui/Views/IntensityDataWidgets/PlotStatusLabel.h"
#include "GUI/coregui/Views/IntensityDataWidgets/ScientificPlotEvent.h"
-#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h"
+#include "GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h"
#include <QItemSelectionModel>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsToolBar.cpp b/GUI/coregui/Views/JobWidgets/ProjectionsToolBar.cpp
index 1c215e4a68e68ebb1ba1654b417a2b292c8e5e1a..ef024024c67879e23f519e0dcebb5b18abb2afc5 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsToolBar.cpp
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsToolBar.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/JobWidgets/ProjectionsToolBar.h"
-#include "GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h"
#include "GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.h"
+#include "GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
#include <QButtonGroup>
#include <QLabel>
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsWidget.cpp b/GUI/coregui/Views/JobWidgets/ProjectionsWidget.cpp
index a3002d20dea0c6d5663807e9e738453cef95d2fb..42752b54535a492ef9a7951546de245c9a155e0e 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsWidget.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/JobWidgets/ProjectionsWidget.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.h"
#include "GUI/coregui/Models/item_constants.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.h"
#include <QTabWidget>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsWidget.h b/GUI/coregui/Views/JobWidgets/ProjectionsWidget.h
index efe337a3e3b4cfdddf1688190e12566d7c1abffc..11d94cecba991ffeaad22a958d96076ef15de295 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsWidget.h
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsWidget.h
@@ -15,8 +15,8 @@
#ifndef PROJECTIONSWIDGET_H
#define PROJECTIONSWIDGET_H
-#include "GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h"
#include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h"
class ProjectionsPlot;
class QTabWidget;
diff --git a/GUI/coregui/Views/MaskWidgets/IShape2DView.cpp b/GUI/coregui/Views/MaskWidgets/IShape2DView.cpp
index bb2b0e6f2f7e8d334c6e2a579f78686e6ba409a0..bf649d864c4f1e2db33937894e72c7feeef6655b 100644
--- a/GUI/coregui/Views/MaskWidgets/IShape2DView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/IShape2DView.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Views/MaskWidgets/IShape2DView.h"
-#include "GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h"
#include "GUI/coregui/Models/MaskItems.h"
#include "GUI/coregui/Models/SessionItem.h"
+#include "GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h"
#include <QAction>
#include <QGraphicsSceneContextMenuEvent>
#include <QMenu>
diff --git a/GUI/coregui/Views/MaskWidgets/LineViews.cpp b/GUI/coregui/Views/MaskWidgets/LineViews.cpp
index bb0141b19769d4dfe52812690aa9e1ba2da84bb5..fbfc6f91937d1f6969dbbf59737782d7a977ea4a 100644
--- a/GUI/coregui/Views/MaskWidgets/LineViews.cpp
+++ b/GUI/coregui/Views/MaskWidgets/LineViews.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Views/MaskWidgets/LineViews.h"
+#include "GUI/coregui/Models/MaskItems.h"
#include "GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h"
#include "GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h"
-#include "GUI/coregui/Models/MaskItems.h"
#include <QCursor>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp b/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
index 51d329a6d9de31cdbe390260311626330cc63188..ff0716ddea0eb90ebf8907abf3057ed9d3752c94 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Views/MaskWidgets/MaskAllView.h"
+#include "GUI/coregui/Models/MaskItems.h"
#include "GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h"
#include "GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h"
-#include "GUI/coregui/Models/MaskItems.h"
#include <QBrush>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditor.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditor.cpp
index a0c9b16032763eb0409fe10c8688a372519ef9cf..c6193b9fc56f4aae1bde107ffda51686bee0a919 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditor.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditor.cpp
@@ -13,12 +13,12 @@
// ************************************************************************** //
#include "GUI/coregui/Views/MaskWidgets/MaskEditor.h"
+#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/Views/MaskWidgets/MaskEditorActions.h"
#include "GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.h"
#include "GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h"
#include "GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.h"
#include "GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h"
-#include "GUI/coregui/Models/SessionModel.h"
#include "minisplitter.h"
#include <QBoxLayout>
#include <QContextMenuEvent>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp
index d84e125296b1991d8cb3cd481c5608f416fd9771..26a60e7b693df89c0b012148f57e77d9b5b5f94c 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp
@@ -13,15 +13,15 @@
// ************************************************************************** //
#include "GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.h"
-#include "GUI/coregui/mainwindow/AppSvc.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/ColorMap.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
-#include "GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h"
-#include "GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h"
#include "GUI/coregui/Models/MaskItems.h"
-#include "GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/ColorMap.h"
#include "GUI/coregui/Views/IntensityDataWidgets/PlotStatusLabel.h"
#include "GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h"
+#include "GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h"
+#include "GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h"
+#include "GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h"
+#include "GUI/coregui/mainwindow/AppSvc.h"
#include "GUI/coregui/mainwindow/projectmanager.h"
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
index 0c76b53916e657e2b5c329c0cc92420efcba32a6..54f7e83d6ae04e88ab73520210dcb4987099e4cd 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
@@ -13,11 +13,11 @@
// ************************************************************************** //
#include "GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h"
-#include "GUI/coregui/Views/AccordionWidget/AccordionWidget.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
-#include "GUI/coregui/Views/AccordionWidget/ContentPane.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/Views/AccordionWidget/AccordionWidget.h"
+#include "GUI/coregui/Views/AccordionWidget/ContentPane.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include <QListView>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
index 815ee01c8380d1f99813e5a115d9a9e6d96abe6a..28ef361d5aeb6400c863fdfd007c3c276371e4aa 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h"
+#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Views/IntensityDataWidgets/ColorMap.h"
#include "GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h"
-#include "GUI/coregui/Models/IntensityDataItem.h"
#include <QGraphicsSceneMouseEvent>
MaskGraphicsProxy::MaskGraphicsProxy()
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
index af6f5456ef667a2bfab0d1910e77bb0286f33de5..93def02a6f49c32d4563d02b8745a7803a4b3574 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
@@ -13,19 +13,19 @@
// ************************************************************************** //
#include "GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h"
+#include "GUI/coregui/Models/IntensityDataItem.h"
+#include "GUI/coregui/Models/MaskItems.h"
+#include "GUI/coregui/Models/SessionItem.h"
+#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/Models/item_constants.h"
#include "GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h"
#include "GUI/coregui/Views/MaskWidgets/IShape2DView.h"
-#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h"
#include "GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h"
-#include "GUI/coregui/Models/MaskItems.h"
#include "GUI/coregui/Views/MaskWidgets/MaskViewFactory.h"
#include "GUI/coregui/Views/MaskWidgets/PolygonView.h"
-#include "GUI/coregui/Models/SessionItem.h"
-#include "GUI/coregui/Models/SessionModel.h"
-#include "GUI/coregui/Models/item_constants.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QGraphicsItem>
#include <QGraphicsSceneMoveEvent>
#include <QItemSelection>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
index fa2d273af8d900e8c282c3de45170231951f8cae..059baf1d277657bd78c12069bb7d34cae49c123e 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
@@ -14,11 +14,11 @@
#include "GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h"
#include "Core/Instrument/DetectorMask.h"
+#include "Core/Instrument/OutputData.h"
+#include "Core/Instrument/RegionOfInterest.h"
#include "Core/Mask/IShape2D.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/MaskItems.h"
-#include "Core/Instrument/OutputData.h"
-#include "Core/Instrument/RegionOfInterest.h"
#include "GUI/coregui/Models/SessionModel.h"
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.cpp b/GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.cpp
index e1314882ae5dc103eb0c3f22522dfe15b6c32517..823a46d8412e5aca2c8e4fdf7cac3649be5512bc 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.cpp
@@ -14,11 +14,11 @@
#include "GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "Core/Instrument/IntensityDataFunctions.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/MaskItems.h"
#include "GUI/coregui/Models/ProjectionItems.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
MaskUnitsConverter::MaskUnitsConverter() : mp_data(nullptr), m_direction(UNDEFINED) {}
diff --git a/GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp b/GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp
index ce5cd5b761d0e3a2024d37c21993169f0bb0a7eb..6b360b18513f36ef1d00ad1a3ddee2aec6ead0b0 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp
@@ -13,8 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Views/MaskWidgets/MaskViewFactory.h"
+#include "GUI/coregui/Models/SessionItem.h"
+#include "GUI/coregui/Models/item_constants.h"
#include "GUI/coregui/Views/MaskWidgets/EllipseView.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Views/MaskWidgets/IShape2DView.h"
#include "GUI/coregui/Views/MaskWidgets/IntensityDataView.h"
#include "GUI/coregui/Views/MaskWidgets/LineViews.h"
@@ -24,8 +25,7 @@
#include "GUI/coregui/Views/MaskWidgets/PolygonView.h"
#include "GUI/coregui/Views/MaskWidgets/RectangleView.h"
#include "GUI/coregui/Views/MaskWidgets/RegionOfInterestView.h"
-#include "GUI/coregui/Models/SessionItem.h"
-#include "GUI/coregui/Models/item_constants.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
IShape2DView* MaskViewFactory::createMaskView(SessionItem* item, ISceneAdaptor* adaptor)
{
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp b/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp
index 75b2c84da7813b3f23fc6d696f1148b4dd2b39d1..2d7b31392f7d827b4b2c6589e85bfc75c4756080 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp
@@ -13,12 +13,12 @@
// ************************************************************************** //
#include "GUI/coregui/Views/MaterialEditor/MaterialEditor.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
-#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
-#include "GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.h"
#include "GUI/coregui/Models/MaterialItem.h"
#include "GUI/coregui/Models/MaterialModel.h"
#include "GUI/coregui/Models/SessionDecorationModel.h"
+#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
+#include "GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include <QListView>
#include <QSplitter>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
index 498d30f3adbcadf706855764726d62e58137af20..77865cb66993da8467cfea8ae940fa8e0849e9a3 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h"
+#include "GUI/coregui/Models/MaterialItem.h"
+#include "GUI/coregui/Models/MaterialModel.h"
#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
#include "GUI/coregui/Views/MaterialEditor/MaterialEditor.h"
-#include "GUI/coregui/Models/MaterialItem.h"
#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
-#include "GUI/coregui/Models/MaterialModel.h"
-#include "GUI/coregui/utils/StyleUtils.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
+#include "GUI/coregui/utils/StyleUtils.h"
#include <QAction>
#include <QPushButton>
#include <QSettings>
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp b/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
index 13bed37bb4c9eb0f4d91a3c9e0160e374c2cda21..4b970d1d4bc19b8f6829ab7ff30d850f2d5ffc21 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
@@ -13,14 +13,10 @@
// ************************************************************************** //
#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
-#include "GUI/coregui/mainwindow/AppSvc.h"
+#include "Core/Material/Material.h"
#include "GUI/coregui/Models/ComboProperty.h"
-#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/LayerItem.h"
-#include "Core/Material/Material.h"
#include "GUI/coregui/Models/MaterialDataItems.h"
-#include "GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/coregui/Models/MaterialItem.h"
#include "GUI/coregui/Models/MaterialItemContainer.h"
#include "GUI/coregui/Models/MaterialModel.h"
@@ -30,6 +26,10 @@
#include "GUI/coregui/Models/ParticleDistributionItem.h"
#include "GUI/coregui/Models/ParticleItem.h"
#include "GUI/coregui/Models/ParticleLayoutItem.h"
+#include "GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h"
+#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
+#include "GUI/coregui/mainwindow/AppSvc.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QColorDialog>
namespace
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h b/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h
index 7e888c0e98eec37cf3ddf7cd33f1aa9063b71c94..ce8fbaf0013a67e029d65918a7116584ad515eaf 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h
+++ b/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h
@@ -15,8 +15,8 @@
#ifndef MATERIALITEMUTILS_H
#define MATERIALITEMUTILS_H
-#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
#include "GUI/coregui/Models/MaterialItem.h"
+#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
#include <QColor>
#include <QString>
#include <memory>
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp b/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp
index f396a7f88dbabd656d35fb615e0828e0e92df29c..222a8ae363b11dc0f4b675da48cd7a90dca1236a 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
+#include "GUI/coregui/Views/InfoWidgets/GroupInfoBox.h"
#include "GUI/coregui/Views/PropertyEditor/ComponentFlatView.h"
#include "GUI/coregui/Views/PropertyEditor/ComponentTreeView.h"
#include "GUI/coregui/Views/PropertyEditor/ComponentView.h"
-#include "GUI/coregui/Views/InfoWidgets/GroupInfoBox.h"
#include <QBoxLayout>
#include <QGroupBox>
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentFlatView.cpp b/GUI/coregui/Views/PropertyEditor/ComponentFlatView.cpp
index 3534d89cedae3926830b94268e00a2d4d6b411f0..5e4c41590eecea50a696ccf23a7c4b11bec86cd3 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentFlatView.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ComponentFlatView.cpp
@@ -13,12 +13,12 @@
// ************************************************************************** //
#include "GUI/coregui/Views/PropertyEditor/ComponentFlatView.h"
+#include "GUI/coregui/Models/SessionItem.h"
+#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/Views/PropertyEditor/ComponentUtils.h"
-#include "GUI/coregui/utils/LayoutUtils.h"
#include "GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.h"
#include "GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.h"
-#include "GUI/coregui/Models/SessionItem.h"
-#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/utils/LayoutUtils.h"
#include <QComboBox>
#include <QDataWidgetMapper>
#include <QGridLayout>
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentTreeView.cpp b/GUI/coregui/Views/PropertyEditor/ComponentTreeView.cpp
index 28c6ae49e1e368b4849dd9bac0a672848cac0764..1b51071d511dd8f15349a380ad813043d84ed813 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentTreeView.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ComponentTreeView.cpp
@@ -14,10 +14,10 @@
#include "GUI/coregui/Views/PropertyEditor/ComponentTreeView.h"
#include "GUI/coregui/Models/ComponentProxyModel.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentTreeActions.h"
-#include "GUI/coregui/utils/CustomEventFilters.h"
#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/Models/SessionModelDelegate.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentTreeActions.h"
+#include "GUI/coregui/utils/CustomEventFilters.h"
#include "GUI/coregui/utils/StyleUtils.h"
#include <QBoxLayout>
#include <QStandardItemModel>
diff --git a/GUI/coregui/Views/PropertyEditor/CustomEditors.cpp b/GUI/coregui/Views/PropertyEditor/CustomEditors.cpp
index ddf56816bacf9d631ed0769dd0d3bbe294cf34c1..82b18d53feafddd9a875991ab115410204892261 100644
--- a/GUI/coregui/Views/PropertyEditor/CustomEditors.cpp
+++ b/GUI/coregui/Views/PropertyEditor/CustomEditors.cpp
@@ -14,12 +14,12 @@
#include "GUI/coregui/Views/PropertyEditor/CustomEditors.h"
#include "GUI/coregui/Models/ComboProperty.h"
-#include "GUI/coregui/utils/CustomEventFilters.h"
-#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/GroupItemController.h"
-#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
#include "GUI/coregui/Views/JobWidgets/ScientificSpinBox.h"
+#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
+#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
+#include "GUI/coregui/utils/CustomEventFilters.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QApplication>
#include <QBoxLayout>
#include <QCheckBox>
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp b/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp
index ba22ba693d12901e96eed3c70adf69281b9e34b3..e42384ede4e621ca75cf85d5b66673344d1f69ef 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp
@@ -13,15 +13,15 @@
// ************************************************************************** //
#include "GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.h"
+#include "Fit/Tools/RealLimits.h"
#include "GUI/coregui/Models/ComboProperty.h"
-#include "GUI/coregui/Views/PropertyEditor/CustomEditors.h"
-#include "GUI/coregui/utils/CustomEventFilters.h"
-#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
#include "GUI/coregui/Models/GroupItemController.h"
-#include "GUI/coregui/Views/PropertyEditor/MultiComboPropertyEditor.h"
-#include "Fit/Tools/RealLimits.h"
-#include "GUI/coregui/Views/JobWidgets/ScientificSpinBox.h"
#include "GUI/coregui/Models/SessionItem.h"
+#include "GUI/coregui/Views/JobWidgets/ScientificSpinBox.h"
+#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
+#include "GUI/coregui/Views/PropertyEditor/CustomEditors.h"
+#include "GUI/coregui/Views/PropertyEditor/MultiComboPropertyEditor.h"
+#include "GUI/coregui/utils/CustomEventFilters.h"
#include <QLabel>
#include <QLineEdit>
#include <QSpinBox>
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.cpp b/GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.cpp
index e93ef842978ec8a1642f4682809154df83b12d5d..a283ded46cbce10a3b0e4b0d068d0dd844441fcf 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.cpp
@@ -13,11 +13,11 @@
// ************************************************************************** //
#include "GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.h"
-#include "GUI/coregui/Views/PropertyEditor/CustomEditors.h"
#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/Models/SessionModelDelegate.h"
+#include "GUI/coregui/Views/PropertyEditor/CustomEditors.h"
#include <QComboBox>
#include <QDataWidgetMapper>
#include <QDebug>
diff --git a/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp b/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp
index 8284df78b5af96c9466214fe53925a6a413702b3..d44269ffe0dca42f851f410d3859b903400e8cf7 100644
--- a/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp
+++ b/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp
@@ -13,22 +13,22 @@
// ************************************************************************** //
#include "GUI/coregui/Views/PropertyEditor/TestComponentView.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentFlatView.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentTreeView.h"
-#include "GUI/coregui/Models/GUIObjectBuilder.h"
+#include "Core/Multilayer/MultiLayer.h"
#include "Core/Scattering/ISample.h"
+#include "Core/StandardSamples/SampleBuilderFactory.h"
+#include "GUI/coregui/Models/GUIObjectBuilder.h"
#include "GUI/coregui/Models/MaterialDataItems.h"
#include "GUI/coregui/Models/MaterialItem.h"
-#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
#include "GUI/coregui/Models/MaterialModel.h"
-#include "Core/Multilayer/MultiLayer.h"
-#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "GUI/coregui/Models/SampleModel.h"
#include "GUI/coregui/Models/SessionModelDelegate.h"
-#include "GUI/coregui/utils/StyleUtils.h"
#include "GUI/coregui/Models/item_constants.h"
+#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentFlatView.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentTreeView.h"
#include "GUI/coregui/mainwindow/mainwindow.h"
+#include "GUI/coregui/utils/StyleUtils.h"
#include "minisplitter.h"
#include <QBoxLayout>
#include <QDebug>
diff --git a/GUI/coregui/Views/RealSpaceWidgets/IPositionBuilder.cpp b/GUI/coregui/Views/RealSpaceWidgets/IPositionBuilder.cpp
index 8f3804d55a8d108e50227a84d7938a7cca43d1c9..878fb0375d970c38cb1ad87ad58260d61e79a87d 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 "Core/includeIncludes/InterferenceFunctions.h"
#include "Core/Lattice/Lattice2D.h"
+#include "Core/includeIncludes/InterferenceFunctions.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.h"
#include <cmath>
#include <random>
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.cpp
index bb90a22b35ba984036365abeafa3f6ce6ee98680..414124fd20c23ba2a9c30a57a98f6dbd661fc911 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.cpp
@@ -13,31 +13,31 @@
// ************************************************************************** //
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h"
-#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
-#include "GUI/coregui/Models/InterferenceFunctionItems.h"
+#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
+#include "Core/Particle/ParticleCoreShell.h"
#include "Core/includeIncludes/InterferenceFunctions.h"
+#include "GUI/ba3d/model/layer.h"
+#include "GUI/coregui/Models/InterferenceFunctionItems.h"
#include "GUI/coregui/Models/Lattice2DItems.h"
#include "GUI/coregui/Models/LayerItem.h"
#include "GUI/coregui/Models/MesoCrystalItem.h"
#include "GUI/coregui/Models/MultiLayerItem.h"
-#include "Core/Particle/Particle.h"
-#include "GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.h"
#include "GUI/coregui/Models/ParticleCompositionItem.h"
-#include "Core/Particle/ParticleCoreShell.h"
#include "GUI/coregui/Models/ParticleCoreShellItem.h"
#include "GUI/coregui/Models/ParticleDistributionItem.h"
#include "GUI/coregui/Models/ParticleItem.h"
#include "GUI/coregui/Models/ParticleLayoutItem.h"
+#include "GUI/coregui/Models/SessionItem.h"
+#include "GUI/coregui/Models/VectorItem.h"
+#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
+#include "GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpacePositionBuilder.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h"
-#include "Core/Parametrization/Units.h"
-#include "GUI/coregui/Models/VectorItem.h"
#include <QDebug>
-#include "GUI/ba3d/model/layer.h"
namespace
{
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
index a6bee16c8564ac4c9e58e3235044e53f63385fbc..73ddff2cad5a3cf0ebf8147832bfdb0a8ccb3e85 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
@@ -14,38 +14,38 @@
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h"
#include "Core/Basics/Exceptions.h"
-#include "Core/Particle/FormFactorCrystal.h"
#include "Core/DecoratedFormFactor/IFormFactorDecorator.h"
+#include "Core/Parametrization/Units.h"
+#include "Core/Particle/FormFactorCrystal.h"
#include "Core/Particle/IParticle.h"
-#include "GUI/coregui/Models/InterferenceFunctionItems.h"
+#include "Core/Particle/MesoCrystal.h"
+#include "Core/Particle/Particle.h"
+#include "Core/Particle/ParticleCoreShell.h"
+#include "Core/Particle/ParticleDistribution.h"
+#include "Core/Scattering/Rotations.h"
#include "Core/includeIncludes/InterferenceFunctions.h"
+#include "GUI/coregui/Models/InterferenceFunctionItems.h"
#include "GUI/coregui/Models/Lattice2DItems.h"
#include "GUI/coregui/Models/LayerItem.h"
#include "GUI/coregui/Models/MaterialItem.h"
#include "GUI/coregui/Models/MaterialModel.h"
-#include "Core/Particle/MesoCrystal.h"
#include "GUI/coregui/Models/MesoCrystalItem.h"
#include "GUI/coregui/Models/MultiLayerItem.h"
-#include "Core/Particle/Particle.h"
-#include "GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.h"
#include "GUI/coregui/Models/ParticleCompositionItem.h"
-#include "Core/Particle/ParticleCoreShell.h"
#include "GUI/coregui/Models/ParticleCoreShellItem.h"
-#include "Core/Particle/ParticleDistribution.h"
#include "GUI/coregui/Models/ParticleDistributionItem.h"
#include "GUI/coregui/Models/ParticleItem.h"
#include "GUI/coregui/Models/ParticleLayoutItem.h"
+#include "GUI/coregui/Models/RotationItems.h"
+#include "GUI/coregui/Models/SessionItem.h"
+#include "GUI/coregui/Models/TransformationItem.h"
+#include "GUI/coregui/Models/VectorItem.h"
+#include "GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h"
-#include "GUI/coregui/Models/RotationItems.h"
-#include "Core/Scattering/Rotations.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h"
-#include "GUI/coregui/Models/TransformationItem.h"
-#include "Core/Parametrization/Units.h"
-#include "GUI/coregui/Models/VectorItem.h"
#include "GUI/coregui/mainwindow/AppSvc.h"
namespace
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h
index 2cc2c745af05a88c011fe95c7d0e2d2d4c1e75d8..411e41e247b626d87e1553f956c6adbc6193193c 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h
@@ -16,9 +16,9 @@
#define REALSPACEBUILDERUTILS_H
#include "Core/Scattering/Rotations.h"
+#include "Core/Vector/Vectors3D.h"
#include "Wrap/WinDllMacros.h"
#include <QVector3D>
-#include "Core/Vector/Vectors3D.h"
#include <memory>
#include <utility>
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
index c2b18422e1c5639cff57320b7016f0f926d64f6a..b39e89f89aa301c01ff5b76fbbea8f5a1a3d0bf5 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
@@ -13,14 +13,14 @@
// ************************************************************************** //
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h"
-#include "GUI/coregui/mainwindow/AppSvc.h"
#include "GUI/coregui/Models/FilterPropertyProxy.h"
-#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h"
-#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h"
-#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.h"
#include "GUI/coregui/Models/SampleModel.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "GUI/coregui/Views/InfoWidgets/WarningSign.h"
+#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h"
+#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h"
+#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.h"
+#include "GUI/coregui/mainwindow/AppSvc.h"
#include "GUI/coregui/mainwindow/projectmanager.h"
#include <QApplication>
#include <QFileDialog>
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h
index c7ae04868fc8b1318199b87d8cb6f5a7a8fcc285..7e31c150f4ec5cbfb3188640d64a7598df585bd2 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h
@@ -77,7 +77,7 @@ public slots:
void onLockViewAction(bool view_locked);
void onChangeLayerSizeAction(double layer_size_scale);
void onSavePictureAction();
- void onRowsAboutToBeRemoved(const QModelIndex &parent, int first, int last);
+ void onRowsAboutToBeRemoved(const QModelIndex& parent, int first, int last);
private slots:
void onDataChanged(const QModelIndex& index);
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
index f5c0d495b283c8556ebdff644d827656c7071a99..e75d7acf723bb4685bbdceae8d88a71115d06b3b 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
@@ -14,23 +14,23 @@
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.h"
#include "Core/Basics/Exceptions.h"
-#include "Core/includeIncludes/HardParticles.h"
-#include "Core/Scattering/IFormFactor.h"
+#include "Core/Parametrization/Units.h"
#include "Core/Particle/IParticle.h"
-#include "GUI/coregui/Models/Lattice2DItems.h"
#include "Core/Particle/MesoCrystal.h"
-#include "GUI/coregui/Models/MesoCrystalItem.h"
#include "Core/Particle/Particle.h"
-#include "GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.h"
-#include "GUI/coregui/Models/ParticleCompositionItem.h"
#include "Core/Particle/ParticleCoreShell.h"
-#include "GUI/coregui/Models/ParticleCoreShellItem.h"
#include "Core/Particle/ParticleDistribution.h"
+#include "Core/Scattering/IFormFactor.h"
+#include "Core/includeIncludes/HardParticles.h"
+#include "GUI/ba3d/model/particles.h"
+#include "GUI/coregui/Models/Lattice2DItems.h"
+#include "GUI/coregui/Models/MesoCrystalItem.h"
+#include "GUI/coregui/Models/ParticleCompositionItem.h"
+#include "GUI/coregui/Models/ParticleCoreShellItem.h"
#include "GUI/coregui/Models/ParticleDistributionItem.h"
+#include "GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h"
#include "GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h"
-#include "Core/Parametrization/Units.h"
-#include "GUI/ba3d/model/particles.h"
namespace
{
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h
index bdf97113868838a60d002f1a88022c6ca97520d0..99873cdcf9ee3a1bc0cf2ac43ad4bbe8b9ccaf80 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h
@@ -15,8 +15,8 @@
#ifndef REALSPACEMODEL_H
#define REALSPACEMODEL_H
-#include "Wrap/WinDllMacros.h"
#include "GUI/ba3d/model/model.h"
+#include "Wrap/WinDllMacros.h"
class RealSpaceModel : public RealSpace::Model
{
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.cpp
index c84d3c490717626d22043254768bb4f86918f7b7..d2fcef3212ae3ce096a3df5bba30b5d76dccd30e 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.h"
+#include "GUI/ba3d/widget.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h"
#include <QVBoxLayout>
-#include "GUI/ba3d/widget.h"
RealSpaceView::RealSpaceView(QWidget* parent) : QWidget(parent), m_3dview(new RealSpace::Widget3D)
{
diff --git a/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp b/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp
index f3b149d71b807a09795fd9fed8f8fb21a66e90ce..c54878d0066c5b95c69691ae393429066095ea78 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp
@@ -13,19 +13,19 @@
// ************************************************************************** //
#include "GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h"
-#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
+#include "Core/Parametrization/Units.h"
+#include "Core/Particle/ParticleComposition.h"
+#include "Core/includeIncludes/HardParticles.h"
#include "GUI/coregui/Models/FormFactorItems.h"
#include "GUI/coregui/Models/GUIDomainSampleVisitor.h"
-#include "Core/includeIncludes/HardParticles.h"
#include "GUI/coregui/Models/LayerItem.h"
#include "GUI/coregui/Models/MultiLayerItem.h"
-#include "Core/Particle/ParticleComposition.h"
#include "GUI/coregui/Models/ParticleCompositionItem.h"
#include "GUI/coregui/Models/ParticleItem.h"
-#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h"
#include "GUI/coregui/Models/SessionItem.h"
-#include "Core/Parametrization/Units.h"
#include "GUI/coregui/Models/VectorItem.h"
+#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
+#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h"
namespace
{
diff --git a/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h b/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h
index 1f34fabfda9b721a5e0c3a79a1a94e99cecd4645..426c81faa4b137aee24b9cbf18abb7c8a37b7f35 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h
@@ -15,10 +15,10 @@
#ifndef TRANSFORMTO3D_H
#define TRANSFORMTO3D_H
-#include "Wrap/WinDllMacros.h"
#include "Core/Vector/Vectors3D.h"
#include "GUI/ba3d/model/layer.h"
#include "GUI/ba3d/model/particles.h"
+#include "Wrap/WinDllMacros.h"
#include <memory>
class SessionItem;
diff --git a/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp b/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
index 19a91d752bcb4870a7a772608273a6731b5c54bb..0d8d42320224f40e3c08d72ab6672c3f54090725 100644
--- a/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
@@ -13,11 +13,11 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SampleDesigner/ConnectableView.h"
+#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h"
#include "GUI/coregui/Views/SampleDesigner/NodeEditorPort.h"
-#include "GUI/coregui/Models/SessionItem.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/utils/StyleUtils.h"
#include <QObject>
#include <QPainter>
@@ -31,8 +31,8 @@ ConnectableView::ConnectableView(QGraphicsItem* parent, QRectF rect)
setFlag(QGraphicsItem::ItemIsMovable, true);
setFlag(QGraphicsItem::ItemIsSelectable, true);
setFlag(QGraphicsItem::ItemSendsGeometryChanges);
- m_label_vspace = StyleUtils::SizeOfLetterM().height()*2.5;
- m_roundpar = StyleUtils::SizeOfLetterM().height()/3.0;
+ m_label_vspace = StyleUtils::SizeOfLetterM().height() * 2.5;
+ m_roundpar = StyleUtils::SizeOfLetterM().height() / 3.0;
}
void ConnectableView::paint(QPainter* painter, const QStyleOptionGraphicsItem* option,
@@ -53,7 +53,7 @@ void ConnectableView::paint(QPainter* painter, const QStyleOptionGraphicsItem* o
painter->setPen(Qt::black);
double width = getRectangle().width() * 0.9;
- double yoffset = StyleUtils::SizeOfLetterM().height()/2; // space above the label
+ double yoffset = StyleUtils::SizeOfLetterM().height() / 2; // space above the label
double height = m_label_vspace - yoffset;
QFont serifFont("Monospace", DesignerHelper::getLabelFontSize(), QFont::Normal);
painter->setFont(serifFont);
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp b/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
index eb21b54c67a80c7c8adf8a63d0a74939dc770ca8..67d3ecd0116c93c062d64b2d962a3b371573ddae 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
@@ -14,11 +14,11 @@
#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
#include "GUI/coregui/Models/item_constants.h"
+#include "GUI/coregui/utils/StyleUtils.h"
#include <QPainter>
#include <QtGlobal>
#include <cmath>
#include <iostream>
-#include "GUI/coregui/utils/StyleUtils.h"
namespace
{
@@ -214,17 +214,17 @@ QPixmap DesignerHelper::getMimePixmap(const QString& name)
int DesignerHelper::getHeaderFontSize()
{
- return StyleUtils::SystemPointSize()*1.5;
+ return StyleUtils::SystemPointSize() * 1.5;
}
int DesignerHelper::layerWidth()
{
- return StyleUtils::SizeOfLetterM().width()*18;
+ return StyleUtils::SizeOfLetterM().width() * 18;
}
int DesignerHelper::layerHeight()
{
- return StyleUtils::SizeOfLetterM().height()*2;
+ return StyleUtils::SizeOfLetterM().height() * 2;
}
QColor DesignerHelper::getDefaultLayerColor()
@@ -274,17 +274,17 @@ QColor DesignerHelper::getDefaultMaterialColor()
int DesignerHelper::getSectionFontSize()
{
- return StyleUtils::SystemPointSize()*1.2;
+ return StyleUtils::SystemPointSize() * 1.2;
}
int DesignerHelper::getLabelFontSize()
{
- return StyleUtils::SystemPointSize()*0.9;
+ return StyleUtils::SystemPointSize() * 0.9;
}
int DesignerHelper::getPortFontSize()
{
- return StyleUtils::SystemPointSize()*0.7;
+ return StyleUtils::SystemPointSize() * 0.7;
}
int DesignerHelper::getPythonEditorFontSize()
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
index b6e573363de5512c166d9b861caec8a844d27b5d..76156719e7471c04014b085f300131d3196d33d6 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
@@ -13,26 +13,26 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SampleDesigner/DesignerScene.h"
-#include "GUI/coregui/Views/SampleDesigner/ConnectableView.h"
-#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
-#include "GUI/coregui/Views/SampleDesigner/DesignerMimeData.h"
+#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "GUI/coregui/Models/FilterPropertyProxy.h"
#include "GUI/coregui/Models/GUIExamplesFactory.h"
-#include "GUI/coregui/Views/SampleDesigner/IView.h"
#include "GUI/coregui/Models/InstrumentModel.h"
#include "GUI/coregui/Models/ItemFactory.h"
-#include "GUI/coregui/Views/SampleDesigner/LayerView.h"
-#include "GUI/coregui/Views/SampleDesigner/NodeEditor.h"
-#include "GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h"
#include "GUI/coregui/Models/ParticleCompositionItem.h"
#include "GUI/coregui/Models/ParticleCoreShellItem.h"
#include "GUI/coregui/Models/ParticleItem.h"
#include "GUI/coregui/Models/ParticleLayoutItem.h"
-#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "GUI/coregui/Models/SampleModel.h"
+#include "GUI/coregui/Models/SessionGraphicsItem.h"
+#include "GUI/coregui/Views/SampleDesigner/ConnectableView.h"
+#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
+#include "GUI/coregui/Views/SampleDesigner/DesignerMimeData.h"
+#include "GUI/coregui/Views/SampleDesigner/IView.h"
+#include "GUI/coregui/Views/SampleDesigner/LayerView.h"
+#include "GUI/coregui/Views/SampleDesigner/NodeEditor.h"
+#include "GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h"
#include "GUI/coregui/Views/SampleDesigner/SampleViewAligner.h"
#include "GUI/coregui/Views/SampleDesigner/SampleViewFactory.h"
-#include "GUI/coregui/Models/SessionGraphicsItem.h"
#include <QGraphicsSceneMouseEvent>
#include <QItemSelection>
#include <QPainter>
diff --git a/GUI/coregui/Views/SampleDesigner/ILayerView.cpp b/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
index 6d358aeb9d4e54f47394b74ad7b74f9dd66df288..156edb18e9c55acc40dfeacf2135d5a54edb7423 100644
--- a/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
@@ -13,14 +13,14 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SampleDesigner/ILayerView.h"
-#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
-#include "GUI/coregui/Views/SampleDesigner/DesignerScene.h"
-#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/LayerItem.h"
-#include "GUI/coregui/Views/SampleDesigner/MultiLayerView.h"
#include "GUI/coregui/Models/SampleModel.h"
#include "GUI/coregui/Models/SessionItem.h"
+#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
+#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
+#include "GUI/coregui/Views/SampleDesigner/DesignerScene.h"
+#include "GUI/coregui/Views/SampleDesigner/MultiLayerView.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QGraphicsSceneMouseEvent>
QLineF MultiLayerCandidate::getInterfaceToScene()
@@ -227,8 +227,7 @@ MultiLayerCandidate ILayerView::getMultiLayerCandidate()
QRectF layerRect = mapRectToScene(boundingRect());
for (auto item : scene()->items()) {
- if (item->type() == ViewTypes::MULTILAYER && item != this
- && !childItems().contains(item)) {
+ if (item->type() == ViewTypes::MULTILAYER && item != this && !childItems().contains(item)) {
MultiLayerView* multilayer = qgraphicsitem_cast<MultiLayerView*>(item);
if (multilayer->mapRectToScene(multilayer->boundingRect()).intersects(layerRect)) {
MultiLayerCandidate candidate;
diff --git a/GUI/coregui/Views/SampleDesigner/IView.h b/GUI/coregui/Views/SampleDesigner/IView.h
index 246960ea14d1af498efaab1f2b78541697277e7c..02c17fd92d48b59691dd8403c065e6810dbe47cf 100644
--- a/GUI/coregui/Views/SampleDesigner/IView.h
+++ b/GUI/coregui/Views/SampleDesigner/IView.h
@@ -15,8 +15,8 @@
#ifndef IVIEW_H
#define IVIEW_H
-#include "Wrap/WinDllMacros.h"
#include "GUI/coregui/Views/SampleDesigner/ViewTypes.h"
+#include "Wrap/WinDllMacros.h"
#include <QGraphicsObject>
#include <memory>
@@ -27,7 +27,6 @@ class BA_CORE_API_ IView : public QGraphicsObject
{
Q_OBJECT
public:
-
IView(QGraphicsItem* parent = 0);
virtual ~IView();
diff --git a/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.cpp b/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.cpp
index b52b739f1838820beabbb0dad0dd334fb649d316..007a1361c1ed5fa121e8bbb54eb0c2bf22314518 100644
--- a/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.cpp
+++ b/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.h"
-#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
#include "GUI/coregui/Models/item_constants.h"
+#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
InterferenceFunction1DLatticeView::InterferenceFunction1DLatticeView(QGraphicsItem* parent)
: ConnectableView(parent)
diff --git a/GUI/coregui/Views/SampleDesigner/LayerView.cpp b/GUI/coregui/Views/SampleDesigner/LayerView.cpp
index 614bdf30d88fe7594f2ffbd37136c4251dd0c547..40964fd92f71471ecdd7d0e044cbaa1fa10176b7 100644
--- a/GUI/coregui/Views/SampleDesigner/LayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/LayerView.cpp
@@ -14,11 +14,11 @@
#include "GUI/coregui/Views/SampleDesigner/LayerView.h"
#include "GUI/coregui/Models/LayerItem.h"
+#include "GUI/coregui/Models/SessionItem.h"
+#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
#include "GUI/coregui/Views/SampleDesigner/MultiLayerView.h"
#include "GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/mainwindow/tooltipdatabase.h"
-#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/coregui/Views/SampleDesigner/MesoCrystalView.cpp b/GUI/coregui/Views/SampleDesigner/MesoCrystalView.cpp
index d8f4eb2aaf7a3531220db3283fc591d78a1465eb..6c379d9ccf7280a6354bf543bb171d463292d4c5 100644
--- a/GUI/coregui/Views/SampleDesigner/MesoCrystalView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/MesoCrystalView.cpp
@@ -30,7 +30,7 @@ MesoCrystalView::MesoCrystalView(QGraphicsItem* parent) : ConnectableView(parent
->setToolTip(QStringLiteral("Connect basis particles"));
addPort("transformation", NodeEditorPort::INPUT, NodeEditorPort::TRANSFORMATION)
->setToolTip(QStringLiteral("Connect rotation to this port, if necessary"));
- m_label_vspace = StyleUtils::SizeOfLetterM().height()*2.5;
+ m_label_vspace = StyleUtils::SizeOfLetterM().height() * 2.5;
}
void MesoCrystalView::addView(IView* childView, int /* row */)
diff --git a/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp b/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
index cebfab66f84e80f329f97ed373032049f3315735..746e029063f0c7afcfc00fe32d1e5553f619b29b 100644
--- a/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
@@ -13,12 +13,12 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SampleDesigner/MultiLayerView.h"
+#include "GUI/coregui/Models/SampleModel.h"
+#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerMimeData.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerScene.h"
#include "GUI/coregui/Views/SampleDesigner/LayerView.h"
-#include "GUI/coregui/Models/SampleModel.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include <QGraphicsSceneMouseEvent>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h b/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h
index 666c9791f78907effdb1c240e84a2048e6eeba0c..5f4c45b834637d9124087e42891ae8d615682226 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h
@@ -21,8 +21,8 @@
* Copyright (c) 2012, STANISLAW ADASZEWSKI
*/
-#include "Wrap/WinDllMacros.h"
#include "GUI/coregui/Views/SampleDesigner/ViewTypes.h"
+#include "Wrap/WinDllMacros.h"
#include <QGraphicsPathItem>
class NodeEditorPort;
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp b/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp
index a36289e6923ffb5761a8f0f9ef96352b6633ac9f..8134b849aa339c524593805a7063c730ced548a5 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SampleDesigner/NodeEditorPort.h"
-#include "GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
+#include "GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h"
#include "GUI/coregui/utils/StyleUtils.h"
#include <QGraphicsScene>
#include <QPainter>
@@ -26,8 +26,8 @@ NodeEditorPort::NodeEditorPort(QGraphicsItem* parent, const QString& name,
: QGraphicsPathItem(parent), m_name(name), m_direction(direction), m_port_type(port_type),
m_radius(0), m_margin(0), m_label(nullptr)
{
- m_radius = StyleUtils::SizeOfLetterM().width()*0.4;
- m_margin = m_radius*0.5;
+ m_radius = StyleUtils::SizeOfLetterM().width() * 0.4;
+ m_margin = m_radius * 0.5;
m_color = getPortTypeColor(port_type);
QPainterPath p;
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.h b/GUI/coregui/Views/SampleDesigner/NodeEditorPort.h
index 36dfb95bcad3d43cc1a4b6690016fc3a63ef89f8..683a78757eb703c4fa99a9ab42b1edc647956c29 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.h
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditorPort.h
@@ -21,8 +21,8 @@
* Copyright (c) 2012, STANISLAW ADASZEWSKI
*/
-#include "Wrap/WinDllMacros.h"
#include "GUI/coregui/Views/SampleDesigner/ViewTypes.h"
+#include "Wrap/WinDllMacros.h"
#include <QGraphicsPathItem>
#include <QString>
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
index 210dc877efe7ab81ebe2b1b62f643412796079c9..652c7765f57d88312bb3ac22e410c295ba35995c 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
@@ -29,7 +29,7 @@ ParticleCompositionView::ParticleCompositionView(QGraphicsItem* parent) : Connec
->setToolTip(QStringLiteral("Connect particles"));
addPort("transformation", NodeEditorPort::INPUT, NodeEditorPort::TRANSFORMATION)
->setToolTip(QStringLiteral("Connect rotation to this port, if necessary"));
- m_label_vspace = StyleUtils::SizeOfLetterM().height()*3.0;
+ m_label_vspace = StyleUtils::SizeOfLetterM().height() * 3.0;
}
void ParticleCompositionView::addView(IView* childView, int /* row */)
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
index 9fd6657a7f7d11cab101ec775eeb446eab3578a9..e33415ce178b05f591aa3bd001d5703ace8a3d7f 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
@@ -14,8 +14,8 @@
#include "GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.h"
#include "GUI/coregui/Models/ParticleCoreShellItem.h"
-#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
#include "GUI/coregui/Models/SessionItem.h"
+#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
#include "GUI/coregui/utils/StyleUtils.h"
ParticleCoreShellView::ParticleCoreShellView(QGraphicsItem* parent) : ConnectableView(parent)
@@ -32,7 +32,7 @@ ParticleCoreShellView::ParticleCoreShellView(QGraphicsItem* parent) : Connectabl
addPort("transformation", NodeEditorPort::INPUT, NodeEditorPort::TRANSFORMATION)
->setToolTip(QStringLiteral("Connect particle rotation to this port, if necessary"));
- m_label_vspace = StyleUtils::SizeOfLetterM().height()*3.0;
+ m_label_vspace = StyleUtils::SizeOfLetterM().height() * 3.0;
}
void ParticleCoreShellView::addView(IView* childView, int /* row */)
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
index 1756f42832a808dfc914c2970b7d0d3d9065723b..d2b188c45a26175725748c6496c11f1a530a4396 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
@@ -28,7 +28,7 @@ ParticleDistributionView::ParticleDistributionView(QGraphicsItem* parent) : Conn
->setToolTip(QStringLiteral("Connect particle to this port. It will be a prototype \n"
"for parametric distribution."));
- m_label_vspace = StyleUtils::SizeOfLetterM().height()*3.0;
+ m_label_vspace = StyleUtils::SizeOfLetterM().height() * 3.0;
}
void ParticleDistributionView::addView(IView* childView, int /* row */)
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
index 68efe76c43eb1d8efb7e0b2591c74452e442d8f5..30a641b4fd67938523a31cde76d4a69dcfe924a8 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h"
+#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Views/SampleDesigner/ParticleView.h"
-#include "GUI/coregui/Models/SessionItem.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
ParticleLayoutView::ParticleLayoutView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleView.cpp
index a2a2e260dac92dc3698552827a2a8f96f997acea..ac3eebe7e128c5d2b38f922380202814ab8521c1 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleView.cpp
@@ -14,10 +14,10 @@
#include "GUI/coregui/Views/SampleDesigner/ParticleView.h"
#include "GUI/coregui/Models/FormFactorItems.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/GroupItem.h"
#include "GUI/coregui/Models/ParticleItem.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/utils/StyleUtils.h"
#include <QObject>
#include <QPainter>
@@ -32,7 +32,7 @@ ParticleView::ParticleView(QGraphicsItem* parent) : ConnectableView(parent)
->setToolTip(QStringLiteral("Connect to the ParticleLayout"));
addPort("transformation", NodeEditorPort::INPUT, NodeEditorPort::TRANSFORMATION)
->setToolTip(QStringLiteral("Connect particle rotation to this port, if necessary"));
- m_label_vspace = StyleUtils::SizeOfLetterM().height()*3.0;
+ m_label_vspace = StyleUtils::SizeOfLetterM().height() * 3.0;
}
void ParticleView::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
diff --git a/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp b/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
index df6a6d00d81ec931b0a015a56d8e5c58d684730f..02b85a8c02d40db829a1c5937f8ef1f2284f267e 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
@@ -13,11 +13,11 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SampleDesigner/SampleDesigner.h"
+#include "Core/Scattering/ISample.h"
#include "GUI/coregui/Models/ApplicationModels.h"
+#include "GUI/coregui/Models/FilterPropertyProxy.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerScene.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerView.h"
-#include "GUI/coregui/Models/FilterPropertyProxy.h"
-#include "Core/Scattering/ISample.h"
#include "GUI/coregui/Views/SampleDesigner/MultiLayerView.h"
SampleDesigner::SampleDesigner(QWidget* parent)
diff --git a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp b/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
index 1ce407bbae4d68e1188173a44320bedb1062624b..808e423f2cd1371f3d1a2f8b9f8a18f92272047b 100644
--- a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/coregui/Models/SessionItem.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include <QItemSelection>
#include <QModelIndexList>
#include <QSortFilterProxyModel>
diff --git a/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp b/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
index 699f98f251159de98fe3e44dd3abf00f13b76da9..13e91240dd111071816604f35536b546fd094141 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SampleDesigner/SampleToolBar.h"
-#include "GUI/coregui/Views/SampleDesigner/DesignerView.h"
#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
+#include "GUI/coregui/Views/SampleDesigner/DesignerView.h"
#include "GUI/coregui/Views/SampleDesigner/SampleViewActions.h"
#include <QAction>
#include <QButtonGroup>
diff --git a/GUI/coregui/Views/SampleDesigner/SampleTreeWidget.cpp b/GUI/coregui/Views/SampleDesigner/SampleTreeWidget.cpp
index 1e065e36aeca7e408974137118d088f0a770d235..a49a83cf5d74a3c7e3cde0e855a74904eaefb071 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleTreeWidget.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleTreeWidget.cpp
@@ -15,8 +15,8 @@
#include "GUI/coregui/Views/SampleDesigner/SampleTreeWidget.h"
#include "GUI/coregui/Models/FilterPropertyProxy.h"
#include "GUI/coregui/Models/ItemFactory.h"
-#include "GUI/coregui/Views/SampleDesigner/ItemTreeView.h"
#include "GUI/coregui/Models/SampleModel.h"
+#include "GUI/coregui/Views/SampleDesigner/ItemTreeView.h"
#include <QAction>
#include <QMenu>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewActions.cpp b/GUI/coregui/Views/SampleDesigner/SampleViewActions.cpp
index 3462bda02c5565b8e38cefd6f4c85c87a9a17adb..3b61a196fc0e984626fdcc7c6fac8a97650decf7 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewActions.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewActions.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SampleDesigner/SampleViewActions.h"
-#include "GUI/coregui/Views/SampleView.h"
#include "GUI/coregui/Views/SampleDesigner/SampleViewDocks.h"
+#include "GUI/coregui/Views/SampleView.h"
#include <QAction>
#include <QDockWidget>
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp b/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp
index 899183ec38d7445089a95788d2047cb4c4961872..c4f1b5f7d5a30a8144ae62011ff689eadc7cab11 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp
@@ -13,20 +13,23 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SampleDesigner/SampleViewAligner.h"
+#include "GUI/coregui/Models/SampleModel.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerScene.h"
#include "GUI/coregui/Views/SampleDesigner/IView.h"
-#include "GUI/coregui/Models/SampleModel.h"
#include "GUI/coregui/utils/StyleUtils.h"
#include <QModelIndex>
-namespace {
-int step_width() {
- return StyleUtils::SizeOfLetterM().width()*12.5;
-}
-int step_height() {
- return StyleUtils::SizeOfLetterM().height()*11;
+namespace
+{
+int step_width()
+{
+ return StyleUtils::SizeOfLetterM().width() * 12.5;
}
+int step_height()
+{
+ return StyleUtils::SizeOfLetterM().height() * 11;
}
+} // namespace
SampleViewAligner::SampleViewAligner(DesignerScene* scene) : m_scene(scene)
{
@@ -176,7 +179,8 @@ void SampleViewAligner::alignSample(const QModelIndex& parentIndex, QPointF refe
QModelIndex itemIndex = sampleModel->index(i_row, 0, parentIndex);
if (!getViewForIndex(itemIndex))
continue;
- QPointF child_reference = reference + QPointF(-step_width(), step_height() * child_counter++);
+ QPointF child_reference =
+ reference + QPointF(-step_width(), step_height() * child_counter++);
alignSample(itemIndex, child_reference, force_alignment);
}
}
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewDocks.cpp b/GUI/coregui/Views/SampleDesigner/SampleViewDocks.cpp
index b611d9cbd3b68b98ea28f6661c90107dcc81a489..d9930a0ce9cacfb0c61d1775edb5c06584169ee1 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewDocks.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewDocks.cpp
@@ -19,9 +19,9 @@
#include "GUI/coregui/Views/SampleDesigner/SampleDesigner.h"
#include "GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.h"
#include "GUI/coregui/Views/SampleDesigner/SampleTreeWidget.h"
-#include "GUI/coregui/Views/SampleView.h"
#include "GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h"
#include "GUI/coregui/Views/SampleDesigner/ScriptPanel.h"
+#include "GUI/coregui/Views/SampleView.h"
#include <QAction>
#include <QDockWidget>
#include <QTreeView>
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp b/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
index 914c1407b9b297b28a3fa3be2f098922ffb6aa0c..b43635870cbec4a1ded6cacbe60804dbcf77e34a 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
@@ -13,6 +13,7 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SampleDesigner/SampleViewFactory.h"
+#include "GUI/coregui/Models/item_constants.h"
#include "GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.h"
#include "GUI/coregui/Views/SampleDesigner/LayerView.h"
#include "GUI/coregui/Views/SampleDesigner/MesoCrystalView.h"
@@ -23,7 +24,6 @@
#include "GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h"
#include "GUI/coregui/Views/SampleDesigner/ParticleView.h"
#include "GUI/coregui/Views/SampleDesigner/TransformationView.h"
-#include "GUI/coregui/Models/item_constants.h"
QStringList SampleViewFactory::m_valid_item_names =
QStringList() << Constants::MultiLayerType << Constants::LayerType
diff --git a/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp b/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp
index dd7c2cd7e5fcb9910eb5aef332a61056ab14d62f..4965e3cf1d6dc43b4b960b90c45f9d29a3cc0569 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h"
-#include "styledbar.h"
#include "GUI/coregui/Views/widgetbox/widgetbox.h"
+#include "styledbar.h"
#include <QVBoxLayout>
#if QT_VERSION < 0x050000
diff --git a/GUI/coregui/Views/SampleDesigner/TransformationView.cpp b/GUI/coregui/Views/SampleDesigner/TransformationView.cpp
index 57789dd94f1420568e9ccb146d074a3093a763d2..ed51ab8fbab08133f4bbcfd396f7f346b68e33bf 100644
--- a/GUI/coregui/Views/SampleDesigner/TransformationView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/TransformationView.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SampleDesigner/TransformationView.h"
-#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
#include "GUI/coregui/Models/item_constants.h"
+#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
TransformationView::TransformationView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/coregui/Views/SessionModelView.cpp b/GUI/coregui/Views/SessionModelView.cpp
index 3c74070d04bd2f50d860285c0abea548832089c1..1294c623308ae677c15d9d91261d35e4c6ae9ef9 100644
--- a/GUI/coregui/Views/SessionModelView.cpp
+++ b/GUI/coregui/Views/SessionModelView.cpp
@@ -16,10 +16,10 @@
#include "GUI/coregui/Models/InstrumentModel.h"
#include "GUI/coregui/Models/JobModel.h"
#include "GUI/coregui/Models/MaterialModel.h"
-#include "GUI/coregui/Views/CommonWidgets/ModelTreeView.h"
#include "GUI/coregui/Models/RealDataModel.h"
#include "GUI/coregui/Models/SampleModel.h"
#include "GUI/coregui/Models/SessionModelDelegate.h"
+#include "GUI/coregui/Views/CommonWidgets/ModelTreeView.h"
#include "GUI/coregui/Views/TestView.h"
#include "GUI/coregui/mainwindow/mainwindow.h"
#include <QToolBar>
diff --git a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
index 2a3d250013448f4d16e7d651f2d7f3fefab279bb..fe7f66ee9488e29a63a2202685e560798741bbe3 100644
--- a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
@@ -13,14 +13,14 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h"
-#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
-#include "GUI/coregui/Models/DomainSimulationBuilder.h"
#include "Core/Export/ExportToPython.h"
#include "Core/Simulation/GISASSimulation.h"
+#include "GUI/coregui/Models/DomainSimulationBuilder.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h"
-#include "GUI/coregui/utils/StyleUtils.h"
#include "GUI/coregui/Views/InfoWidgets/WarningSign.h"
+#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
+#include "GUI/coregui/utils/StyleUtils.h"
#include <QFileDialog>
#include <QMessageBox>
#include <QPushButton>
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp b/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp
index 94883561db031966d15fc485979ed989adffc0cc..1db35ee6d62fa64f61f68148c907cc02794693be 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentFlatView.h"
#include "GUI/coregui/Models/SimulationOptionsItem.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentFlatView.h"
#include <QGroupBox>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp b/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp
index 532c203672af249403aaf14c493cb0b0c380a9f1..f933fc13126a7279dcf989e5dddbe0ebb655e6d7 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.h"
-#include "GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/RealDataItem.h"
#include "GUI/coregui/Models/SampleValidator.h"
+#include "GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h"
#include <QMessageBox>
//! Returns true if given setup is valid for submitting the job
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp b/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp
index 38a42cbc1654f39ad4114ed8b3b3be27c13a4906..224e1075a9829707be6a0fe8a8753d75433177e8 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.h"
-#include "GUI/coregui/mainwindow/AppSvc.h"
#include "GUI/coregui/Models/ApplicationModels.h"
#include "GUI/coregui/Models/DocumentModel.h"
#include "GUI/coregui/Models/InstrumentItems.h"
@@ -23,6 +22,7 @@
#include "GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.h"
#include "GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.h"
#include "GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.h"
+#include "GUI/coregui/mainwindow/AppSvc.h"
#include "GUI/coregui/mainwindow/projectmanager.h"
#include <QMessageBox>
#include <QPushButton>
diff --git a/GUI/coregui/Views/SpecularDataWidgets/SpecularDataCanvas.cpp b/GUI/coregui/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
index 459926de63c49f08678522fe6c05d2c4b5841951..d33b04701b1300966ef8a1dda624a5368da73451 100644
--- a/GUI/coregui/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
+++ b/GUI/coregui/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
@@ -13,11 +13,11 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SpecularDataWidgets/SpecularDataCanvas.h"
-#include "GUI/coregui/mainwindow/AppSvc.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h"
#include "GUI/coregui/Models/SpecularDataItem.h"
-#include "GUI/coregui/Views/SpecularDataWidgets/SpecularPlotCanvas.h"
#include "GUI/coregui/Views/FitWidgets/plot_constants.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h"
+#include "GUI/coregui/Views/SpecularDataWidgets/SpecularPlotCanvas.h"
+#include "GUI/coregui/mainwindow/AppSvc.h"
#include "GUI/coregui/mainwindow/projectmanager.h"
#include "qcustomplot.h"
diff --git a/GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.cpp b/GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.cpp
index 9111c66df4701880317f6abc95c886431d6bcfb7..c338fa8933119543ae2a832612f1e0d1f41f5eb5 100644
--- a/GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.cpp
+++ b/GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.cpp
@@ -14,11 +14,11 @@
#include "GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.h"
#include "GUI/coregui/Models/DataItemUtils.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h"
#include "GUI/coregui/Models/JobItem.h"
-#include "GUI/coregui/Views/SpecularDataWidgets/SpecularDataCanvas.h"
#include "GUI/coregui/Models/SpecularDataItem.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h"
+#include "GUI/coregui/Views/SpecularDataWidgets/SpecularDataCanvas.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QBoxLayout>
#include <QMenu>
diff --git a/GUI/coregui/Views/SpecularDataWidgets/SpecularPlot.cpp b/GUI/coregui/Views/SpecularDataWidgets/SpecularPlot.cpp
index 60269176da7dfdd19e94ddecb701e668b8993bfb..5e3a930632886003bc001e337cb3c33322a6cb27 100644
--- a/GUI/coregui/Views/SpecularDataWidgets/SpecularPlot.cpp
+++ b/GUI/coregui/Views/SpecularDataWidgets/SpecularPlot.cpp
@@ -13,13 +13,13 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SpecularDataWidgets/SpecularPlot.h"
-#include "GUI/coregui/Models/AxesItems.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.h"
#include "Core/Basics/MathConstants.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/PlotEventInfo.h"
+#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/SpecularDataItem.h"
#include "GUI/coregui/Views/CommonWidgets/UpdateTimer.h"
#include "GUI/coregui/Views/FitWidgets/plot_constants.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/PlotEventInfo.h"
namespace
{
diff --git a/GUI/coregui/Views/SpecularDataWidgets/SpecularPlotCanvas.cpp b/GUI/coregui/Views/SpecularDataWidgets/SpecularPlotCanvas.cpp
index b7b7b1226734520d2ed1717a9ae65e5a8e1aea64..aa289eb14a6ba858f971c181a48c967f7ddbbeaa 100644
--- a/GUI/coregui/Views/SpecularDataWidgets/SpecularPlotCanvas.cpp
+++ b/GUI/coregui/Views/SpecularDataWidgets/SpecularPlotCanvas.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "GUI/coregui/Views/SpecularDataWidgets/SpecularPlotCanvas.h"
+#include "GUI/coregui/Models/SpecularDataItem.h"
#include "GUI/coregui/Views/IntensityDataWidgets/FontScalingEvent.h"
#include "GUI/coregui/Views/IntensityDataWidgets/PlotStatusLabel.h"
-#include "GUI/coregui/Models/SpecularDataItem.h"
#include "GUI/coregui/Views/SpecularDataWidgets/SpecularPlot.h"
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/TestView.cpp b/GUI/coregui/Views/TestView.cpp
index e105bdfb11d7f5456e815bfdfef9c22d8957e3d6..21595f6436614eaf444df803ba4e76ab797c019f 100644
--- a/GUI/coregui/Views/TestView.cpp
+++ b/GUI/coregui/Views/TestView.cpp
@@ -13,21 +13,21 @@
// ************************************************************************** //
#include "GUI/coregui/Views/TestView.h"
-#include "GUI/coregui/Views/AccordionWidget/AccordionWidget.h"
#include "GUI/coregui/Models/ApplicationModels.h"
#include "GUI/coregui/Models/Data1DViewItem.h"
#include "GUI/coregui/Models/DataPropertyContainer.h"
#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Models/JobModel.h"
-#include "GUI/coregui/Views/MaskWidgets/MaskEditor.h"
-#include "GUI/coregui/Views/MaterialEditor/MaterialEditor.h"
#include "GUI/coregui/Models/MinimizerItem.h"
-#include "GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h"
-#include "GUI/coregui/Views/SpecularDataWidgets/Plot1DCanvas.h"
#include "GUI/coregui/Models/RealDataItem.h"
#include "GUI/coregui/Models/SampleModel.h"
#include "GUI/coregui/Models/SpecularDataItem.h"
+#include "GUI/coregui/Views/AccordionWidget/AccordionWidget.h"
+#include "GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h"
+#include "GUI/coregui/Views/MaskWidgets/MaskEditor.h"
+#include "GUI/coregui/Views/MaterialEditor/MaterialEditor.h"
#include "GUI/coregui/Views/PropertyEditor/TestComponentView.h"
+#include "GUI/coregui/Views/SpecularDataWidgets/Plot1DCanvas.h"
#include "GUI/coregui/mainwindow/mainwindow.h"
#include <QTreeView>
diff --git a/GUI/coregui/Views/WelcomeView.cpp b/GUI/coregui/Views/WelcomeView.cpp
index 597576d328f3149876aba55b90e3bdb1a2782161..8426853f29b2ad7a57ec504d725262543933d34c 100644
--- a/GUI/coregui/Views/WelcomeView.cpp
+++ b/GUI/coregui/Views/WelcomeView.cpp
@@ -14,14 +14,14 @@
#include "GUI/coregui/Views/WelcomeView.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
-#include "GUI/coregui/utils/FancyLabel.h"
-#include "GUI/coregui/utils/LayoutUtils.h"
-#include "GUI/coregui/utils/StyleUtils.h"
#include "GUI/coregui/mainwindow/UpdateNotifierWidget.h"
#include "GUI/coregui/mainwindow/mainwindow.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
#include "GUI/coregui/mainwindow/projectdocument.h"
#include "GUI/coregui/mainwindow/projectmanager.h"
+#include "GUI/coregui/utils/FancyLabel.h"
+#include "GUI/coregui/utils/LayoutUtils.h"
+#include "GUI/coregui/utils/StyleUtils.h"
#include "GUI/coregui/utils/qstringutils.h"
#include <QCommandLinkButton>
#include <QDesktopServices>
diff --git a/GUI/coregui/Views/widgetbox/widgetbox.h b/GUI/coregui/Views/widgetbox/widgetbox.h
index 034187f7a9cef1159603df0515687c386514cb9c..5b482db91ba3e524d02730332d4f12a7d7956b6e 100644
--- a/GUI/coregui/Views/widgetbox/widgetbox.h
+++ b/GUI/coregui/Views/widgetbox/widgetbox.h
@@ -42,8 +42,8 @@
#ifndef WIDGETBOX_H
#define WIDGETBOX_H
-#include "GUI/coregui/Views/widgetbox/widgetbox_global.h"
#include "GUI/coregui/Views/widgetbox/qdesigner_widgetbox_p.h"
+#include "GUI/coregui/Views/widgetbox/widgetbox_global.h"
QT_BEGIN_NAMESPACE
diff --git a/GUI/coregui/mainwindow/AutosaveController.cpp b/GUI/coregui/mainwindow/AutosaveController.cpp
index 5e94d669d273cf4b02604e1b1a8163f7d27f8e65..6f85680625a7f6a309f99c9532fed7f21c4755cf 100644
--- a/GUI/coregui/mainwindow/AutosaveController.cpp
+++ b/GUI/coregui/mainwindow/AutosaveController.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "GUI/coregui/mainwindow/AutosaveController.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "GUI/coregui/mainwindow/ProjectUtils.h"
#include "GUI/coregui/Views/CommonWidgets/UpdateTimer.h"
+#include "GUI/coregui/mainwindow/ProjectUtils.h"
#include "GUI/coregui/mainwindow/projectdocument.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QDir>
namespace
diff --git a/GUI/coregui/mainwindow/OutputDataIOHistory.cpp b/GUI/coregui/mainwindow/OutputDataIOHistory.cpp
index a2a03bf356521d0ff1096a3f99e57c6b7297753b..87dcbbe3cb6bac076cab5363e30c1137ce73127d 100644
--- a/GUI/coregui/mainwindow/OutputDataIOHistory.cpp
+++ b/GUI/coregui/mainwindow/OutputDataIOHistory.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/mainwindow/OutputDataIOHistory.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/mainwindow/SaveLoadInterface.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
//! Static method to create info for just saved item.
diff --git a/GUI/coregui/mainwindow/OutputDataIOService.cpp b/GUI/coregui/mainwindow/OutputDataIOService.cpp
index 986da37f4a32b0d4166f7c00f349770724299bf4..a5ae64fdbc723cf8a71b6487517abc843fa9c7dc 100644
--- a/GUI/coregui/mainwindow/OutputDataIOService.cpp
+++ b/GUI/coregui/mainwindow/OutputDataIOService.cpp
@@ -13,14 +13,14 @@
// ************************************************************************** //
#include "GUI/coregui/mainwindow/OutputDataIOService.h"
-#include "GUI/coregui/Models/ApplicationModels.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
+#include "GUI/coregui/Models/ApplicationModels.h"
#include "GUI/coregui/Models/JobItem.h"
-#include "GUI/coregui/utils/MessageService.h"
#include "GUI/coregui/Models/ModelPath.h"
+#include "GUI/coregui/Models/item_constants.h"
#include "GUI/coregui/mainwindow/ProjectUtils.h"
#include "GUI/coregui/mainwindow/SaveLoadInterface.h"
-#include "GUI/coregui/Models/item_constants.h"
+#include "GUI/coregui/utils/MessageService.h"
namespace
{
diff --git a/GUI/coregui/mainwindow/ProjectUtils.cpp b/GUI/coregui/mainwindow/ProjectUtils.cpp
index 436baf0ac9fa1beecc3af1fcfd85ba1aa39fbf1a..8afc193bf309d59098115b2d128ad8d1787fa4a8 100644
--- a/GUI/coregui/mainwindow/ProjectUtils.cpp
+++ b/GUI/coregui/mainwindow/ProjectUtils.cpp
@@ -13,11 +13,11 @@
// ************************************************************************** //
#include "GUI/coregui/mainwindow/ProjectUtils.h"
-#include "GUI/coregui/mainwindow/AppSvc.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/ItemFileNameUtils.h"
+#include "GUI/coregui/mainwindow/AppSvc.h"
#include "GUI/coregui/mainwindow/projectdocument.h"
#include "GUI/coregui/mainwindow/projectmanager.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QDateTime>
#include <QDebug>
#include <QDir>
diff --git a/GUI/coregui/mainwindow/PyImportAssistant.cpp b/GUI/coregui/mainwindow/PyImportAssistant.cpp
index 590980d8e4c2a0559ab3943edba9b186d8e9e4ed..adeeea00f890c661591f377a0f85070e33386e7f 100644
--- a/GUI/coregui/mainwindow/PyImportAssistant.cpp
+++ b/GUI/coregui/mainwindow/PyImportAssistant.cpp
@@ -13,19 +13,19 @@
// ************************************************************************** //
#include "GUI/coregui/mainwindow/PyImportAssistant.h"
-#include "GUI/coregui/mainwindow/AppSvc.h"
#include "BABuild.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.h"
-#include "GUI/coregui/Views/InfoWidgets/DetailedMessageBox.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "GUI/coregui/Models/GUIObjectBuilder.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "GUI/coregui/mainwindow/ProjectUtils.h"
#include "Core/Tools/PyImport.h"
#include "Core/Tools/SysUtils.h"
+#include "GUI/coregui/Models/GUIObjectBuilder.h"
+#include "GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.h"
+#include "GUI/coregui/Views/InfoWidgets/DetailedMessageBox.h"
+#include "GUI/coregui/mainwindow/AppSvc.h"
+#include "GUI/coregui/mainwindow/ProjectUtils.h"
#include "GUI/coregui/mainwindow/mainwindow.h"
#include "GUI/coregui/mainwindow/projectmanager.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QApplication>
#include <QDebug>
#include <QFileDialog>
diff --git a/GUI/coregui/mainwindow/SaveService.cpp b/GUI/coregui/mainwindow/SaveService.cpp
index d31fc4f131dde6d40493ce7dad5047d88c4b7f52..6f1804061e61af8ea54b3db9db19c47e572dca5d 100644
--- a/GUI/coregui/mainwindow/SaveService.cpp
+++ b/GUI/coregui/mainwindow/SaveService.cpp
@@ -13,12 +13,12 @@
// ************************************************************************** //
#include "GUI/coregui/mainwindow/SaveService.h"
+#include "GUI/coregui/Views/CommonWidgets/UpdateTimer.h"
#include "GUI/coregui/mainwindow/AutosaveController.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/mainwindow/ProjectUtils.h"
#include "GUI/coregui/mainwindow/SaveThread.h"
-#include "GUI/coregui/Views/CommonWidgets/UpdateTimer.h"
#include "GUI/coregui/mainwindow/projectdocument.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QApplication>
#include <QCoreApplication>
#include <QTime>
diff --git a/GUI/coregui/mainwindow/UpdateNotifier.cpp b/GUI/coregui/mainwindow/UpdateNotifier.cpp
index 695d308aea610cb951b4d6537bcdb58aff6ba64b..ba81902fa29490f29bc52caa3423ce10ebfa6724 100644
--- a/GUI/coregui/mainwindow/UpdateNotifier.cpp
+++ b/GUI/coregui/mainwindow/UpdateNotifier.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/mainwindow/UpdateNotifier.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QtNetwork>
UpdateNotifier::UpdateNotifier(QObject* parent)
diff --git a/GUI/coregui/mainwindow/aboutapplicationdialog.cpp b/GUI/coregui/mainwindow/aboutapplicationdialog.cpp
index 7ae21f6908f5f8e7d06a7e9e90af79214923a21c..1a5f53d56ad5f09f2ad6a439b6e5e43afc467043 100644
--- a/GUI/coregui/mainwindow/aboutapplicationdialog.cpp
+++ b/GUI/coregui/mainwindow/aboutapplicationdialog.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/mainwindow/aboutapplicationdialog.h"
-#include "GUI/coregui/utils/CustomEventFilters.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
+#include "GUI/coregui/utils/CustomEventFilters.h"
#include "GUI/coregui/utils/GUIHelpers.h"
#include <QDate>
#include <QLabel>
diff --git a/GUI/coregui/mainwindow/actionmanager.cpp b/GUI/coregui/mainwindow/actionmanager.cpp
index 4b3246a18bd3c04caced6e0de78d56ef05430a90..c3f54c476867be00e351f71f74b9940a962bd2ac 100644
--- a/GUI/coregui/mainwindow/actionmanager.cpp
+++ b/GUI/coregui/mainwindow/actionmanager.cpp
@@ -13,14 +13,14 @@
// ************************************************************************** //
#include "GUI/coregui/mainwindow/actionmanager.h"
-#include "GUI/coregui/mainwindow/PyImportAssistant.h"
#include "Core/Tools/SysUtils.h"
+#include "GUI/coregui/mainwindow/PyImportAssistant.h"
#include "GUI/coregui/mainwindow/UpdateNotifier.h"
#include "GUI/coregui/mainwindow/aboutapplicationdialog.h"
-#include "GUI/coregui/utils/hostosinfo.h"
#include "GUI/coregui/mainwindow/mainwindow.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
#include "GUI/coregui/mainwindow/projectmanager.h"
+#include "GUI/coregui/utils/hostosinfo.h"
#include "GUI/coregui/utils/qstringutils.h"
#include <QDir>
#include <QMenuBar>
diff --git a/GUI/coregui/mainwindow/mainwindow.cpp b/GUI/coregui/mainwindow/mainwindow.cpp
index 05b666ff03e9d9f8358a1a16f6ee40d110d29c65..4deb64690dac4f2de5625dddf1e2c892dcb364eb 100644
--- a/GUI/coregui/mainwindow/mainwindow.cpp
+++ b/GUI/coregui/mainwindow/mainwindow.cpp
@@ -14,24 +14,24 @@
#include "GUI/coregui/mainwindow/mainwindow.h"
#include "GUI/coregui/Models/ApplicationModels.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
+#include "GUI/coregui/Models/JobModel.h"
#include "GUI/coregui/Views/ImportDataView.h"
#include "GUI/coregui/Views/InstrumentView.h"
-#include "GUI/coregui/Models/JobModel.h"
#include "GUI/coregui/Views/JobView.h"
#include "GUI/coregui/Views/SampleView.h"
#include "GUI/coregui/Views/SessionModelView.h"
#include "GUI/coregui/Views/SimulationView.h"
-#include "GUI/coregui/mainwindow/UpdateNotifier.h"
#include "GUI/coregui/Views/WelcomeView.h"
+#include "GUI/coregui/mainwindow/UpdateNotifier.h"
#include "GUI/coregui/mainwindow/actionmanager.h"
-#include "fancytabwidget.h"
-#include "GUI/coregui/utils/hostosinfo.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
-#include "progressbar.h"
#include "GUI/coregui/mainwindow/projectmanager.h"
-#include "stylehelper.h"
#include "GUI/coregui/mainwindow/tooltipdatabase.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
+#include "GUI/coregui/utils/hostosinfo.h"
+#include "fancytabwidget.h"
+#include "progressbar.h"
+#include "stylehelper.h"
#include <QAction>
#include <QApplication>
#include <QCloseEvent>
diff --git a/GUI/coregui/mainwindow/projectdocument.cpp b/GUI/coregui/mainwindow/projectdocument.cpp
index 79f1454f2cc5b43ea996cc3b01c1df015db7b821..c8792f077abf5b249a4693822869e4b250ba5369 100644
--- a/GUI/coregui/mainwindow/projectdocument.cpp
+++ b/GUI/coregui/mainwindow/projectdocument.cpp
@@ -14,11 +14,11 @@
#include "GUI/coregui/mainwindow/projectdocument.h"
#include "GUI/coregui/Models/ApplicationModels.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/JobModel.h"
-#include "GUI/coregui/utils/MessageService.h"
#include "GUI/coregui/mainwindow/OutputDataIOService.h"
#include "GUI/coregui/mainwindow/ProjectUtils.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
+#include "GUI/coregui/utils/MessageService.h"
#include <QDir>
#include <QElapsedTimer>
#include <QXmlStreamReader>
diff --git a/GUI/coregui/mainwindow/projectmanager.cpp b/GUI/coregui/mainwindow/projectmanager.cpp
index 0f7fcd2d5a63aa3c58eddbc97c180c43231f485d..93e2d3977a0632300f16acc0bf48048dd5dc2c61 100644
--- a/GUI/coregui/mainwindow/projectmanager.cpp
+++ b/GUI/coregui/mainwindow/projectmanager.cpp
@@ -13,17 +13,17 @@
// ************************************************************************** //
#include "GUI/coregui/mainwindow/projectmanager.h"
-#include "GUI/coregui/mainwindow/AppSvc.h"
#include "GUI/coregui/Models/ApplicationModels.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "GUI/coregui/utils/MessageService.h"
#include "GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.h"
+#include "GUI/coregui/mainwindow/AppSvc.h"
#include "GUI/coregui/mainwindow/ProjectUtils.h"
#include "GUI/coregui/mainwindow/SaveService.h"
#include "GUI/coregui/mainwindow/mainwindow.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
#include "GUI/coregui/mainwindow/newprojectdialog.h"
#include "GUI/coregui/mainwindow/projectdocument.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
+#include "GUI/coregui/utils/MessageService.h"
#include <QApplication>
#include <QDateTime>
#include <QFileDialog>
diff --git a/GUI/coregui/mainwindow/tooltipdatabase.cpp b/GUI/coregui/mainwindow/tooltipdatabase.cpp
index f19cfe32a64b63a4649d5d984a2dcd64c748960b..a3bf9573e64df3a64d1a12a2f7e3abe75dbe1ab6 100644
--- a/GUI/coregui/mainwindow/tooltipdatabase.cpp
+++ b/GUI/coregui/mainwindow/tooltipdatabase.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/mainwindow/tooltipdatabase.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/item_constants.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QFile>
#include <QXmlStreamReader>
diff --git a/GUI/coregui/utils/ImportDataInfo.cpp b/GUI/coregui/utils/ImportDataInfo.cpp
index e0d3f5d8cd64ac68e184d678c5f959a90aef5a94..8fc690c9c7735c4fce29cbc7f61354c673c4cb34 100644
--- a/GUI/coregui/utils/ImportDataInfo.cpp
+++ b/GUI/coregui/utils/ImportDataInfo.cpp
@@ -14,10 +14,10 @@
#include "GUI/coregui/utils/ImportDataInfo.h"
#include "Core/Instrument/AxisNames.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h"
-#include "GUI/coregui/Models/JobItemUtils.h"
#include "Core/Instrument/OutputData.h"
+#include "GUI/coregui/Models/JobItemUtils.h"
+#include "GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
namespace
{
diff --git a/GUI/coregui/utils/StyleUtils.cpp b/GUI/coregui/utils/StyleUtils.cpp
index 275853ac48758a93a1ce9662b5b218113987e00a..3dc7b1d78b0e23655fdf24c0ee604254d63c76de 100644
--- a/GUI/coregui/utils/StyleUtils.cpp
+++ b/GUI/coregui/utils/StyleUtils.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/utils/StyleUtils.h"
-#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
#include "GUI/coregui/Views/CommonWidgets/detailswidget.h"
+#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
#include "GUI/coregui/utils/hostosinfo.h"
#include <QApplication>
#include <QBoxLayout>
@@ -26,11 +26,12 @@ namespace
Utils::DetailsWidget* createEmptyDetailsWidget(const QString& name, bool expanded);
QSize FindSizeOfLetterM(const QWidget* widget);
-QSize DefaultSizeOfLetterM() {
+QSize DefaultSizeOfLetterM()
+{
QWidget widget;
return FindSizeOfLetterM(&widget);
}
-}
+} // namespace
void StyleUtils::setPropertyStyle(QTreeView* tree)
{
@@ -119,7 +120,7 @@ int StyleUtils::SystemPointSize()
int StyleUtils::PropertyPanelWidth()
{
- return SizeOfLetterM().width()*16;
+ return SizeOfLetterM().width() * 16;
}
namespace
diff --git a/GUI/main/main.cpp b/GUI/main/main.cpp
index 12aad4267f51f2c8e9802e8148182ebb0ac9dc2b..9b6d77f59c35ed85e33f5afd4803cd1dcc769b19 100644
--- a/GUI/main/main.cpp
+++ b/GUI/main/main.cpp
@@ -14,9 +14,9 @@
#include "GUI/coregui/Views/FitWidgets/FitProgressInfo.h"
#include "GUI/coregui/mainwindow/SplashScreen.h"
-#include "GUI/main/appoptions.h"
#include "GUI/coregui/mainwindow/mainwindow.h"
#include "GUI/coregui/utils/hostosinfo.h"
+#include "GUI/main/appoptions.h"
#include <QApplication>
#include <QLocale>
#include <QMetaType>
diff --git a/Tests/Functional/Core/CoreSpecial/BatchSimulation.cpp b/Tests/Functional/Core/CoreSpecial/BatchSimulation.cpp
index 4585e869a02c617830cd3781993cf2a3a4656976..07eef578340c6dd936be2f7c4bd301fd51bb92bc 100644
--- a/Tests/Functional/Core/CoreSpecial/BatchSimulation.cpp
+++ b/Tests/Functional/Core/CoreSpecial/BatchSimulation.cpp
@@ -13,11 +13,11 @@
// ************************************************************************** //
#include "Tests/Functional/Core/CoreSpecial/BatchSimulation.h"
-#include "Tests/Functional/TestMachinery/IFunctionalTest.h"
#include "Core/Instrument/IntensityDataFunctions.h"
-#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "Core/Simulation/Simulation.h"
+#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "Core/StandardSamples/SimulationFactory.h"
+#include "Tests/Functional/TestMachinery/IFunctionalTest.h"
#include <iostream>
#include <memory>
diff --git a/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp b/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp
index ff14f29ea6cf1ece513ed4b1ae2370c2352d048a..6e24b95391f8d7b4d5695b3840d1810db2648c5c 100644
--- a/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp
+++ b/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp
@@ -14,9 +14,9 @@
#include "Tests/Functional/Core/CoreSpecial/CoreIOPathTest.h"
#include "BATesting.h"
-#include "Core/Tools/FileSystemUtils.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Instrument/OutputData.h"
+#include "Core/Tools/FileSystemUtils.h"
#include "Tests/Functional/TestMachinery/TestUtils.h"
#include <boost/filesystem.hpp>
#include <iostream>
diff --git a/Tests/Functional/Core/CoreSpecial/CoreIOPerformanceTest.cpp b/Tests/Functional/Core/CoreSpecial/CoreIOPerformanceTest.cpp
index b3e148936b6325803ccb03ab0fedc64a4d10dedd..bbe19ac47ccbe835c739691c73965e68591f6e1f 100644
--- a/Tests/Functional/Core/CoreSpecial/CoreIOPerformanceTest.cpp
+++ b/Tests/Functional/Core/CoreSpecial/CoreIOPerformanceTest.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Tests/Functional/Core/CoreSpecial/CoreIOPerformanceTest.h"
-#include "Tests/Functional/TestMachinery/Benchmark.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Tools/Numeric.h"
+#include "Tests/Functional/TestMachinery/Benchmark.h"
#include <boost/format.hpp>
#include <cassert>
#include <iomanip>
diff --git a/Tests/Functional/Core/CoreSpecial/CoreIOPerformanceTest.h b/Tests/Functional/Core/CoreSpecial/CoreIOPerformanceTest.h
index 8d98f67d02b5185b296ab286029137b61a134b26..0b2e7bfe560b80827e060884542c77d0e6709ed5 100644
--- a/Tests/Functional/Core/CoreSpecial/CoreIOPerformanceTest.h
+++ b/Tests/Functional/Core/CoreSpecial/CoreIOPerformanceTest.h
@@ -15,9 +15,9 @@
#ifndef COREIOPERFORMANCETEST_H
#define COREIOPERFORMANCETEST_H
+#include "Core/Instrument/OutputData.h"
#include "Tests/Functional/TestMachinery/Benchmark.h"
#include "Tests/Functional/TestMachinery/IFunctionalTest.h"
-#include "Core/Instrument/OutputData.h"
#include <memory>
//! Functional test to validate read/write of large data files.
diff --git a/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp b/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp
index 66a53e0cc1093fc1b2ecad0d924e62b45e136828..4045654120f78abfb526010acb260d80d9f8c2a2 100644
--- a/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp
+++ b/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp
@@ -14,10 +14,10 @@
#include "Tests/Functional/Core/CoreSpecial/FourierTransformationTest.h"
#include "BATesting.h"
-#include "Core/Tools/FileSystemUtils.h"
-#include "Core/Instrument/IntensityDataFunctions.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
+#include "Core/Instrument/IntensityDataFunctions.h"
#include "Core/Instrument/OutputData.h"
+#include "Core/Tools/FileSystemUtils.h"
#include "Tests/Functional/TestMachinery/TestUtils.h"
#include <iostream>
#include <memory>
diff --git a/Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceBuilder.cpp b/Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceBuilder.cpp
index 83ce20f5e48d99c7ffbb15cab92d1d9f0ac27878..6a27ffafd935df60b4855941354559982fd7c1f2 100644
--- a/Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceBuilder.cpp
+++ b/Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceBuilder.cpp
@@ -13,20 +13,20 @@
// ************************************************************************** //
#include "Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceBuilder.h"
-#include "Core/Particle/Crystal.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/HardParticle/FormFactorCylinder.h"
-#include "Core/SoftParticle/FormFactorSphereLogNormalRadius.h"
#include "Core/Lattice/ISelectionRule.h"
#include "Core/Lattice/Lattice.h"
+#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerRoughness.h"
-#include "Core/Material/MaterialFactoryFuncs.h"
-#include "Core/Particle/MesoCrystal.h"
#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Crystal.h"
+#include "Core/Particle/MesoCrystal.h"
#include "Core/Particle/Particle.h"
#include "Core/Particle/ParticleComposition.h"
-#include "Core/Aggregate/ParticleLayout.h"
-#include "Core/Parametrization/Units.h"
+#include "Core/SoftParticle/FormFactorSphereLogNormalRadius.h"
using Units::deg;
using Units::nm;
diff --git a/Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceBuilder.h b/Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceBuilder.h
index 94e22b7c7ccca3890d89750764976fa67301f50d..fdd5f53eedca51c18896f0223d4ee4c382bf24a2 100644
--- a/Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceBuilder.h
+++ b/Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceBuilder.h
@@ -15,8 +15,8 @@
#ifndef MESOCRYSTALPERFORMANCEBUILDER_H
#define MESOCRYSTALPERFORMANCEBUILDER_H
-#include "Core/Multilayer/IMultiLayerBuilder.h"
#include "Core/Material/Material.h"
+#include "Core/Multilayer/IMultiLayerBuilder.h"
class MesoCrystal;
class IFormFactor;
diff --git a/Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceTest.cpp b/Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceTest.cpp
index 6f2292fa305d784ed6f19684ecd759265c0b6fcd..541c09b4e041b08335a8383ba84e9be83805e597 100644
--- a/Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceTest.cpp
+++ b/Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceTest.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceTest.h"
-#include "Core/Simulation/GISASSimulation.h"
-#include "Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceBuilder.h"
#include "Core/Instrument/RectangularDetector.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Simulation/GISASSimulation.h"
+#include "Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceBuilder.h"
#include <iostream>
namespace
diff --git a/Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTest.cpp b/Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTest.cpp
index 333b4379a505bba883a3d9fcee026f2b19cab884..5ca5b5a1b7e6a338c1c34540f7575b39eca77d99 100644
--- a/Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTest.cpp
+++ b/Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTest.cpp
@@ -13,14 +13,14 @@
// ************************************************************************** //
#include "Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTest.h"
-#include "Core/StandardSamples/CylindersBuilder.h"
-#include "Core/Parametrization/Distributions.h"
-#include "Core/Simulation/GISASSimulation.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTestComponents.h"
-#include "Core/StandardSamples/ParaCrystalBuilder.h"
+#include "Core/Parametrization/Distributions.h"
#include "Core/Parametrization/ParameterPattern.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Simulation/GISASSimulation.h"
+#include "Core/StandardSamples/CylindersBuilder.h"
+#include "Core/StandardSamples/ParaCrystalBuilder.h"
+#include "Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTestComponents.h"
#include <algorithm>
#include <boost/format.hpp>
#include <chrono>
diff --git a/Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTestComponents.cpp b/Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTestComponents.cpp
index a9f629ee75ff8ba1823fa3cdfa043e13b698cd1d..a954c92b599af51f4a90c0062fa1f89ae6516652 100644
--- a/Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTestComponents.cpp
+++ b/Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTestComponents.cpp
@@ -13,21 +13,21 @@
// ************************************************************************** //
#include "Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTestComponents.h"
-#include "Core/StandardSamples/CylindersBuilder.h"
-#include "Core/Parametrization/Distributions.h"
-#include "Core/HardParticle/FormFactorFullSphere.h"
-#include "Core/Simulation/GISASSimulation.h"
#include "Core/Aggregate/InterferenceFunction2DLattice.h"
-#include "Core/Multilayer/Layer.h"
+#include "Core/Aggregate/ParticleLayout.h"
+#include "Core/HardParticle/FormFactorFullSphere.h"
+#include "Core/Instrument/RectangularDetector.h"
+#include "Core/Mask/Rectangle.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Parametrization/Distributions.h"
#include "Core/Parametrization/ParameterPattern.h"
+#include "Core/Parametrization/Units.h"
#include "Core/Particle/Particle.h"
#include "Core/Particle/ParticleDistribution.h"
-#include "Core/Aggregate/ParticleLayout.h"
-#include "Core/Mask/Rectangle.h"
-#include "Core/Instrument/RectangularDetector.h"
-#include "Core/Parametrization/Units.h"
+#include "Core/Simulation/GISASSimulation.h"
+#include "Core/StandardSamples/CylindersBuilder.h"
namespace
{
diff --git a/Tests/Functional/Core/CoreSpecial/MultilayerPerformanceTest.cpp b/Tests/Functional/Core/CoreSpecial/MultilayerPerformanceTest.cpp
index 70487c4844e5804cb31e028bfca56bc7890a45f0..16a5002d501e90973bda3dd5f63004819e5cc84c 100644
--- a/Tests/Functional/Core/CoreSpecial/MultilayerPerformanceTest.cpp
+++ b/Tests/Functional/Core/CoreSpecial/MultilayerPerformanceTest.cpp
@@ -14,8 +14,8 @@
#include "Tests/Functional/Core/CoreSpecial/MultilayerPerformanceTest.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/StandardSamples/PlainMultiLayerBySLDBuilder.h"
#include "Core/Simulation/SpecularSimulation.h"
+#include "Core/StandardSamples/PlainMultiLayerBySLDBuilder.h"
#include "Core/StandardSamples/StandardSimulations.h"
#include <chrono>
diff --git a/Tests/Functional/Core/CoreStandardTest/CoreStandardTest.cpp b/Tests/Functional/Core/CoreStandardTest/CoreStandardTest.cpp
index eac5a7af574c87d04886f7f648d6e4be9a22d64c..742a294f12dd596f9d28d468064ed5b13134a5e2 100644
--- a/Tests/Functional/Core/CoreStandardTest/CoreStandardTest.cpp
+++ b/Tests/Functional/Core/CoreStandardTest/CoreStandardTest.cpp
@@ -15,9 +15,9 @@
#include "Tests/Functional/Core/CoreStandardTest/CoreStandardTest.h"
#include "BABuild.h"
#include "BATesting.h"
-#include "Core/Tools/FileSystemUtils.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Simulation/Simulation.h"
+#include "Core/Tools/FileSystemUtils.h"
#include "Tests/Functional/TestMachinery/TestUtils.h"
bool CoreStandardTest::runTest()
diff --git a/Tests/Functional/Core/MPI/mpitest.cpp b/Tests/Functional/Core/MPI/mpitest.cpp
index d6ee1b7faa400055300c7bae4ff8020f63941ed8..9e68e0f8becfb74ddf449f7ad667ded529829bf0 100644
--- a/Tests/Functional/Core/MPI/mpitest.cpp
+++ b/Tests/Functional/Core/MPI/mpitest.cpp
@@ -1,7 +1,7 @@
#include <mpi.h>
-#include "Core/Instrument/IntensityDataFunctions.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
+#include "Core/Instrument/IntensityDataFunctions.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "Core/StandardSamples/SimulationFactory.h"
diff --git a/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTest.cpp b/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTest.cpp
index 5531221b06424a8d3be7e9326dc38adb4ecdd218..2784aa4554428a46bc2b9d20d478a7f3f34002d0 100644
--- a/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTest.cpp
+++ b/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTest.cpp
@@ -14,9 +14,9 @@
#include "Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTest.h"
#include "BATesting.h"
-#include "Core/Tools/FileSystemUtils.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Simulation/Simulation.h"
+#include "Core/Tools/FileSystemUtils.h"
#include "Tests/Functional/TestMachinery/TestUtils.h"
namespace
diff --git a/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTestService.cpp b/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTestService.cpp
index b146fdb46b6b272c7ad1605c6b764269d725cea5..965859cab5bbd9875244018921c9d1b0228d4a67 100644
--- a/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTestService.cpp
+++ b/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTestService.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTestService.h"
-#include "Core/StandardSamples/SampleBuilderFactory.h"
-#include "Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTest.h"
#include "Core/Simulation/Simulation.h"
+#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "Core/StandardSamples/SimulationFactory.h"
+#include "Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTest.h"
#include "Tests/Functional/TestMachinery/TestUtils.h"
using sim_ptr = std::unique_ptr<Simulation>;
diff --git a/Tests/Functional/Fit/FitObjective/AdjustMinimizerPlan.cpp b/Tests/Functional/Fit/FitObjective/AdjustMinimizerPlan.cpp
index 5f3587f086f0ed7f20693b0223fe82c4c3bf33d4..d3e06a883616d90eb64b1d11721cb97807eb15d5 100644
--- a/Tests/Functional/Fit/FitObjective/AdjustMinimizerPlan.cpp
+++ b/Tests/Functional/Fit/FitObjective/AdjustMinimizerPlan.cpp
@@ -14,10 +14,10 @@
#include "Tests/Functional/Fit/FitObjective/AdjustMinimizerPlan.h"
#include "Core/Fitting/FitObjective.h"
+#include "Core/Parametrization/Units.h"
#include "Fit/Kernel/KernelTypes.h"
#include "Fit/Kernel/Minimizer.h"
#include "Fit/Kernel/Parameters.h"
-#include "Core/Parametrization/Units.h"
#include <iostream>
namespace
diff --git a/Tests/Functional/Fit/FitObjective/FitPlan.cpp b/Tests/Functional/Fit/FitObjective/FitPlan.cpp
index 62d2550fd16eb587f203bcc21c4472455c84cbbf..4e5e025849657b7558d25a61051b83d4c5533c75 100644
--- a/Tests/Functional/Fit/FitObjective/FitPlan.cpp
+++ b/Tests/Functional/Fit/FitObjective/FitPlan.cpp
@@ -14,12 +14,12 @@
#include "Tests/Functional/Fit/FitObjective/FitPlan.h"
#include "Core/Fitting/FitObjective.h"
-#include "Fit/Kernel/KernelTypes.h"
-#include "Fit/Kernel/Minimizer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Fit/Kernel/Parameters.h"
#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "Core/StandardSamples/SimulationFactory.h"
+#include "Fit/Kernel/KernelTypes.h"
+#include "Fit/Kernel/Minimizer.h"
+#include "Fit/Kernel/Parameters.h"
FitPlan::FitPlan(const std::string& name, bool residual_based)
: MinimizerTestPlan(name), m_residual_based(residual_based)
diff --git a/Tests/Functional/Fit/FitObjective/FitPlanCases.cpp b/Tests/Functional/Fit/FitObjective/FitPlanCases.cpp
index 6423d0f265ce099817cf155058d444c78899aece..7d90282227207f4f411f0bf008c61047b47403ec 100644
--- a/Tests/Functional/Fit/FitObjective/FitPlanCases.cpp
+++ b/Tests/Functional/Fit/FitObjective/FitPlanCases.cpp
@@ -14,19 +14,19 @@
#include "Tests/Functional/Fit/FitObjective/FitPlanCases.h"
#include "Core/Aggregate/FTDecayFunctions.h"
+#include "Core/Aggregate/InterferenceFunction2DLattice.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Fitting/FitObjective.h"
#include "Core/HardParticle/FormFactorCylinder.h"
-#include "Core/Simulation/GISASSimulation.h"
-#include "Core/Aggregate/InterferenceFunction2DLattice.h"
-#include "Core/Multilayer/Layer.h"
+#include "Core/Instrument/RectangularDetector.h"
+#include "Core/Mask/Rectangle.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Fit/Kernel/Parameters.h"
-#include "Core/Particle/Particle.h"
-#include "Core/Aggregate/ParticleLayout.h"
-#include "Core/Mask/Rectangle.h"
-#include "Core/Instrument/RectangularDetector.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
+#include "Core/Simulation/GISASSimulation.h"
+#include "Fit/Kernel/Parameters.h"
using namespace Fit;
diff --git a/Tests/Functional/Fit/Minimizer/FunctionTestPlanCases.cpp b/Tests/Functional/Fit/Minimizer/FunctionTestPlanCases.cpp
index f66333af51bdd935454a42f56e66df39bcfbd11f..21ce13f5ee4941adb4b035affc39f2df1a0e5d1b 100644
--- a/Tests/Functional/Fit/Minimizer/FunctionTestPlanCases.cpp
+++ b/Tests/Functional/Fit/Minimizer/FunctionTestPlanCases.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Tests/Functional/Fit/Minimizer/FunctionTestPlanCases.h"
-#include "Tests/Functional/TestMachinery/ObjectiveTestFunctions.h"
#include "Fit/Kernel/Parameter.h"
+#include "Tests/Functional/TestMachinery/ObjectiveTestFunctions.h"
namespace
{
diff --git a/Tests/Functional/GUI/GUISpecial/CsvImportAssistantPerformanceTest.cpp b/Tests/Functional/GUI/GUISpecial/CsvImportAssistantPerformanceTest.cpp
index 8d8c091c2678502e1e542ca1c5eb1bbc5e4cc31c..d6b49f0739c21dada3e71de1b93a4a29852f7840 100644
--- a/Tests/Functional/GUI/GUISpecial/CsvImportAssistantPerformanceTest.cpp
+++ b/Tests/Functional/GUI/GUISpecial/CsvImportAssistantPerformanceTest.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "Tests/Functional/GUI/GUISpecial/CsvImportAssistantPerformanceTest.h"
-#include "Core/Instrument/ArrayUtils.h"
-#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.h"
#include "Core/InputOutput/OutputDataReadFactory.h"
#include "Core/InputOutput/OutputDataWriteFactory.h"
+#include "Core/Instrument/ArrayUtils.h"
+#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.h"
#include <ctime>
#include <iostream>
diff --git a/Tests/Functional/GUI/GUISpecial/CsvImportAssistantPerformanceTest.h b/Tests/Functional/GUI/GUISpecial/CsvImportAssistantPerformanceTest.h
index 8f8ce2fdc8b86f719bb53470274205931bc86dde..6356f0edcb4d8851b1353ee2b3705bd7f6fa5449 100644
--- a/Tests/Functional/GUI/GUISpecial/CsvImportAssistantPerformanceTest.h
+++ b/Tests/Functional/GUI/GUISpecial/CsvImportAssistantPerformanceTest.h
@@ -15,8 +15,8 @@
#ifndef CSVIMPORTASSISTANTPERFORMANCETEST_H
#define CSVIMPORTASSISTANTPERFORMANCETEST_H
-#include "Tests/Functional/TestMachinery/IFunctionalTest.h"
#include "GUI/coregui/Models/SpecularDataItem.h"
+#include "Tests/Functional/TestMachinery/IFunctionalTest.h"
#include <QString>
#include <memory>
diff --git a/Tests/Functional/GUI/GUISpecial/GUIPerformanceTest.cpp b/Tests/Functional/GUI/GUISpecial/GUIPerformanceTest.cpp
index 2ba1f537954105e420a64d45810d47c3354e9caa..36e7e2ffd99bfd34d7fcf6c8e07fd8702d208ae7 100644
--- a/Tests/Functional/GUI/GUISpecial/GUIPerformanceTest.cpp
+++ b/Tests/Functional/GUI/GUISpecial/GUIPerformanceTest.cpp
@@ -13,14 +13,14 @@
// ************************************************************************** //
#include "Tests/Functional/GUI/GUISpecial/GUIPerformanceTest.h"
+#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Simulation/GISASSimulation.h"
+#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "GUI/coregui/Models/ApplicationModels.h"
-#include "Tests/Functional/TestMachinery/Benchmark.h"
#include "GUI/coregui/Models/DetectorItems.h"
#include "GUI/coregui/Models/DocumentModel.h"
#include "GUI/coregui/Models/DomainSimulationBuilder.h"
#include "GUI/coregui/Models/FitParameterHelper.h"
-#include "Core/Simulation/GISASSimulation.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/GUIObjectBuilder.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/InstrumentModel.h"
@@ -28,11 +28,11 @@
#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Models/JobModel.h"
#include "GUI/coregui/Models/ModelPath.h"
-#include "Core/Multilayer/MultiLayer.h"
#include "GUI/coregui/Models/ParameterTreeItems.h"
#include "GUI/coregui/Models/ParameterTreeUtils.h"
-#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "GUI/coregui/Models/SampleModel.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
+#include "Tests/Functional/TestMachinery/Benchmark.h"
#include <QCoreApplication>
#include <QDebug>
#include <QElapsedTimer>
diff --git a/Tests/Functional/GUI/GUISpecial/GUISaveLoadProject.cpp b/Tests/Functional/GUI/GUISpecial/GUISaveLoadProject.cpp
index 1fb75048da1bd9306827cd794fd4c36041041cbf..9af5b6a5c937eba1fb0c7c1eb467f652419f03c9 100644
--- a/Tests/Functional/GUI/GUISpecial/GUISaveLoadProject.cpp
+++ b/Tests/Functional/GUI/GUISpecial/GUISaveLoadProject.cpp
@@ -13,24 +13,24 @@
// ************************************************************************** //
#include "Tests/Functional/GUI/GUISpecial/GUISaveLoadProject.h"
-#include "GUI/coregui/Models/ApplicationModels.h"
#include "BATesting.h"
+#include "Core/Multilayer/MultiLayer.h"
+#include "Core/StandardSamples/SampleBuilderFactory.h"
+#include "Core/Tools/FileSystemUtils.h"
+#include "GUI/coregui/Models/ApplicationModels.h"
#include "GUI/coregui/Models/DetectorItems.h"
#include "GUI/coregui/Models/DocumentModel.h"
-#include "Core/Tools/FileSystemUtils.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/GUIObjectBuilder.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/InstrumentModel.h"
#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Models/JobModel.h"
-#include "GUI/coregui/utils/MessageService.h"
-#include "Core/Multilayer/MultiLayer.h"
-#include "GUI/coregui/mainwindow/ProjectUtils.h"
-#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "GUI/coregui/Models/SampleModel.h"
#include "GUI/coregui/Models/SimulationOptionsItem.h"
+#include "GUI/coregui/mainwindow/ProjectUtils.h"
#include "GUI/coregui/mainwindow/projectdocument.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
+#include "GUI/coregui/utils/MessageService.h"
#include <QCoreApplication>
#include <QElapsedTimer>
#include <QXmlStreamWriter>
diff --git a/Tests/Functional/GUI/GUISpecial/GUITranslationTest.cpp b/Tests/Functional/GUI/GUISpecial/GUITranslationTest.cpp
index 1c72f32409361ff0762c9b7d9e19fef224b66fa5..718d6b19e5cbdc00755f2a85735d34f7f0a1d02a 100644
--- a/Tests/Functional/GUI/GUISpecial/GUITranslationTest.cpp
+++ b/Tests/Functional/GUI/GUISpecial/GUITranslationTest.cpp
@@ -13,12 +13,16 @@
// ************************************************************************** //
#include "Tests/Functional/GUI/GUISpecial/GUITranslationTest.h"
+#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Parametrization/ParameterPool.h"
+#include "Core/Simulation/GISASSimulation.h"
+#include "Core/StandardSamples/SampleBuilderFactory.h"
+#include "Core/StandardSamples/SimulationFactory.h"
+#include "Fit/Tools/StringUtils.h"
#include "GUI/coregui/Models/ApplicationModels.h"
#include "GUI/coregui/Models/BeamItems.h"
#include "GUI/coregui/Models/DocumentModel.h"
#include "GUI/coregui/Models/FitParameterHelper.h"
-#include "Core/Simulation/GISASSimulation.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/GUIObjectBuilder.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/InstrumentModel.h"
@@ -26,17 +30,13 @@
#include "GUI/coregui/Models/JobModel.h"
#include "GUI/coregui/Models/MaterialItem.h"
#include "GUI/coregui/Models/ModelPath.h"
-#include "Core/Multilayer/MultiLayer.h"
#include "GUI/coregui/Models/MultiLayerItem.h"
-#include "Core/Parametrization/ParameterPool.h"
#include "GUI/coregui/Models/ParameterTreeItems.h"
#include "GUI/coregui/Models/ParameterTreeUtils.h"
#include "GUI/coregui/Models/RectangularDetectorItem.h"
-#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "GUI/coregui/Models/SampleModel.h"
-#include "Core/StandardSamples/SimulationFactory.h"
#include "GUI/coregui/Models/SphericalDetectorItem.h"
-#include "Fit/Tools/StringUtils.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include <QStack>
namespace
diff --git a/Tests/Functional/GUI/GUIStandardTest/GUIStandardTest.cpp b/Tests/Functional/GUI/GUIStandardTest/GUIStandardTest.cpp
index 3adaa6228d739f621958457fcd7c95c6be61b302..1a29e59cd41b1a99ef9ef40881f49f85082f7d1d 100644
--- a/Tests/Functional/GUI/GUIStandardTest/GUIStandardTest.cpp
+++ b/Tests/Functional/GUI/GUIStandardTest/GUIStandardTest.cpp
@@ -13,6 +13,7 @@
// ************************************************************************** //
#include "Tests/Functional/GUI/GUIStandardTest/GUIStandardTest.h"
+#include "Core/Simulation/Simulation.h"
#include "GUI/coregui/Models/DocumentModel.h"
#include "GUI/coregui/Models/DomainSimulationBuilder.h"
#include "GUI/coregui/Models/GUIObjectBuilder.h"
@@ -20,7 +21,6 @@
#include "GUI/coregui/Models/InstrumentModel.h"
#include "GUI/coregui/Models/MaterialModel.h"
#include "GUI/coregui/Models/SampleModel.h"
-#include "Core/Simulation/Simulation.h"
#include "Tests/Functional/TestMachinery/TestUtils.h"
namespace
diff --git a/Tests/Functional/GUI/GUIStandardTest/main.cpp b/Tests/Functional/GUI/GUIStandardTest/main.cpp
index ce73ee7e352bc0cc6ee5a5ed61a392e069863241..f389591e7b629acd86d3acede9c75af09e74d33d 100644
--- a/Tests/Functional/GUI/GUIStandardTest/main.cpp
+++ b/Tests/Functional/GUI/GUIStandardTest/main.cpp
@@ -20,7 +20,7 @@
int main(int argc, char** argv)
{
- bool ok = StandardTestService<GUIStandardTest>().execute(argc, argv);
+ bool ok = StandardTestService<GUIStandardTest>().execute(argc, argv);
if (!ok)
std::cout << "\n"
<< "hint: If this test fails while all other form-factor related tests\n"
diff --git a/Tests/Functional/Python/PyEmbedded/TestCases.cpp b/Tests/Functional/Python/PyEmbedded/TestCases.cpp
index c8d4aa62e7ed849594b0caed824eda67511b2f6a..9c54d06ed7f62e4831de4c7d4835c16f34871cf4 100644
--- a/Tests/Functional/Python/PyEmbedded/TestCases.cpp
+++ b/Tests/Functional/Python/PyEmbedded/TestCases.cpp
@@ -17,12 +17,12 @@
#include "BAVersion.h"
#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Export/ExportToPython.h"
+#include "Core/Export/PythonFormatting.h"
#include "Core/Multilayer/MultiLayer.h"
+#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "Core/Tools/PyEmbeddedUtils.h"
#include "Core/Tools/PyImport.h"
#include "Core/Tools/PythonCore.h"
-#include "Core/Export/PythonFormatting.h"
-#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "Core/Tools/SysUtils.h"
#include <iostream>
#include <sstream>
@@ -112,7 +112,7 @@ bool FunctionCall::runTest()
std::cout << "BornAgain version via Python: '" << str << "'\n";
std::cout << "BornAgain version from Core: '" << BornAgain::GetVersionNumber() << "'\n";
- if (str!=BornAgain::GetVersionNumber()) {
+ if (str != BornAgain::GetVersionNumber()) {
std::cout << "Version numbers disagree, test will fail.\n"
<< "Possible reasons:\n"
<< "- Python bindings not regenerated\n"
diff --git a/Tests/Functional/Python/PyStandard/PyStandardTest.cpp b/Tests/Functional/Python/PyStandard/PyStandardTest.cpp
index 945952db71313b6c3e015de97dc575e4a33ce662..b51964abb9e234faec34ce8e2389172279aa721f 100644
--- a/Tests/Functional/Python/PyStandard/PyStandardTest.cpp
+++ b/Tests/Functional/Python/PyStandard/PyStandardTest.cpp
@@ -15,9 +15,9 @@
#include "Tests/Functional/Python/PyStandard/PyStandardTest.h"
#include "BATesting.h"
#include "Core/Export/ExportToPython.h"
-#include "Core/Tools/FileSystemUtils.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Simulation/Simulation.h"
+#include "Core/Tools/FileSystemUtils.h"
#include "Tests/Functional/TestMachinery/TestUtils.h"
#include <fstream>
#include <iostream>
diff --git a/Tests/Functional/TestMachinery/IMinimizerTest.cpp b/Tests/Functional/TestMachinery/IMinimizerTest.cpp
index c002e98e8d3c0256e5ff902bd11de506ab9df909..0c0bfe5761e0fc95dae7839066c695df135bebd2 100644
--- a/Tests/Functional/TestMachinery/IMinimizerTest.cpp
+++ b/Tests/Functional/TestMachinery/IMinimizerTest.cpp
@@ -14,8 +14,8 @@
#include "Tests/Functional/TestMachinery/IMinimizerTest.h"
#include "Fit/Kernel/Minimizer.h"
-#include "Tests/Functional/TestMachinery/MinimizerTestPlan.h"
#include "Fit/Kernel/Parameters.h"
+#include "Tests/Functional/TestMachinery/MinimizerTestPlan.h"
#include <iostream>
using namespace Fit;
diff --git a/Tests/Functional/TestMachinery/ParameterPlan.h b/Tests/Functional/TestMachinery/ParameterPlan.h
index b885e27e6633f0469bcda2e4020cdb20738b30f7..c918af6c43e61493d6101bdcbbd9c454bd023c0c 100644
--- a/Tests/Functional/TestMachinery/ParameterPlan.h
+++ b/Tests/Functional/TestMachinery/ParameterPlan.h
@@ -25,7 +25,9 @@ class BA_CORE_API_ ParameterPlan
{
public:
ParameterPlan(const Fit::Parameter& param, double expected_value, double tolerance = 0.01)
- : m_expected_value(expected_value), m_tolerance(tolerance), m_parameter(param) {}
+ : m_expected_value(expected_value), m_tolerance(tolerance), m_parameter(param)
+ {
+ }
Fit::Parameter fitParameter() const { return m_parameter; }
double expectedValue() const { return m_expected_value; }
diff --git a/Tests/Functional/TestMachinery/StandardTestCatalogue.cpp b/Tests/Functional/TestMachinery/StandardTestCatalogue.cpp
index 81281f579686e6de3b9ba0d59adbad9e4dc29654..276512827cd9c718ec497262cb47d693c6364b1b 100644
--- a/Tests/Functional/TestMachinery/StandardTestCatalogue.cpp
+++ b/Tests/Functional/TestMachinery/StandardTestCatalogue.cpp
@@ -21,9 +21,8 @@ StandardTestCatalogue::StandardTestCatalogue()
add("FormFactors", "Test of all form factors defined", "MiniGISAS", "ParticleInTheAirBuilder",
2e-10);
- add("FormFactorsWithAbsorption",
- "Test of all form factors defined, absorption case", "MiniGISAS_v2",
- "LayersWithAbsorptionBuilder", 2e-10);
+ add("FormFactorsWithAbsorption", "Test of all form factors defined, absorption case",
+ "MiniGISAS_v2", "LayersWithAbsorptionBuilder", 2e-10);
add("GISASAbsorptiveSLDLayers", "Test for SLD material in GISAS simulations", "MiniGISAS",
"LayersWithAbsorptionBySLDBuilder", 2e-10);
diff --git a/Tests/Functional/TestMachinery/StandardTestService.cpp b/Tests/Functional/TestMachinery/StandardTestService.cpp
index 7776d9bde87dc53b8b5ca07dd7fc8ad401760146..e4c7ca68ec4366198241f43dfbbafaaffb11548f 100644
--- a/Tests/Functional/TestMachinery/StandardTestService.cpp
+++ b/Tests/Functional/TestMachinery/StandardTestService.cpp
@@ -14,12 +14,12 @@
#include "Tests/Functional/TestMachinery/StandardTestService.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Tests/Functional/TestMachinery/IFunctionalTest.h"
#include "Core/Multilayer/IMultiLayerBuilder.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "Core/Simulation/Simulation.h"
+#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "Core/StandardSamples/SimulationFactory.h"
+#include "Tests/Functional/TestMachinery/IFunctionalTest.h"
#include "Tests/Functional/TestMachinery/StandardTestCatalogue.h"
#include "Tests/Functional/TestMachinery/TestUtils.h"
#include <iostream>
diff --git a/Tests/UnitTests/Core/Axes/CustomBinAxisTest.cpp b/Tests/UnitTests/Core/Axes/CustomBinAxisTest.cpp
index ecf6b058c159dcabdf4933105a4ddec66e660a20..af8fc277368d84751b9ba12a77d6e5133b41ac01 100644
--- a/Tests/UnitTests/Core/Axes/CustomBinAxisTest.cpp
+++ b/Tests/UnitTests/Core/Axes/CustomBinAxisTest.cpp
@@ -1,6 +1,6 @@
#include "Core/Binning/CustomBinAxis.h"
-#include "Core/InputOutput/DataFormatUtils.h"
#include "Core/Basics/MathConstants.h"
+#include "Core/InputOutput/DataFormatUtils.h"
#include "Tests/UnitTests/utilities/google_test.h"
#include <vector>
diff --git a/Tests/UnitTests/Core/Axes/DepthProbeConverterTest.cpp b/Tests/UnitTests/Core/Axes/DepthProbeConverterTest.cpp
index 0317740293414ccba332ff50839d95b6d7b14e37..e3a0d576ad38dcc9411313e34e73068a0aafb29d 100644
--- a/Tests/UnitTests/Core/Axes/DepthProbeConverterTest.cpp
+++ b/Tests/UnitTests/Core/Axes/DepthProbeConverterTest.cpp
@@ -1,6 +1,6 @@
+#include "Core/Basics/MathConstants.h"
#include "Core/Beam/Beam.h"
#include "Core/Binning/FixedBinAxis.h"
-#include "Core/Basics/MathConstants.h"
#include "Core/Instrument/SimpleUnitConverters.h"
#include "Core/Parametrization/Units.h"
#include "Tests/UnitTests/utilities/google_test.h"
diff --git a/Tests/UnitTests/Core/Axes/FixedBinAxisTest.cpp b/Tests/UnitTests/Core/Axes/FixedBinAxisTest.cpp
index fffd628bb350aed3801240e6e87d0779ea50fe71..8186f8f4b4931c44a65d12a45ce30e66e1d498a6 100644
--- a/Tests/UnitTests/Core/Axes/FixedBinAxisTest.cpp
+++ b/Tests/UnitTests/Core/Axes/FixedBinAxisTest.cpp
@@ -1,6 +1,6 @@
#include "Core/Binning/FixedBinAxis.h"
-#include "Core/InputOutput/DataFormatUtils.h"
#include "Core/Basics/Exceptions.h"
+#include "Core/InputOutput/DataFormatUtils.h"
#include "Tests/UnitTests/utilities/google_test.h"
#include <iostream>
diff --git a/Tests/UnitTests/Core/Axes/Histogram2DTest.cpp b/Tests/UnitTests/Core/Axes/Histogram2DTest.cpp
index a328432610931b1f93861e22e77155827c7128d6..922b52df3aa74473bb759675741baa95bc631fbc 100644
--- a/Tests/UnitTests/Core/Axes/Histogram2DTest.cpp
+++ b/Tests/UnitTests/Core/Axes/Histogram2DTest.cpp
@@ -22,8 +22,7 @@ protected:
// 0.0 -----------------------------------
// -1.0 -0.5 0.5 1.0 2.0 X
-Histogram2DTest::Histogram2DTest()
- : hist{4, {-1.0, -0.5, 0.5, 1.0, 2.0}, 3, {0.0, 1.0, 2.0, 4.0}}
+Histogram2DTest::Histogram2DTest() : hist{4, {-1.0, -0.5, 0.5, 1.0, 2.0}, 3, {0.0, 1.0, 2.0, 4.0}}
{
}
diff --git a/Tests/UnitTests/Core/Axes/KVectorTest.cpp b/Tests/UnitTests/Core/Axes/KVectorTest.cpp
index fadd97febc90352d5e8ef19fc3317a56e9987dbe..50d435b74ebc32fa8fc3d7c5f3f7418ab3a4be56 100644
--- a/Tests/UnitTests/Core/Axes/KVectorTest.cpp
+++ b/Tests/UnitTests/Core/Axes/KVectorTest.cpp
@@ -75,7 +75,7 @@ TEST_F(KVectorTest, BasicArithmetics)
a = kvector_t(1., 2., 3.);
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wself-assign-overloaded"
-// https://stackoverflow.com/a/57646029/1017348: a pretty stupid warning
+ // https://stackoverflow.com/a/57646029/1017348: a pretty stupid warning
a -= a;
#pragma clang diagnostic pop
EXPECT_EQ(double(0.), a.x());
diff --git a/Tests/UnitTests/Core/Axes/PointwiseAxisTest.cpp b/Tests/UnitTests/Core/Axes/PointwiseAxisTest.cpp
index 3b6866de30ebde3bdc31f5384f1682d2df7abfff..75fda005809d8bc870a5cd4ab41799c563f10c97 100644
--- a/Tests/UnitTests/Core/Axes/PointwiseAxisTest.cpp
+++ b/Tests/UnitTests/Core/Axes/PointwiseAxisTest.cpp
@@ -1,6 +1,6 @@
#include "Core/Binning/PointwiseAxis.h"
-#include "Core/InputOutput/DataFormatUtils.h"
#include "Core/Binning/FixedBinAxis.h"
+#include "Core/InputOutput/DataFormatUtils.h"
#include "Tests/UnitTests/utilities/google_test.h"
#include <iostream>
diff --git a/Tests/UnitTests/Core/Axes/UnitConverter1DTest.cpp b/Tests/UnitTests/Core/Axes/UnitConverter1DTest.cpp
index 5b306be4bf86b0903906dacc9562494a19c936e4..67fa97614c049e5d7d1fda140cf08813e1b1b790 100644
--- a/Tests/UnitTests/Core/Axes/UnitConverter1DTest.cpp
+++ b/Tests/UnitTests/Core/Axes/UnitConverter1DTest.cpp
@@ -1,12 +1,12 @@
#include "Core/Instrument/UnitConverter1D.h"
+#include "Core/Basics/MathConstants.h"
#include "Core/Beam/Beam.h"
#include "Core/Binning/FixedBinAxis.h"
-#include "Core/Basics/MathConstants.h"
-#include "Core/Instrument/OutputData.h"
#include "Core/Binning/PointwiseAxis.h"
+#include "Core/Binning/VariableBinAxis.h"
+#include "Core/Instrument/OutputData.h"
#include "Core/Instrument/QSpecScan.h"
#include "Core/Parametrization/Units.h"
-#include "Core/Binning/VariableBinAxis.h"
#include "Tests/UnitTests/utilities/google_test.h"
class UnitConverter1DTest : public ::testing::Test
diff --git a/Tests/UnitTests/Core/Axes/VariableBinAxisTest.cpp b/Tests/UnitTests/Core/Axes/VariableBinAxisTest.cpp
index 3d73abdb5acb60239b84ae0182b1afbafde8dfc8..a04ece7627dbfda9ebdc24e901779c7fe53bfb69 100644
--- a/Tests/UnitTests/Core/Axes/VariableBinAxisTest.cpp
+++ b/Tests/UnitTests/Core/Axes/VariableBinAxisTest.cpp
@@ -1,6 +1,6 @@
#include "Core/Binning/VariableBinAxis.h"
-#include "Core/InputOutput/DataFormatUtils.h"
#include "Core/Basics/Exceptions.h"
+#include "Core/InputOutput/DataFormatUtils.h"
#include "Tests/UnitTests/utilities/google_test.h"
class VariableBinAxisTest : public ::testing::Test
diff --git a/Tests/UnitTests/Core/Basics/MinMaxValueTest.cpp b/Tests/UnitTests/Core/Basics/MinMaxValueTest.cpp
index 68486b50ff88ecc7aa0132c525fe9a52b744cdca..6a69801658b68a3bbc16ea5f9f808fae7507814e 100644
--- a/Tests/UnitTests/Core/Basics/MinMaxValueTest.cpp
+++ b/Tests/UnitTests/Core/Basics/MinMaxValueTest.cpp
@@ -10,23 +10,25 @@ TEST_F(MinMaxValueTest, MinMaxValueAlmostEq)
{
double val;
std::vector<double> A{0.};
- std::vector<int> C {1, 2, 3};
+ std::vector<int> C{1, 2, 3};
- val = algo::min_value(A.begin(), A.end(), [](const double& x)->double { return x; });
+ val = algo::min_value(A.begin(), A.end(), [](const double& x) -> double { return x; });
EXPECT_EQ(val, 0.);
- val = algo::max_value(A.begin(), A.end(), [](const double& x)->double { return 2+x; });
+ val = algo::max_value(A.begin(), A.end(), [](const double& x) -> double { return 2 + x; });
EXPECT_NEAR(val, 2., 1e-15);
- val = algo::min_value(C.begin(), C.end(), [](const int& i)->double { return i; });
+ val = algo::min_value(C.begin(), C.end(), [](const int& i) -> double { return i; });
EXPECT_EQ(val, 1);
- val = algo::min_value(C.begin(), C.end(), [](const int& i)->double { return -i; });
+ val = algo::min_value(C.begin(), C.end(), [](const int& i) -> double { return -i; });
EXPECT_EQ(val, -3);
- val = algo::min_value(C.begin(), C.end(), [](const int& i)->double { return pow(i-2.1,2); });
+ val =
+ algo::min_value(C.begin(), C.end(), [](const int& i) -> double { return pow(i - 2.1, 2); });
EXPECT_NEAR(val, 0.01, 1e-13);
- val = algo::max_value(C.begin(), C.end(), [](const int& i)->double { return i; });
+ val = algo::max_value(C.begin(), C.end(), [](const int& i) -> double { return i; });
EXPECT_EQ(val, 3);
- val = algo::max_value(C.begin(), C.end(), [](const int& i)->double { return -i; });
+ val = algo::max_value(C.begin(), C.end(), [](const int& i) -> double { return -i; });
EXPECT_EQ(val, -1);
- val = algo::max_value(C.begin(), C.end(), [](const int& i)->double { return -pow(i-2.1,2); });
+ val = algo::max_value(C.begin(), C.end(),
+ [](const int& i) -> double { return -pow(i - 2.1, 2); });
EXPECT_NEAR(val, -0.01, 1e-13);
}
diff --git a/Tests/UnitTests/Core/DataStructure/IOStrategyTest.cpp b/Tests/UnitTests/Core/DataStructure/IOStrategyTest.cpp
index c8eb3da5080c81fa7d10c00045bacc4ca28a3599..a4d947b7136e4f7b262c8892eac9f1111ad2591f 100644
--- a/Tests/UnitTests/Core/DataStructure/IOStrategyTest.cpp
+++ b/Tests/UnitTests/Core/DataStructure/IOStrategyTest.cpp
@@ -1,7 +1,7 @@
#include "Core/Binning/FixedBinAxis.h"
-#include "Core/Instrument/OutputData.h"
#include "Core/InputOutput/OutputDataReadStrategy.h"
#include "Core/InputOutput/OutputDataWriteStrategy.h"
+#include "Core/Instrument/OutputData.h"
#include "Tests/UnitTests/utilities/google_test.h"
class IOStrategyTest : public ::testing::Test
diff --git a/Tests/UnitTests/Core/DataStructure/OutputDataTest.cpp b/Tests/UnitTests/Core/DataStructure/OutputDataTest.cpp
index 96e8e3690e55acd2b816d68735daeaa76d618175..943b86f9b934f9f1675e3185fd956e61ad12c328 100644
--- a/Tests/UnitTests/Core/DataStructure/OutputDataTest.cpp
+++ b/Tests/UnitTests/Core/DataStructure/OutputDataTest.cpp
@@ -1,8 +1,8 @@
#include "Core/Instrument/OutputData.h"
#include "Core/Binning/FixedBinAxis.h"
+#include "Core/Binning/VariableBinAxis.h"
#include "Core/Instrument/IntensityDataFunctions.h"
#include "Core/Parametrization/ThreadInfo.h"
-#include "Core/Binning/VariableBinAxis.h"
#include "Tests/UnitTests/utilities/google_test.h"
#include <algorithm>
diff --git a/Tests/UnitTests/Core/Detector/DetectorMaskTest.cpp b/Tests/UnitTests/Core/Detector/DetectorMaskTest.cpp
index 720d095a33f0c0b7900d867d4a015cd2f0cbafe6..a562fee25589e9c5f60a2acc80b61b14f0f1c9f1 100644
--- a/Tests/UnitTests/Core/Detector/DetectorMaskTest.cpp
+++ b/Tests/UnitTests/Core/Detector/DetectorMaskTest.cpp
@@ -1,6 +1,6 @@
#include "Core/Instrument/DetectorMask.h"
-#include "Core/Mask/Polygon.h"
#include "Core/Instrument/SphericalDetector.h"
+#include "Core/Mask/Polygon.h"
#include "Tests/UnitTests/utilities/google_test.h"
#include <memory>
diff --git a/Tests/UnitTests/Core/Detector/RectangularDetectorTest.cpp b/Tests/UnitTests/Core/Detector/RectangularDetectorTest.cpp
index 379d641295afa32c2b82e40632a9302c82287b2a..4a490606d586899d2b55a62ad6109fedde328962 100644
--- a/Tests/UnitTests/Core/Detector/RectangularDetectorTest.cpp
+++ b/Tests/UnitTests/Core/Detector/RectangularDetectorTest.cpp
@@ -1,7 +1,7 @@
#include "Core/Instrument/RectangularDetector.h"
+#include "Core/Parametrization/Units.h"
#include "Core/Simulation/GISASSimulation.h"
#include "Core/Tools/Numeric.h"
-#include "Core/Parametrization/Units.h"
#include "Tests/UnitTests/utilities/google_test.h"
#include <iostream>
#include <memory>
diff --git a/Tests/UnitTests/Core/Detector/SimulationAreaTest.cpp b/Tests/UnitTests/Core/Detector/SimulationAreaTest.cpp
index a99a7aeeffb1a789bc8ab26b65f1c66d5434e8e8..234969483708445493b232ff85aeac09f4a1c3e1 100644
--- a/Tests/UnitTests/Core/Detector/SimulationAreaTest.cpp
+++ b/Tests/UnitTests/Core/Detector/SimulationAreaTest.cpp
@@ -1,7 +1,7 @@
#include "Core/Instrument/SimulationArea.h"
#include "Core/Instrument/DetectorFunctions.h"
-#include "Core/Mask/Rectangle.h"
#include "Core/Instrument/SphericalDetector.h"
+#include "Core/Mask/Rectangle.h"
#include "Tests/UnitTests/utilities/google_test.h"
#include <iostream>
#include <memory>
diff --git a/Tests/UnitTests/Core/Detector/SpecularDetector1DTest.cpp b/Tests/UnitTests/Core/Detector/SpecularDetector1DTest.cpp
index d3f3824017484305d41f7b9f77041452109cf145..e57f9ede75a0fefaddd82f120b29d14eba9f72fe 100644
--- a/Tests/UnitTests/Core/Detector/SpecularDetector1DTest.cpp
+++ b/Tests/UnitTests/Core/Detector/SpecularDetector1DTest.cpp
@@ -1,6 +1,6 @@
#include "Core/Instrument/SpecularDetector1D.h"
-#include "Core/Beam/Beam.h"
#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/Beam/Beam.h"
#include "Core/Binning/FixedBinAxis.h"
#include "Core/Instrument/OutputData.h"
#include "Core/Instrument/SimulationArea.h"
diff --git a/Tests/UnitTests/Core/Detector/SphericalDetectorTest.cpp b/Tests/UnitTests/Core/Detector/SphericalDetectorTest.cpp
index f223c82c82fa6c939e5f7609ef8540f9ad986eca..e498b12c09371ea7ff622916e2aa3876e644bd8b 100644
--- a/Tests/UnitTests/Core/Detector/SphericalDetectorTest.cpp
+++ b/Tests/UnitTests/Core/Detector/SphericalDetectorTest.cpp
@@ -1,16 +1,16 @@
#include "Core/Instrument/SphericalDetector.h"
-#include "Core/Beam/Beam.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Instrument/ConvolutionDetectorResolution.h"
-#include "Core/Instrument/DetectorFunctions.h"
#include "Core/Basics/Exceptions.h"
+#include "Core/Beam/Beam.h"
#include "Core/Binning/FixedBinAxis.h"
+#include "Core/Instrument/ConvolutionDetectorResolution.h"
+#include "Core/Instrument/DetectorFunctions.h"
#include "Core/Instrument/OutputData.h"
-#include "Core/Mask/Polygon.h"
-#include "Core/Mask/Rectangle.h"
#include "Core/Instrument/RegionOfInterest.h"
#include "Core/Instrument/ResolutionFunction2DGaussian.h"
#include "Core/Instrument/SimulationArea.h"
+#include "Core/Mask/Polygon.h"
+#include "Core/Mask/Rectangle.h"
#include "Core/Parametrization/Units.h"
#include "Tests/UnitTests/utilities/google_test.h"
#include <memory>
diff --git a/Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.cpp b/Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.cpp
index 52cb5fb290b8bebbc8e5ecd279790f9d9c784913..7b277325ff92dda1ac79f1c04289d7839eab4f7d 100644
--- a/Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.cpp
+++ b/Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.cpp
@@ -1,11 +1,11 @@
#include "Core/Export/PythonFormatting.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Parametrization/Distributions.h"
#include "Core/Binning/FixedBinAxis.h"
-#include "Core/Parametrization/ParameterDistribution.h"
#include "Core/Binning/PointwiseAxis.h"
-#include "Fit/Tools/RealLimits.h"
+#include "Core/Parametrization/Distributions.h"
+#include "Core/Parametrization/ParameterDistribution.h"
#include "Core/Parametrization/Units.h"
+#include "Fit/Tools/RealLimits.h"
#include "Tests/UnitTests/utilities/google_test.h"
class PythonFormattingTest : public ::testing::Test
diff --git a/Tests/UnitTests/Core/Fitting/FitObjectiveTest.cpp b/Tests/UnitTests/Core/Fitting/FitObjectiveTest.cpp
index 43cb70821942f9b04ae235e569f404677204d4ea..4c538f65d5f5f360740b154c740d3924f3dc2e84 100644
--- a/Tests/UnitTests/Core/Fitting/FitObjectiveTest.cpp
+++ b/Tests/UnitTests/Core/Fitting/FitObjectiveTest.cpp
@@ -1,6 +1,6 @@
#include "Core/Fitting/FitObjective.h"
-#include "Tests/UnitTests/Core/Fitting/FittingTestHelper.h"
#include "Fit/Kernel/Parameters.h"
+#include "Tests/UnitTests/Core/Fitting/FittingTestHelper.h"
#include "Tests/UnitTests/utilities/google_test.h"
class FitObjectiveTest : public ::testing::Test
diff --git a/Tests/UnitTests/Core/Fitting/FittingTestHelper.h b/Tests/UnitTests/Core/Fitting/FittingTestHelper.h
index 4089f1da45fc9ecd49deaf2301a4ce596bc98731..478d230ee308964b4fceb90e5b5663d7517f99d3 100644
--- a/Tests/UnitTests/Core/Fitting/FittingTestHelper.h
+++ b/Tests/UnitTests/Core/Fitting/FittingTestHelper.h
@@ -1,13 +1,13 @@
#ifndef FITTINGTESTHELPER_H
#define FITTINGTESTHELPER_H
-#include "Core/Simulation/GISASSimulation.h"
-#include "Core/Multilayer/Layer.h"
+#include "Core/Instrument/OutputData.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Instrument/OutputData.h"
-#include "Fit/Kernel/Parameters.h"
#include "Core/Parametrization/Units.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/Fitting/SimDataPairTest.cpp b/Tests/UnitTests/Core/Fitting/SimDataPairTest.cpp
index 6e4ba0393c3bb40b0316dd09ad827cfa46112e66..0d99af2d8256e157a57577eef72a1985436894b5 100644
--- a/Tests/UnitTests/Core/Fitting/SimDataPairTest.cpp
+++ b/Tests/UnitTests/Core/Fitting/SimDataPairTest.cpp
@@ -1,6 +1,6 @@
#include "Core/Fitting/SimDataPair.h"
-#include "Tests/UnitTests/Core/Fitting/FittingTestHelper.h"
#include "Fit/Kernel/Parameters.h"
+#include "Tests/UnitTests/Core/Fitting/FittingTestHelper.h"
#include "Tests/UnitTests/utilities/google_test.h"
class SimDataPairTest : public ::testing::Test
diff --git a/Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.cpp b/Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.cpp
index c57d9dc8a861368e28e1845d79426afa3243fab5..1d123a561d88d409efc5ebf229f45b6f380760d3 100644
--- a/Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.cpp
@@ -1,12 +1,12 @@
#include "Core/Simulation/DepthProbeSimulation.h"
-#include "Core/Parametrization/Distributions.h"
+#include "Core/Basics/MathConstants.h"
#include "Core/Binning/FixedBinAxis.h"
#include "Core/Instrument/Histogram2D.h"
+#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/IMultiLayerBuilder.h"
#include "Core/Multilayer/Layer.h"
-#include "Core/Material/MaterialFactoryFuncs.h"
-#include "Core/Basics/MathConstants.h"
#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Parametrization/Distributions.h"
#include "Core/Parametrization/ParameterPattern.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
diff --git a/Tests/UnitTests/Core/Fresnel/KzComputationTest.cpp b/Tests/UnitTests/Core/Fresnel/KzComputationTest.cpp
index 2d4dd95b8ac784ec50c695c8ca66975d781579e8..d722f4797d96884c341a2d6cf2e3a6daf82f4693 100644
--- a/Tests/UnitTests/Core/Fresnel/KzComputationTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/KzComputationTest.cpp
@@ -1,11 +1,11 @@
#include "Core/Multilayer/KzComputation.h"
-#include "Core/Multilayer/Layer.h"
+#include "Core/Computation/ProcessedSample.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/StandardSamples/PlainMultiLayerBySLDBuilder.h"
-#include "Core/Computation/ProcessedSample.h"
#include "Core/Parametrization/SimulationOptions.h"
#include "Core/Parametrization/Units.h"
+#include "Core/StandardSamples/PlainMultiLayerBySLDBuilder.h"
#include "Tests/UnitTests/utilities/google_test.h"
class KzComputationTest : public ::testing::Test
diff --git a/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp b/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp
index e77faf7132c870a958397e4421ac3a0bfba9e9d1..ab05ec1aef35a335e7650b4f97e99e8caad0f6a1 100644
--- a/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp
@@ -1,10 +1,10 @@
-#include "Core/Multilayer/Layer.h"
+#include "Core/Computation/ProcessedSample.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Computation/ProcessedSample.h"
-#include "Core/Parametrization/SimulationOptions.h"
#include "Core/Multilayer/SpecularMagneticOldStrategy.h"
#include "Core/Multilayer/SpecularScalarTanhStrategy.h"
+#include "Core/Parametrization/SimulationOptions.h"
#include "Core/Parametrization/Units.h"
#include "Tests/UnitTests/utilities/google_test.h"
diff --git a/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest_v2.cpp b/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest_v2.cpp
index e353ede5c623d1abff8e9a8dfd13537a4cffa147..b3a2685233a36541a528f45f1e42404d88616c0d 100644
--- a/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest_v2.cpp
+++ b/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest_v2.cpp
@@ -1,10 +1,10 @@
-#include "Core/Multilayer/Layer.h"
+#include "Core/Computation/ProcessedSample.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Computation/ProcessedSample.h"
-#include "Core/Parametrization/SimulationOptions.h"
#include "Core/Multilayer/SpecularMagneticStrategy.h"
#include "Core/Multilayer/SpecularScalarTanhStrategy.h"
+#include "Core/Parametrization/SimulationOptions.h"
#include "Core/Parametrization/Units.h"
#include "Tests/UnitTests/utilities/google_test.h"
diff --git a/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp b/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp
index 81311b93f2fe3a933cabaa39d69d0690c0d7a187..1298a00b1322f009306b2980b6fc746246162dad 100644
--- a/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp
@@ -1,10 +1,10 @@
-#include "Core/Instrument/AngularSpecScan.h"
-#include "Core/Binning/FixedBinAxis.h"
#include "Core/Beam/FootprintFactorGaussian.h"
+#include "Core/Binning/FixedBinAxis.h"
#include "Core/Binning/PointwiseAxis.h"
+#include "Core/Instrument/AngularSpecScan.h"
#include "Core/Instrument/QSpecScan.h"
-#include "Core/Parametrization/RangedDistributions.h"
#include "Core/Instrument/ScanResolution.h"
+#include "Core/Parametrization/RangedDistributions.h"
#include "Core/SimulationElement/SpecularSimulationElement.h"
#include "Tests/UnitTests/utilities/google_test.h"
diff --git a/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp b/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp
index 41d3c572fec4b8f5a2c400f08d0ccb39b4c87273..0ef1760622a853505fdbed78dbe37b5ddfda7866 100644
--- a/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp
@@ -1,19 +1,19 @@
#include "Core/Simulation/SpecularSimulation.h"
-#include "Core/Instrument/AngularSpecScan.h"
-#include "Core/Parametrization/Distributions.h"
#include "Core/Basics/Exceptions.h"
+#include "Core/Basics/MathConstants.h"
#include "Core/Binning/FixedBinAxis.h"
+#include "Core/Binning/VariableBinAxis.h"
+#include "Core/Instrument/AngularSpecScan.h"
#include "Core/Instrument/Histogram1D.h"
+#include "Core/Instrument/QSpecScan.h"
+#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/IMultiLayerBuilder.h"
#include "Core/Multilayer/Layer.h"
-#include "Core/Material/MaterialFactoryFuncs.h"
-#include "Core/Basics/MathConstants.h"
#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Parametrization/Distributions.h"
#include "Core/Parametrization/ParameterPattern.h"
-#include "Core/Instrument/QSpecScan.h"
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/Units.h"
-#include "Core/Binning/VariableBinAxis.h"
#include "Tests/UnitTests/utilities/google_test.h"
#include <iostream>
diff --git a/Tests/UnitTests/Core/Other/BeamTest.cpp b/Tests/UnitTests/Core/Other/BeamTest.cpp
index 2ab6c25bc8508f0288d1b0f78ae02c2c0f1a631e..4834f8a3ef59cef2ebe658abf38601666e54fe2b 100644
--- a/Tests/UnitTests/Core/Other/BeamTest.cpp
+++ b/Tests/UnitTests/Core/Other/BeamTest.cpp
@@ -1,8 +1,8 @@
#include "Core/Beam/Beam.h"
#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/Basics/MathConstants.h"
#include "Core/Beam/FootprintFactorGaussian.h"
#include "Core/Beam/FootprintFactorSquare.h"
-#include "Core/Basics/MathConstants.h"
#include "Core/Parametrization/ParameterPool.h"
#include "Core/Parametrization/RealParameter.h"
#include "Tests/UnitTests/utilities/google_test.h"
diff --git a/Tests/UnitTests/Core/Other/GISASSimulationTest.cpp b/Tests/UnitTests/Core/Other/GISASSimulationTest.cpp
index 2d9b6fc01b38ec26439708d7159dad2447b2b5d2..275cad669ce482cf9d342197c9c1a32b94ca5bc6 100644
--- a/Tests/UnitTests/Core/Other/GISASSimulationTest.cpp
+++ b/Tests/UnitTests/Core/Other/GISASSimulationTest.cpp
@@ -1,10 +1,10 @@
#include "Core/Simulation/GISASSimulation.h"
-#include "Core/Beam/Beam.h"
#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/Beam/Beam.h"
+#include "Core/Instrument/OutputData.h"
#include "Core/Multilayer/IMultiLayerBuilder.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Instrument/OutputData.h"
#include "Tests/UnitTests/utilities/google_test.h"
#include <cmath>
#include <memory>
diff --git a/Tests/UnitTests/Core/Other/MaterialTest.cpp b/Tests/UnitTests/Core/Other/MaterialTest.cpp
index 8bc3e7b7f533f386739a653d9752e6a618ed1dcd..43cbb47b622569dc2140766af5936539e2550ec4 100644
--- a/Tests/UnitTests/Core/Other/MaterialTest.cpp
+++ b/Tests/UnitTests/Core/Other/MaterialTest.cpp
@@ -1,10 +1,10 @@
#include "Core/Basics/Exceptions.h"
-#include "Core/Particle/HomogeneousRegion.h"
#include "Core/Material/MaterialBySLDImpl.h"
#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Material/RefractiveMaterialImpl.h"
-#include "Core/Scattering/Rotations.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/HomogeneousRegion.h"
+#include "Core/Scattering/Rotations.h"
#include "Core/Vector/WavevectorInfo.h"
#include "Tests/UnitTests/utilities/google_test.h"
diff --git a/Tests/UnitTests/Core/Other/SampleBuilderNoteTest.cpp b/Tests/UnitTests/Core/Other/SampleBuilderNoteTest.cpp
index 4fc724651d3deee66683e9893f497c61b6b79f7d..a16231494cba6cd512e70c465082e1be25c9405d 100644
--- a/Tests/UnitTests/Core/Other/SampleBuilderNoteTest.cpp
+++ b/Tests/UnitTests/Core/Other/SampleBuilderNoteTest.cpp
@@ -1,7 +1,7 @@
#include "Core/Multilayer/IMultiLayerBuilder.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Parametrization/ParameterPool.h"
#include "Core/Multilayer/SampleBuilderNode.h"
+#include "Core/Parametrization/ParameterPool.h"
#include "Tests/UnitTests/utilities/google_test.h"
#include <iostream>
#include <memory>
diff --git a/Tests/UnitTests/Core/Other/Shape2DTest.cpp b/Tests/UnitTests/Core/Other/Shape2DTest.cpp
index 7b0ac6eda302f0532631beb82fb67ed39e1cef43..ecdce544d3bdef9f7c6382254868df3a3b291d5a 100644
--- a/Tests/UnitTests/Core/Other/Shape2DTest.cpp
+++ b/Tests/UnitTests/Core/Other/Shape2DTest.cpp
@@ -1,7 +1,7 @@
+#include "Core/Basics/MathConstants.h"
#include "Core/Binning/Bin.h"
#include "Core/Mask/Ellipse.h"
#include "Core/Mask/Line.h"
-#include "Core/Basics/MathConstants.h"
#include "Core/Mask/Rectangle.h"
#include "Core/Parametrization/Units.h"
#include "Tests/UnitTests/utilities/google_test.h"
diff --git a/Tests/UnitTests/Core/Other/SimulationResultTest.cpp b/Tests/UnitTests/Core/Other/SimulationResultTest.cpp
index 9ad381819e9310834abb11f3a3e91cb216368e29..dbacb9f4e3db4ca3e504260b0ae74250f2b63757 100644
--- a/Tests/UnitTests/Core/Other/SimulationResultTest.cpp
+++ b/Tests/UnitTests/Core/Other/SimulationResultTest.cpp
@@ -1,6 +1,6 @@
#include "Core/Instrument/SimulationResult.h"
-#include "Core/Simulation/GISASSimulation.h"
#include "Core/Instrument/OutputData.h"
+#include "Core/Simulation/GISASSimulation.h"
#include "Tests/UnitTests/utilities/google_test.h"
class SimulationResultTest : public ::testing::Test
diff --git a/Tests/UnitTests/Core/Parameters/FTDistributionsTest.cpp b/Tests/UnitTests/Core/Parameters/FTDistributionsTest.cpp
index 3b1880d0058102b51ce58c5ae610c92f7309e095..25913f4932bbdbdaf18f53602b8ebbfdfd653994 100644
--- a/Tests/UnitTests/Core/Parameters/FTDistributionsTest.cpp
+++ b/Tests/UnitTests/Core/Parameters/FTDistributionsTest.cpp
@@ -1,6 +1,6 @@
-#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Aggregate/FTDistributions1D.h"
#include "Core/Aggregate/FTDistributions2D.h"
+#include "Core/Basics/BornAgainNamespace.h"
#include "Core/Basics/MathConstants.h"
#include "Core/Parametrization/RealParameter.h"
#include "Tests/UnitTests/utilities/google_test.h"
diff --git a/Tests/UnitTests/Core/Parameters/ParameterDistributionTest.cpp b/Tests/UnitTests/Core/Parameters/ParameterDistributionTest.cpp
index c2288ef3018829676dd2d317f1a0baf244c00e3b..13508ad91e3f60cb433325d832870dc435f78b5a 100644
--- a/Tests/UnitTests/Core/Parameters/ParameterDistributionTest.cpp
+++ b/Tests/UnitTests/Core/Parameters/ParameterDistributionTest.cpp
@@ -1,6 +1,6 @@
#include "Core/Parametrization/ParameterDistribution.h"
-#include "Core/Parametrization/Distributions.h"
#include "Core/Basics/Exceptions.h"
+#include "Core/Parametrization/Distributions.h"
#include "Core/Parametrization/IParameterized.h"
#include "Core/Parametrization/ParameterSample.h"
#include "Core/Parametrization/ParameterUtils.h"
diff --git a/Tests/UnitTests/Core/Sample/FormFactorBasicTest.cpp b/Tests/UnitTests/Core/Sample/FormFactorBasicTest.cpp
index 4c6bd7a9fd2dacde916d11a820fd641efb8759aa..0098765b369d9e158ae6c0189de14be8c1bbbf13 100644
--- a/Tests/UnitTests/Core/Sample/FormFactorBasicTest.cpp
+++ b/Tests/UnitTests/Core/Sample/FormFactorBasicTest.cpp
@@ -1,9 +1,9 @@
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/includeIncludes/HardParticles.h"
-#include "Core/Scattering/IFormFactorBorn.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Scattering/Rotations.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Scattering/IFormFactorBorn.h"
+#include "Core/Scattering/Rotations.h"
+#include "Core/includeIncludes/HardParticles.h"
#include "Tests/UnitTests/utilities/google_test.h"
class FormFactorBasicTest : public ::testing::Test
@@ -128,11 +128,11 @@ TEST_F(FormFactorBasicTest, Box)
EXPECT_EQ(0., particle.bottomZ(RotationZ()));
EXPECT_EQ(height, particle.topZ(RotationZ()));
- EXPECT_EQ(0., particle.bottomZ(RotationZ(17*Units::degree)));
- EXPECT_EQ(height, particle.topZ(RotationZ(39*Units::degree)));
+ EXPECT_EQ(0., particle.bottomZ(RotationZ(17 * Units::degree)));
+ EXPECT_EQ(height, particle.topZ(RotationZ(39 * Units::degree)));
- EXPECT_NEAR(-width/2, particle.bottomZ(RotationX(90*Units::degree)), 1e-12);
- EXPECT_NEAR(-length/2, particle.bottomZ(RotationY(90*Units::degree)), 1e-12);
+ EXPECT_NEAR(-width / 2, particle.bottomZ(RotationX(90 * Units::degree)), 1e-12);
+ EXPECT_NEAR(-length / 2, particle.bottomZ(RotationY(90 * Units::degree)), 1e-12);
test_ff(&particle);
}
@@ -204,7 +204,7 @@ TEST_F(FormFactorBasicTest, Cuboctahedron)
EXPECT_EQ(alpha, particle.getAlpha());
EXPECT_DOUBLE_EQ(volume, particle.volume());
EXPECT_EQ(0., particle.bottomZ(RotationZ()));
- EXPECT_EQ(height*(1+height_ratio), particle.topZ(RotationZ()));
+ EXPECT_EQ(height * (1 + height_ratio), particle.topZ(RotationZ()));
test_ff(&particle);
}
@@ -225,18 +225,18 @@ TEST_F(FormFactorBasicTest, Cylinder)
EXPECT_EQ(0., particle.bottomZ(RotationZ()));
EXPECT_EQ(height, particle.topZ(RotationZ()));
- EXPECT_NEAR(-radius, particle.bottomZ(RotationX(90*Units::degree)), 1e-13);
- EXPECT_NEAR(+radius, particle.topZ (RotationX(90*Units::degree)), 1e-13);
- EXPECT_NEAR(-radius, particle.bottomZ(RotationY(90*Units::degree)), 1e-13);
- EXPECT_NEAR(+radius, particle.topZ (RotationY(90*Units::degree)), 1e-13);
+ EXPECT_NEAR(-radius, particle.bottomZ(RotationX(90 * Units::degree)), 1e-13);
+ EXPECT_NEAR(+radius, particle.topZ(RotationX(90 * Units::degree)), 1e-13);
+ EXPECT_NEAR(-radius, particle.bottomZ(RotationY(90 * Units::degree)), 1e-13);
+ EXPECT_NEAR(+radius, particle.topZ(RotationY(90 * Units::degree)), 1e-13);
- EXPECT_NEAR(-height, particle.bottomZ(RotationY(180*Units::degree)), 1e-13);
- EXPECT_NEAR(0, particle.topZ (RotationY(180*Units::degree)), 1e-13);
+ EXPECT_NEAR(-height, particle.bottomZ(RotationY(180 * Units::degree)), 1e-13);
+ EXPECT_NEAR(0, particle.topZ(RotationY(180 * Units::degree)), 1e-13);
- for (double gamma: { 1.123, -2.34, 7.5, -9. })
+ for (double gamma : {1.123, -2.34, 7.5, -9.})
// 7.5deg is worst case for 24-vertex circle
- EXPECT_NEAR(-radius, particle.bottomZ(
- RotationEuler(0, 90*Units::degree, gamma*Units::degree)),
+ EXPECT_NEAR(-radius,
+ particle.bottomZ(RotationEuler(0, 90 * Units::degree, gamma * Units::degree)),
3e-2); // TODO decrease epsilon after replacement of vertex-based approximation
test_ff(&particle);
@@ -252,8 +252,8 @@ TEST_F(FormFactorBasicTest, Dodecahedron)
EXPECT_EQ(edge, particle.getEdge());
EXPECT_DOUBLE_EQ(volume, particle.volume());
EXPECT_EQ(0., particle.bottomZ(RotationZ()));
- EXPECT_NEAR(2*1.11352*edge, particle.topZ(RotationZ()), 1e-4);
- // height=2*inradius from web ressource
+ EXPECT_NEAR(2 * 1.11352 * edge, particle.topZ(RotationZ()), 1e-4);
+ // height=2*inradius from web ressource
test_ff(&particle);
}
@@ -305,7 +305,7 @@ TEST_F(FormFactorBasicTest, FullSphere)
EXPECT_EQ(radius, particle.getRadius());
EXPECT_DOUBLE_EQ(volume, particle.volume());
EXPECT_EQ(0., particle.bottomZ(RotationZ()));
- EXPECT_EQ(2*radius, particle.topZ(RotationZ()));
+ EXPECT_EQ(2 * radius, particle.topZ(RotationZ()));
test_ff(&particle);
}
@@ -339,8 +339,8 @@ TEST_F(FormFactorBasicTest, Icosahedron)
EXPECT_EQ(edge, particle.getEdge());
EXPECT_DOUBLE_EQ(volume, particle.volume());
EXPECT_EQ(0., particle.bottomZ(RotationZ()));
- EXPECT_NEAR(2*0.755761*edge, particle.topZ(RotationZ()), 1e-4);
- // height=2*inradius from web ressource
+ EXPECT_NEAR(2 * 0.755761 * edge, particle.topZ(RotationZ()), 1e-4);
+ // height=2*inradius from web ressource
test_ff(&particle);
}
diff --git a/Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp b/Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp
index 17bacf5b47077a805ecef32b11d2d0e71cbc1d22..27ab20b593ae530ff9ae15bbd595c2e351857a3e 100644
--- a/Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp
+++ b/Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp
@@ -1,8 +1,8 @@
#include "Core/Multilayer/LayerInterface.h"
#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerRoughness.h"
-#include "Core/Material/MaterialFactoryFuncs.h"
#include "Tests/UnitTests/utilities/google_test.h"
#include <memory>
diff --git a/Tests/UnitTests/Core/Sample/LayerTest.cpp b/Tests/UnitTests/Core/Sample/LayerTest.cpp
index 595701fae2183e79785b4da6ddd9f83cb14c20ef..ac1666209419639beae545ceded8ad57e68e802b 100644
--- a/Tests/UnitTests/Core/Sample/LayerTest.cpp
+++ b/Tests/UnitTests/Core/Sample/LayerTest.cpp
@@ -1,6 +1,6 @@
#include "Core/Multilayer/Layer.h"
-#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Aggregate/ParticleLayout.h"
+#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Parametrization/Units.h"
#include "Tests/UnitTests/utilities/google_test.h"
diff --git a/Tests/UnitTests/Core/Sample/MesoCrystalTest.cpp b/Tests/UnitTests/Core/Sample/MesoCrystalTest.cpp
index 9850bd8b1ec5306309223d8de1a67e5117531fd3..e1f8f47f48bde77029090b9304981c3cfa5a4ada 100644
--- a/Tests/UnitTests/Core/Sample/MesoCrystalTest.cpp
+++ b/Tests/UnitTests/Core/Sample/MesoCrystalTest.cpp
@@ -1,8 +1,8 @@
#include "Core/Particle/MesoCrystal.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Particle/Crystal.h"
#include "Core/HardParticle/FormFactorFullSphere.h"
#include "Core/Lattice/Lattice.h"
+#include "Core/Particle/Crystal.h"
#include "Core/Particle/ParticleComposition.h"
#include "Tests/UnitTests/utilities/google_test.h"
diff --git a/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp b/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp
index be381551a7ca9815dca61a931e846e762b343e17..118916ca3e0c4abd19ff38eb2740ac6ef89315b0 100644
--- a/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp
+++ b/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp
@@ -1,12 +1,12 @@
#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/Basics/MathConstants.h"
+#include "Core/Computation/MultiLayerUtils.h"
+#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerInterface.h"
#include "Core/Multilayer/LayerRoughness.h"
-#include "Core/Material/MaterialFactoryFuncs.h"
-#include "Core/Basics/MathConstants.h"
-#include "Core/Computation/MultiLayerUtils.h"
-#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Parametrization/Units.h"
#include "Tests/UnitTests/utilities/google_test.h"
diff --git a/Tests/UnitTests/Core/Sample/MultilayerAveragingTest.cpp b/Tests/UnitTests/Core/Sample/MultilayerAveragingTest.cpp
index a5d59de9dc9881bf61afdfd84e82f3f5ae40724d..b1fc952a11812379176181cafcd1464a2c388a7e 100644
--- a/Tests/UnitTests/Core/Sample/MultilayerAveragingTest.cpp
+++ b/Tests/UnitTests/Core/Sample/MultilayerAveragingTest.cpp
@@ -1,14 +1,14 @@
-#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/Aggregate/InterferenceFunction2DLattice.h"
-#include "Core/Multilayer/Layer.h"
-#include "Core/Material/MaterialFactoryFuncs.h"
-#include "Core/Basics/MathConstants.h"
-#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Particle/Particle.h"
#include "Core/Aggregate/ParticleLayout.h"
+#include "Core/Basics/MathConstants.h"
#include "Core/Computation/ProcessedSample.h"
-#include "Core/Parametrization/SimulationOptions.h"
#include "Core/Computation/Slice.h"
+#include "Core/HardParticle/FormFactorCylinder.h"
+#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
+#include "Core/Multilayer/MultiLayer.h"
+#include "Core/Parametrization/SimulationOptions.h"
+#include "Core/Particle/Particle.h"
#include "Tests/UnitTests/utilities/google_test.h"
class MultilayerAveragingTest : public ::testing::Test
diff --git a/Tests/UnitTests/Core/Sample/ParticleCompositionTest.cpp b/Tests/UnitTests/Core/Sample/ParticleCompositionTest.cpp
index 50ad4bbb3889957fe7b85e2b23d579dd86ac8205..6529a231e25d9aef5e27fd5d66be94579b1b6f6c 100644
--- a/Tests/UnitTests/Core/Sample/ParticleCompositionTest.cpp
+++ b/Tests/UnitTests/Core/Sample/ParticleCompositionTest.cpp
@@ -1,8 +1,8 @@
#include "Core/Particle/ParticleComposition.h"
#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/Basics/MathConstants.h"
#include "Core/HardParticle/FormFactorFullSphere.h"
#include "Core/Material/MaterialFactoryFuncs.h"
-#include "Core/Basics/MathConstants.h"
#include "Core/Particle/Particle.h"
#include "Tests/UnitTests/utilities/google_test.h"
diff --git a/Tests/UnitTests/Core/Sample/ParticleCoreShellTest.cpp b/Tests/UnitTests/Core/Sample/ParticleCoreShellTest.cpp
index ba3a57c04ebc0331116ad248cc73f63e5b4fb9c7..cc7bedad34bcd6f18eb396d2af2ade94723e1086 100644
--- a/Tests/UnitTests/Core/Sample/ParticleCoreShellTest.cpp
+++ b/Tests/UnitTests/Core/Sample/ParticleCoreShellTest.cpp
@@ -1,11 +1,11 @@
#include "Core/Particle/ParticleCoreShell.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/includeIncludes/HardParticles.h"
-#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Basics/MathConstants.h"
+#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Parametrization/Units.h"
#include "Core/Particle/Particle.h"
#include "Core/Scattering/Rotations.h"
-#include "Core/Parametrization/Units.h"
+#include "Core/includeIncludes/HardParticles.h"
#include "Tests/UnitTests/utilities/google_test.h"
class ParticleCoreShellTest : public ::testing::Test
diff --git a/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp b/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp
index 95334fa690704efa4103bf651e84ad50c38bc5f6..571e60d14b4e7a4b567c3904ff734aa852786f64 100644
--- a/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp
+++ b/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp
@@ -1,11 +1,11 @@
#include "Core/Particle/ParticleDistribution.h"
#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Parametrization/Distributions.h"
-#include "Core/includeIncludes/FormFactors.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Parametrization/Distributions.h"
#include "Core/Parametrization/ParameterUtils.h"
-#include "Core/Particle/Particle.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/Particle.h"
+#include "Core/includeIncludes/FormFactors.h"
#include "Tests/UnitTests/utilities/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 887da8cf861f2fd028685535302b5908c7fc2722..3b96635c4e87bd4fe767c71229766a01f3fd7047 100644
--- a/Tests/UnitTests/Core/Sample/ParticleLayoutTest.cpp
+++ b/Tests/UnitTests/Core/Sample/ParticleLayoutTest.cpp
@@ -1,12 +1,12 @@
#include "Core/Aggregate/ParticleLayout.h"
-#include "Core/Basics/BornAgainNamespace.h"
-#include "Core/Particle/IAbstractParticle.h"
-#include "Core/Export/INodeUtils.h"
#include "Core/Aggregate/InterferenceFunction1DLattice.h"
#include "Core/Aggregate/InterferenceFunctionNone.h"
+#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/Export/INodeUtils.h"
#include "Core/Material/MaterialFactoryFuncs.h"
-#include "Core/Particle/Particle.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Particle/IAbstractParticle.h"
+#include "Core/Particle/Particle.h"
#include "Tests/UnitTests/utilities/google_test.h"
class ParticleLayoutTest : public ::testing::Test
diff --git a/Tests/UnitTests/Core/Sample/ParticleTest.cpp b/Tests/UnitTests/Core/Sample/ParticleTest.cpp
index c69aa8f303d06784e7d0743662126619b0f45b85..a9d09faf5b6a79cba7c43ebb1abfda90b80e0e80 100644
--- a/Tests/UnitTests/Core/Sample/ParticleTest.cpp
+++ b/Tests/UnitTests/Core/Sample/ParticleTest.cpp
@@ -1,8 +1,8 @@
#include "Core/Particle/Particle.h"
#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/Basics/MathConstants.h"
#include "Core/HardParticle/FormFactorFullSphere.h"
#include "Core/Material/MaterialFactoryFuncs.h"
-#include "Core/Basics/MathConstants.h"
#include "Core/Parametrization/Units.h"
#include "Tests/UnitTests/utilities/google_test.h"
diff --git a/Tests/UnitTests/Core/Sample/RTTest.cpp b/Tests/UnitTests/Core/Sample/RTTest.cpp
index 2a6a2242e268dfb39eec3ead24644c73a92e3951..23e25b03f2bb48cc421ae626bbbc744e15b54663 100644
--- a/Tests/UnitTests/Core/Sample/RTTest.cpp
+++ b/Tests/UnitTests/Core/Sample/RTTest.cpp
@@ -1,14 +1,14 @@
+#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Basics/BornAgainNamespace.h"
+#include "Core/Basics/MathConstants.h"
+#include "Core/Computation/ProcessedSample.h"
+#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerInterface.h"
#include "Core/Multilayer/LayerRoughness.h"
-#include "Core/Material/MaterialFactoryFuncs.h"
-#include "Core/Basics/MathConstants.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Aggregate/ParticleLayout.h"
-#include "Core/Computation/ProcessedSample.h"
-#include "Core/Parametrization/SimulationOptions.h"
#include "Core/Multilayer/SpecularScalarTanhStrategy.h"
+#include "Core/Parametrization/SimulationOptions.h"
#include "Tests/UnitTests/utilities/google_test.h"
class RTTest : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestAxesItems.cpp b/Tests/UnitTests/GUI/TestAxesItems.cpp
index b6b726748876f009c113ce0c60308452c7c09bc0..2be4990d3dc9c80706d21e79258f0b218d025639 100644
--- a/Tests/UnitTests/GUI/TestAxesItems.cpp
+++ b/Tests/UnitTests/GUI/TestAxesItems.cpp
@@ -1,10 +1,10 @@
-#include "GUI/coregui/Models/AxesItems.h"
#include "Core/Binning/FixedBinAxis.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
+#include "Core/Binning/VariableBinAxis.h"
+#include "Core/Parametrization/Units.h"
+#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/PropertyItem.h"
#include "GUI/coregui/Models/TransformFromDomain.h"
-#include "Core/Parametrization/Units.h"
-#include "Core/Binning/VariableBinAxis.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include "Tests/UnitTests/utilities/google_test.h"
class TestAxesItems : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestComboProperty.cpp b/Tests/UnitTests/GUI/TestComboProperty.cpp
index 2006a3860255e16f7cecdee94b19c4cb8be40259..00c1803a0ef11c46e3f978c00defa7bab4da889e 100644
--- a/Tests/UnitTests/GUI/TestComboProperty.cpp
+++ b/Tests/UnitTests/GUI/TestComboProperty.cpp
@@ -1,7 +1,7 @@
#include "GUI/coregui/Models/ComboProperty.h"
#include "Tests/UnitTests/GUI/Comparators.h"
-#include "Tests/UnitTests/utilities/google_test.h"
#include "Tests/UnitTests/GUI/test_utils.h"
+#include "Tests/UnitTests/utilities/google_test.h"
class TestComboProperty : public ::testing::Test
{
diff --git a/Tests/UnitTests/GUI/TestComponentProxyModel.cpp b/Tests/UnitTests/GUI/TestComponentProxyModel.cpp
index 304359d3faa5fab4d23a4c57b1aa5e8b0599fc48..527ff6a2db4d1ecb68db54d3e7435e80626b864d 100644
--- a/Tests/UnitTests/GUI/TestComponentProxyModel.cpp
+++ b/Tests/UnitTests/GUI/TestComponentProxyModel.cpp
@@ -8,9 +8,9 @@
#include "GUI/coregui/Models/ProxyModelStrategy.h"
#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/Models/VectorItem.h"
-#include "Tests/UnitTests/utilities/google_test.h"
#include "GUI/coregui/Models/item_constants.h"
#include "Tests/UnitTests/GUI/test_utils.h"
+#include "Tests/UnitTests/utilities/google_test.h"
#include <QDebug>
#include <QSignalSpy>
diff --git a/Tests/UnitTests/GUI/TestComponentUtils.cpp b/Tests/UnitTests/GUI/TestComponentUtils.cpp
index 66f91006979cc6d02e3a7c22e1578fd7b7005d9f..3b78d766abdae01079c73d3b44f46c24ae88714f 100644
--- a/Tests/UnitTests/GUI/TestComponentUtils.cpp
+++ b/Tests/UnitTests/GUI/TestComponentUtils.cpp
@@ -1,10 +1,10 @@
-#include "GUI/coregui/Views/PropertyEditor/ComponentUtils.h"
#include "GUI/coregui/Models/FormFactorItems.h"
#include "GUI/coregui/Models/ParticleItem.h"
#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Models/SessionModel.h"
-#include "Tests/UnitTests/utilities/google_test.h"
#include "GUI/coregui/Models/item_constants.h"
+#include "GUI/coregui/Views/PropertyEditor/ComponentUtils.h"
+#include "Tests/UnitTests/utilities/google_test.h"
#include <QDebug>
class TestComponentUtils : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestCsvImportAssistant.cpp b/Tests/UnitTests/GUI/TestCsvImportAssistant.cpp
index f05f4eb1e51d52b4f85347e2b05a5c90f24ac657..1adca2359548aa6b814d1f470fd17503f307d304 100644
--- a/Tests/UnitTests/GUI/TestCsvImportAssistant.cpp
+++ b/Tests/UnitTests/GUI/TestCsvImportAssistant.cpp
@@ -1,10 +1,10 @@
+#include "Core/InputOutput/OutputDataReadFactory.h"
+#include "Core/InputOutput/OutputDataWriteFactory.h"
#include "Core/Instrument/ArrayUtils.h"
#include "Core/Instrument/AxisNames.h"
-#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.h"
#include "GUI/coregui/Models/JobItemUtils.h"
-#include "Core/InputOutput/OutputDataReadFactory.h"
-#include "Core/InputOutput/OutputDataWriteFactory.h"
#include "GUI/coregui/Models/SpecularDataItem.h"
+#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.h"
#include "Tests/UnitTests/utilities/google_test.h"
#include <vector>
diff --git a/Tests/UnitTests/GUI/TestDataItemViews.cpp b/Tests/UnitTests/GUI/TestDataItemViews.cpp
index 6e33290850ee46d8ed222a6c3963e29416a7669c..38b69afa2f842da9dc8720394a52927196daef20 100644
--- a/Tests/UnitTests/GUI/TestDataItemViews.cpp
+++ b/Tests/UnitTests/GUI/TestDataItemViews.cpp
@@ -3,13 +3,13 @@
#include "GUI/coregui/Models/DataItem.h"
#include "GUI/coregui/Models/DataProperties.h"
#include "GUI/coregui/Models/DataPropertyContainer.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "GUI/coregui/utils/MessageService.h"
#include "GUI/coregui/Models/RealDataModel.h"
#include "GUI/coregui/Models/SessionModel.h"
-#include "Tests/UnitTests/utilities/google_test.h"
#include "GUI/coregui/mainwindow/projectdocument.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
+#include "GUI/coregui/utils/MessageService.h"
#include "Tests/UnitTests/GUI/test_utils.h"
+#include "Tests/UnitTests/utilities/google_test.h"
class TestDataItemViews : public ::testing::Test
{
diff --git a/Tests/UnitTests/GUI/TestDetectorItems.cpp b/Tests/UnitTests/GUI/TestDetectorItems.cpp
index 36395282838ca27f41548a91531341717e26fd16..d3476c5c5a1a227aa57991d29192aa5dd21aa649 100644
--- a/Tests/UnitTests/GUI/TestDetectorItems.cpp
+++ b/Tests/UnitTests/GUI/TestDetectorItems.cpp
@@ -1,12 +1,12 @@
-#include "GUI/coregui/Models/ComboProperty.h"
#include "Core/Instrument/ConvolutionDetectorResolution.h"
-#include "GUI/coregui/Models/DetectorItems.h"
#include "Core/Instrument/IDetector2D.h"
+#include "Core/Instrument/ResolutionFunction2DGaussian.h"
+#include "Core/Parametrization/Units.h"
+#include "GUI/coregui/Models/ComboProperty.h"
+#include "GUI/coregui/Models/DetectorItems.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/InstrumentModel.h"
#include "GUI/coregui/Models/RectangularDetectorItem.h"
-#include "Core/Instrument/ResolutionFunction2DGaussian.h"
-#include "Core/Parametrization/Units.h"
#include "Tests/UnitTests/utilities/google_test.h"
class TestDetectorItems : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestExternalProperty.cpp b/Tests/UnitTests/GUI/TestExternalProperty.cpp
index b90467b33ceda7fe607b8e2c589b7ad608fd52e2..4de88b559b59c00c73e52a176a59d84f6e35b6f6 100644
--- a/Tests/UnitTests/GUI/TestExternalProperty.cpp
+++ b/Tests/UnitTests/GUI/TestExternalProperty.cpp
@@ -1,7 +1,7 @@
-#include "Tests/UnitTests/GUI/Comparators.h"
#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
-#include "Tests/UnitTests/utilities/google_test.h"
+#include "Tests/UnitTests/GUI/Comparators.h"
#include "Tests/UnitTests/GUI/test_utils.h"
+#include "Tests/UnitTests/utilities/google_test.h"
class TestExternalProperty : public ::testing::Test
{
diff --git a/Tests/UnitTests/GUI/TestFTDistributionItems.cpp b/Tests/UnitTests/GUI/TestFTDistributionItems.cpp
index 6703ae7572b7ca9340d2d6cfae719c07c46d3d77..d59fcc0ba0653b3ae23c6b45b864eec5a51c5645 100644
--- a/Tests/UnitTests/GUI/TestFTDistributionItems.cpp
+++ b/Tests/UnitTests/GUI/TestFTDistributionItems.cpp
@@ -1,5 +1,5 @@
-#include "GUI/coregui/Models/FTDistributionItems.h"
#include "Core/Aggregate/FTDistributions1D.h"
+#include "GUI/coregui/Models/FTDistributionItems.h"
#include "Tests/UnitTests/utilities/google_test.h"
class TestFTDistributionItems : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestFormFactorItems.cpp b/Tests/UnitTests/GUI/TestFormFactorItems.cpp
index d8e95b76ed8fa1e5fc5f070305ef2231ae024177..540e66475bcddf094f88442e66a8df53d8f664f5 100644
--- a/Tests/UnitTests/GUI/TestFormFactorItems.cpp
+++ b/Tests/UnitTests/GUI/TestFormFactorItems.cpp
@@ -1,7 +1,7 @@
-#include "GUI/coregui/Models/FormFactorItems.h"
-#include "Core/includeIncludes/FormFactors.h"
-#include "Core/Tools/Numeric.h"
#include "Core/Parametrization/Units.h"
+#include "Core/Tools/Numeric.h"
+#include "Core/includeIncludes/FormFactors.h"
+#include "GUI/coregui/Models/FormFactorItems.h"
#include "Tests/UnitTests/utilities/google_test.h"
class TestFormFactorItems : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp b/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp
index 9a849b6ab37a19c7004ea5af3e9feed665203ff0..f5eb4c32af49cc9c0bf99580d57b43c5266515b7 100644
--- a/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp
+++ b/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp
@@ -1,9 +1,9 @@
-#include "GUI/coregui/Models/FormFactorItems.h"
-#include "Core/includeIncludes/FormFactors.h"
-#include "GUI/coregui/Models/InterferenceFunctionItems.h"
-#include "Core/includeIncludes/InterferenceFunctions.h"
#include "Core/Parametrization/ParameterPool.h"
#include "Core/Parametrization/Units.h"
+#include "Core/includeIncludes/FormFactors.h"
+#include "Core/includeIncludes/InterferenceFunctions.h"
+#include "GUI/coregui/Models/FormFactorItems.h"
+#include "GUI/coregui/Models/InterferenceFunctionItems.h"
#include "Tests/UnitTests/utilities/google_test.h"
class TestGUICoreObjectCorrespondence : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestGroupItem.cpp b/Tests/UnitTests/GUI/TestGroupItem.cpp
index 876f00168e5a3a2be82e7e515da2cfb8efddeef0..f9806b4690fffab35391d8fa40b30f3b264205b1 100644
--- a/Tests/UnitTests/GUI/TestGroupItem.cpp
+++ b/Tests/UnitTests/GUI/TestGroupItem.cpp
@@ -1,11 +1,11 @@
#include "GUI/coregui/Models/ComboProperty.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/GroupInfo.h"
#include "GUI/coregui/Models/GroupItem.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "GUI/coregui/Models/SessionModel.h"
-#include "Tests/UnitTests/utilities/google_test.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include "Tests/UnitTests/GUI/test_utils.h"
+#include "Tests/UnitTests/utilities/google_test.h"
class TestGroupItem : public ::testing::Test
{
diff --git a/Tests/UnitTests/GUI/TestLayerItems.cpp b/Tests/UnitTests/GUI/TestLayerItems.cpp
index a45045b78ce986231c248bcabfe5e48591a4374c..bd0bc5a532f9d67e7363f5e588c3d1cc411cf2dc 100644
--- a/Tests/UnitTests/GUI/TestLayerItems.cpp
+++ b/Tests/UnitTests/GUI/TestLayerItems.cpp
@@ -1,10 +1,10 @@
#include "GUI/coregui/Models/ApplicationModels.h"
-#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
#include "GUI/coregui/Models/LayerItem.h"
#include "GUI/coregui/Models/MaterialItem.h"
#include "GUI/coregui/Models/MaterialModel.h"
#include "GUI/coregui/Models/ModelMapper.h"
#include "GUI/coregui/Models/SampleModel.h"
+#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
#include "Tests/UnitTests/utilities/google_test.h"
class TestLayerItems : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestLinkInstrument.cpp b/Tests/UnitTests/GUI/TestLinkInstrument.cpp
index d613cecd77c1c0bf0723622f10d0fba06ed132e8..ae39181a35b50d0823d2f37a4db267b3877b1a14 100644
--- a/Tests/UnitTests/GUI/TestLinkInstrument.cpp
+++ b/Tests/UnitTests/GUI/TestLinkInstrument.cpp
@@ -3,12 +3,12 @@
#include "GUI/coregui/Models/InstrumentModel.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/JobItemUtils.h"
-#include "GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.h"
#include "GUI/coregui/Models/RealDataItem.h"
#include "GUI/coregui/Models/RealDataModel.h"
#include "GUI/coregui/Models/RectangularDetectorItem.h"
-#include "Tests/UnitTests/utilities/google_test.h"
+#include "GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.h"
#include "Tests/UnitTests/GUI/test_utils.h"
+#include "Tests/UnitTests/utilities/google_test.h"
#include <QSignalSpy>
#include <QTest>
diff --git a/Tests/UnitTests/GUI/TestMapperForItem.cpp b/Tests/UnitTests/GUI/TestMapperForItem.cpp
index 89db903b151ae91a68250ef55030fea11421002c..495741af6a348438c3cdafd152a0b10cf89813c4 100644
--- a/Tests/UnitTests/GUI/TestMapperForItem.cpp
+++ b/Tests/UnitTests/GUI/TestMapperForItem.cpp
@@ -3,8 +3,8 @@
#include "GUI/coregui/Models/SampleModel.h"
#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
-#include "Tests/UnitTests/utilities/google_test.h"
#include "GUI/coregui/Models/item_constants.h"
+#include "Tests/UnitTests/utilities/google_test.h"
#include <memory>
using SessionItemUtils::ParentRow;
diff --git a/Tests/UnitTests/GUI/TestMaterialModel.cpp b/Tests/UnitTests/GUI/TestMaterialModel.cpp
index c62ff58279b5759bb74cbcfde00b4298fdb72d2b..11a6e75f947a9db71b541ac263e183e57c393fbc 100644
--- a/Tests/UnitTests/GUI/TestMaterialModel.cpp
+++ b/Tests/UnitTests/GUI/TestMaterialModel.cpp
@@ -1,7 +1,7 @@
#include "GUI/coregui/Models/MaterialDataItems.h"
#include "GUI/coregui/Models/MaterialItem.h"
-#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
#include "GUI/coregui/Models/MaterialModel.h"
+#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
#include "Tests/UnitTests/utilities/google_test.h"
#include <memory>
diff --git a/Tests/UnitTests/GUI/TestMaterialPropertyController.cpp b/Tests/UnitTests/GUI/TestMaterialPropertyController.cpp
index 689a3a7b46dcc2a3214f236c8afd2dc4408dcaf4..e8bfcf6ee8240ad9ea4b37d857e234c7546e595a 100644
--- a/Tests/UnitTests/GUI/TestMaterialPropertyController.cpp
+++ b/Tests/UnitTests/GUI/TestMaterialPropertyController.cpp
@@ -1,10 +1,10 @@
-#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
#include "GUI/coregui/Models/LayerItem.h"
#include "GUI/coregui/Models/MaterialItem.h"
-#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
#include "GUI/coregui/Models/MaterialModel.h"
#include "GUI/coregui/Models/MaterialPropertyController.h"
#include "GUI/coregui/Models/SampleModel.h"
+#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
+#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
#include "Tests/UnitTests/utilities/google_test.h"
#include <QtTest>
diff --git a/Tests/UnitTests/GUI/TestMessageService.cpp b/Tests/UnitTests/GUI/TestMessageService.cpp
index ef55e4ac6acf116f57c38568e23546a33bc03d80..90c458adf8abd5c04d7e3ad2a34fc25a0bd47c2f 100644
--- a/Tests/UnitTests/GUI/TestMessageService.cpp
+++ b/Tests/UnitTests/GUI/TestMessageService.cpp
@@ -1,8 +1,8 @@
+#include "GUI/coregui/Models/item_constants.h"
#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/utils/GUIMessage.h"
#include "GUI/coregui/utils/MessageService.h"
#include "Tests/UnitTests/utilities/google_test.h"
-#include "GUI/coregui/Models/item_constants.h"
#include <QObject>
#include <QString>
diff --git a/Tests/UnitTests/GUI/TestModelUtils.cpp b/Tests/UnitTests/GUI/TestModelUtils.cpp
index b0d3d8e422fc7795b6395eb15c0a55af6f98c1cf..5220d75d0811e22c9967d91e560fad96005746af 100644
--- a/Tests/UnitTests/GUI/TestModelUtils.cpp
+++ b/Tests/UnitTests/GUI/TestModelUtils.cpp
@@ -2,8 +2,8 @@
#include "GUI/coregui/Models/ModelUtils.h"
#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/Models/VectorItem.h"
-#include "Tests/UnitTests/utilities/google_test.h"
#include "GUI/coregui/Models/item_constants.h"
+#include "Tests/UnitTests/utilities/google_test.h"
#include <QVector>
class TestModelUtils : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestMultiLayerItem.cpp b/Tests/UnitTests/GUI/TestMultiLayerItem.cpp
index 11d5d0dbfde3e3e5d59ede557282833ba28a2978..97539e17a2be7073ba2803a0aff67d2b45449156 100644
--- a/Tests/UnitTests/GUI/TestMultiLayerItem.cpp
+++ b/Tests/UnitTests/GUI/TestMultiLayerItem.cpp
@@ -1,8 +1,8 @@
#include "GUI/coregui/Models/LayerItem.h"
#include "GUI/coregui/Models/MultiLayerItem.h"
#include "GUI/coregui/Models/SampleModel.h"
-#include "Tests/UnitTests/utilities/google_test.h"
#include "GUI/coregui/Models/item_constants.h"
+#include "Tests/UnitTests/utilities/google_test.h"
class TestMultiLayerItem : public ::testing::Test
{
diff --git a/Tests/UnitTests/GUI/TestOutputDataIOService.cpp b/Tests/UnitTests/GUI/TestOutputDataIOService.cpp
index 13983da7f5b2870325474960a5a6531ec91ad988..053e88020ef94fc85922ddeac2b9728496de6b6f 100644
--- a/Tests/UnitTests/GUI/TestOutputDataIOService.cpp
+++ b/Tests/UnitTests/GUI/TestOutputDataIOService.cpp
@@ -1,20 +1,20 @@
+#include "Core/InputOutput/IntensityDataIOFactory.h"
+#include "Core/Instrument/OutputData.h"
#include "GUI/coregui/Models/ApplicationModels.h"
#include "GUI/coregui/Models/DataItem.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "GUI/coregui/utils/ImportDataInfo.h"
-#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Models/JobItemUtils.h"
#include "GUI/coregui/Models/JobModel.h"
#include "GUI/coregui/Models/JobModelFunctions.h"
-#include "Core/Instrument/OutputData.h"
+#include "GUI/coregui/Models/RealDataItem.h"
+#include "GUI/coregui/Models/RealDataModel.h"
#include "GUI/coregui/mainwindow/OutputDataIOHistory.h"
#include "GUI/coregui/mainwindow/OutputDataIOService.h"
#include "GUI/coregui/mainwindow/ProjectUtils.h"
-#include "GUI/coregui/Models/RealDataItem.h"
-#include "GUI/coregui/Models/RealDataModel.h"
-#include "Tests/UnitTests/utilities/google_test.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
+#include "GUI/coregui/utils/ImportDataInfo.h"
#include "Tests/UnitTests/GUI/test_utils.h"
+#include "Tests/UnitTests/utilities/google_test.h"
#include <QTest>
#include <memory>
diff --git a/Tests/UnitTests/GUI/TestParaCrystalItems.cpp b/Tests/UnitTests/GUI/TestParaCrystalItems.cpp
index 1b28b1291958c1909247d1e85cda3264744c8897..c3b55165752f99aebc95f59c47e3e7fe315365e6 100644
--- a/Tests/UnitTests/GUI/TestParaCrystalItems.cpp
+++ b/Tests/UnitTests/GUI/TestParaCrystalItems.cpp
@@ -1,15 +1,15 @@
-#include "GUI/coregui/Models/FTDistributionItems.h"
#include "Core/Aggregate/FTDistributions2D.h"
#include "Core/Aggregate/InterferenceFunction2DParaCrystal.h"
-#include "GUI/coregui/Models/InterferenceFunctionItems.h"
#include "Core/Lattice/Lattice2D.h"
+#include "Core/Parametrization/Units.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 "Core/Parametrization/Units.h"
-#include "Tests/UnitTests/utilities/google_test.h"
#include "GUI/coregui/Models/item_constants.h"
+#include "Tests/UnitTests/utilities/google_test.h"
class TestParaCrystalItems : public ::testing::Test
{
diff --git a/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp b/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp
index ae2aefe7821d0e52b68fab0732e7a05580d2c73f..081eb4d8996b7faf4bd276157df35ebd5ab517ea 100644
--- a/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp
+++ b/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp
@@ -1,17 +1,17 @@
-#include "GUI/coregui/Models/ComboProperty.h"
-#include "GUI/coregui/Models/DistributionItems.h"
-#include "Core/Parametrization/Distributions.h"
-#include "Core/includeIncludes/FormFactors.h"
-#include "GUI/coregui/Views/MaterialEditor/MaterialEditor.h"
#include "Core/Material/MaterialFactoryFuncs.h"
-#include "GUI/coregui/Models/MaterialModel.h"
+#include "Core/Parametrization/Distributions.h"
#include "Core/Particle/Particle.h"
#include "Core/Particle/ParticleDistribution.h"
+#include "Core/includeIncludes/FormFactors.h"
+#include "GUI/coregui/Models/ComboProperty.h"
+#include "GUI/coregui/Models/DistributionItems.h"
+#include "GUI/coregui/Models/MaterialModel.h"
#include "GUI/coregui/Models/ParticleDistributionItem.h"
#include "GUI/coregui/Models/ParticleItem.h"
#include "GUI/coregui/Models/RealLimitsItems.h"
#include "GUI/coregui/Models/SampleModel.h"
#include "GUI/coregui/Models/TransformFromDomain.h"
+#include "GUI/coregui/Views/MaterialEditor/MaterialEditor.h"
#include "Tests/UnitTests/utilities/google_test.h"
#include <QXmlStreamWriter>
diff --git a/Tests/UnitTests/GUI/TestParticleLayoutItem.h b/Tests/UnitTests/GUI/TestParticleLayoutItem.h
index 5f5483f4fb0c75da9b378c5a55fb080b56ad59d6..95a118276504967655fff7dd8e69a21ac10e9f0a 100644
--- a/Tests/UnitTests/GUI/TestParticleLayoutItem.h
+++ b/Tests/UnitTests/GUI/TestParticleLayoutItem.h
@@ -1,6 +1,6 @@
+#include "Core/Basics/MathConstants.h"
#include "GUI/coregui/Models/InterferenceFunctionItems.h"
#include "GUI/coregui/Models/Lattice2DItems.h"
-#include "Core/Basics/MathConstants.h"
#include "GUI/coregui/Models/ParticleLayoutItem.h"
#include "GUI/coregui/Models/SampleModel.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
diff --git a/Tests/UnitTests/GUI/TestProjectDocument.cpp b/Tests/UnitTests/GUI/TestProjectDocument.cpp
index 35a9a2dbb20ee1e8a14834da1a2f99e03b2376c8..12f704a5a49abad170eedd230e398012b8c9a5db 100644
--- a/Tests/UnitTests/GUI/TestProjectDocument.cpp
+++ b/Tests/UnitTests/GUI/TestProjectDocument.cpp
@@ -1,15 +1,15 @@
#include "GUI/coregui/Models/ApplicationModels.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/InstrumentModel.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/JobItemUtils.h"
-#include "GUI/coregui/mainwindow/ProjectUtils.h"
#include "GUI/coregui/Models/RealDataItem.h"
#include "GUI/coregui/Models/RealDataModel.h"
-#include "Tests/UnitTests/utilities/google_test.h"
+#include "GUI/coregui/mainwindow/ProjectUtils.h"
#include "GUI/coregui/mainwindow/projectdocument.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include "Tests/UnitTests/GUI/test_utils.h"
+#include "Tests/UnitTests/utilities/google_test.h"
#include <QFileInfo>
#include <QSignalSpy>
diff --git a/Tests/UnitTests/GUI/TestProjectUtils.cpp b/Tests/UnitTests/GUI/TestProjectUtils.cpp
index 0570af55a3e1a6f72883da4f315ff1f4f44a2dea..109ac6b7659d4ad22b2e08d819681aa6ddd3cec7 100644
--- a/Tests/UnitTests/GUI/TestProjectUtils.cpp
+++ b/Tests/UnitTests/GUI/TestProjectUtils.cpp
@@ -1,5 +1,5 @@
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/mainwindow/ProjectUtils.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include "Tests/UnitTests/utilities/google_test.h"
#include <QDir>
#include <QFile>
diff --git a/Tests/UnitTests/GUI/TestPropertyRepeater.cpp b/Tests/UnitTests/GUI/TestPropertyRepeater.cpp
index 3d7067ca0985b754f37f93220276a70feae2162f..e7f398d837cd6de482e644f8adf60aedda8b1fad 100644
--- a/Tests/UnitTests/GUI/TestPropertyRepeater.cpp
+++ b/Tests/UnitTests/GUI/TestPropertyRepeater.cpp
@@ -1,9 +1,9 @@
#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.h"
#include "GUI/coregui/Models/SessionModel.h"
-#include "Tests/UnitTests/utilities/google_test.h"
#include "GUI/coregui/Models/item_constants.h"
+#include "GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.h"
+#include "Tests/UnitTests/utilities/google_test.h"
namespace
{
diff --git a/Tests/UnitTests/GUI/TestProxyModelStrategy.cpp b/Tests/UnitTests/GUI/TestProxyModelStrategy.cpp
index 047725dfc8a3d8f6c006f0ad2dfd51b03679c87c..4a92855f1fe3d5bc00cdc765e52d05483896d357 100644
--- a/Tests/UnitTests/GUI/TestProxyModelStrategy.cpp
+++ b/Tests/UnitTests/GUI/TestProxyModelStrategy.cpp
@@ -6,8 +6,8 @@
#include "GUI/coregui/Models/ProxyModelStrategy.h"
#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/Models/VectorItem.h"
-#include "Tests/UnitTests/utilities/google_test.h"
#include "GUI/coregui/Models/item_constants.h"
+#include "Tests/UnitTests/utilities/google_test.h"
class TestProxyModelStrategy : public ::testing::Test
{
diff --git a/Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.cpp b/Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.cpp
index 196d8f4fc0287300a294f9d0e40aa5e447681e0a..b77e0c9964f743ae2cad3011a5ceb8730568687f 100644
--- a/Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.cpp
+++ b/Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.cpp
@@ -3,17 +3,17 @@
#ifdef BORNAGAIN_OPENGL
-#include "GUI/coregui/Models/ApplicationModels.h"
-#include "Core/Scattering/IFormFactor.h"
#include "Core/DecoratedFormFactor/IFormFactorDecorator.h"
#include "Core/Particle/Particle.h"
-#include "GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.h"
+#include "Core/Scattering/IFormFactor.h"
+#include "GUI/coregui/Models/ApplicationModels.h"
#include "GUI/coregui/Models/ParticleItem.h"
#include "GUI/coregui/Models/ParticleLayoutItem.h"
+#include "GUI/coregui/Models/SampleModel.h"
+#include "GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h"
-#include "GUI/coregui/Models/SampleModel.h"
#include "GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h"
#include "Tests/UnitTests/utilities/google_test.h"
#include <QObject>
diff --git a/Tests/UnitTests/GUI/TestSaveService.cpp b/Tests/UnitTests/GUI/TestSaveService.cpp
index 75642d3f797bc9cb1d079b86155ccb924bf10206..2159a425848dad7c8e3f34e9968a7c646ab9e9bc 100644
--- a/Tests/UnitTests/GUI/TestSaveService.cpp
+++ b/Tests/UnitTests/GUI/TestSaveService.cpp
@@ -1,17 +1,17 @@
#include "GUI/coregui/Models/ApplicationModels.h"
-#include "GUI/coregui/mainwindow/AutosaveController.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/InstrumentModel.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/JobItemUtils.h"
-#include "GUI/coregui/mainwindow/ProjectUtils.h"
#include "GUI/coregui/Models/RealDataItem.h"
#include "GUI/coregui/Models/RealDataModel.h"
+#include "GUI/coregui/mainwindow/AutosaveController.h"
+#include "GUI/coregui/mainwindow/ProjectUtils.h"
#include "GUI/coregui/mainwindow/SaveService.h"
-#include "Tests/UnitTests/utilities/google_test.h"
#include "GUI/coregui/mainwindow/projectdocument.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include "Tests/UnitTests/GUI/test_utils.h"
+#include "Tests/UnitTests/utilities/google_test.h"
#include <QSignalSpy>
class TestSaveService : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestSavingSpecularData.cpp b/Tests/UnitTests/GUI/TestSavingSpecularData.cpp
index d6def27f626ab1fa4ad5dfd46768a0fe2e5f598c..8583ac1f7ba5d79abd20b704f2f851f91e0e2c1b 100644
--- a/Tests/UnitTests/GUI/TestSavingSpecularData.cpp
+++ b/Tests/UnitTests/GUI/TestSavingSpecularData.cpp
@@ -1,22 +1,22 @@
+#include "Core/Binning/PointwiseAxis.h"
+#include "Core/InputOutput/IntensityDataIOFactory.h"
+#include "Core/Instrument/OutputData.h"
#include "GUI/coregui/Models/ApplicationModels.h"
#include "GUI/coregui/Models/DataItem.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/GroupItem.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/InstrumentModel.h"
-#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "GUI/coregui/Models/ItemFileNameUtils.h"
#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Models/JobModel.h"
#include "GUI/coregui/Models/JobModelFunctions.h"
-#include "Core/Instrument/OutputData.h"
-#include "GUI/coregui/mainwindow/OutputDataIOService.h"
-#include "Core/Binning/PointwiseAxis.h"
#include "GUI/coregui/Models/PointwiseAxisItem.h"
-#include "GUI/coregui/mainwindow/ProjectUtils.h"
#include "GUI/coregui/Models/SpecularBeamInclinationItem.h"
-#include "Tests/UnitTests/utilities/google_test.h"
+#include "GUI/coregui/mainwindow/OutputDataIOService.h"
+#include "GUI/coregui/mainwindow/ProjectUtils.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include "Tests/UnitTests/GUI/test_utils.h"
+#include "Tests/UnitTests/utilities/google_test.h"
#include <QTest>
class TestSavingSpecularData : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestSessionItem.cpp b/Tests/UnitTests/GUI/TestSessionItem.cpp
index 9bd26e9574ad6426480cfd39e042b96141107547..60597c7a2b21612158852177495c082f0a6a4e5a 100644
--- a/Tests/UnitTests/GUI/TestSessionItem.cpp
+++ b/Tests/UnitTests/GUI/TestSessionItem.cpp
@@ -1,6 +1,6 @@
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
#include "Tests/UnitTests/utilities/google_test.h"
class TestSessionItem : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestSessionItemController.cpp b/Tests/UnitTests/GUI/TestSessionItemController.cpp
index 2064c1407624e2e4e891d5d5a949196e001f607e..98748ba1413e6ed336d1150e9edbb379d3f9fd0d 100644
--- a/Tests/UnitTests/GUI/TestSessionItemController.cpp
+++ b/Tests/UnitTests/GUI/TestSessionItemController.cpp
@@ -1,6 +1,6 @@
#include "GUI/coregui/Models/AxesItems.h"
-#include "GUI/coregui/Views/CommonWidgets/SessionItemController.h"
#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/Views/CommonWidgets/SessionItemController.h"
#include "Tests/UnitTests/GUI/TestSessionItemControllerHelper.h"
#include "Tests/UnitTests/utilities/google_test.h"
#include <QObject>
diff --git a/Tests/UnitTests/GUI/TestSessionItemData.cpp b/Tests/UnitTests/GUI/TestSessionItemData.cpp
index 60ab9ecfbe1437c6d058bfdfa4c1114b6bd3b55a..1de42432952d355c1b45e3ac112ec9ea1d929de6 100644
--- a/Tests/UnitTests/GUI/TestSessionItemData.cpp
+++ b/Tests/UnitTests/GUI/TestSessionItemData.cpp
@@ -1,6 +1,6 @@
-#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
#include "GUI/coregui/Models/SessionFlags.h"
#include "GUI/coregui/Models/SessionItemData.h"
+#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
#include "Tests/UnitTests/utilities/google_test.h"
class TestSessionItemData : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestSessionItemTags.cpp b/Tests/UnitTests/GUI/TestSessionItemTags.cpp
index c332944b253cbe2850b88d319621d5a4b857ce40..d19f70e512b4a1267e414c89c60eae909a00c469 100644
--- a/Tests/UnitTests/GUI/TestSessionItemTags.cpp
+++ b/Tests/UnitTests/GUI/TestSessionItemTags.cpp
@@ -1,7 +1,7 @@
-#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/Models/SessionItemTags.h"
-#include "Tests/UnitTests/utilities/google_test.h"
#include "GUI/coregui/Models/item_constants.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
+#include "Tests/UnitTests/utilities/google_test.h"
class TestSessionItemTags : public ::testing::Test
{
diff --git a/Tests/UnitTests/GUI/TestSessionItemUtils.cpp b/Tests/UnitTests/GUI/TestSessionItemUtils.cpp
index 11c63d50d9e7e424d4c25482d166516a89104ca7..9b4426a4a593128c65dd28abf31b9f9ebac35f59 100644
--- a/Tests/UnitTests/GUI/TestSessionItemUtils.cpp
+++ b/Tests/UnitTests/GUI/TestSessionItemUtils.cpp
@@ -1,11 +1,11 @@
#include "GUI/coregui/Models/ComboProperty.h"
-#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/Models/VectorItem.h"
-#include "Tests/UnitTests/utilities/google_test.h"
#include "GUI/coregui/Models/item_constants.h"
+#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
+#include "Tests/UnitTests/utilities/google_test.h"
class TestSessionItemUtils : public ::testing::Test
{
diff --git a/Tests/UnitTests/GUI/TestUpdateTimer.cpp b/Tests/UnitTests/GUI/TestUpdateTimer.cpp
index 555fdb2c48d74db16a75d894d1dca57eeec64259..22f8a25d34b13bffee963a34fa8fb29b2da2281e 100644
--- a/Tests/UnitTests/GUI/TestUpdateTimer.cpp
+++ b/Tests/UnitTests/GUI/TestUpdateTimer.cpp
@@ -25,12 +25,12 @@ TEST_F(TestUpdateTimer, test_updateTimerShort)
EXPECT_TRUE(spy.wait(timer_interval * 3));
EXPECT_EQ(spy.count(), 2);
-/* The following test is disabled because it occasionally fails on Travis
- // Checks that after time smaller than timer interval, we have no signals
- for (int i = 0; i < 10; ++i)
- timer.scheduleUpdate();
-
- EXPECT_FALSE(spy.wait(timer_interval / 2));
- EXPECT_EQ(spy.count(), 2);
-*/
+ /* The following test is disabled because it occasionally fails on Travis
+ // Checks that after time smaller than timer interval, we have no signals
+ for (int i = 0; i < 10; ++i)
+ timer.scheduleUpdate();
+
+ EXPECT_FALSE(spy.wait(timer_interval / 2));
+ EXPECT_EQ(spy.count(), 2);
+ */
}
diff --git a/Tests/UnitTests/GUI/test_utils.cpp b/Tests/UnitTests/GUI/test_utils.cpp
index a58d0f2278d134bd3c04bc2d1404f6fdebdd69b2..17b071f63c8e8c8b59ab1a72a5b38b45c95514a3 100644
--- a/Tests/UnitTests/GUI/test_utils.cpp
+++ b/Tests/UnitTests/GUI/test_utils.cpp
@@ -14,13 +14,13 @@
// ************************************************************************** //
#include "Tests/UnitTests/GUI/test_utils.h"
-#include "GUI/coregui/utils/GUIHelpers.h"
-#include "Core/Instrument/IntensityDataFunctions.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
+#include "Core/Instrument/IntensityDataFunctions.h"
#include "Core/Instrument/OutputData.h"
-#include "GUI/coregui/mainwindow/ProjectUtils.h"
#include "GUI/coregui/Models/RealDataItem.h"
#include "GUI/coregui/Models/SessionModel.h"
+#include "GUI/coregui/mainwindow/ProjectUtils.h"
+#include "GUI/coregui/utils/GUIHelpers.h"
namespace
{
diff --git a/Tests/UnitTests/Numeric/FormFactorSpecializationTest.cpp b/Tests/UnitTests/Numeric/FormFactorSpecializationTest.cpp
index 237810f918617d12a7f9a1fd260ea7129472c346..795241362038aac83549f50f8b5a534ba76f6a67 100644
--- a/Tests/UnitTests/Numeric/FormFactorSpecializationTest.cpp
+++ b/Tests/UnitTests/Numeric/FormFactorSpecializationTest.cpp
@@ -2,7 +2,6 @@
#include "Tests/UnitTests/Numeric/FormFactorTest.h"
#include "Tests/UnitTests/utilities/google_test.h"
-
//! Compare form factor for particle shapes A and B, where A is given special
//! parameter values so that it coincides with the more symmetric B.
@@ -11,8 +10,8 @@ class FFSpecializationTest : public testing::Test
protected:
void run_test(IFormFactorBorn* p0, IFormFactorBorn* p1, double eps, double qmag1, double qmag2)
{
- formFactorTest::run_test_for_many_q(
- [&](cvector_t q) { test_ff_eq(q, p0, p1, eps); }, qmag1, qmag2);
+ formFactorTest::run_test_for_many_q([&](cvector_t q) { test_ff_eq(q, p0, p1, eps); }, qmag1,
+ qmag2);
}
private:
diff --git a/Tests/UnitTests/Numeric/FormFactorSymmetryTest.cpp b/Tests/UnitTests/Numeric/FormFactorSymmetryTest.cpp
index e8412e55e6c7f98be8150eeacec11daa42ea0771..0809c9b6e96ec43503c5d7c1ca89bf0739b10c00 100644
--- a/Tests/UnitTests/Numeric/FormFactorSymmetryTest.cpp
+++ b/Tests/UnitTests/Numeric/FormFactorSymmetryTest.cpp
@@ -1,5 +1,5 @@
-#include "Core/includeIncludes/HardParticles.h"
#include "Core/Basics/MathConstants.h"
+#include "Core/includeIncludes/HardParticles.h"
#include "Tests/UnitTests/Numeric/FormFactorTest.h"
#include "Tests/UnitTests/utilities/google_test.h"
@@ -22,8 +22,8 @@ private:
protected:
void run_test(IFormFactorBorn* p, transform_t trafo, double eps, double qmag1, double qmag2)
{
- formFactorTest::run_test_for_many_q(
- [&](cvector_t q) { test_qq_eq(q, p, trafo, eps); }, qmag1, qmag2);
+ formFactorTest::run_test_for_many_q([&](cvector_t q) { test_qq_eq(q, p, trafo, eps); },
+ qmag1, qmag2);
}
};
@@ -41,8 +41,7 @@ TEST_F(FFSymmetryTest, Prism6)
{
FormFactorPrism6 p(1.33, .42);
run_test(
- &p, [](const cvector_t& q) -> cvector_t { return q.rotatedZ(M_PI / 3); }, 1e-12, 1e-99,
- 50);
+ &p, [](const cvector_t& q) -> cvector_t { return q.rotatedZ(M_PI / 3); }, 1e-12, 1e-99, 50);
run_test(
&p, [](const cvector_t& q) -> cvector_t { return q.rotatedZ(-M_TWOPI / 3); }, 3.8e-12,
1e-99, 50);
@@ -99,8 +98,7 @@ TEST_F(FFSymmetryTest, FullSpheroid)
{
FormFactorFullSpheroid p(.73, .36);
run_test(
- &p, [](const cvector_t& q) -> cvector_t { return q.rotatedZ(.123); }, 1e-12,
- 1e-99, 2e2);
+ &p, [](const cvector_t& q) -> cvector_t { return q.rotatedZ(.123); }, 1e-12, 1e-99, 2e2);
}
// ****** TODO: tests that do not pass for the full q range *********
diff --git a/Tests/UnitTests/Numeric/FormFactorTest.cpp b/Tests/UnitTests/Numeric/FormFactorTest.cpp
index a1d1ad44fea19e8da5750b95c9f82c706c78cc0f..7a16e5eb40a20535878becd38cb5b0a1a7242ff4 100644
--- a/Tests/UnitTests/Numeric/FormFactorTest.cpp
+++ b/Tests/UnitTests/Numeric/FormFactorTest.cpp
@@ -10,21 +10,21 @@ namespace formFactorTest
const complex_t I{0, 1};
-
auto qlist = testing::Combine(
- testing::Values( cvector_t({1, 0, 0}), cvector_t({0, 1, 0}), cvector_t({0, 0, 1}),
- cvector_t({1, 1, 0}), cvector_t({1, 0, 1}), cvector_t({0, 1, 1}),
- cvector_t({0, .25, 1}), cvector_t({-.2, 0, 1}), cvector_t({.25, -.2, 1}),
- cvector_t({1, 1, 1})),
+ testing::Values(cvector_t({1, 0, 0}), cvector_t({0, 1, 0}), cvector_t({0, 0, 1}),
+ cvector_t({1, 1, 0}), cvector_t({1, 0, 1}), cvector_t({0, 1, 1}),
+ cvector_t({0, .25, 1}), cvector_t({-.2, 0, 1}), cvector_t({.25, -.2, 1}),
+ cvector_t({1, 1, 1})),
testing::Values(cvector_t({1, 0, 0}), cvector_t({0, 1, 0}), cvector_t({0, 0, 1}),
cvector_t({1, 1, 0}), cvector_t({1, 0, 1}), cvector_t({1, 0, 1}),
cvector_t({1, 1, 1})),
- testing::Values(1e-19, 1e-17, 1e-15, 1e-13, 1e-11, 1e-9, 1e-6, 1e-3, .03, 1., 1e1, 1e2, 1e3, 1e4),
- testing::Values(-1e-15, +1e-14, -1e-13 * I, -1e-11, 1e-9 * I, -1e-7, -1e-5 * I, 1e-3,
- +1e-2, .1+.1*I, -.99+.3*I, .999, -.9999));
+ testing::Values(1e-19, 1e-17, 1e-15, 1e-13, 1e-11, 1e-9, 1e-6, 1e-3, .03, 1., 1e1, 1e2, 1e3,
+ 1e4),
+ testing::Values(-1e-15, +1e-14, -1e-13 * I, -1e-11, 1e-9 * I, -1e-7, -1e-5 * I, 1e-3, +1e-2,
+ .1 + .1 * I, -.99 + .3 * I, .999, -.9999));
-void run_test_for_many_q(
- std::function<void(cvector_t)> run_one_test, double qmag_min, double qmag_max)
+void run_test_for_many_q(std::function<void(cvector_t)> run_one_test, double qmag_min,
+ double qmag_max)
{
ParamGenerator<std::tuple<cvector_t, cvector_t, double, complex_t>> gen = qlist;
for (auto it : gen) {
@@ -33,12 +33,12 @@ void run_test_for_many_q(
double qmag = std::get<2>(it);
complex_t qeps = std::get<3>(it);
const cvector_t q = qmag * (qdir + qeps * qdev).unit();
-
+
if (q.mag() <= qmag_min || q.mag() >= qmag_max)
continue;
-
+
run_one_test(q);
}
}
-}
+} // namespace formFactorTest
diff --git a/Tests/UnitTests/Numeric/FormFactorTest.h b/Tests/UnitTests/Numeric/FormFactorTest.h
index df2940bf1156200b2a80174149bb5a8310662604..aeb4b5d577d8bfb7d8a28a0bf3aff8709aba572a 100644
--- a/Tests/UnitTests/Numeric/FormFactorTest.h
+++ b/Tests/UnitTests/Numeric/FormFactorTest.h
@@ -6,6 +6,6 @@
namespace formFactorTest
{
- void run_test_for_many_q(
- std::function<void(cvector_t)> run_one_test, double qmag_min, double qmag_max);
+void run_test_for_many_q(std::function<void(cvector_t)> run_one_test, double qmag_min,
+ double qmag_max);
}
diff --git a/Wrap/WinDllMacros.h b/Wrap/WinDllMacros.h
index cda5600355d7b916a47b01975a3184de1ba01f34..8b92875799a15e46c5376743acb044e9e61cc566 100644
--- a/Wrap/WinDllMacros.h
+++ b/Wrap/WinDllMacros.h
@@ -23,9 +23,9 @@
#define BA_CORE_API_ __declspec(dllexport)
#else
#define BA_CORE_API_ __declspec(dllimport)
-#endif // BA_CORE_BUILD_DLL
+#endif // BA_CORE_BUILD_DLL
-#endif // _WIN32
+#endif // _WIN32
#ifndef BA_CORE_API_
#define BA_CORE_API_
diff --git a/unused/ComponentParameter.h b/unused/ComponentParameter.h
index 5d39acd95b151a193b2731f7f12771e606bde1cc..d99c785a1dfeaced2bbc74aa024cb6fed4a6f2ca 100644
--- a/unused/ComponentParameter.h
+++ b/unused/ComponentParameter.h
@@ -23,19 +23,25 @@
//! Wraps a parameter of type ISample.
//! @ingroup tools_internal
-class BA_CORE_API_ ComponentParameter : public IParameter<ISample> {
+class BA_CORE_API_ ComponentParameter : public IParameter<ISample>
+{
public:
- ComponentParameter(
- const std::string& name, volatile ISample* par,
- const std::string& parent_name, const std::function<void()>& onChange)
- : IParameter<ISample>(name, par, parent_name, onChange) {}
-
- ComponentParameter* clone( const std::string& new_name="" ) const {
- return new ComponentParameter(
- new_name=="" ? getName() : new_name, m_data, m_parent_name, m_onChange); }
-
- bool operator==(const ComponentParameter& other) const {
- return *static_cast<const IParameter*>(this)==*static_cast<const IParameter*>(&other); }
+ ComponentParameter(const std::string& name, volatile ISample* par,
+ const std::string& parent_name, const std::function<void()>& onChange)
+ : IParameter<ISample>(name, par, parent_name, onChange)
+ {
+ }
+
+ ComponentParameter* clone(const std::string& new_name = "") const
+ {
+ return new ComponentParameter(new_name == "" ? getName() : new_name, m_data, m_parent_name,
+ m_onChange);
+ }
+
+ bool operator==(const ComponentParameter& other) const
+ {
+ return *static_cast<const IParameter*>(this) == *static_cast<const IParameter*>(&other);
+ }
protected:
};
diff --git a/unused/MatrixSpecularInfoMapTest.h b/unused/MatrixSpecularInfoMapTest.h
index cad81fd4f9dc7b012d97a636b50dcc20b5a0c9b8..54ed687287d5391dad921409b2a7d30186b5d001 100644
--- a/unused/MatrixSpecularInfoMapTest.h
+++ b/unused/MatrixSpecularInfoMapTest.h
@@ -1,22 +1,20 @@
#ifndef MATRIXSPECULARINFOMAPTEST_H
#define MATRIXSPECULARINFOMAPTEST_H
-#include "Core/Multilayer/Layer.h"
+#include "Core/Basics/MathConstants.h"
#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MatrixRTCoefficients.h"
-#include "MatrixMLFresnelMap.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Basics/MathConstants.h"
#include "Core/SimulationElement/SimulationElement.h"
+#include "MatrixMLFresnelMap.h"
#include <memory>
-class MatrixSpecularInfoMapTest : public ::testing :: Test
+class MatrixSpecularInfoMapTest : public ::testing ::Test
{
protected:
MatrixSpecularInfoMapTest();
- virtual ~MatrixSpecularInfoMapTest() {
- delete mp_multilayer;
- }
+ virtual ~MatrixSpecularInfoMapTest() { delete mp_multilayer; }
MultiLayer* mp_multilayer;
};
@@ -39,7 +37,7 @@ TEST_F(MatrixSpecularInfoMapTest, getCoefficients)
MatrixSpecularInfoMap map(mp_multilayer, 0);
SimulationElement sim_element(M_TWOPI, 1.0, 1.0, nullptr);
std::unique_ptr<const MatrixRTCoefficients> P_rt_coeffs(
- (MatrixRTCoefficients*) map.getOutCoefficients(sim_element));
+ (MatrixRTCoefficients*)map.getOutCoefficients(sim_element));
complex_t R0 = complex_t(0.1750375, -0.0222467);
complex_t lambda0 = complex_t(0.841471, 0.0);
(void)R0;
diff --git a/unused/ScalarSpecularInfoMapTest.h b/unused/ScalarSpecularInfoMapTest.h
index 012463cc02321c7640e12e80c7eb0c39c7180947..08854b8866cb2be28c83ae20cea2af7506e185bf 100644
--- a/unused/ScalarSpecularInfoMapTest.h
+++ b/unused/ScalarSpecularInfoMapTest.h
@@ -1,16 +1,16 @@
#ifndef SCALARSPECULARINFOMAPTEST_H
#define SCALARSPECULARINFOMAPTEST_H
-#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Multilayer/Layer.h"
-#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Basics/MathConstants.h"
+#include "Core/Material/MaterialFactoryFuncs.h"
+#include "Core/Multilayer/Layer.h"
+#include "Core/Multilayer/MultiLayer.h"
#include "Core/Multilayer/ScalarRTCoefficients.h"
-#include "ScalarSpecularInfoMap.h"
#include "Core/SimulationElement/SimulationElement.h"
+#include "ScalarSpecularInfoMap.h"
#include <memory>
-class ScalarSpecularInfoMapTest : public ::testing :: Test
+class ScalarSpecularInfoMapTest : public ::testing ::Test
{
protected:
ScalarSpecularInfoMapTest();
@@ -36,9 +36,9 @@ ScalarSpecularInfoMapTest::ScalarSpecularInfoMapTest()
TEST_F(ScalarSpecularInfoMapTest, getCoefficients)
{
ScalarSpecularInfoMap map(mp_multilayer, 0);
- SimulationElement sim_element(M_TWOPI, 1.0, 1.0, SphericalPixel::createZeroSizePixel(0,0));
+ SimulationElement sim_element(M_TWOPI, 1.0, 1.0, SphericalPixel::createZeroSizePixel(0, 0));
std::unique_ptr<const ScalarRTCoefficients> P_rt_coeffs(
- (ScalarRTCoefficients*) map.getOutCoefficients(sim_element));
+ (ScalarRTCoefficients*)map.getOutCoefficients(sim_element));
complex_t R0 = complex_t(0.1750375, -0.0222467);
complex_t lambda0 = complex_t(0.841471, 0.0);
EXPECT_TRUE(nullptr != P_rt_coeffs.get());
@@ -47,7 +47,7 @@ TEST_F(ScalarSpecularInfoMapTest, getCoefficients)
EXPECT_EQ(0.0, P_rt_coeffs->T1plus()(1));
EXPECT_EQ(0.0, P_rt_coeffs->T1min()(0));
- EXPECT_EQ(complex_t(1.0,0.0), P_rt_coeffs->T1min()(1).real());
+ EXPECT_EQ(complex_t(1.0, 0.0), P_rt_coeffs->T1min()(1).real());
EXPECT_NEAR(1.0, P_rt_coeffs->T2plus()(0).real(), 1e-6);
EXPECT_NEAR(0.0, P_rt_coeffs->T2plus()(0).imag(), 1e-6);
diff --git a/unused/ScanningMinimizer.cpp b/unused/ScanningMinimizer.cpp
index 75389a363a9d83dfd390b6938cbf05bcc014a181..7815a98d611ba750ec0569114d4e9154f4d6720b 100644
--- a/unused/ScanningMinimizer.cpp
+++ b/unused/ScanningMinimizer.cpp
@@ -16,8 +16,8 @@
#include "unused/ScanningMinimizer.h"
#include "Core/Basics/Exceptions.h"
#include "FitParameter.h"
-#include <iostream>
#include <iomanip>
+#include <iostream>
//! Scan minimizer find minimum of chi2 function by equidistant scanning of fit parameters.
// Only parameters with defined limits (i.e. Limits::limited(left, right) )
@@ -27,19 +27,19 @@ void ScanningMinimizer::minimize()
construct_fcnvalues_map();
// scanning values of fit parameters
- for(auto it = m_fcnvalues_map->begin(); it!=m_fcnvalues_map->end(); ++it) {
- for(size_t i_axis=0; i_axis<m_fcnvalues_map->getRank(); ++i_axis) {
+ for (auto it = m_fcnvalues_map->begin(); it != m_fcnvalues_map->end(); ++it) {
+ for (size_t i_axis = 0; i_axis < m_fcnvalues_map->getRank(); ++i_axis) {
size_t xbin = m_fcnvalues_map->getAxisBinIndex(it.getIndex(), i_axis);
double value = (*m_fcnvalues_map->getAxis(i_axis))[xbin];
std::string parname = m_fcnvalues_map->getAxis(i_axis)->getName();
m_parameters.getFitParameter(parname)->setValue(value);
}
- std::vector<double> current_values=m_parameters.getValues();
+ std::vector<double> current_values = m_parameters.getValues();
*it = m_fcn(¤t_values[0]); // running simulation
}
set_parvalues_to_minimum();
- std::vector<double> current_values=m_parameters.getValues();
+ std::vector<double> current_values = m_parameters.getValues();
m_fcn(¤t_values[0]); // running simulation once again at optimum values
}
@@ -49,14 +49,14 @@ void ScanningMinimizer::construct_fcnvalues_map()
{
delete m_fcnvalues_map;
m_fcnvalues_map = new OutputData<double>;
- for(size_t i_par=0; i_par < m_parameters.size(); i_par++ ) {
- const FitParameter *par = m_parameters[i_par];
- if( par->hasLowerLimit() && par->hasUpperLimit() ) {
+ for (size_t i_par = 0; i_par < m_parameters.size(); i_par++) {
+ const FitParameter* par = m_parameters[i_par];
+ if (par->hasLowerLimit() && par->hasUpperLimit()) {
FixedBinAxis axis(par->getName(), m_nbins, par->getLowerLimit(), par->getUpperLimit());
m_fcnvalues_map->addAxis(axis);
}
}
- if( !m_fcnvalues_map->getRank() )
+ if (!m_fcnvalues_map->getRank())
throw Exceptions::LogicErrorException(
"ScanningMinimizer::construct_parameter_map() -> Error! "
"No parameters with TAttLimit::limited(left,right) attribute were found.");
@@ -66,8 +66,9 @@ void ScanningMinimizer::construct_fcnvalues_map()
void ScanningMinimizer::set_parvalues_to_minimum()
{
assert(m_fcnvalues_map);
- OutputData<double>::iterator it = std::min_element(m_fcnvalues_map->begin(), m_fcnvalues_map->end());
- for(size_t i_axis=0; i_axis<m_fcnvalues_map->getRank(); ++i_axis) {
+ OutputData<double>::iterator it =
+ std::min_element(m_fcnvalues_map->begin(), m_fcnvalues_map->end());
+ for (size_t i_axis = 0; i_axis < m_fcnvalues_map->getRank(); ++i_axis) {
size_t xbin = m_fcnvalues_map->getAxisBinIndex(it.getIndex(), i_axis);
double value = (*m_fcnvalues_map->getAxis(i_axis))[xbin];
std::string parname = m_fcnvalues_map->getAxis(i_axis)->getName();
@@ -84,8 +85,10 @@ double ScanningMinimizer::getMinValue() const
void ScanningMinimizer::printResults() const
{
std::cout << "--- ScanningMinimizer ------------------------------------" << std::endl;
- std::cout << std::setw(25) << std::left << " nbins" << ": " << m_nbins << std::endl;
- std::cout << std::setw(25) << std::left << " Minimum value" << ": " << getMinValue() << std::endl;
+ std::cout << std::setw(25) << std::left << " nbins"
+ << ": " << m_nbins << std::endl;
+ std::cout << std::setw(25) << std::left << " Minimum value"
+ << ": " << getMinValue() << std::endl;
std::cout << " Best parameters:" << std::endl;
m_parameters.printParameters();
}
@@ -98,11 +101,11 @@ void ScanningMinimizer::setChiSquaredFunction(function_chi2_t fun_chi2, size_t)
void ScanningMinimizer::setParameters(const FitSuiteParameters& parameters)
{
m_parameters.clear();
- for(size_t i_par = 0; i_par<parameters.size(); ++i_par)
- m_parameters.push_back(new FitParameter( *parameters[i_par] ) );
+ for (size_t i_par = 0; i_par < parameters.size(); ++i_par)
+ m_parameters.push_back(new FitParameter(*parameters[i_par]));
}
-std::vector<double > ScanningMinimizer::getValueOfVariablesAtMinimum() const
+std::vector<double> ScanningMinimizer::getValueOfVariablesAtMinimum() const
{
return m_parameters.getValues();
}
diff --git a/unused/ScanningMinimizer.h b/unused/ScanningMinimizer.h
index ecd037f2ef552f8a35337a4fe6433201c174f754..7a0bc8bd4b4b12e585b2ec39dd9fbda5f798df4b 100644
--- a/unused/ScanningMinimizer.h
+++ b/unused/ScanningMinimizer.h
@@ -25,8 +25,8 @@
class BA_CORE_API_ ScanningMinimizer : public IMinimizer
{
- public:
- ScanningMinimizer(int nbins = 10) : m_fcnvalues_map(0), m_nbins(nbins) { }
+public:
+ ScanningMinimizer(int nbins = 10) : m_fcnvalues_map(0), m_nbins(nbins) {}
virtual ~ScanningMinimizer() { delete m_fcnvalues_map; }
virtual void minimize();
@@ -49,14 +49,13 @@ class BA_CORE_API_ ScanningMinimizer : public IMinimizer
virtual std::vector<double> getValueOfVariablesAtMinimum() const;
- private:
-
+private:
void construct_fcnvalues_map();
void set_parvalues_to_minimum();
//! values of minimized function on the grid, axes are limited parameters
OutputData<double>* m_fcnvalues_map;
- size_t m_nbins; //! number of bins per one parameter
+ size_t m_nbins; //! number of bins per one parameter
FitSuiteParameters m_parameters; //! minimizer parameters
function_chi2_t m_fcn;
};