diff --git a/Core/Assembly/DecouplingApproximationStrategy.cpp b/Core/Assembly/DecouplingApproximationStrategy.cpp
index d683bd25424f4efd9a243f4bd9aceb3a38860d4b..02a99948577fd52c2f603c88a07133abee49abaa 100644
--- a/Core/Assembly/DecouplingApproximationStrategy.cpp
+++ b/Core/Assembly/DecouplingApproximationStrategy.cpp
@@ -14,13 +14,13 @@
// ************************************************************************** //
#include "DecouplingApproximationStrategy.h"
-#include "SimulationElement.h"
#include "Exceptions.h"
#include "FormFactorInfo.h"
#include "IInterferenceFunction.h"
-#include "MathFunctions.h"
#include "Layer.h"
#include "LayerSpecularInfo.h"
+#include "MathFunctions.h"
+#include "SimulationElement.h"
#include <cassert>
#include <iostream>
diff --git a/Core/Assembly/FTDecayFunctions.cpp b/Core/Assembly/FTDecayFunctions.cpp
index 29b40879a75742bca6f87c0a5b7a3d56b686c96f..9783bb9b867b69f97a9765b43d968994bd3a1e26 100644
--- a/Core/Assembly/FTDecayFunctions.cpp
+++ b/Core/Assembly/FTDecayFunctions.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FTDecayFunctions.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "FTDecayFunctions.h"
using namespace BornAgain;
diff --git a/Core/Assembly/FTDistributions.cpp b/Core/Assembly/FTDistributions.cpp
index e7d6167855a05b405c068c91be40f46007d45870..3631d84c97bff09a17ed2a4c36e63db7d9b3e5e4 100644
--- a/Core/Assembly/FTDistributions.cpp
+++ b/Core/Assembly/FTDistributions.cpp
@@ -13,10 +13,10 @@
//
// ************************************************************************** //
+#include "FTDistributions.h"
#include "BornAgainNamespace.h"
#include "IntegratorReal.h"
#include "MathFunctions.h"
-#include "FTDistributions.h"
using namespace BornAgain;
diff --git a/Core/Assembly/IInterferenceFunctionStrategy.cpp b/Core/Assembly/IInterferenceFunctionStrategy.cpp
index 1bd666f596fe95c0789293c2ce1d9c5a819f1a82..9a5254574780cf7f700d8944582b7eb97d371871 100644
--- a/Core/Assembly/IInterferenceFunctionStrategy.cpp
+++ b/Core/Assembly/IInterferenceFunctionStrategy.cpp
@@ -13,15 +13,15 @@
//
// ************************************************************************** //
-#include "IFormFactor.h"
-#include "FormFactorInfo.h"
#include "IInterferenceFunctionStrategy.h"
+#include "FormFactorInfo.h"
+#include "IFormFactor.h"
#include "IInterferenceFunction.h"
#include "IntegratorMCMiser.h"
+#include "Layer.h"
#include "LayerSpecularInfo.h"
#include "ScalarRTCoefficients.h"
#include "SimulationElement.h"
-#include "Layer.h"
#include "Units.h"
#include "WavevectorInfo.h"
diff --git a/Core/Assembly/IInterferenceFunctionStrategy.h b/Core/Assembly/IInterferenceFunctionStrategy.h
index a60f569600c2a79b3442caf189cdc91cfe81a550..168434421145e6be223abbb1e80b4ed9395cd421 100644
--- a/Core/Assembly/IInterferenceFunctionStrategy.h
+++ b/Core/Assembly/IInterferenceFunctionStrategy.h
@@ -22,8 +22,8 @@
#include "SimulationOptions.h"
#include "Vectors3D.h"
#include <Eigen/StdVector>
-#include <vector>
#include <memory>
+#include <vector>
template <class T> class IntegratorMCMiser;
class FormFactorInfo;
diff --git a/Core/Assembly/InterferenceFunction1DLattice.cpp b/Core/Assembly/InterferenceFunction1DLattice.cpp
index 1b828d453b427c5c17e252bf99054ec1d13e0947..02f81ebe46171c4f631d5bbbb20d8a0b2035e561 100644
--- a/Core/Assembly/InterferenceFunction1DLattice.cpp
+++ b/Core/Assembly/InterferenceFunction1DLattice.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "InterferenceFunction1DLattice.h"
+#include "BornAgainNamespace.h"
using namespace BornAgain;
diff --git a/Core/Assembly/InterferenceFunction2DParaCrystal.cpp b/Core/Assembly/InterferenceFunction2DParaCrystal.cpp
index ac8c8a676cf60063ef71f92fd8777ac5dbd7faba..33d3646f9a0ca148e4ad72527df841fcf99813f0 100644
--- a/Core/Assembly/InterferenceFunction2DParaCrystal.cpp
+++ b/Core/Assembly/InterferenceFunction2DParaCrystal.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "InterferenceFunction2DParaCrystal.h"
#include "BornAgainNamespace.h"
#include "IntegratorReal.h"
-#include "InterferenceFunction2DParaCrystal.h"
using namespace BornAgain;
diff --git a/Core/Assembly/InterferenceFunctionNone.cpp b/Core/Assembly/InterferenceFunctionNone.cpp
index 77ae0bd71086157d1aa6d2d01be54d1a6490f123..17eee05e829c71fbc02dad93ac952471bdba3f3a 100644
--- a/Core/Assembly/InterferenceFunctionNone.cpp
+++ b/Core/Assembly/InterferenceFunctionNone.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "InterferenceFunctionNone.h"
+#include "BornAgainNamespace.h"
InterferenceFunctionNone::InterferenceFunctionNone()
diff --git a/Core/Assembly/InterferenceFunctionRadialParaCrystal.cpp b/Core/Assembly/InterferenceFunctionRadialParaCrystal.cpp
index c3287d949e1dbb04c5608281e3f3a32f540b17e1..15acb9ddad59f4363ed48eaa15fb63ebdc9cbee1 100644
--- a/Core/Assembly/InterferenceFunctionRadialParaCrystal.cpp
+++ b/Core/Assembly/InterferenceFunctionRadialParaCrystal.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "InterferenceFunctionRadialParaCrystal.h"
+#include "BornAgainNamespace.h"
using namespace BornAgain;
diff --git a/Core/Assembly/SizeSpacingCorrelationApproximationStrategy.cpp b/Core/Assembly/SizeSpacingCorrelationApproximationStrategy.cpp
index 29083425e2319fbe4f4dd1c809159623046087ed..87a061b724a35265f7e42e439b9d4e3551ba5d5c 100644
--- a/Core/Assembly/SizeSpacingCorrelationApproximationStrategy.cpp
+++ b/Core/Assembly/SizeSpacingCorrelationApproximationStrategy.cpp
@@ -14,8 +14,8 @@
// ************************************************************************** //
#include "SizeSpacingCorrelationApproximationStrategy.h"
-#include "IFormFactor.h"
#include "FormFactorInfo.h"
+#include "IFormFactor.h"
#include "InterferenceFunctionRadialParaCrystal.h"
#include "SimulationElement.h"
diff --git a/Core/Basics/FileSystem.cpp b/Core/Basics/FileSystem.cpp
index 3386495e5da24f267115cb846a9d87c48d787a76..1ad96df4fcfea4c82898839a2186940179bc48ec 100644
--- a/Core/Basics/FileSystem.cpp
+++ b/Core/Basics/FileSystem.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "Exceptions.h"
#include "FileSystem.h"
+#include "Exceptions.h"
#include <boost/filesystem.hpp>
std::string Utils::FileSystem::m_argv0_path = std::string();
diff --git a/Core/Basics/MessageService.cpp b/Core/Basics/MessageService.cpp
index aba28ded87154086faacf722fd8495e4bbca9ec2..ee3228c7a81c850744e042e3a62b3b6b72c91b3e 100644
--- a/Core/Basics/MessageService.cpp
+++ b/Core/Basics/MessageService.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "Exceptions.h"
#include "MessageService.h"
+#include "Exceptions.h"
#include <boost/date_time/posix_time/posix_time.hpp>
std::vector<std::string> MSG::Logger::m_level_names =
diff --git a/Core/Basics/Utils.cpp b/Core/Basics/Utils.cpp
index 2b29ab44cf1688c46e9cb3225167bd9ec6aeee1a..0f1d8d4c32d551b5d6bc50d004e989fb5c4f0515 100644
--- a/Core/Basics/Utils.cpp
+++ b/Core/Basics/Utils.cpp
@@ -14,10 +14,10 @@
// ************************************************************************** //
#include "Utils.h"
-#include <thread>
#include <boost/algorithm/string.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/regex.hpp>
+#include <thread>
diff --git a/Core/Export/PyGenTools.cpp b/Core/Export/PyGenTools.cpp
index c4844af1624e42368e32b70cf0b22892bb26620f..ebb077a8a219e9064c0e81d1be7822858bdcb13e 100644
--- a/Core/Export/PyGenTools.cpp
+++ b/Core/Export/PyGenTools.cpp
@@ -18,8 +18,8 @@
#include "Ellipse.h"
#include "GISASSimulation.h"
#include "IInterferenceFunction.h"
-#include "InfinitePlane.h"
#include "IShape2D.h"
+#include "InfinitePlane.h"
#include "Line.h"
#include "Macros.h"
#include "MultiLayer.h"
diff --git a/Core/Export/PyGenVisitor.cpp b/Core/Export/PyGenVisitor.cpp
index 13e5e297807d7e5bab3199cb56f997358e0b2e33..140b9818d44fd399dd8cbc8d868028a4171f2056 100644
--- a/Core/Export/PyGenVisitor.cpp
+++ b/Core/Export/PyGenVisitor.cpp
@@ -18,12 +18,12 @@
#include "Crystal.h"
#include "FormFactors.h"
#include "InterferenceFunctions.h"
-#include "Materials.h"
-#include "MultiLayer.h"
-#include "MultiLayerDWBASimulation.h"
#include "Layer.h"
#include "LayerInterface.h"
#include "LayerRoughness.h"
+#include "Materials.h"
+#include "MultiLayer.h"
+#include "MultiLayerDWBASimulation.h"
#include "ParticleCoreShell.h"
#include "ParticleDistribution.h"
#include "ParticleLayout.h"
diff --git a/Core/Export/SampleLabelHandler.cpp b/Core/Export/SampleLabelHandler.cpp
index 0dded76ddb2a99b0e945a3b1b8a924ea2aa04952..50b21e4e0e5a24940163bf40cb94a18911b9145a 100644
--- a/Core/Export/SampleLabelHandler.cpp
+++ b/Core/Export/SampleLabelHandler.cpp
@@ -17,8 +17,8 @@
#include "HomogeneousMagneticMaterial.h"
#include "IInterferenceFunction.h"
#include "IMaterial.h"
-#include "MultiLayer.h"
#include "LayerRoughness.h"
+#include "MultiLayer.h"
#include "Particle.h"
#include "ParticleComposition.h"
#include "ParticleCoreShell.h"
diff --git a/Core/FormFactor/FormFactorDWBA.cpp b/Core/FormFactor/FormFactorDWBA.cpp
index eef1c1d47536f8336bf79ed880afadedabe484e1..788612fbd3bb5d86798f136907ea5dce334a6ceb 100644
--- a/Core/FormFactor/FormFactorDWBA.cpp
+++ b/Core/FormFactor/FormFactorDWBA.cpp
@@ -13,10 +13,10 @@
//
// ************************************************************************** //
-#include "LayerSpecularInfo.h"
-#include "BornAgainNamespace.h"
#include "FormFactorDWBA.h"
+#include "BornAgainNamespace.h"
#include "ILayerRTCoefficients.h"
+#include "LayerSpecularInfo.h"
FormFactorDWBA::FormFactorDWBA(const IFormFactor& form_factor)
: IFormFactorDecorator(form_factor)
diff --git a/Core/FormFactor/FormFactorDWBAPol.cpp b/Core/FormFactor/FormFactorDWBAPol.cpp
index 9c145f6f8e4caeea020b19542f0904acc4a7858c..59c937a566917c0f9f8c8e05fa8240d27cfc4a5e 100644
--- a/Core/FormFactor/FormFactorDWBAPol.cpp
+++ b/Core/FormFactor/FormFactorDWBAPol.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FormFactorDWBAPol.h"
#include "BornAgainNamespace.h"
#include "ILayerRTCoefficients.h"
-#include "FormFactorDWBAPol.h"
FormFactorDWBAPol::FormFactorDWBAPol(const IFormFactor &form_factor)
: mp_form_factor(form_factor.clone())
diff --git a/Core/FormFactor/FormFactorDecoratorDebyeWaller.cpp b/Core/FormFactor/FormFactorDecoratorDebyeWaller.cpp
index 40f48b04ad2e6f2fad791d6d5b86f2195cee95ae..3fe21f53dfab931eddebec6cc4c135a3d2de229c 100644
--- a/Core/FormFactor/FormFactorDecoratorDebyeWaller.cpp
+++ b/Core/FormFactor/FormFactorDecoratorDebyeWaller.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "FormFactorDecoratorDebyeWaller.h"
+#include "BornAgainNamespace.h"
using namespace BornAgain;
diff --git a/Core/FormFactor/FormFactorDecoratorMultiPositionFactor.cpp b/Core/FormFactor/FormFactorDecoratorMultiPositionFactor.cpp
index 991aaed723e1b3244da07e70724e768815b3755a..d303493273533d193794b3fae7f5e987fbaaafe4 100644
--- a/Core/FormFactor/FormFactorDecoratorMultiPositionFactor.cpp
+++ b/Core/FormFactor/FormFactorDecoratorMultiPositionFactor.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "FormFactorDecoratorMultiPositionFactor.h"
+#include "BornAgainNamespace.h"
FormFactorDecoratorMultiPositionFactor::FormFactorDecoratorMultiPositionFactor(
const IFormFactor &form_factor, std::vector<kvector_t> positions)
diff --git a/Core/FormFactor/FormFactorDecoratorRotation.cpp b/Core/FormFactor/FormFactorDecoratorRotation.cpp
index 021cfd751be637570c97ad6ba3b57e89f7855cdf..2e6c51839aef0946ff6c18a573de9411b988e3c3 100644
--- a/Core/FormFactor/FormFactorDecoratorRotation.cpp
+++ b/Core/FormFactor/FormFactorDecoratorRotation.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "FormFactorDecoratorRotation.h"
+#include "BornAgainNamespace.h"
#include <memory>
FormFactorDecoratorRotation::FormFactorDecoratorRotation(
diff --git a/Core/FormFactor/FormFactorTools.cpp b/Core/FormFactor/FormFactorTools.cpp
index 635b687313c28b120195acaee1086a7520074a8a..09ca363de34ef7884da905a9049164cb6ec321fe 100644
--- a/Core/FormFactor/FormFactorTools.cpp
+++ b/Core/FormFactor/FormFactorTools.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FormFactorTools.h"
#include "FormFactorDWBA.h"
#include "FormFactorDWBAPol.h"
-#include "FormFactorTools.h"
IFormFactor *FormFactorTools::createDWBAScalarFormFactor(const IFormFactor &form_factor)
{
diff --git a/Core/HardParticles/FormFactorAnisoPyramid.cpp b/Core/HardParticles/FormFactorAnisoPyramid.cpp
index 999aca42e84e184acc0c69f565b074130886a959..071069dc3b92dfb8b5ba029b01a44b2be1297f7a 100644
--- a/Core/HardParticles/FormFactorAnisoPyramid.cpp
+++ b/Core/HardParticles/FormFactorAnisoPyramid.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FormFactorAnisoPyramid.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "FormFactorAnisoPyramid.h"
const PolyhedralTopology FormFactorAnisoPyramid::topology = {
{
diff --git a/Core/HardParticles/FormFactorBox.cpp b/Core/HardParticles/FormFactorBox.cpp
index b8fcfc00cc124252085c29f0eccb2df0e787ddb8..c1d01aaca810b381f16d1112b71c336a47432796 100644
--- a/Core/HardParticles/FormFactorBox.cpp
+++ b/Core/HardParticles/FormFactorBox.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FormFactorBox.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "FormFactorBox.h"
using namespace BornAgain;
diff --git a/Core/HardParticles/FormFactorCone.cpp b/Core/HardParticles/FormFactorCone.cpp
index 39398524837c80a70dfb6b34ef9a52898c533405..dfb6dbe3fa92d24da6d662c941fe5024eb585fbb 100644
--- a/Core/HardParticles/FormFactorCone.cpp
+++ b/Core/HardParticles/FormFactorCone.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FormFactorCone.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "FormFactorCone.h"
//! @brief Cone constructor
//! @param radius of Cone's base
diff --git a/Core/HardParticles/FormFactorCone6.cpp b/Core/HardParticles/FormFactorCone6.cpp
index 7980da9c3fb6842e415dd1e28dc7eed5b8916ecd..0dde5c5ea2a46a702d42949b0f11b6c8cbefc3ce 100644
--- a/Core/HardParticles/FormFactorCone6.cpp
+++ b/Core/HardParticles/FormFactorCone6.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FormFactorCone6.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "FormFactorCone6.h"
const PolyhedralTopology FormFactorCone6::topology = {
{
diff --git a/Core/HardParticles/FormFactorCuboctahedron.cpp b/Core/HardParticles/FormFactorCuboctahedron.cpp
index 9dc98059b61f71b8841b26f3467f6997479a4845..8ba33e58109bf7efff26178633d651d554e86118 100644
--- a/Core/HardParticles/FormFactorCuboctahedron.cpp
+++ b/Core/HardParticles/FormFactorCuboctahedron.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FormFactorCuboctahedron.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "FormFactorCuboctahedron.h"
const PolyhedralTopology FormFactorCuboctahedron::topology = {
{
diff --git a/Core/HardParticles/FormFactorCylinder.cpp b/Core/HardParticles/FormFactorCylinder.cpp
index c56914d5a10642834fedddfbf2bf263a84cfca6e..c67967a14f9073c6699ad88cf08666725ecead68 100644
--- a/Core/HardParticles/FormFactorCylinder.cpp
+++ b/Core/HardParticles/FormFactorCylinder.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FormFactorCylinder.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "FormFactorCylinder.h"
using namespace BornAgain;
diff --git a/Core/HardParticles/FormFactorDodecahedron.cpp b/Core/HardParticles/FormFactorDodecahedron.cpp
index 109d6a0dc200e7f741bf8f7e6113fdea671cb785..4fcf359e65e324e18933a0dcd6298a71bb256e73 100644
--- a/Core/HardParticles/FormFactorDodecahedron.cpp
+++ b/Core/HardParticles/FormFactorDodecahedron.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "FormFactorDodecahedron.h"
+#include "BornAgainNamespace.h"
const PolyhedralTopology FormFactorDodecahedron::topology = {
{
diff --git a/Core/HardParticles/FormFactorEllipsoidalCylinder.cpp b/Core/HardParticles/FormFactorEllipsoidalCylinder.cpp
index 00326fe250f4ded602d1449bef48a54aa388ceb1..b54e9f97bc258622d2fb1d83ecbedde139e2156f 100644
--- a/Core/HardParticles/FormFactorEllipsoidalCylinder.cpp
+++ b/Core/HardParticles/FormFactorEllipsoidalCylinder.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FormFactorEllipsoidalCylinder.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "FormFactorEllipsoidalCylinder.h"
using namespace BornAgain;
diff --git a/Core/HardParticles/FormFactorFullSphere.cpp b/Core/HardParticles/FormFactorFullSphere.cpp
index b801441e1aff5fb50df40695626ddcc8dfc254fc..12d52e52ba51a07017804b402429b35885b3c1bf 100644
--- a/Core/HardParticles/FormFactorFullSphere.cpp
+++ b/Core/HardParticles/FormFactorFullSphere.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "FormFactorFullSphere.h"
+#include "BornAgainNamespace.h"
#ifdef POLYHEDRAL_DIAGNOSTIC
#endif
diff --git a/Core/HardParticles/FormFactorFullSpheroid.cpp b/Core/HardParticles/FormFactorFullSpheroid.cpp
index 343bbe458c34120f088c32c6bddde4bad87b4814..be65922e7d4df84779e322f7aa425e26448a4b35 100644
--- a/Core/HardParticles/FormFactorFullSpheroid.cpp
+++ b/Core/HardParticles/FormFactorFullSpheroid.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FormFactorFullSpheroid.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "FormFactorFullSpheroid.h"
using namespace BornAgain;
diff --git a/Core/HardParticles/FormFactorHemiEllipsoid.cpp b/Core/HardParticles/FormFactorHemiEllipsoid.cpp
index 82462960bc735b2395609138862a59dc047bb498..55046fd1fa7059cc1180831ca1af227a17c08ea6 100644
--- a/Core/HardParticles/FormFactorHemiEllipsoid.cpp
+++ b/Core/HardParticles/FormFactorHemiEllipsoid.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FormFactorHemiEllipsoid.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "FormFactorHemiEllipsoid.h"
using namespace BornAgain;
diff --git a/Core/HardParticles/FormFactorIcosahedron.cpp b/Core/HardParticles/FormFactorIcosahedron.cpp
index 30e1c6dc397124704851b5eede515a6d2403af21..6eda9d0e825b97055cd2e09ef9b654f25d418948 100644
--- a/Core/HardParticles/FormFactorIcosahedron.cpp
+++ b/Core/HardParticles/FormFactorIcosahedron.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "FormFactorIcosahedron.h"
+#include "BornAgainNamespace.h"
const PolyhedralTopology FormFactorIcosahedron::topology = {
{
diff --git a/Core/HardParticles/FormFactorLongBoxGauss.cpp b/Core/HardParticles/FormFactorLongBoxGauss.cpp
index 2015962162843d8ba7a953e9e713c347f1ff2593..f4380bb572ee4142151eef18a644f034ef8d12f9 100644
--- a/Core/HardParticles/FormFactorLongBoxGauss.cpp
+++ b/Core/HardParticles/FormFactorLongBoxGauss.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FormFactorLongBoxGauss.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "FormFactorLongBoxGauss.h"
using namespace BornAgain;
diff --git a/Core/HardParticles/FormFactorLongBoxLorentz.cpp b/Core/HardParticles/FormFactorLongBoxLorentz.cpp
index 8359936753fb3235329456c19d27b721ad554797..c1e4db7c064b1ae81989ebd86ceab1a6b3e4fcfa 100644
--- a/Core/HardParticles/FormFactorLongBoxLorentz.cpp
+++ b/Core/HardParticles/FormFactorLongBoxLorentz.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FormFactorLongBoxLorentz.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "FormFactorLongBoxLorentz.h"
using namespace BornAgain;
diff --git a/Core/HardParticles/FormFactorLongRipple1Gauss.cpp b/Core/HardParticles/FormFactorLongRipple1Gauss.cpp
index b1a2273cfc740afddd5cd014673e9539e0a58afe..aca9757a7d609b49bdfd71be827e81a07a789acd 100644
--- a/Core/HardParticles/FormFactorLongRipple1Gauss.cpp
+++ b/Core/HardParticles/FormFactorLongRipple1Gauss.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FormFactorLongRipple1Gauss.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "FormFactorLongRipple1Gauss.h"
using namespace BornAgain;
diff --git a/Core/HardParticles/FormFactorLongRipple1Lorentz.cpp b/Core/HardParticles/FormFactorLongRipple1Lorentz.cpp
index 20b254a63868c7506f6a81afe72b52cd2a3758e6..84962af415cd01cf6075d60814b526aaa7b34b83 100644
--- a/Core/HardParticles/FormFactorLongRipple1Lorentz.cpp
+++ b/Core/HardParticles/FormFactorLongRipple1Lorentz.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FormFactorLongRipple1Lorentz.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "FormFactorLongRipple1Lorentz.h"
using namespace BornAgain;
diff --git a/Core/HardParticles/FormFactorLongRipple2Gauss.cpp b/Core/HardParticles/FormFactorLongRipple2Gauss.cpp
index c592c1612ffa2280f5e6a91a70df5839cc13cdb0..30fb4735474c2d999a4269303aecd8c19cabfed8 100644
--- a/Core/HardParticles/FormFactorLongRipple2Gauss.cpp
+++ b/Core/HardParticles/FormFactorLongRipple2Gauss.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "FormFactorLongRipple2Gauss.h"
+#include "BornAgainNamespace.h"
using namespace BornAgain;
diff --git a/Core/HardParticles/FormFactorLongRipple2Lorentz.cpp b/Core/HardParticles/FormFactorLongRipple2Lorentz.cpp
index a1cf50460ca99b8664c47e90765434af6e246269..abd4c4e54ff0551f9687da8f02f7f3704aa14f92 100644
--- a/Core/HardParticles/FormFactorLongRipple2Lorentz.cpp
+++ b/Core/HardParticles/FormFactorLongRipple2Lorentz.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "FormFactorLongRipple2Lorentz.h"
+#include "BornAgainNamespace.h"
using namespace BornAgain;
diff --git a/Core/HardParticles/FormFactorPolyhedron.cpp b/Core/HardParticles/FormFactorPolyhedron.cpp
index 0dfb0145690905743cf5ab51f7785a6e6a67201d..c7b691700bb0cb7baf2ce83440efd614143e0b2c 100644
--- a/Core/HardParticles/FormFactorPolyhedron.cpp
+++ b/Core/HardParticles/FormFactorPolyhedron.cpp
@@ -17,10 +17,10 @@
//! by Joachim Wuttke, entitled
//! "Form factor (Fourier shape transform) of polygon and polyhedron."
+#include "FormFactorPolyhedron.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
#include "Precomputed.h"
-#include "FormFactorPolyhedron.h"
#include <iomanip>
static const complex_t I(0.,1.);
diff --git a/Core/HardParticles/FormFactorPrism3.cpp b/Core/HardParticles/FormFactorPrism3.cpp
index a8529079fd655f134ea559c9a61cbfb74618f378..234991c74d8bb7caf86ae9f913594d1b1c71893d 100644
--- a/Core/HardParticles/FormFactorPrism3.cpp
+++ b/Core/HardParticles/FormFactorPrism3.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "FormFactorPrism3.h"
+#include "BornAgainNamespace.h"
//! @brief Prism3 constructor
//! @param base_edge of hexagonal base
diff --git a/Core/HardParticles/FormFactorPrism6.cpp b/Core/HardParticles/FormFactorPrism6.cpp
index 1491030937a71ca715ebcc62cf8255f4796fde0f..0586575ea2628cbb627608006af8163d56718a3a 100644
--- a/Core/HardParticles/FormFactorPrism6.cpp
+++ b/Core/HardParticles/FormFactorPrism6.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "FormFactorPrism6.h"
+#include "BornAgainNamespace.h"
//! @brief Prism6 constructor
//! @param base_edge of hexagonal base
diff --git a/Core/HardParticles/FormFactorPyramid.cpp b/Core/HardParticles/FormFactorPyramid.cpp
index b2e4acfca1e2ad4ed0d4bc6e722c304f5aba06fd..d40603f871c1f33de2a0f5b148af927c86979c63 100644
--- a/Core/HardParticles/FormFactorPyramid.cpp
+++ b/Core/HardParticles/FormFactorPyramid.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FormFactorPyramid.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "FormFactorPyramid.h"
const PolyhedralTopology FormFactorPyramid::topology = {
{
diff --git a/Core/HardParticles/FormFactorRipple1.cpp b/Core/HardParticles/FormFactorRipple1.cpp
index abf165a5a6411d5463432a5b9e9d7ddab88c466d..980f47485a16c487493e569d9037cb0a7a93ccca 100644
--- a/Core/HardParticles/FormFactorRipple1.cpp
+++ b/Core/HardParticles/FormFactorRipple1.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FormFactorRipple1.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "FormFactorRipple1.h"
static complex_t I(0.,1.);
diff --git a/Core/HardParticles/FormFactorRipple2.cpp b/Core/HardParticles/FormFactorRipple2.cpp
index 30526d56b370c46ccf31277e61e203ea4ef5205b..0129f47d51180534ae21cd405be1c56b52dbc9b6 100644
--- a/Core/HardParticles/FormFactorRipple2.cpp
+++ b/Core/HardParticles/FormFactorRipple2.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FormFactorRipple2.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "FormFactorRipple2.h"
using namespace BornAgain;
diff --git a/Core/HardParticles/FormFactorTetrahedron.cpp b/Core/HardParticles/FormFactorTetrahedron.cpp
index 5b6ad849332e54cfe6a6c9ae280d67d274ce3af6..d6c7f0626c07f7d62ee7fdfd4f623790a0cc76a9 100644
--- a/Core/HardParticles/FormFactorTetrahedron.cpp
+++ b/Core/HardParticles/FormFactorTetrahedron.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FormFactorTetrahedron.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "FormFactorTetrahedron.h"
const PolyhedralTopology FormFactorTetrahedron::topology = {
{
diff --git a/Core/HardParticles/FormFactorTriangle.cpp b/Core/HardParticles/FormFactorTriangle.cpp
index 3af84617447b43c4e776404bfeb675a636a763af..8116cbe5c497a58b2e9fe2d6b9fff5c62e38ffee 100644
--- a/Core/HardParticles/FormFactorTriangle.cpp
+++ b/Core/HardParticles/FormFactorTriangle.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "FormFactorTriangle.h"
+#include "BornAgainNamespace.h"
FormFactorTriangle::FormFactorTriangle(const double base_edge)
: m_base_edge( base_edge )
diff --git a/Core/HardParticles/FormFactorTrivial.cpp b/Core/HardParticles/FormFactorTrivial.cpp
index 4c89c8c84b11b9889f4bb8c23cae710446c0935a..731ce4c10009d94c28fcaaa0508abbe637959b67 100644
--- a/Core/HardParticles/FormFactorTrivial.cpp
+++ b/Core/HardParticles/FormFactorTrivial.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "FormFactorTrivial.h"
+#include "BornAgainNamespace.h"
FormFactorTrivial::FormFactorTrivial()
diff --git a/Core/HardParticles/FormFactorTruncatedCube.cpp b/Core/HardParticles/FormFactorTruncatedCube.cpp
index e265288a6939de045b9a36c55a23d7d26853c6bc..dd3f959993f27038e8fc8fdea4503befe2f1fe93 100644
--- a/Core/HardParticles/FormFactorTruncatedCube.cpp
+++ b/Core/HardParticles/FormFactorTruncatedCube.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "FormFactorTruncatedCube.h"
+#include "BornAgainNamespace.h"
const PolyhedralTopology FormFactorTruncatedCube::topology = {
{
diff --git a/Core/HardParticles/FormFactorTruncatedSphere.cpp b/Core/HardParticles/FormFactorTruncatedSphere.cpp
index e5f80690f16ae9750a4f7fe3bcddb21ff5b5b9ae..a8311385662047670f210115fa086aa72c2a90a1 100644
--- a/Core/HardParticles/FormFactorTruncatedSphere.cpp
+++ b/Core/HardParticles/FormFactorTruncatedSphere.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FormFactorTruncatedSphere.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "FormFactorTruncatedSphere.h"
using namespace BornAgain;
diff --git a/Core/HardParticles/FormFactorTruncatedSpheroid.cpp b/Core/HardParticles/FormFactorTruncatedSpheroid.cpp
index c24d1cde2c83e043eab8e0d01a0b1de3935ef415..9f25e981fb94a00a8aa7b097f915aaf1b12b1c76 100644
--- a/Core/HardParticles/FormFactorTruncatedSpheroid.cpp
+++ b/Core/HardParticles/FormFactorTruncatedSpheroid.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FormFactorTruncatedSpheroid.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "FormFactorTruncatedSpheroid.h"
using namespace BornAgain;
diff --git a/Core/InputOutput/IntensityDataIOFactory.cpp b/Core/InputOutput/IntensityDataIOFactory.cpp
index 89f03c116d7488874c05ab492bfee629473e5136..77beeded8d45538aae665575c1df8782c625f25c 100644
--- a/Core/InputOutput/IntensityDataIOFactory.cpp
+++ b/Core/InputOutput/IntensityDataIOFactory.cpp
@@ -13,10 +13,10 @@
//
// ************************************************************************** //
+#include "IntensityDataIOFactory.h"
#include "IHistogram.h"
#include "OutputDataReadFactory.h"
#include "OutputDataWriteFactory.h"
-#include "IntensityDataIOFactory.h"
OutputData<double>* IntensityDataIOFactory::readOutputData(const std::string& file_name)
diff --git a/Core/InputOutput/IntensityDataIOFactory.h b/Core/InputOutput/IntensityDataIOFactory.h
index b8242b53f72527daf087bc4480ae4f26fdcba961..f5a7e6672bb7590e39bb2b475601c66150195795 100644
--- a/Core/InputOutput/IntensityDataIOFactory.h
+++ b/Core/InputOutput/IntensityDataIOFactory.h
@@ -16,7 +16,7 @@
#ifndef INTENSITYDATAIOFACTORY_H
#define INTENSITYDATAIOFACTORY_H
-
+#include <string>
template <class T> class OutputData;
class IHistogram;
diff --git a/Core/InputOutput/OutputDataIOHelper.cpp b/Core/InputOutput/OutputDataIOHelper.cpp
index 73db61734247e8b2ddb22656f7b108d33b7658bf..79794aff16ce7481026e5034b11815a3b4b87fce 100644
--- a/Core/InputOutput/OutputDataIOHelper.cpp
+++ b/Core/InputOutput/OutputDataIOHelper.cpp
@@ -14,12 +14,12 @@
// ************************************************************************** //
+#include "OutputDataIOHelper.h"
#include "ConstKBinAxis.h"
#include "CustomBinAxis.h"
#include "FileSystem.h"
#include "OutputData.h"
#include "Utils.h"
-#include "OutputDataIOHelper.h"
bool OutputDataIOHelper::isCompressed(const std::string& name)
diff --git a/Core/InputOutput/OutputDataIOHelper.h b/Core/InputOutput/OutputDataIOHelper.h
index e44cd64364cacb11e0893121aa860241ce1b0391..dfda0882c92069992337336e7c8de32d0e4071c8 100644
--- a/Core/InputOutput/OutputDataIOHelper.h
+++ b/Core/InputOutput/OutputDataIOHelper.h
@@ -16,7 +16,7 @@
#ifndef OUTPUTDATAIOHELPER_H
#define OUTPUTDATAIOHELPER_H
-
+#include <string>
#include <vector>
class IAxis;
diff --git a/Core/InputOutput/OutputDataReadFactory.cpp b/Core/InputOutput/OutputDataReadFactory.cpp
index 418320088a312c576b02e692c7eb8fb524d4824a..e0eebfb274638676230f2b33248deea89892ed8c 100644
--- a/Core/InputOutput/OutputDataReadFactory.cpp
+++ b/Core/InputOutput/OutputDataReadFactory.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "OutputDataReadFactory.h"
#include "Exceptions.h"
#include "OutputDataIOHelper.h"
-#include "OutputDataReadFactory.h"
OutputDataReader* OutputDataReadFactory::getReader(const std::string &file_name)
diff --git a/Core/InputOutput/OutputDataReadStrategy.cpp b/Core/InputOutput/OutputDataReadStrategy.cpp
index a240f588af08699d7ff477dc20f07098ffb8d2d5..0a1519683687c0e4c7d257d9d4c1fc0a5a611249 100644
--- a/Core/InputOutput/OutputDataReadStrategy.cpp
+++ b/Core/InputOutput/OutputDataReadStrategy.cpp
@@ -14,10 +14,10 @@
// ************************************************************************** //
+#include "OutputDataReadStrategy.h"
#include "OutputData.h"
#include "OutputDataIOHelper.h"
#include "TiffHandler.h"
-#include "OutputDataReadStrategy.h"
OutputData<double>* OutputDataReadINTStrategy::readOutputData(std::istream& input_stream)
{
diff --git a/Core/InputOutput/OutputDataReadStrategy.h b/Core/InputOutput/OutputDataReadStrategy.h
index cea6eef32d7b6692106366f25716b3e6b7a9fd95..8796fc3c40787b05a624967cc629962a7e889cf5 100644
--- a/Core/InputOutput/OutputDataReadStrategy.h
+++ b/Core/InputOutput/OutputDataReadStrategy.h
@@ -16,6 +16,7 @@
#ifndef OUTPUTDATAREADSTRATEGY_H
#define OUTPUTDATAREADSTRATEGY_H
+#include <istream>
template <class T> class OutputData;
diff --git a/Core/InputOutput/OutputDataReader.cpp b/Core/InputOutput/OutputDataReader.cpp
index 236dcc5a618779bad9d32e47ba4d59a2c27db2eb..bc22ed14bbe07ece3b34ae649c360615a09850c3 100644
--- a/Core/InputOutput/OutputDataReader.cpp
+++ b/Core/InputOutput/OutputDataReader.cpp
@@ -12,10 +12,10 @@
//! @authors C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
//
// ************************************************************************** //
+#include "OutputDataReader.h"
#include "OutputData.h"
#include "OutputDataIOHelper.h"
#include "boost_streams.h"
-#include "OutputDataReader.h"
#include <fstream>
OutputDataReader::OutputDataReader(const std::string& file_name)
diff --git a/Core/InputOutput/OutputDataWriteFactory.cpp b/Core/InputOutput/OutputDataWriteFactory.cpp
index 4287c76cabf3c593e4976ba0db77e56f7112187b..8670446c8178e6429de5bb669cb8311265718e18 100644
--- a/Core/InputOutput/OutputDataWriteFactory.cpp
+++ b/Core/InputOutput/OutputDataWriteFactory.cpp
@@ -12,9 +12,9 @@
//! @authors C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
//
// ************************************************************************** //
+#include "OutputDataWriteFactory.h"
#include "Exceptions.h"
#include "OutputDataIOHelper.h"
-#include "OutputDataWriteFactory.h"
OutputDataWriter *OutputDataWriteFactory::getWriter(const std::string &file_name)
{
diff --git a/Core/InputOutput/OutputDataWriteStrategy.cpp b/Core/InputOutput/OutputDataWriteStrategy.cpp
index 2f9dfef5e375e7fb88c5868922389f281769e9a6..1e9b593c2c897693ff13a0253ca389dfdecbbbe5 100644
--- a/Core/InputOutput/OutputDataWriteStrategy.cpp
+++ b/Core/InputOutput/OutputDataWriteStrategy.cpp
@@ -13,10 +13,10 @@
//
// ************************************************************************** //
-#include "OutputData.h" // needed by some compilers
#include "OutputDataWriteStrategy.h"
-#include "TiffHandler.h"
#include "BornAgainNamespace.h"
+#include "OutputData.h" // needed by some compilers
+#include "TiffHandler.h"
#include <cmath>
#include <iomanip>
diff --git a/Core/InputOutput/OutputDataWriteStrategy.h b/Core/InputOutput/OutputDataWriteStrategy.h
index 61efdc653f577efbcd78a65baa483a9f9ed56183..7d6ca9c99c97cd1beaaaa616f50141ef562b4534 100644
--- a/Core/InputOutput/OutputDataWriteStrategy.h
+++ b/Core/InputOutput/OutputDataWriteStrategy.h
@@ -16,10 +16,10 @@
#ifndef OUTPUTDATAWRITESTRATEGY_H
#define OUTPUTDATAWRITESTRATEGY_H
+#include <istream>
template <class T> class OutputData;
-
//! @class IOutputDataWriteStrategy
//! @ingroup input_output_internal
//! @brief Strategy interface to write OututData in file
@@ -51,7 +51,6 @@ public:
virtual void writeOutputData(const OutputData<double> &data, std::ostream &output_stream);
};
-
#ifdef BORNAGAIN_TIFF_SUPPORT
class TiffHandler;
@@ -72,5 +71,3 @@ private:
#endif // BORNAGAIN_TIFF_SUPPORT
#endif // OUTPUTDATAWRITESTRATEGY_H
-
-
diff --git a/Core/InputOutput/OutputDataWriter.cpp b/Core/InputOutput/OutputDataWriter.cpp
index 7853939ba4f35fc34deedb8cf8b19fbdac9f38cc..bd224e696700b8c91e83a5c148092274c749f386 100644
--- a/Core/InputOutput/OutputDataWriter.cpp
+++ b/Core/InputOutput/OutputDataWriter.cpp
@@ -13,10 +13,10 @@
//
// ************************************************************************** //
+#include "OutputDataWriter.h"
#include "OutputData.h"
#include "OutputDataIOHelper.h"
#include "boost_streams.h"
-#include "OutputDataWriter.h"
#include <fstream>
OutputDataWriter::OutputDataWriter(const std::string &file_name)
diff --git a/Core/InputOutput/TiffHandler.cpp b/Core/InputOutput/TiffHandler.cpp
index f904fca18d32bd2c67d9e03135573e04d0d4d784..7910ba702a4b98a64123cb28338d2e337ce8e748 100644
--- a/Core/InputOutput/TiffHandler.cpp
+++ b/Core/InputOutput/TiffHandler.cpp
@@ -15,9 +15,9 @@
#ifdef BORNAGAIN_TIFF_SUPPORT
+#include "TiffHandler.h"
#include "BornAgainNamespace.h"
#include "Utils.h"
-#include "TiffHandler.h"
namespace {
size_t supported_bitPerSample = 32;
diff --git a/Core/Instrument/Beam.cpp b/Core/Instrument/Beam.cpp
index c63d6c96e58b524775b3307b65db821081c0b924..4ff0206d4cabdd90592ac2b6f194684ec683fc47 100644
--- a/Core/Instrument/Beam.cpp
+++ b/Core/Instrument/Beam.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "Beam.h"
#include "BornAgainNamespace.h"
#include "Complex.h"
-#include "Beam.h"
using namespace BornAgain;
diff --git a/Core/Instrument/ConvolutionDetectorResolution.cpp b/Core/Instrument/ConvolutionDetectorResolution.cpp
index b4b1c8f6018faba8d3ed3826278bee628edf8b66..28c6f2d5bc06655d84716a99c29bad07ddb9b95d 100644
--- a/Core/Instrument/ConvolutionDetectorResolution.cpp
+++ b/Core/Instrument/ConvolutionDetectorResolution.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "Convolve.h"
#include "ConvolutionDetectorResolution.h"
+#include "Convolve.h"
ConvolutionDetectorResolution::ConvolutionDetectorResolution(
diff --git a/Core/Instrument/Ellipse.cpp b/Core/Instrument/Ellipse.cpp
index 36886a04818407af936ab962d43767159ede8b27..3c8ea79fa12b2cd59f1a646bdec64a7b8ba60ec7 100644
--- a/Core/Instrument/Ellipse.cpp
+++ b/Core/Instrument/Ellipse.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "Bin.h"
#include "Ellipse.h"
+#include "Bin.h"
namespace Geometry {
diff --git a/Core/Instrument/Histogram1D.cpp b/Core/Instrument/Histogram1D.cpp
index 33fedee50567a15837d3849b104e212337cecda7..c6c3b9bf6b5eb7f8ac0f7e7e5700647863630009 100644
--- a/Core/Instrument/Histogram1D.cpp
+++ b/Core/Instrument/Histogram1D.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "Histogram1D.h"
#include "NumpyUtils.h"
#include "VariableBinAxis.h"
-#include "Histogram1D.h"
#include <memory>
diff --git a/Core/Instrument/Histogram2D.cpp b/Core/Instrument/Histogram2D.cpp
index 2e1af82ac4b0d1f7843a35ce16f7a017c1b28e78..835a3e40ab8948f141a713eaab9bddc20d7302ec 100644
--- a/Core/Instrument/Histogram2D.cpp
+++ b/Core/Instrument/Histogram2D.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "Histogram2D.h"
#include "Histogram1D.h"
#include "VariableBinAxis.h"
-#include "Histogram2D.h"
#include <memory>
Histogram2D::Histogram2D(int nbinsx, double xlow, double xup, int nbinsy, double ylow, double yup)
diff --git a/Core/Instrument/IDetector2D.h b/Core/Instrument/IDetector2D.h
index 082bbd02b56e4c1dc4df3d96498bdfb7d6f862b3..5cf335c85b0f3093d58bb9679576c678c6998382 100644
--- a/Core/Instrument/IDetector2D.h
+++ b/Core/Instrument/IDetector2D.h
@@ -16,9 +16,9 @@
#ifndef IDETECTOR2D_H
#define IDETECTOR2D_H
-#include "IParameterized.h"
#include "DetectorMask.h"
#include "EigenCore.h"
+#include "IParameterized.h"
#include "SafePointerVector.h"
#include "Vectors3D.h"
#include <memory>
diff --git a/Core/Instrument/IDetectorResolution.cpp b/Core/Instrument/IDetectorResolution.cpp
index d0ad26e6439e4367e69909d5cffcfe35749bd4c9..df8f5961d146841e3c479de57316fa49584c573a 100644
--- a/Core/Instrument/IDetectorResolution.cpp
+++ b/Core/Instrument/IDetectorResolution.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
-#include <memory>
-#include "OutputDataFunctions.h"
#include "IDetectorResolution.h"
+#include "OutputDataFunctions.h"
+#include <memory>
void IDetectorResolution::applyDetectorResolutionPol(
OutputData<Eigen::Matrix2d>* p_matrix_intensity) const
diff --git a/Core/Instrument/Instrument.cpp b/Core/Instrument/Instrument.cpp
index 4c40578c1d9e09e9048e3942c28eddd9178c7553..0fdff3bde9062c813be4e7a1d2334501b41ee1a7 100644
--- a/Core/Instrument/Instrument.cpp
+++ b/Core/Instrument/Instrument.cpp
@@ -13,10 +13,10 @@
//
// ************************************************************************** //
-#include "ConvolutionDetectorResolution.h"
-#include "SphericalDetector.h"
#include "Instrument.h"
+#include "ConvolutionDetectorResolution.h"
#include "SimulationElement.h"
+#include "SphericalDetector.h"
Instrument::Instrument()
: IParameterized("Instrument")
diff --git a/Core/Instrument/IntensityDataFunctions.cpp b/Core/Instrument/IntensityDataFunctions.cpp
index 3ef0e8a28ea5fd33433ce03b3c320f87aa9be013..f1840d4a7d916dc1628a57b9f982ee493e6a9330 100644
--- a/Core/Instrument/IntensityDataFunctions.cpp
+++ b/Core/Instrument/IntensityDataFunctions.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "IntensityDataFunctions.h"
#include "ConvolutionDetectorResolution.h"
#include "IHistogram.h"
-#include "IntensityDataFunctions.h"
#include <memory>
double IntensityDataFunctions::getRelativeDifference(
diff --git a/Core/Instrument/IsGISAXSDetector.cpp b/Core/Instrument/IsGISAXSDetector.cpp
index 827e19059a6e148ae9b53a0f433830ca2074aeda..d6c3997071ab9aa1826a3f26168e76f42942c8ee 100644
--- a/Core/Instrument/IsGISAXSDetector.cpp
+++ b/Core/Instrument/IsGISAXSDetector.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "IsGISAXSDetector.h"
#include "BornAgainNamespace.h"
#include "CustomBinAxis.h"
-#include "IsGISAXSDetector.h"
IsGISAXSDetector::IsGISAXSDetector()
diff --git a/Core/Instrument/Rectangle.cpp b/Core/Instrument/Rectangle.cpp
index fbc66dbefd96ace8940f2c72590ac9c62c70d766..b08e3680d0d260f21ca3b456d1194d776eaf153d 100644
--- a/Core/Instrument/Rectangle.cpp
+++ b/Core/Instrument/Rectangle.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "Bin.h"
#include "Rectangle.h"
+#include "Bin.h"
namespace Geometry {
diff --git a/Core/Instrument/RectangularDetector.cpp b/Core/Instrument/RectangularDetector.cpp
index a12fa8200428619d0293c39b68d829dcb0e785eb..25684063e43c3d32dacddcee3d0f597baf6becd0 100644
--- a/Core/Instrument/RectangularDetector.cpp
+++ b/Core/Instrument/RectangularDetector.cpp
@@ -13,12 +13,12 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
+#include "RectangularDetector.h"
#include "Beam.h"
+#include "BornAgainNamespace.h"
#include "IDetectorResolution.h"
-#include "RectangularDetector.h"
-#include "Units.h"
#include "SimulationElement.h"
+#include "Units.h"
RectangularDetector::RectangularDetector(int nxbins, double width, int nybins, double height)
: m_u0(0.0)
diff --git a/Core/Instrument/ResolutionFunction2DGaussian.cpp b/Core/Instrument/ResolutionFunction2DGaussian.cpp
index 63c70c89253f38fa8dc05d5cb01b17c3eda5ee7e..996f0debd0b2803b708b625a94bc071ac036f624 100644
--- a/Core/Instrument/ResolutionFunction2DGaussian.cpp
+++ b/Core/Instrument/ResolutionFunction2DGaussian.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "ResolutionFunction2DGaussian.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "ResolutionFunction2DGaussian.h"
ResolutionFunction2DGaussian::ResolutionFunction2DGaussian(double sigma_x, double sigma_y)
: m_sigma_x(sigma_x)
diff --git a/Core/Instrument/SphericalDetector.cpp b/Core/Instrument/SphericalDetector.cpp
index 4e7045e64c0103818c746eb15c72f965e0365058..199266ee2642fd2d3309e354a79e82c598270595 100644
--- a/Core/Instrument/SphericalDetector.cpp
+++ b/Core/Instrument/SphericalDetector.cpp
@@ -13,12 +13,12 @@
//
// ************************************************************************** //
+#include "SphericalDetector.h"
#include "BornAgainNamespace.h"
#include "IDetectorResolution.h"
#include "IPixelMap.h"
-#include "Units.h"
-#include "SphericalDetector.h"
#include "SimulationElement.h"
+#include "Units.h"
SphericalDetector::SphericalDetector()
{
diff --git a/Core/Lattice/Lattice.cpp b/Core/Lattice/Lattice.cpp
index be8ef12036529e5159facd40a98e0ad2b6242c97..38a09ff0a69c9758c088d9d4d660bea42b940f4e 100644
--- a/Core/Lattice/Lattice.cpp
+++ b/Core/Lattice/Lattice.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "Units.h"
#include "Lattice.h"
+#include "Units.h"
#include <gsl/gsl_linalg.h>
Lattice::Lattice()
diff --git a/Core/Multilayer/LayerInterface.cpp b/Core/Multilayer/LayerInterface.cpp
index 7c2bab86b9f2e1c742bc3056d440784cea3e16c1..1cfff63d43eb65ae4eedfa36e8d1af5883e06485 100644
--- a/Core/Multilayer/LayerInterface.cpp
+++ b/Core/Multilayer/LayerInterface.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "LayerInterface.h"
#include "BornAgainNamespace.h"
#include "MessageService.h"
-#include "LayerInterface.h"
LayerInterface::LayerInterface()
diff --git a/Core/Multilayer/LayerRoughness.cpp b/Core/Multilayer/LayerRoughness.cpp
index 7d4c1414e57fab9517985865bea46d67e89bc1c0..2c8eb10d753c1f3934bd202fc2b6f9e3c7270b98 100644
--- a/Core/Multilayer/LayerRoughness.cpp
+++ b/Core/Multilayer/LayerRoughness.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "LayerRoughness.h"
#include "BornAgainNamespace.h"
#include "Units.h"
-#include "LayerRoughness.h"
using namespace BornAgain;
diff --git a/Core/Multilayer/LayerStrategyBuilder.cpp b/Core/Multilayer/LayerStrategyBuilder.cpp
index 133e996980da7db5374351646394af40c2f3a12b..1248b6f73184ea905f8aa970af51a23eb3b4be3e 100644
--- a/Core/Multilayer/LayerStrategyBuilder.cpp
+++ b/Core/Multilayer/LayerStrategyBuilder.cpp
@@ -15,13 +15,13 @@
// ************************************************************************** //
#include "LayerStrategyBuilder.h"
-#include "FormFactorTools.h"
#include "FormFactorInfo.h"
+#include "FormFactorTools.h"
#include "IFormFactor.h"
+#include "ILayout.h"
+#include "IParticle.h"
#include "InterferenceFunctionStrategies.h"
#include "InterferenceFunctions.h"
-#include "IParticle.h"
-#include "ILayout.h"
#include "Layer.h"
#include "LayerSpecularInfo.h"
#include "Simulation.h"
diff --git a/Core/Multilayer/LayerStrategyBuilder.h b/Core/Multilayer/LayerStrategyBuilder.h
index a6ddb8a9175b3037be40d05501c598c85c5b1b39..20c67c3190a74e074b16aba12b6e34048742bdfc 100644
--- a/Core/Multilayer/LayerStrategyBuilder.h
+++ b/Core/Multilayer/LayerStrategyBuilder.h
@@ -16,8 +16,8 @@
#ifndef LAYERSTRATEGYBUILDER_H
#define LAYERSTRATEGYBUILDER_H
-#include "SimulationOptions.h"
#include "SafePointerVector.h"
+#include "SimulationOptions.h"
#include <memory>
class FormFactorInfo;
diff --git a/Core/Multilayer/MultiLayer.cpp b/Core/Multilayer/MultiLayer.cpp
index 853b11395be85b6e1ccf184b0bba32a7711c9e97..a2f52e6e8efd935255aac203ed849b5230a20b45 100644
--- a/Core/Multilayer/MultiLayer.cpp
+++ b/Core/Multilayer/MultiLayer.cpp
@@ -15,11 +15,11 @@
#include "MultiLayer.h"
#include "BornAgainNamespace.h"
+#include "Layer.h"
+#include "LayerInterface.h"
#include "Materials.h"
#include "MessageService.h"
#include "MultiLayerDWBASimulation.h"
-#include "Layer.h"
-#include "LayerInterface.h"
using namespace BornAgain;
diff --git a/Core/Multilayer/SpecularMagnetic.cpp b/Core/Multilayer/SpecularMagnetic.cpp
index 2620c8b4dea0c7a50fb5d44647106b622a4e4300..2cc979ccbba638d3ed762893565a0ec989555439 100644
--- a/Core/Multilayer/SpecularMagnetic.cpp
+++ b/Core/Multilayer/SpecularMagnetic.cpp
@@ -14,10 +14,10 @@
// ************************************************************************** //
#include "SpecularMagnetic.h"
-#include "Materials.h"
-#include "MultiLayer.h"
#include "Layer.h"
#include "LayerInterface.h"
+#include "Materials.h"
+#include "MultiLayer.h"
#include <Eigen/LU>
static complex_t I(0.,1.);
diff --git a/Core/Multilayer/SpecularMatrix.cpp b/Core/Multilayer/SpecularMatrix.cpp
index 219af34c39b6f24ed1406fdffd98477f8f44472b..2c440f7e85b2aa290b276175a43b2e109fd119e1 100644
--- a/Core/Multilayer/SpecularMatrix.cpp
+++ b/Core/Multilayer/SpecularMatrix.cpp
@@ -14,10 +14,10 @@
// ************************************************************************** //
#include "SpecularMatrix.h"
-#include "MathFunctions.h"
-#include "MultiLayer.h"
#include "Layer.h"
#include "LayerInterface.h"
+#include "MathFunctions.h"
+#include "MultiLayer.h"
namespace {
const complex_t imag_unit = complex_t(0.0, 1.0);
diff --git a/Core/Parametrization/Distributions.cpp b/Core/Parametrization/Distributions.cpp
index ce4509957a10d33c6391030c0aec90817b0acedc..1f31277513bb2b399ede471dfcd8fdcbcad30e98 100644
--- a/Core/Parametrization/Distributions.cpp
+++ b/Core/Parametrization/Distributions.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "Distributions.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "Distributions.h"
using namespace BornAgain;
diff --git a/Core/Parametrization/ParameterDistribution.cpp b/Core/Parametrization/ParameterDistribution.cpp
index 310091061d1c02d4ad4368bd66e1e6e5f46e7582..abd7516f0c9eef0b6a63ad4941fbc706a6d2c7e9 100644
--- a/Core/Parametrization/ParameterDistribution.cpp
+++ b/Core/Parametrization/ParameterDistribution.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "Distributions.h"
#include "ParameterDistribution.h"
+#include "Distributions.h"
ParameterDistribution::ParameterDistribution(const std::string &par_name,
diff --git a/Core/Parametrization/ParameterPool.cpp b/Core/Parametrization/ParameterPool.cpp
index fde00d4cb6660dc3f6ea288bba2c3fa11e2ef152..72559f89f93df28172fd4ac705e245edab5dff3a 100644
--- a/Core/Parametrization/ParameterPool.cpp
+++ b/Core/Parametrization/ParameterPool.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "Utils.h"
#include "ParameterPool.h"
+#include "Utils.h"
typedef std::map<std::string, RealParameterWrapper > parametermap_t;
diff --git a/Core/Particles/FormFactorWeighted.cpp b/Core/Particles/FormFactorWeighted.cpp
index aab7b97f7e85549e44b14aa16386cfb132446f88..86f42bc23ba97c8d3784484e7c33989d10a2ee96 100644
--- a/Core/Particles/FormFactorWeighted.cpp
+++ b/Core/Particles/FormFactorWeighted.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "FormFactorWeighted.h"
+#include "BornAgainNamespace.h"
FormFactorWeighted::FormFactorWeighted()
diff --git a/Core/Particles/FormFactors.h b/Core/Particles/FormFactors.h
index b088155a13109f928209c85b14401c0b798d67aa..62a6263e41381188302d5180946202579e984b3d 100644
--- a/Core/Particles/FormFactors.h
+++ b/Core/Particles/FormFactors.h
@@ -18,12 +18,12 @@
#include "FormFactorDecoratorDebyeWaller.h"
#include "FormFactorDecoratorFactor.h"
+#include "FormFactorDecoratorMaterial.h"
#include "FormFactorDecoratorMultiPositionFactor.h"
#include "FormFactorDecoratorPositionFactor.h"
-#include "FormFactorDecoratorMaterial.h"
#include "FormFactorDecoratorRotation.h"
#include "FormFactorWeighted.h"
-#include "SoftParticles.h"
#include "HardParticles.h"
+#include "SoftParticles.h"
#endif // FORMFACTORS_H
diff --git a/Core/Particles/IParticle.cpp b/Core/Particles/IParticle.cpp
index 27fa14429640e766f15a39b3504e5b6cd6f291b2..434b1075cc699aa10762a00d3b04f9203297e9df 100644
--- a/Core/Particles/IParticle.cpp
+++ b/Core/Particles/IParticle.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "FormFactorDecoratorPositionFactor.h"
#include "IParticle.h"
+#include "FormFactorDecoratorPositionFactor.h"
using namespace BornAgain;
diff --git a/Core/Particles/MesoCrystal.cpp b/Core/Particles/MesoCrystal.cpp
index 61f88b7c8cc5707ee362e18a74ef457335a4253d..c037e18bcaf224f2e89dc5cbfb308a848a115026 100644
--- a/Core/Particles/MesoCrystal.cpp
+++ b/Core/Particles/MesoCrystal.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "MesoCrystal.h"
#include "FormFactorDecoratorPositionFactor.h"
#include "FormFactorDecoratorRotation.h"
-#include "MesoCrystal.h"
#include "IClusteredParticles.h"
MesoCrystal::MesoCrystal(IClusteredParticles* p_particle_structure, IFormFactor* p_form_factor)
diff --git a/Core/Particles/Particle.cpp b/Core/Particles/Particle.cpp
index 8467421e7430115eaf59b94378e4f64a7643e4a4..e58a87371ec62bbaceb3ae14b654c077c47e75d2 100644
--- a/Core/Particles/Particle.cpp
+++ b/Core/Particles/Particle.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "Particle.h"
#include "FormFactorDecoratorPositionFactor.h"
#include "Materials.h"
-#include "Particle.h"
Particle::Particle()
diff --git a/Core/Particles/ParticleDistribution.cpp b/Core/Particles/ParticleDistribution.cpp
index f6233d96927e7e789d186bfccbf741b440e63682..a90799f16643bd9e2b513811c7e0818440c2b7d0 100644
--- a/Core/Particles/ParticleDistribution.cpp
+++ b/Core/Particles/ParticleDistribution.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "ParticleDistribution.h"
+#include "BornAgainNamespace.h"
ParticleDistribution::ParticleDistribution(const IParticle &prototype,
const ParameterDistribution &par_distr)
diff --git a/Core/Sample/ISampleIteratorStrategy.cpp b/Core/Sample/ISampleIteratorStrategy.cpp
index 1761f37311708987c9760bb8833260f617d0f453..c2eff8623ffe152f0e3896aa1548af4c6afd79cb 100644
--- a/Core/Sample/ISampleIteratorStrategy.cpp
+++ b/Core/Sample/ISampleIteratorStrategy.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "SampleTreeIterator.h"
#include "ISampleIteratorStrategy.h"
+#include "SampleTreeIterator.h"
SampleIteratorPreorderStrategy::SampleIteratorPreorderStrategy()
diff --git a/Core/Simulation/DWBADiffuseReflection.cpp b/Core/Simulation/DWBADiffuseReflection.cpp
index abf3902e52985d8fc1f0aa4f2b516d97dc4f6137..092e45dae4e00f06d2f3090bea34663fd1e659ec 100644
--- a/Core/Simulation/DWBADiffuseReflection.cpp
+++ b/Core/Simulation/DWBADiffuseReflection.cpp
@@ -14,10 +14,10 @@
// ************************************************************************** //
#include "DWBADiffuseReflection.h"
-#include "MultiLayer.h"
-#include "Units.h"
#include "Layer.h"
#include "LayerInterface.h"
+#include "MultiLayer.h"
+#include "Units.h"
DWBADiffuseReflection::DWBADiffuseReflection()
: m_sample(0)
diff --git a/Core/Simulation/DecoratedLayerDWBASimulation.cpp b/Core/Simulation/DecoratedLayerDWBASimulation.cpp
index d4b582e4cc7d201e80f5b2ef9a3be2ff07c623fa..ba67917ba6a76d34ac294dc7ddd86b612e8872b3 100644
--- a/Core/Simulation/DecoratedLayerDWBASimulation.cpp
+++ b/Core/Simulation/DecoratedLayerDWBASimulation.cpp
@@ -14,10 +14,10 @@
// ************************************************************************** //
#include "DecoratedLayerDWBASimulation.h"
+#include "IInterferenceFunctionStrategy.h"
#include "Layer.h"
#include "LayerStrategyBuilder.h"
#include "MessageService.h"
-#include "IInterferenceFunctionStrategy.h"
#include "SimulationElement.h"
DecoratedLayerDWBASimulation::DecoratedLayerDWBASimulation(
diff --git a/Core/Simulation/LayerDWBASimulation.cpp b/Core/Simulation/LayerDWBASimulation.cpp
index d8ea03d0205e982d5ee5c33f92b8c53cac604004..3c2c4178258c40f0dcf9daec7744a594536cf31c 100644
--- a/Core/Simulation/LayerDWBASimulation.cpp
+++ b/Core/Simulation/LayerDWBASimulation.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "Layer.h"
#include "LayerDWBASimulation.h"
+#include "Layer.h"
LayerDWBASimulation::LayerDWBASimulation(const Layer* p_layer)
: mp_specular_info(0)
diff --git a/Core/Simulation/MultiLayerDWBASimulation.cpp b/Core/Simulation/MultiLayerDWBASimulation.cpp
index 9123743df33acde524b93ecff1a15abd298fa4b2..c751519d2ef656079062069adcc180957dfe29ce 100644
--- a/Core/Simulation/MultiLayerDWBASimulation.cpp
+++ b/Core/Simulation/MultiLayerDWBASimulation.cpp
@@ -13,21 +13,21 @@
//
// ************************************************************************** //
+#include "MultiLayerDWBASimulation.h"
#include "BornAgainNamespace.h"
+#include "Layer.h"
+#include "LayerDWBASimulation.h"
+#include "LayerInterface.h"
+#include "LayerRoughness.h"
+#include "Materials.h"
#include "MatrixSpecularInfoMap.h"
#include "MessageService.h"
-#include "Materials.h"
#include "MultiLayer.h"
#include "MultiLayerRoughnessDWBASimulation.h"
#include "ScalarSpecularInfoMap.h"
-#include "SpecularMatrix.h"
-#include "SpecularMagnetic.h"
-#include "MultiLayerDWBASimulation.h"
#include "SimulationElement.h"
-#include "Layer.h"
-#include "LayerDWBASimulation.h"
-#include "LayerInterface.h"
-#include "LayerRoughness.h"
+#include "SpecularMagnetic.h"
+#include "SpecularMatrix.h"
MultiLayerDWBASimulation::MultiLayerDWBASimulation(const MultiLayer* p_multi_layer)
: mp_roughness_dwba_simulation(0)
diff --git a/Core/Simulation/MultiLayerDWBASimulation.h b/Core/Simulation/MultiLayerDWBASimulation.h
index fc82740c20d44528c993d143c6410a91087c2bb5..61ca68040ae997e87b22d3a9e8ab87c74789fc6f 100644
--- a/Core/Simulation/MultiLayerDWBASimulation.h
+++ b/Core/Simulation/MultiLayerDWBASimulation.h
@@ -16,10 +16,11 @@
#ifndef MULTILAYERDWBASIMULATION_H
#define MULTILAYERDWBASIMULATION_H
-#include "DWBASimulation.h"
#include "Complex.h"
+#include "DWBASimulation.h"
class LayerDWBASimulation;
+class MultiLayer;
class MultiLayerRoughnessDWBASimulation;
//! @class MultiLayerDWBASimulation
@@ -30,10 +31,10 @@ class MultiLayerRoughnessDWBASimulation;
class BA_CORE_API_ MultiLayerDWBASimulation : public DWBASimulation
{
public:
- MultiLayerDWBASimulation(const MultiLayer *p_multi_layer);
+ MultiLayerDWBASimulation(const MultiLayer* p_multi_layer);
virtual ~MultiLayerDWBASimulation();
- MultiLayerDWBASimulation *clone() const
+ MultiLayerDWBASimulation* clone() const
{
throw Exceptions::NotImplementedException(
"MultiLayerDWBASimulation::clone() -> Error: not implemented");
@@ -54,8 +55,8 @@ protected:
bool requiresMatrixRTCoefficients() const;
std::map<size_t, SafePointerVector<LayerDWBASimulation>> m_layer_dwba_simulations_map;
- MultiLayer *mp_multi_layer;
- MultiLayerRoughnessDWBASimulation *mp_roughness_dwba_simulation;
+ MultiLayer* mp_multi_layer;
+ MultiLayerRoughnessDWBASimulation* mp_roughness_dwba_simulation;
};
#endif // MULTILAYERDWBASIMULATION_H
diff --git a/Core/Simulation/MultiLayerRoughnessDWBASimulation.cpp b/Core/Simulation/MultiLayerRoughnessDWBASimulation.cpp
index d566e13eceea6f15e9de3230b5884d1faab9ec0b..03353ee0424c6311dfefeacfd375ca1cfff371ee 100644
--- a/Core/Simulation/MultiLayerRoughnessDWBASimulation.cpp
+++ b/Core/Simulation/MultiLayerRoughnessDWBASimulation.cpp
@@ -16,13 +16,13 @@
#include "MultiLayerRoughnessDWBASimulation.h"
#include "DWBADiffuseReflection.h"
#include "Faddeeva.hh"
-#include "MultiLayer.h"
#include "Layer.h"
-#include "LayerSpecularInfo.h"
#include "LayerInterface.h"
#include "LayerRoughness.h"
-#include "Units.h"
+#include "LayerSpecularInfo.h"
+#include "MultiLayer.h"
#include "SimulationElement.h"
+#include "Units.h"
// Diffuse scattering from rough interfaces is modelled after
// Phys. Rev. B, vol. 51 (4), p. 2311 (1995)
diff --git a/Core/Simulation/OMPISimulation.cpp b/Core/Simulation/OMPISimulation.cpp
index 24d601874852cfbeb0c6b236f79a03ee5dbdd02c..88dd10a2d098266916429be5518fb29ceb27a5a4 100644
--- a/Core/Simulation/OMPISimulation.cpp
+++ b/Core/Simulation/OMPISimulation.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "OutputDataFunctions.h"
#include "OMPISimulation.h"
+#include "OutputDataFunctions.h"
#ifdef BORNAGAIN_OPENMPI
diff --git a/Core/Simulation/Simulation.cpp b/Core/Simulation/Simulation.cpp
index 56be61b258825a4950091b87fd20542a70ba2d71..8fb156c4a9d3bfad924c5521628bd3813b17208d 100644
--- a/Core/Simulation/Simulation.cpp
+++ b/Core/Simulation/Simulation.cpp
@@ -15,12 +15,12 @@
#include "Simulation.h"
#include "DWBASimulation.h"
+#include "ISample.h"
#include "MessageService.h"
#include "OMPISimulation.h"
-#include "ISample.h"
#include "SimulationElement.h"
-#include <thread>
#include <gsl/gsl_errno.h>
+#include <thread>
Simulation::Simulation()
: IParameterized("Simulation")
diff --git a/Core/Simulation/SpecularSimulation.h b/Core/Simulation/SpecularSimulation.h
index 4266e808767c1b3437c3e9c2707533888e4cc067..2b09abac7bddf357bfe083605c6ca92e4754b2ed 100644
--- a/Core/Simulation/SpecularSimulation.h
+++ b/Core/Simulation/SpecularSimulation.h
@@ -17,8 +17,8 @@
#define SPECULARSIMULATION_H
#include "ICloneable.h"
-#include "IParameterized.h"
#include "ILayerRTCoefficients.h"
+#include "IParameterized.h"
#include "OutputData.h"
#include <memory>
diff --git a/Core/SoftParticles/FormFactorGauss.cpp b/Core/SoftParticles/FormFactorGauss.cpp
index f4d7986d07765d0a076a070929eb1f9fda63fdb6..06f1107caeeee7d1be2617e112d6631b01c7ef43 100644
--- a/Core/SoftParticles/FormFactorGauss.cpp
+++ b/Core/SoftParticles/FormFactorGauss.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "FormFactorGauss.h"
+#include "BornAgainNamespace.h"
using namespace BornAgain;
diff --git a/Core/SoftParticles/FormFactorLorentz.cpp b/Core/SoftParticles/FormFactorLorentz.cpp
index e46e9647e57d5cd0065b5c60d9f9fa7514c07a3f..7712326a2cb113e0822219e1dd55e4966b0dce65 100644
--- a/Core/SoftParticles/FormFactorLorentz.cpp
+++ b/Core/SoftParticles/FormFactorLorentz.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "FormFactorLorentz.h"
+#include "BornAgainNamespace.h"
using namespace BornAgain;
diff --git a/Core/SoftParticles/FormFactorSphereGaussianRadius.cpp b/Core/SoftParticles/FormFactorSphereGaussianRadius.cpp
index ff21862c47b2a6d5f0468eaf0fa3387b70956548..8cfed4ce459075f8d3bf459e274ef0a25c593143 100644
--- a/Core/SoftParticles/FormFactorSphereGaussianRadius.cpp
+++ b/Core/SoftParticles/FormFactorSphereGaussianRadius.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "FormFactorSphereGaussianRadius.h"
+#include "BornAgainNamespace.h"
using namespace BornAgain;
diff --git a/Core/SoftParticles/FormFactorSphereLogNormalRadius.cpp b/Core/SoftParticles/FormFactorSphereLogNormalRadius.cpp
index f06ab3f5c02e4e1ddf8437b6d68504cc25b32a1b..9ffa1dc45ed05db71698a5194e1b3619dc453ff8 100644
--- a/Core/SoftParticles/FormFactorSphereLogNormalRadius.cpp
+++ b/Core/SoftParticles/FormFactorSphereLogNormalRadius.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FormFactorSphereLogNormalRadius.h"
#include "BornAgainNamespace.h"
#include "Distributions.h"
-#include "FormFactorSphereLogNormalRadius.h"
using namespace BornAgain;
diff --git a/Core/SoftParticles/FormFactorSphereUniformRadius.cpp b/Core/SoftParticles/FormFactorSphereUniformRadius.cpp
index dd8796c6a87c1798a3f34ca7ea4f5c6cb590f635..dacc46bf5e0684897ff9fdf93eb42eadc22ae8bc 100644
--- a/Core/SoftParticles/FormFactorSphereUniformRadius.cpp
+++ b/Core/SoftParticles/FormFactorSphereUniformRadius.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "FormFactorSphereUniformRadius.h"
+#include "BornAgainNamespace.h"
using namespace BornAgain;
diff --git a/Core/SoftParticles/SoftParticles.h b/Core/SoftParticles/SoftParticles.h
index 5a6e888ba5dfd0c727ba3e1fb194ff54a8383ca6..4d5f50d627e4964dd348afcb61528fce5df89782 100644
--- a/Core/SoftParticles/SoftParticles.h
+++ b/Core/SoftParticles/SoftParticles.h
@@ -16,11 +16,11 @@
#ifndef SOFTPARTICLES_H
#define SOFTPARTICLES_H
+#include "SoftParticles.h"
#include "FormFactorGauss.h"
#include "FormFactorLorentz.h"
#include "FormFactorSphereGaussianRadius.h"
#include "FormFactorSphereLogNormalRadius.h"
#include "FormFactorSphereUniformRadius.h"
-#include "SoftParticles.h"
#endif // SOFTPARTICLES_H
diff --git a/Core/StandardSamples/BoxCompositionBuilder.cpp b/Core/StandardSamples/BoxCompositionBuilder.cpp
index 46df69be7c09c09277a21f8c0bd7e653e94a0795..0daf7becdff905569fca5205e865332316be85b5 100644
--- a/Core/StandardSamples/BoxCompositionBuilder.cpp
+++ b/Core/StandardSamples/BoxCompositionBuilder.cpp
@@ -14,10 +14,10 @@
// ************************************************************************** //
#include "BoxCompositionBuilder.h"
-#include "HomogeneousMaterial.h"
#include "FormFactorBox.h"
-#include "MultiLayer.h"
+#include "HomogeneousMaterial.h"
#include "Layer.h"
+#include "MultiLayer.h"
#include "Particle.h"
#include "ParticleComposition.h"
#include "ParticleLayout.h"
diff --git a/Core/StandardSamples/CoreShellParticleBuilder.cpp b/Core/StandardSamples/CoreShellParticleBuilder.cpp
index 34b1ae659b0c35a731f71a889acd7306faff7a99..ca7a83a4bd34efbd8732668f95bc0ec4f2bc9007 100644
--- a/Core/StandardSamples/CoreShellParticleBuilder.cpp
+++ b/Core/StandardSamples/CoreShellParticleBuilder.cpp
@@ -15,12 +15,12 @@
#include "CoreShellParticleBuilder.h"
#include "FormFactorBox.h"
+#include "Layer.h"
#include "Materials.h"
#include "MultiLayer.h"
#include "Particle.h"
#include "ParticleCoreShell.h"
#include "ParticleLayout.h"
-#include "Layer.h"
// --- CoreShellParticleBuilder ---
diff --git a/Core/StandardSamples/CylindersBuilder.cpp b/Core/StandardSamples/CylindersBuilder.cpp
index 889b85e3a0e0b4f36b82bf2b8301e58dd599b715..511bddb4341e0982dcd13dac0d3135c4defc9ee1 100644
--- a/Core/StandardSamples/CylindersBuilder.cpp
+++ b/Core/StandardSamples/CylindersBuilder.cpp
@@ -13,15 +13,15 @@
//
// ************************************************************************** //
-#include "BornAgainNamespace.h"
#include "CylindersBuilder.h"
+#include "BornAgainNamespace.h"
#include "FormFactorCylinder.h"
#include "HomogeneousMaterial.h"
+#include "Layer.h"
#include "LayerInterface.h"
#include "MultiLayer.h"
#include "Particle.h"
#include "ParticleLayout.h"
-#include "Layer.h"
// -----------------------------------------------------------------------------
// Cylinders in DWBA
diff --git a/Core/StandardSamples/LatticeBuilder.cpp b/Core/StandardSamples/LatticeBuilder.cpp
index 0b677bc744cc2d734f4d9d061623f672caf41904..0622f8ba7eed46f2b70bc9c5395f5ac6d0c4c3c4 100644
--- a/Core/StandardSamples/LatticeBuilder.cpp
+++ b/Core/StandardSamples/LatticeBuilder.cpp
@@ -15,12 +15,12 @@
#include "LatticeBuilder.h"
#include "FormFactorCylinder.h"
-#include "InterferenceFunction1DLattice.h"
#include "HomogeneousMaterial.h"
+#include "InterferenceFunction1DLattice.h"
+#include "Layer.h"
#include "MultiLayer.h"
#include "Particle.h"
#include "ParticleLayout.h"
-#include "Layer.h"
Lattice1DBuilder::Lattice1DBuilder()
: m_length(20.0*Units::nanometer)
diff --git a/Core/StandardSamples/LayersWithAbsorptionBuilder.cpp b/Core/StandardSamples/LayersWithAbsorptionBuilder.cpp
index dd169ac1e45c0ea746821105bcea17026d9a5c20..73e843388b3ebe5cb8cb09f575907232b00d0230 100644
--- a/Core/StandardSamples/LayersWithAbsorptionBuilder.cpp
+++ b/Core/StandardSamples/LayersWithAbsorptionBuilder.cpp
@@ -14,12 +14,12 @@
// ************************************************************************** //
#include "LayersWithAbsorptionBuilder.h"
-#include "MultiLayer.h"
-#include "Particle.h"
-#include "ParticleLayout.h"
#include "Layer.h"
#include "LayerInterface.h"
#include "LayerRoughness.h"
+#include "MultiLayer.h"
+#include "Particle.h"
+#include "ParticleLayout.h"
ISample* LayersWithAbsorptionBuilder::buildSample() const
{
diff --git a/Core/StandardSamples/MagneticParticlesBuilder.cpp b/Core/StandardSamples/MagneticParticlesBuilder.cpp
index cdfa7c2da52269460708b4a53ef3a9ae74f3ecb1..f38304cde1b4c6868cad1b041d8193dfd0cae8c7 100644
--- a/Core/StandardSamples/MagneticParticlesBuilder.cpp
+++ b/Core/StandardSamples/MagneticParticlesBuilder.cpp
@@ -15,11 +15,11 @@
#include "MagneticParticlesBuilder.h"
#include "FormFactorCylinder.h"
-#include "Materials.h"
-#include "MultiLayer.h"
#include "Layer.h"
#include "LayerInterface.h"
#include "LayerRoughness.h"
+#include "Materials.h"
+#include "MultiLayer.h"
#include "Particle.h"
#include "ParticleLayout.h"
diff --git a/Core/StandardSamples/MesoCrystalBuilder.cpp b/Core/StandardSamples/MesoCrystalBuilder.cpp
index 321a783191d33c48a933152610bf5358623f1b86..a0dfdc3ef48d9232413d765d02a162eb2df06971 100644
--- a/Core/StandardSamples/MesoCrystalBuilder.cpp
+++ b/Core/StandardSamples/MesoCrystalBuilder.cpp
@@ -19,12 +19,12 @@
#include "FormFactorDecoratorDebyeWaller.h"
#include "FormFactorSphereGaussianRadius.h"
#include "HomogeneousMaterial.h"
-#include "MesoCrystal.h"
-#include "MultiLayer.h"
-#include "ParticleLayout.h"
#include "Layer.h"
#include "LayerInterface.h"
#include "LayerRoughness.h"
+#include "MesoCrystal.h"
+#include "MultiLayer.h"
+#include "ParticleLayout.h"
MesoCrystalBuilder::MesoCrystalBuilder()
: m_lattice_length_a(6.2091e+00*Units::nanometer)
diff --git a/Core/StandardSamples/MultiLayerWithRoughnessBuilder.cpp b/Core/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
index 712eb31486e1e6802b2c52be9c242a632e9f0a0f..1683b2daffc2c670b8c1f28abe8f5e3589f2e04a 100644
--- a/Core/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
+++ b/Core/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
@@ -15,10 +15,10 @@
#include "MultiLayerWithRoughnessBuilder.h"
#include "HomogeneousMaterial.h"
-#include "MultiLayer.h"
-#include "Units.h"
#include "Layer.h"
#include "LayerRoughness.h"
+#include "MultiLayer.h"
+#include "Units.h"
MultiLayerWithRoughnessBuilder::MultiLayerWithRoughnessBuilder()
: m_thicknessA(2.5*Units::nanometer)
diff --git a/Core/StandardSamples/MultipleLayoutBuilder.cpp b/Core/StandardSamples/MultipleLayoutBuilder.cpp
index 86601c898e77395288cc1ab8f144077072aa934f..6790726e8b5426e7769855205b812d8a46628daa 100644
--- a/Core/StandardSamples/MultipleLayoutBuilder.cpp
+++ b/Core/StandardSamples/MultipleLayoutBuilder.cpp
@@ -17,10 +17,10 @@
#include "FormFactorCylinder.h"
#include "FormFactorPrism3.h"
#include "HomogeneousMaterial.h"
+#include "Layer.h"
#include "MultiLayer.h"
#include "Particle.h"
#include "ParticleLayout.h"
-#include "Layer.h"
MultipleLayoutBuilder::MultipleLayoutBuilder()
: m_cylinder_height(5*Units::nanometer)
diff --git a/Core/StandardSamples/ParaCrystalBuilder.cpp b/Core/StandardSamples/ParaCrystalBuilder.cpp
index 6ae3ad4d36fa2472920ef7d292933e202d841ab0..ac20e42e1aec712b27e6f79aab89aaa8faa11082 100644
--- a/Core/StandardSamples/ParaCrystalBuilder.cpp
+++ b/Core/StandardSamples/ParaCrystalBuilder.cpp
@@ -18,10 +18,10 @@
#include "HomogeneousMaterial.h"
#include "InterferenceFunction2DParaCrystal.h"
#include "InterferenceFunctionRadialParaCrystal.h"
+#include "Layer.h"
#include "MultiLayer.h"
#include "Particle.h"
#include "ParticleLayout.h"
-#include "Layer.h"
RadialParaCrystalBuilder::RadialParaCrystalBuilder()
: m_corr_peak_distance(20.0*Units::nanometer)
diff --git a/Core/StandardSamples/ParticleCompositionBuilder.cpp b/Core/StandardSamples/ParticleCompositionBuilder.cpp
index 5c1d2849a2c13a2ff28816efdb8ce27a57be5ae1..cc0dd5bcb74679c46ffd977e93cd95a2a838d611 100644
--- a/Core/StandardSamples/ParticleCompositionBuilder.cpp
+++ b/Core/StandardSamples/ParticleCompositionBuilder.cpp
@@ -13,15 +13,15 @@
//
// ************************************************************************** //
+#include "ParticleCompositionBuilder.h"
#include "FormFactorFullSphere.h"
#include "HomogeneousMaterial.h"
#include "InterferenceFunction2DLattice.h"
+#include "Layer.h"
#include "MultiLayer.h"
#include "Particle.h"
#include "ParticleComposition.h"
-#include "ParticleCompositionBuilder.h"
#include "ParticleLayout.h"
-#include "Layer.h"
// --- ParticleCompositionBuilder ---
diff --git a/Core/StandardSamples/ParticleDistributionsBuilder.cpp b/Core/StandardSamples/ParticleDistributionsBuilder.cpp
index a7d9cdb59f8be061e8bb27c01c7366e1d6c154ae..849dc29753403465fb05f5195d2382824944237b 100644
--- a/Core/StandardSamples/ParticleDistributionsBuilder.cpp
+++ b/Core/StandardSamples/ParticleDistributionsBuilder.cpp
@@ -13,15 +13,15 @@
//
// ************************************************************************** //
+#include "ParticleDistributionsBuilder.h"
#include "Distributions.h"
#include "FormFactorCylinder.h"
#include "HomogeneousMaterial.h"
+#include "Layer.h"
#include "MultiLayer.h"
#include "Particle.h"
#include "ParticleDistribution.h"
-#include "ParticleDistributionsBuilder.h"
#include "ParticleLayout.h"
-#include "Layer.h"
using namespace BornAgain;
diff --git a/Core/StandardSamples/ParticleInTheAirBuilder.cpp b/Core/StandardSamples/ParticleInTheAirBuilder.cpp
index 061221bd93bc56ca999de9cde047262acff1d801..91d0be200a73c3f202662898ecb018ea7f277dd9 100644
--- a/Core/StandardSamples/ParticleInTheAirBuilder.cpp
+++ b/Core/StandardSamples/ParticleInTheAirBuilder.cpp
@@ -15,10 +15,10 @@
#include "ParticleInTheAirBuilder.h"
#include "HomogeneousMaterial.h"
+#include "Layer.h"
#include "MultiLayer.h"
#include "Particle.h"
#include "ParticleLayout.h"
-#include "Layer.h"
ISample* ParticleInTheAirBuilder::buildSample() const
{
diff --git a/Core/StandardSamples/RipplesBuilder.cpp b/Core/StandardSamples/RipplesBuilder.cpp
index fdde3413956789534d0b1c58e6c8211a4152263c..5fc20ca93dcb4521128d567928d3ae194c929232 100644
--- a/Core/StandardSamples/RipplesBuilder.cpp
+++ b/Core/StandardSamples/RipplesBuilder.cpp
@@ -18,10 +18,10 @@
#include "FormFactorRipple2.h"
#include "HomogeneousMaterial.h"
#include "InterferenceFunctionRadialParaCrystal.h"
+#include "Layer.h"
#include "MultiLayer.h"
#include "Particle.h"
#include "ParticleLayout.h"
-#include "Layer.h"
CosineRippleBuilder::CosineRippleBuilder()
: m_w(20.0*Units::nanometer)
diff --git a/Core/StandardSamples/RotatedPyramidsBuilder.cpp b/Core/StandardSamples/RotatedPyramidsBuilder.cpp
index 9e63ed1dda84e452b061ff7fc366432cb4cd58b3..f9ff65771533f956e4deab83e4a97e408aa31521 100644
--- a/Core/StandardSamples/RotatedPyramidsBuilder.cpp
+++ b/Core/StandardSamples/RotatedPyramidsBuilder.cpp
@@ -13,13 +13,13 @@
//
// ************************************************************************** //
+#include "RotatedPyramidsBuilder.h"
#include "FormFactorPyramid.h"
#include "HomogeneousMaterial.h"
+#include "Layer.h"
#include "MultiLayer.h"
-#include "RotatedPyramidsBuilder.h"
#include "Particle.h"
#include "ParticleLayout.h"
-#include "Layer.h"
RotatedPyramidsBuilder::RotatedPyramidsBuilder()
: m_length(10*Units::nanometer)
diff --git a/Core/StandardSamples/SampleBuilderFactory.cpp b/Core/StandardSamples/SampleBuilderFactory.cpp
index 05131873e7ccde7b2be1a4c86f35130fc435c2ab..927e27177244ebceb1370fd6d0757c3fcd2a30ce 100644
--- a/Core/StandardSamples/SampleBuilderFactory.cpp
+++ b/Core/StandardSamples/SampleBuilderFactory.cpp
@@ -13,6 +13,7 @@
//
// ************************************************************************** //
+#include "SampleBuilderFactory.h"
#include "BoxCompositionBuilder.h"
#include "CoreShellParticleBuilder.h"
#include "CustomMorphologyBuilder.h"
@@ -33,7 +34,6 @@
#include "SizeDistributionModelsBuilder.h"
#include "TransformationsBuilder.h"
#include "TwoDimLatticeBuilder.h"
-#include "SampleBuilderFactory.h"
SampleBuilderFactory::SampleBuilderFactory()
{
diff --git a/Core/StandardSamples/SizeDistributionModelsBuilder.cpp b/Core/StandardSamples/SizeDistributionModelsBuilder.cpp
index a94bfe952f737c45e2171337c32e2a2db7ce444b..a273b9c22ff5ed112c25a3ce77bfcdd72a3f23f5 100644
--- a/Core/StandardSamples/SizeDistributionModelsBuilder.cpp
+++ b/Core/StandardSamples/SizeDistributionModelsBuilder.cpp
@@ -18,11 +18,11 @@
#include "FormFactorCylinder.h"
#include "HomogeneousMaterial.h"
#include "InterferenceFunctionRadialParaCrystal.h"
+#include "Layer.h"
#include "MultiLayer.h"
#include "Particle.h"
#include "ParticleDistribution.h"
#include "ParticleLayout.h"
-#include "Layer.h"
using namespace BornAgain;
diff --git a/Core/StandardSamples/TransformationsBuilder.cpp b/Core/StandardSamples/TransformationsBuilder.cpp
index b5bcf595615cba3f581a3ebde196e16b06501c2a..bf3b74509ccf8885d287affcd06704be15f72451 100644
--- a/Core/StandardSamples/TransformationsBuilder.cpp
+++ b/Core/StandardSamples/TransformationsBuilder.cpp
@@ -16,10 +16,10 @@
#include "TransformationsBuilder.h"
#include "FormFactorBox.h"
#include "HomogeneousMaterial.h"
+#include "Layer.h"
#include "MultiLayer.h"
#include "Particle.h"
#include "ParticleLayout.h"
-#include "Layer.h"
ISample* TransformBoxBuilder::buildSample() const
{
diff --git a/Core/StandardSamples/TwoDimLatticeBuilder.cpp b/Core/StandardSamples/TwoDimLatticeBuilder.cpp
index ebb2c8a941be9f33affdf11defb63ae9921ca6a0..f32bb52f978ce6004cd7e54cbe80e85cf4c5f414 100644
--- a/Core/StandardSamples/TwoDimLatticeBuilder.cpp
+++ b/Core/StandardSamples/TwoDimLatticeBuilder.cpp
@@ -17,11 +17,11 @@
#include "FormFactorCylinder.h"
#include "HomogeneousMaterial.h"
#include "InterferenceFunction2DLattice.h"
+#include "Layer.h"
#include "MultiLayer.h"
#include "Particle.h"
#include "ParticleComposition.h"
#include "ParticleLayout.h"
-#include "Layer.h"
// -----------------------------------------------------------------------------
// lattice #1:
diff --git a/Core/TestMachinery/CoreTest.cpp b/Core/TestMachinery/CoreTest.cpp
index 1a8242686e36124fb65aa8a36baf211770b16d2f..45fd3577c7e1f5310ab5202fe02b3b9eb4190f2e 100644
--- a/Core/TestMachinery/CoreTest.cpp
+++ b/Core/TestMachinery/CoreTest.cpp
@@ -13,13 +13,13 @@
//
// ************************************************************************** //
+#include "CoreTest.h"
#include "FileSystem.h"
#include "GISASSimulation.h"
#include "IntensityDataFunctions.h"
#include "IntensityDataIOFactory.h"
#include "TestConfig.h"
#include "Utils.h"
-#include "CoreTest.h"
CoreTest::CoreTest(
const std::string& name, const std::string& description, GISASSimulation* simulation,
diff --git a/Core/TestMachinery/CoreTest.h b/Core/TestMachinery/CoreTest.h
index 2adddd705392fbbee35d3c9b15526a35a8d614ff..774fdada071db6e5a59ab4c3c7e1d48c832419a8 100644
--- a/Core/TestMachinery/CoreTest.h
+++ b/Core/TestMachinery/CoreTest.h
@@ -17,8 +17,9 @@
#define CORETEST_H
#include "IFunctionalTest.h"
-#include "OutputData.h"
+template <class T> class OutputData;
+class GISASSimulation;
//! @class CoreTest
//! @ingroup standard_samples
@@ -46,6 +47,6 @@ private:
OutputData<double>* m_reference;
double m_difference;
std::string m_ref_filename;
- };
+};
#endif // CORETEST_H
diff --git a/Core/TestMachinery/FunctionalTestRegistry.cpp b/Core/TestMachinery/FunctionalTestRegistry.cpp
index 3132d709884962e696dad06288a088b50e985296..f8ab72ac7c527e76e644e3a72d47abea7356940c 100644
--- a/Core/TestMachinery/FunctionalTestRegistry.cpp
+++ b/Core/TestMachinery/FunctionalTestRegistry.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "Utils.h"
#include "FunctionalTestRegistry.h"
+#include "Utils.h"
FunctionalTestRegistry::FunctionalTestRegistry()
{
diff --git a/Core/TestMachinery/IFunctionalTest.cpp b/Core/TestMachinery/IFunctionalTest.cpp
index ee2389aece857a90b34230835a84f7237b084a01..9457b266254b6d0b53d6c9440cfcefe0a867d2b6 100644
--- a/Core/TestMachinery/IFunctionalTest.cpp
+++ b/Core/TestMachinery/IFunctionalTest.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "Utils.h"
#include "IFunctionalTest.h"
+#include "Utils.h"
namespace {
diff --git a/Core/TestMachinery/SubtestRegistry.cpp b/Core/TestMachinery/SubtestRegistry.cpp
index 5302588b75d0845336f57a84bf2cf08e685f0c0e..0676fa33f0e9f1392249834b543a74744c7fb987 100644
--- a/Core/TestMachinery/SubtestRegistry.cpp
+++ b/Core/TestMachinery/SubtestRegistry.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "SubtestRegistry.h"
#include "BornAgainNamespace.h"
#include "HardParticles.h"
-#include "SubtestRegistry.h"
// ************************************************************************** //
diff --git a/Core/Tools/Convolve.cpp b/Core/Tools/Convolve.cpp
index 26860e1b23f45f208a6ff21ccb8f363764585467..7c4d45d44d35d7d06382eae9da738906e8f4d399 100644
--- a/Core/Tools/Convolve.cpp
+++ b/Core/Tools/Convolve.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "Exceptions.h"
#include "Convolve.h"
+#include "Exceptions.h"
#include <iostream>
#include <sstream>
diff --git a/Core/Tools/IntegratorMCMiser.h b/Core/Tools/IntegratorMCMiser.h
index 771f1db56db95882027d8a07bf2c9baecd0644f0..b7f42dad27ab3b4cb6e1f61cc730f2c6a04388bf 100644
--- a/Core/Tools/IntegratorMCMiser.h
+++ b/Core/Tools/IntegratorMCMiser.h
@@ -17,8 +17,8 @@
#ifndef INTEGRATORMCMISER_H
#define INTEGRATORMCMISER_H
-#include <memory>
#include <gsl/gsl_monte_miser.h>
+#include <memory>
//! Alias template for member function with signature double f(double)
template <class T>
diff --git a/Core/Tools/IntegratorReal.h b/Core/Tools/IntegratorReal.h
index 149d8c17977f9c57a47812f8bca9844d32cb2ac1..1575284e2d6dbf4e19b9ece51dde9113ce3ac7f9 100644
--- a/Core/Tools/IntegratorReal.h
+++ b/Core/Tools/IntegratorReal.h
@@ -16,8 +16,8 @@
#ifndef INTEGRATORREAL_H
#define INTEGRATORREAL_H
-#include <memory>
#include <gsl/gsl_integration.h>
+#include <memory>
//! Alias template for member function with signature double f(double)
template <class T>
diff --git a/Core/Tools/MathFunctions.cpp b/Core/Tools/MathFunctions.cpp
index 3c03eac0e6b5635010c9b1f0b8d092b7fa6707ec..63c2dd15e2faf0bc87d3f6726fe45984d9864e4a 100644
--- a/Core/Tools/MathFunctions.cpp
+++ b/Core/Tools/MathFunctions.cpp
@@ -14,14 +14,14 @@
// ************************************************************************** //
#include "MathFunctions.h"
-#include <chrono>
-#include <cstring>
-#include <fftw3.h>
-#include <random>
#include <gsl/gsl_sf_bessel.h>
#include <gsl/gsl_sf_erf.h>
#include <gsl/gsl_sf_expint.h>
#include <gsl/gsl_sf_trig.h>
+#include <chrono>
+#include <cstring>
+#include <fftw3.h>
+#include <random>
// ************************************************************************** //
diff --git a/Core/Visitors/SampleMaterialVisitor.h b/Core/Visitors/SampleMaterialVisitor.h
index 7b2bcca858df2b0ac29876b0722bf2d715143967..1e6a69f2b2a070d31eae9392a49c06f1621a162b 100644
--- a/Core/Visitors/SampleMaterialVisitor.h
+++ b/Core/Visitors/SampleMaterialVisitor.h
@@ -16,8 +16,8 @@
#ifndef SAMPLEMATERIALVISITOR_H
#define SAMPLEMATERIALVISITOR_H
-#include "ISampleVisitor.h"
#include "IMaterial.h"
+#include "ISampleVisitor.h"
#include <vector>
//! @class SampleMaterialVisitor
diff --git a/Core/Visitors/SamplePrintVisitor.cpp b/Core/Visitors/SamplePrintVisitor.cpp
index 34a87ba8b27e02735b20ce6353d3c5e03c5d0a6f..d907767971e350ef20868477fb311e4b76035190 100644
--- a/Core/Visitors/SamplePrintVisitor.cpp
+++ b/Core/Visitors/SamplePrintVisitor.cpp
@@ -13,18 +13,18 @@
//
// ************************************************************************** //
+#include "SamplePrintVisitor.h"
#include "Crystal.h"
#include "FormFactors.h"
#include "InterferenceFunctions.h"
+#include "Layer.h"
+#include "LayerInterface.h"
+#include "LayerRoughness.h"
#include "MesoCrystal.h"
#include "MultiLayer.h"
#include "ParticleCoreShell.h"
#include "ParticleDistribution.h"
#include "ParticleLayout.h"
-#include "SamplePrintVisitor.h"
-#include "Layer.h"
-#include "LayerInterface.h"
-#include "LayerRoughness.h"
void SamplePrintVisitor::visit(const ISample*)
{
diff --git a/Fit/FitKernel/FitKernel.cpp b/Fit/FitKernel/FitKernel.cpp
index f4ecfae7a3f3c06875960b15a204e1799fc638d3..d5ae3bba0aabaf25138ebd22b4f6aa3532793b5e 100644
--- a/Fit/FitKernel/FitKernel.cpp
+++ b/Fit/FitKernel/FitKernel.cpp
@@ -13,10 +13,10 @@
//
// ************************************************************************** //
+#include "FitKernel.h"
#include "FitSuite.h"
#include "MessageService.h"
#include "MinimizerFactory.h"
-#include "FitKernel.h"
FitKernel::FitKernel(FitSuite *fit_suite)
diff --git a/Fit/FitKernel/FitObject.cpp b/Fit/FitKernel/FitObject.cpp
index 7971dc50bd4827139d3a7dc387480e0186f35483..00bb3ddcdaa69e959f61c91cd3bf35f7a3d86c0b 100644
--- a/Fit/FitKernel/FitObject.cpp
+++ b/Fit/FitKernel/FitObject.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FitObject.h"
#include "GISASSimulation.h"
#include "IIntensityNormalizer.h"
-#include "FitObject.h"
FitObject::FitObject(const GISASSimulation& simulation, const OutputData<double >& real_data,
double weight, bool adjust_detector_to_data)
diff --git a/Fit/FitKernel/FitStrategyAdjustMinimizer.cpp b/Fit/FitKernel/FitStrategyAdjustMinimizer.cpp
index fb95d5c24fe9a3245e7b6b198dfaa7d73a8b8c00..375da879922021e5300897222b2762a195a80a38 100644
--- a/Fit/FitKernel/FitStrategyAdjustMinimizer.cpp
+++ b/Fit/FitKernel/FitStrategyAdjustMinimizer.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FitStrategyAdjustMinimizer.h"
#include "FitKernel.h"
#include "MinimizerFactory.h"
-#include "FitStrategyAdjustMinimizer.h"
FitStrategyAdjustMinimizer::FitStrategyAdjustMinimizer()
diff --git a/Fit/FitKernel/FitStrategyAdjustParameters.cpp b/Fit/FitKernel/FitStrategyAdjustParameters.cpp
index de2bcc1c1b584fc33722a941ea45b637140b0be4..a1a9e854bc70712935f32923b99dda4823cdce22 100644
--- a/Fit/FitKernel/FitStrategyAdjustParameters.cpp
+++ b/Fit/FitKernel/FitStrategyAdjustParameters.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FitStrategyAdjustParameters.h"
#include "FitKernel.h"
#include "MessageService.h"
-#include "FitStrategyAdjustParameters.h"
FitStrategyAdjustParameters::FitStrategyAdjustParameters(const FitStrategyAdjustParameters &other)
diff --git a/Fit/FitKernel/FitSuite.cpp b/Fit/FitKernel/FitSuite.cpp
index c7f0c485593df2b34b405928fd8210bb4ae98cd6..354f403382ccea953f1f4b04cab2ece019c90bd2 100644
--- a/Fit/FitKernel/FitSuite.cpp
+++ b/Fit/FitKernel/FitSuite.cpp
@@ -13,10 +13,10 @@
//
// ************************************************************************** //
+#include "FitSuite.h"
#include "FitKernel.h"
#include "FitSuitePrintObserver.h"
#include "MinimizerFactory.h"
-#include "FitSuite.h"
FitSuite::FitSuite()
: m_kernel(new FitKernel(this))
diff --git a/Fit/FitKernel/FitSuiteObjects.cpp b/Fit/FitKernel/FitSuiteObjects.cpp
index 6b002336fa917341cf39d323b4253742e9aee921..0a2d931dcd1cecf151dcbcf58c74f2b7453b9175 100644
--- a/Fit/FitKernel/FitSuiteObjects.cpp
+++ b/Fit/FitKernel/FitSuiteObjects.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "ChiSquaredModule.h"
#include "FitSuiteObjects.h"
+#include "ChiSquaredModule.h"
FitSuiteObjects::FitSuiteObjects()
: m_total_weight(0)
diff --git a/Fit/FitKernel/FitSuiteParameters.cpp b/Fit/FitKernel/FitSuiteParameters.cpp
index 4d451e89909113784bfbd3b4ef9952dfb73dbef7..7d11c484d66a75661872469f0e07ffdea9a31aa8 100644
--- a/Fit/FitKernel/FitSuiteParameters.cpp
+++ b/Fit/FitKernel/FitSuiteParameters.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "FitSuiteParameters.h"
#include "FitParameterLinked.h"
#include "MessageService.h"
-#include "FitSuiteParameters.h"
FitSuiteParameters::FitSuiteParameters()
{
diff --git a/Fit/FitKernel/FitSuitePrintObserver.cpp b/Fit/FitKernel/FitSuitePrintObserver.cpp
index 96327088f392f64596209e0e60c2fbe2a38a5c25..df1874b72d6e4a6929a95c4f59dd0594e4910934 100644
--- a/Fit/FitKernel/FitSuitePrintObserver.cpp
+++ b/Fit/FitKernel/FitSuitePrintObserver.cpp
@@ -13,10 +13,10 @@
//
// ************************************************************************** //
+#include "FitSuitePrintObserver.h"
#include "FitSuite.h"
#include "FitSuiteParameters.h"
#include "FitSuiteStrategies.h"
-#include "FitSuitePrintObserver.h"
FitSuitePrintObserver::FitSuitePrintObserver(int print_every_nth)
diff --git a/Fit/FitKernel/IFitObserver.cpp b/Fit/FitKernel/IFitObserver.cpp
index 11b7e810a39ff24ad20fe88574f792b40bce90bc..5c9a9ce0210c2af3374213776daf9a8055132855 100644
--- a/Fit/FitKernel/IFitObserver.cpp
+++ b/Fit/FitKernel/IFitObserver.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "IFitObserver.h"
#include "FitSuite.h"
#include "FitSuiteStrategies.h"
-#include "IFitObserver.h"
IFitObserver::IFitObserver(int update_every_nth)
diff --git a/Fit/FitKernel/MinimizerFactory.cpp b/Fit/FitKernel/MinimizerFactory.cpp
index 6e55d4dfdc09375f977d191d9681a1e6a95c131d..8db30c03d62bdc5e38848892d78612c6342528bd 100644
--- a/Fit/FitKernel/MinimizerFactory.cpp
+++ b/Fit/FitKernel/MinimizerFactory.cpp
@@ -13,6 +13,7 @@
//
// ************************************************************************** //
+#include "MinimizerFactory.h"
#include "MinimizerScan.h"
#include "MinimizerTest.h"
#include "ROOTGeneticMinimizer.h"
@@ -20,7 +21,6 @@
#include "ROOTMinuit2Minimizer.h"
#include "ROOTMultiMinMinimizer.h"
#include "ROOTSimAnMinimizer.h"
-#include "MinimizerFactory.h"
// ************************************************************************** //
// auxiliary class MinimizerCatalogue
diff --git a/Fit/FitKernel/MinimizerLibrary.cpp b/Fit/FitKernel/MinimizerLibrary.cpp
index 9f504626f42b811eb4191db49767bfd8e09c9ed9..dbad74f9c5fcfcaef96df7022395e1d38dff219e 100644
--- a/Fit/FitKernel/MinimizerLibrary.cpp
+++ b/Fit/FitKernel/MinimizerLibrary.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "MinimizerLibrary.h"
#include "BornAgainNamespace.h"
#include "Exceptions.h"
-#include "MinimizerLibrary.h"
using namespace MinimizerLibrary;
diff --git a/Fit/FitKernel/ROOTMinimizer.cpp b/Fit/FitKernel/ROOTMinimizer.cpp
index a9ff39dfbb3d1ef5eb95a631ae62dfe6abd0a83a..c632f3afb89c0d7c6bbf53bc7f2a3c39e8ddfd81 100644
--- a/Fit/FitKernel/ROOTMinimizer.cpp
+++ b/Fit/FitKernel/ROOTMinimizer.cpp
@@ -13,10 +13,10 @@
//
// ************************************************************************** //
+#include "ROOTMinimizer.h"
#include "Math/Minimizer.h"
#include "ROOTMinimizerFunction.h"
#include "ROOTMinimizerHelper.h"
-#include "ROOTMinimizer.h"
// ----------------------------------------------------------------------------
// ROOTMinimizer c-tor
diff --git a/Fit/FitKernel/ROOTMinimizerHelper.cpp b/Fit/FitKernel/ROOTMinimizerHelper.cpp
index 7279e83a6c4693e3829905efd76af94af23495c5..60aea1a77cf3406fe0d1f0f448d6075cbb913dcc 100644
--- a/Fit/FitKernel/ROOTMinimizerHelper.cpp
+++ b/Fit/FitKernel/ROOTMinimizerHelper.cpp
@@ -13,10 +13,10 @@
//
// ************************************************************************** //
+#include "ROOTMinimizerHelper.h"
#include "Math/GenAlgoOptions.h"
#include "Math/Minimizer.h"
#include "Utils.h"
-#include "ROOTMinimizerHelper.h"
// ----------------------------------------------------------------------------
diff --git a/Fit/StandardFits/IMinimizerTest.cpp b/Fit/StandardFits/IMinimizerTest.cpp
index e5bf1ffdb7fea5b99f61a64c6847892a7dc38370..4301a71af8a965cda148926f9520b1cb0977fe72 100644
--- a/Fit/StandardFits/IMinimizerTest.cpp
+++ b/Fit/StandardFits/IMinimizerTest.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "IMinimizerTest.h"
#include "FitSuite.h"
#include "GISASSimulation.h"
-#include "IMinimizerTest.h"
#include "ISample.h"
#include "MinimizerFactory.h"
#include "SampleBuilderFactory.h"
diff --git a/Fit/StandardFits/MinimizerTests.cpp b/Fit/StandardFits/MinimizerTests.cpp
index 095a218f19aca595fd4b0434200153dabf739ccc..28fa11de1d4cbdd63b9032fbe9361a03faaf8bf3 100644
--- a/Fit/StandardFits/MinimizerTests.cpp
+++ b/Fit/StandardFits/MinimizerTests.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "MinimizerTests.h"
#include "FitSuite.h"
#include "MinimizerFactory.h"
-#include "MinimizerTests.h"
Minuit2MigradTest::Minuit2MigradTest()
: IMinimizerTest("Minuit2", "Migrad")
diff --git a/Fit/StandardFits/StandardFitsFactory.cpp b/Fit/StandardFits/StandardFitsFactory.cpp
index faa904b00738ba68f63dd9cd3b3ada4a032af248..784b7abe75974bd6b6c3420eee3aa2fde5677401 100644
--- a/Fit/StandardFits/StandardFitsFactory.cpp
+++ b/Fit/StandardFits/StandardFitsFactory.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "StandardFitsFactory.h"
#include "MinimizerTests.h"
#include "RectDetectorFitTest.h"
-#include "StandardFitsFactory.h"
#include <boost/format.hpp>
StandardFitsFactory::StandardFitsFactory()
diff --git a/Fit/StandardFits/StandardFitsFactory.h b/Fit/StandardFits/StandardFitsFactory.h
index a351a5fb1f87cb1ab2411da27fd7e08b5b9a9607..e406ee81b6036275729f90ebc051c92f93962c37 100644
--- a/Fit/StandardFits/StandardFitsFactory.h
+++ b/Fit/StandardFits/StandardFitsFactory.h
@@ -18,6 +18,8 @@
#include "IFactory.h"
+class IFunctionalTest;
+
//! @class StandardFitsFactory
//! @ingroup standard_samples
//! @brief Factory to create predefined functional fit tests
diff --git a/GUI/coregui/Models/AngleProperty.cpp b/GUI/coregui/Models/AngleProperty.cpp
index 65cd83ab33efc8a5240ce306d06929fbeb03d10a..6561290078f336f97b7d81868dda1076260d9f62 100644
--- a/GUI/coregui/Models/AngleProperty.cpp
+++ b/GUI/coregui/Models/AngleProperty.cpp
@@ -15,8 +15,8 @@
// ************************************************************************** //
#include "AngleProperty.h"
-#include "Units.h"
#include "GUIHelpers.h"
+#include "Units.h"
#include "item_constants.h"
QStringList AngleProperty::m_labels = QStringList()
diff --git a/GUI/coregui/Models/AngleProperty.h b/GUI/coregui/Models/AngleProperty.h
index f9ce4d8bd0489668d23c586ba49a69dd508256fd..6f3a81ce90c67d0ff549a766f4a2df30a436dbe5 100644
--- a/GUI/coregui/Models/AngleProperty.h
+++ b/GUI/coregui/Models/AngleProperty.h
@@ -17,8 +17,8 @@
#ifndef ANGLEPROPERTY_H
#define ANGLEPROPERTY_H
-#include <QVariant>
#include <QStringList>
+#include <QVariant>
//! The AngleProperty keeps angle value together with units (radians, degrees)
//! in which the angle should be presented to the user.
diff --git a/GUI/coregui/Models/ApplicationModels.cpp b/GUI/coregui/Models/ApplicationModels.cpp
index 2f07c5c907c0cb823f82b591f0e1d5c8bb5b99f2..7a476896ed650caa01dde3845243a310e5e83917 100644
--- a/GUI/coregui/Models/ApplicationModels.cpp
+++ b/GUI/coregui/Models/ApplicationModels.cpp
@@ -15,19 +15,19 @@
// ************************************************************************** //
#include "ApplicationModels.h"
+#include "DocumentModel.h"
#include "GISASSimulation.h"
#include "GUIObjectBuilder.h"
-#include "DocumentModel.h"
+#include "ISample.h"
+#include "IconProvider.h"
+#include "InstrumentModel.h"
+#include "JobItem.h"
+#include "JobModel.h"
#include "MaterialModel.h"
#include "MaterialSvc.h"
-#include "InstrumentModel.h"
-#include "ISample.h"
-#include "SampleModel.h"
#include "RealDataModel.h"
-#include "JobModel.h"
-#include "IconProvider.h"
#include "SampleBuilderFactory.h"
-#include "JobItem.h"
+#include "SampleModel.h"
#include "WarningMessageService.h"
ApplicationModels::ApplicationModels(QObject *parent)
diff --git a/GUI/coregui/Models/BeamAngleItems.cpp b/GUI/coregui/Models/BeamAngleItems.cpp
index 54c4183fe203b13fa4d520cb452326ce5ac69593..1e034b4fb488800d8c0bac541fd026c782448430 100644
--- a/GUI/coregui/Models/BeamAngleItems.cpp
+++ b/GUI/coregui/Models/BeamAngleItems.cpp
@@ -16,8 +16,8 @@
#include "BeamAngleItems.h"
#include "Distributions.h"
-#include "Units.h"
#include "GUIHelpers.h"
+#include "Units.h"
BeamInclinationAngleItem::BeamInclinationAngleItem()
diff --git a/GUI/coregui/Models/BeamDistributionItem.cpp b/GUI/coregui/Models/BeamDistributionItem.cpp
index 594a6a3cea520c2c9c04bb3485034070333d5e24..11c8b34fc1b4f962fe36ee9c30ce795094a9c980 100644
--- a/GUI/coregui/Models/BeamDistributionItem.cpp
+++ b/GUI/coregui/Models/BeamDistributionItem.cpp
@@ -16,10 +16,10 @@
#include "BeamDistributionItem.h"
#include "Distributions.h"
+#include "GUIHelpers.h"
+#include "GroupItem.h"
#include "ParameterDistribution.h"
#include "Units.h"
-#include "GroupItem.h"
-#include "GUIHelpers.h"
#include <QDebug>
const QString BeamDistributionItem::P_DISTRIBUTION = "Distribution";
diff --git a/GUI/coregui/Models/BeamItem.cpp b/GUI/coregui/Models/BeamItem.cpp
index d679086c2aa41f81a7281da985e12d154adda6df..804d1f73e39efc56238b4e70312770b79a988026 100644
--- a/GUI/coregui/Models/BeamItem.cpp
+++ b/GUI/coregui/Models/BeamItem.cpp
@@ -15,9 +15,9 @@
// ************************************************************************** //
#include "BeamItem.h"
-#include "ScientificDoubleProperty.h"
#include "BeamDistributionItem.h"
#include "BornAgainNamespace.h"
+#include "ScientificDoubleProperty.h"
const QString BeamItem::P_INTENSITY = QString::fromStdString(BornAgain::Intensity);
diff --git a/GUI/coregui/Models/ColorProperty.h b/GUI/coregui/Models/ColorProperty.h
index 9e3893b99230ec5852e74c8ddec387cad4d92491..195c8e442b3fb08497128a2c5d015777f7d05ec9 100644
--- a/GUI/coregui/Models/ColorProperty.h
+++ b/GUI/coregui/Models/ColorProperty.h
@@ -18,6 +18,7 @@
#define COLORPROPERTY_H
#include <QPixmap>
+#include <QVariant>
//! The ColorProperty for SessionItem and PropertyEditor
//!
diff --git a/GUI/coregui/Models/ComboProperty.h b/GUI/coregui/Models/ComboProperty.h
index 5553ac7d67a66e08b1bd521c2f5fc0d579edf682..07be43abc13087ec3268c958b51b7a5719fe195e 100644
--- a/GUI/coregui/Models/ComboProperty.h
+++ b/GUI/coregui/Models/ComboProperty.h
@@ -17,8 +17,8 @@
#ifndef COMBOPROPERTY_H
#define COMBOPROPERTY_H
-#include <QVariant>
#include <QStringList>
+#include <QVariant>
//! The ComboProperty defines SessionItem's property with a value
//! from predefined list.
diff --git a/GUI/coregui/Models/DetectorItems.h b/GUI/coregui/Models/DetectorItems.h
index 326dbe181bf1bf578878d2f58cec5a328eaea4a2..cb7eb239a2d44e7ed15f8242b96de8badcb05841 100644
--- a/GUI/coregui/Models/DetectorItems.h
+++ b/GUI/coregui/Models/DetectorItems.h
@@ -17,8 +17,8 @@
#ifndef DETECTORITEMS_H
#define DETECTORITEMS_H
-#include "SphericalDetectorItem.h"
#include "RectangularDetectorItem.h"
+#include "SphericalDetectorItem.h"
class MaskContainerItem;
diff --git a/GUI/coregui/Models/DomainFittingBuilder.cpp b/GUI/coregui/Models/DomainFittingBuilder.cpp
index 04058cc8fec849678bed2cc0124c9a3eb2a42627..6d1dd39576726d36fac524a255a342d7c58577c4 100644
--- a/GUI/coregui/Models/DomainFittingBuilder.cpp
+++ b/GUI/coregui/Models/DomainFittingBuilder.cpp
@@ -15,18 +15,18 @@
// ************************************************************************** //
#include "DomainFittingBuilder.h"
#include "DomainSimulationBuilder.h"
-#include "JobItem.h"
+#include "FitParameterItems.h"
#include "FitSuite.h"
#include "FitSuiteItem.h"
-#include "FitParameterItems.h"
-#include "IntensityDataItem.h"
#include "GISASSimulation.h"
+#include "GUIHelpers.h"
+#include "IMinimizer.h"
+#include "IntensityDataItem.h"
+#include "JobItem.h"
+#include "MinimizerItem.h"
#include "ModelPath.h"
#include "MultiLayerItem.h"
#include "RealDataItem.h"
-#include "MinimizerItem.h"
-#include "IMinimizer.h"
-#include "GUIHelpers.h"
// FIXME make unique_ptr all along
diff --git a/GUI/coregui/Models/DomainObjectBuilder.cpp b/GUI/coregui/Models/DomainObjectBuilder.cpp
index 644b724063a6758afc16b94fe0b085188a1bf06a..61572de8c94fec254b17a82000377fbf8c7bca7e 100644
--- a/GUI/coregui/Models/DomainObjectBuilder.cpp
+++ b/GUI/coregui/Models/DomainObjectBuilder.cpp
@@ -15,15 +15,15 @@
// ************************************************************************** //
#include "DomainObjectBuilder.h"
-#include "TransformToDomain.h"
+#include "ComboProperty.h"
#include "GISASSimulation.h"
#include "GUIHelpers.h"
#include "IInterferenceFunction.h"
#include "LayerItem.h"
#include "MultiLayer.h"
#include "ParticleDistributionItem.h"
-#include "ComboProperty.h"
#include "ParticleLayoutItem.h"
+#include "TransformToDomain.h"
std::unique_ptr<MultiLayer> DomainObjectBuilder::buildMultiLayer(
const SessionItem& multilayer_item) const
diff --git a/GUI/coregui/Models/FTDecayFunctionItems.h b/GUI/coregui/Models/FTDecayFunctionItems.h
index 6e5f4be1f41f7729169a40fc10f419f4e4f707e6..df25256a3bc2671dba7c553384aca04c0dab1875 100644
--- a/GUI/coregui/Models/FTDecayFunctionItems.h
+++ b/GUI/coregui/Models/FTDecayFunctionItems.h
@@ -18,8 +18,8 @@
#define FTDECAYFUNCTIONITEMS_H
-#include "SessionItem.h"
#include "FTDecayFunctions.h"
+#include "SessionItem.h"
class BA_CORE_API_ FTDecayFunction1DItem : public SessionItem
diff --git a/GUI/coregui/Models/FTDistributionItems.h b/GUI/coregui/Models/FTDistributionItems.h
index 195c948df203c5a6a87602e6d31c9515dd0e4dd6..a465e7ad8c9a3007467909ac43f650ce574ee620 100644
--- a/GUI/coregui/Models/FTDistributionItems.h
+++ b/GUI/coregui/Models/FTDistributionItems.h
@@ -18,8 +18,8 @@
#define FTDISTRIBUTIONITEMS_H
-#include "SessionItem.h"
#include "FTDistributions.h"
+#include "SessionItem.h"
class BA_CORE_API_ FTDistribution1DItem : public SessionItem
diff --git a/GUI/coregui/Models/FitParameterHelper.cpp b/GUI/coregui/Models/FitParameterHelper.cpp
index 69bfd30e9501fb62232a6244c945a643dc762c8a..324622b67e5fe339604fe365f159532a9444acce 100644
--- a/GUI/coregui/Models/FitParameterHelper.cpp
+++ b/GUI/coregui/Models/FitParameterHelper.cpp
@@ -15,11 +15,11 @@
// ************************************************************************** //
#include "FitParameterHelper.h"
-#include "JobItem.h"
#include "FitParameterItems.h"
+#include "JobItem.h"
#include "JobModel.h"
-#include "ParameterTreeItems.h"
#include "ModelPath.h"
+#include "ParameterTreeItems.h"
//! Creates fit parameter from given ParameterItem, sets starting value to the value
//! of ParameterItem, copies link.
diff --git a/GUI/coregui/Models/FitParameterItems.cpp b/GUI/coregui/Models/FitParameterItems.cpp
index 48872a20e1ccf809d788788db67139c5b91c9d6f..ad1dcf5a0c4a92137ce9abc732bf21349a59ec54 100644
--- a/GUI/coregui/Models/FitParameterItems.cpp
+++ b/GUI/coregui/Models/FitParameterItems.cpp
@@ -16,9 +16,9 @@
#include "FitParameterItems.h"
#include "ComboProperty.h"
+#include "GUIHelpers.h"
#include "ModelPath.h"
#include "ParameterTreeItems.h"
-#include "GUIHelpers.h"
namespace
{
diff --git a/GUI/coregui/Models/FitParameterProxyModel.cpp b/GUI/coregui/Models/FitParameterProxyModel.cpp
index 349c4cb6c0cb9609cb3b0ce22aa140ff7ada6668..cfba02073def965ac406ada29e60f3d59be120c6 100644
--- a/GUI/coregui/Models/FitParameterProxyModel.cpp
+++ b/GUI/coregui/Models/FitParameterProxyModel.cpp
@@ -15,10 +15,10 @@
// ************************************************************************** //
#include "FitParameterProxyModel.h"
-#include "FitParameterItems.h"
-#include "JobModel.h"
#include "FitParameterHelper.h"
+#include "FitParameterItems.h"
#include "GUIHelpers.h"
+#include "JobModel.h"
#include "ModelPath.h"
#include <QMimeData>
diff --git a/GUI/coregui/Models/GUIObjectBuilder.cpp b/GUI/coregui/Models/GUIObjectBuilder.cpp
index 0f6b092ede4d44db8faddaab605ff88cb92fcc61..7901edb874f15a0aaac4a3954a6b802b737a16c7 100644
--- a/GUI/coregui/Models/GUIObjectBuilder.cpp
+++ b/GUI/coregui/Models/GUIObjectBuilder.cpp
@@ -18,12 +18,12 @@
#include "BeamDistributionItem.h"
#include "BeamItem.h"
#include "BornAgainNamespace.h"
-#include "Crystal.h"
#include "ComboProperty.h"
+#include "Crystal.h"
#include "DetectorItems.h"
#include "DocumentModel.h"
-#include "FormFactors.h"
#include "FormFactorItems.h"
+#include "FormFactors.h"
#include "GISASSimulation.h"
#include "GUIHelpers.h"
#include "InstrumentModel.h"
diff --git a/GUI/coregui/Models/GroupItem.h b/GUI/coregui/Models/GroupItem.h
index 70a08e1e5e06d0bc0fee9c8c49196c7fd7f12f90..d20cb6ce6a93f5aafb85c01eaf8a1fe8f37d8520 100644
--- a/GUI/coregui/Models/GroupItem.h
+++ b/GUI/coregui/Models/GroupItem.h
@@ -17,8 +17,8 @@
#ifndef GROUPITEM_H
#define GROUPITEM_H
-#include "SessionItem.h"
#include "GroupProperty.h"
+#include "SessionItem.h"
class BA_CORE_API_ GroupItem : public SessionItem
{
diff --git a/GUI/coregui/Models/GroupPropertyRegistry.h b/GUI/coregui/Models/GroupPropertyRegistry.h
index 87326081b9315cdeccd460039115e47fad52357e..8e3c9941859fc5f8012b9dff56e968267b95816a 100644
--- a/GUI/coregui/Models/GroupPropertyRegistry.h
+++ b/GUI/coregui/Models/GroupPropertyRegistry.h
@@ -17,8 +17,8 @@
#ifndef GROUPPROPERTYREGISTRY_H
#define GROUPPROPERTYREGISTRY_H
-#include "item_constants.h"
#include "GroupProperty.h"
+#include "item_constants.h"
diff --git a/GUI/coregui/Models/InstrumentItem.cpp b/GUI/coregui/Models/InstrumentItem.cpp
index e36e95427bd729763f7389cb72c9c72d92cd1c37..944e750fe211d860d0da4cdd156e20a316d8ec11 100644
--- a/GUI/coregui/Models/InstrumentItem.cpp
+++ b/GUI/coregui/Models/InstrumentItem.cpp
@@ -15,8 +15,8 @@
// ************************************************************************** //
#include "InstrumentItem.h"
-#include "DetectorItems.h"
#include "BeamItem.h"
+#include "DetectorItems.h"
InstrumentItem::InstrumentItem()
: SessionItem(Constants::InstrumentType)
diff --git a/GUI/coregui/Models/IntensityDataItem.cpp b/GUI/coregui/Models/IntensityDataItem.cpp
index 197cbefe227507c6d1db210cbfde762753ae0196..7ecaab469785465f9105044fd45e6682e796ada6 100644
--- a/GUI/coregui/Models/IntensityDataItem.cpp
+++ b/GUI/coregui/Models/IntensityDataItem.cpp
@@ -15,10 +15,10 @@
// ************************************************************************** //
#include "IntensityDataItem.h"
-#include "ComboProperty.h"
#include "AxesItems.h"
-#include "GUIHelpers.h"
#include "BornAgainNamespace.h"
+#include "ComboProperty.h"
+#include "GUIHelpers.h"
const QString IntensityDataItem::P_AXES_UNITS = "Axes Units";
const QString IntensityDataItem::P_TITLE = "Title";
diff --git a/GUI/coregui/Models/IntensityDataItem.h b/GUI/coregui/Models/IntensityDataItem.h
index 5a4632484c5a2052ae6d88bfe49c12b9302dd216..6b8daba3b9667e14d37635241e8607d1ef2e3a16 100644
--- a/GUI/coregui/Models/IntensityDataItem.h
+++ b/GUI/coregui/Models/IntensityDataItem.h
@@ -17,8 +17,8 @@
#ifndef INTENSITYDATAITEM_H
#define INTENSITYDATAITEM_H
-#include "SessionItem.h"
#include "IDetector2D.h"
+#include "SessionItem.h"
class BasicAxisItem;
diff --git a/GUI/coregui/Models/InterferenceFunctionItems.cpp b/GUI/coregui/Models/InterferenceFunctionItems.cpp
index 18f0ec10259873e3f720ab2b11517e8f0cb00030..3ff2c14831e81fd124e9da5546b835a2c5da211f 100644
--- a/GUI/coregui/Models/InterferenceFunctionItems.cpp
+++ b/GUI/coregui/Models/InterferenceFunctionItems.cpp
@@ -15,8 +15,8 @@
// ************************************************************************** //
#include "InterferenceFunctionItems.h"
-#include "Units.h"
#include "BornAgainNamespace.h"
+#include "Units.h"
const QString InterferenceFunctionRadialParaCrystalItem::P_PEAK_DISTANCE =
diff --git a/GUI/coregui/Models/ItemFactory.cpp b/GUI/coregui/Models/ItemFactory.cpp
index 709822f98d9c0d45d1d536dbd5ed8e1405138c8f..ec100ca26daff7a67ee671948b18b5b9646203cd 100644
--- a/GUI/coregui/Models/ItemFactory.cpp
+++ b/GUI/coregui/Models/ItemFactory.cpp
@@ -15,44 +15,44 @@
// ************************************************************************** //
#include "ItemFactory.h"
-#include "MultiLayerItem.h"
-#include "LayerItem.h"
-#include "ParticleLayoutItem.h"
-#include "ParticleItem.h"
-#include "TransformationItem.h"
-#include "RotationItems.h"
-#include "ParticleCoreShellItem.h"
-#include "ParticleCompositionItem.h"
-#include "ParticleDistributionItem.h"
-#include "InterferenceFunctionItems.h"
-#include "InstrumentItem.h"
+#include "AxesItems.h"
+#include "BeamAngleItems.h"
#include "BeamItem.h"
+#include "BeamWavelengthItem.h"
#include "DetectorItems.h"
-#include "VectorItem.h"
-#include "PropertyItem.h"
-#include "GroupItem.h"
-#include "GUIHelpers.h"
-#include "FormFactorItems.h"
-#include "LayerRoughnessItems.h"
-#include "FTDistributionItems.h"
#include "FTDecayFunctionItems.h"
+#include "FTDistributionItems.h"
+#include "FitParameterItems.h"
+#include "FitSuiteItem.h"
+#include "FormFactorItems.h"
+#include "GUIHelpers.h"
+#include "GroupItem.h"
+#include "InstrumentItem.h"
+#include "IntensityDataItem.h"
+#include "InterferenceFunctionItems.h"
+#include "JobItem.h"
#include "LatticeTypeItems.h"
-#include "MaterialItem.h"
-#include "RefractiveIndexItem.h"
+#include "LayerItem.h"
+#include "LayerRoughnessItems.h"
#include "MagneticFieldItem.h"
-#include "JobItem.h"
-#include "IntensityDataItem.h"
-#include "AxesItems.h"
-#include "ResolutionFunctionItems.h"
-#include "BeamWavelengthItem.h"
-#include "BeamAngleItems.h"
#include "MaskItems.h"
+#include "MaterialItem.h"
+#include "MinimizerItem.h"
+#include "MultiLayerItem.h"
#include "ParameterTreeItems.h"
-#include "SimulationOptionsItem.h"
-#include "FitParameterItems.h"
-#include "FitSuiteItem.h"
+#include "ParticleCompositionItem.h"
+#include "ParticleCoreShellItem.h"
+#include "ParticleDistributionItem.h"
+#include "ParticleItem.h"
+#include "ParticleLayoutItem.h"
+#include "PropertyItem.h"
#include "RealDataItem.h"
-#include "MinimizerItem.h"
+#include "RefractiveIndexItem.h"
+#include "ResolutionFunctionItems.h"
+#include "RotationItems.h"
+#include "SimulationOptionsItem.h"
+#include "TransformationItem.h"
+#include "VectorItem.h"
#include <QDebug>
namespace {
diff --git a/GUI/coregui/Models/JobItem.cpp b/GUI/coregui/Models/JobItem.cpp
index 3d6f280e8e9bd756f5f8b4d0554a615898742d05..881f9ded76119f6bbbced1ec8d58dc0a8ea5aa77 100644
--- a/GUI/coregui/Models/JobItem.cpp
+++ b/GUI/coregui/Models/JobItem.cpp
@@ -16,15 +16,15 @@
#include "JobItem.h"
#include "ComboProperty.h"
-#include "IntensityDataItem.h"
-#include "MultiLayerItem.h"
+#include "FitSuiteItem.h"
+#include "GUIHelpers.h"
#include "InstrumentItem.h"
+#include "IntensityDataItem.h"
#include "JobItemHelper.h"
-#include "SimulationOptionsItem.h"
-#include "GUIHelpers.h"
-#include "FitSuiteItem.h"
+#include "MultiLayerItem.h"
#include "ParameterTreeItems.h"
#include "RealDataItem.h"
+#include "SimulationOptionsItem.h"
#include <QDebug>
namespace {
diff --git a/GUI/coregui/Models/JobItemHelper.cpp b/GUI/coregui/Models/JobItemHelper.cpp
index 46dec6d92c4a9e85d45f683e110e0849a0f98379..da96b639aa6c099640702cdcdb86e195b9f13332 100644
--- a/GUI/coregui/Models/JobItemHelper.cpp
+++ b/GUI/coregui/Models/JobItemHelper.cpp
@@ -15,15 +15,15 @@
// ************************************************************************** //
#include "JobItemHelper.h"
-#include "IntensityDataItem.h"
-#include "GISASSimulation.h"
#include "ComboProperty.h"
#include "DomainObjectBuilder.h"
-#include "InstrumentItem.h"
+#include "GISASSimulation.h"
#include "GUIHelpers.h"
+#include "InstrumentItem.h"
+#include "IntensityDataIOFactory.h"
+#include "IntensityDataItem.h"
#include "JobItem.h"
#include "RealDataItem.h"
-#include "IntensityDataIOFactory.h"
#include <QFileInfo>
namespace
diff --git a/GUI/coregui/Models/JobModel.cpp b/GUI/coregui/Models/JobModel.cpp
index 1b4414318451a662f6cc7ecbd5de26ab6c92c9c4..1151e0d48addd54e988764f2bf816d0c6dd9ca5b 100644
--- a/GUI/coregui/Models/JobModel.cpp
+++ b/GUI/coregui/Models/JobModel.cpp
@@ -15,20 +15,20 @@
// ************************************************************************** //
#include "JobModel.h"
-#include "JobQueueData.h"
-#include "JobItem.h"
+#include "FitSuiteItem.h"
#include "GUIHelpers.h"
-#include "MultiLayerItem.h"
#include "InstrumentItem.h"
-#include "RealDataItem.h"
+#include "IntensityDataItem.h"
+#include "JobItem.h"
+#include "JobItemHelper.h"
+#include "JobQueueData.h"
+#include "MultiLayerItem.h"
#include "ParameterTreeBuilder.h"
#include "ParameterTreeItems.h"
+#include "RealDataItem.h"
#include "SimulationOptionsItem.h"
-#include "JobItemHelper.h"
-#include "IntensityDataItem.h"
-#include "FitSuiteItem.h"
-#include <QUuid>
#include <QDebug>
+#include <QUuid>
JobModel::JobModel(QObject *parent)
diff --git a/GUI/coregui/Models/JobQueueData.cpp b/GUI/coregui/Models/JobQueueData.cpp
index 0ed9089cf9d26fc61b29e7443b78d691cba4b62f..ae685c50e53ca72654905cadec95a69bcf3a9b07 100644
--- a/GUI/coregui/Models/JobQueueData.cpp
+++ b/GUI/coregui/Models/JobQueueData.cpp
@@ -15,14 +15,14 @@
// ************************************************************************** //
#include "JobQueueData.h"
+#include "DomainSimulationBuilder.h"
+#include "GISASSimulation.h"
+#include "GUIHelpers.h"
#include "JobItem.h"
#include "JobModel.h"
#include "JobWorker.h"
-#include "GISASSimulation.h"
-#include "DomainSimulationBuilder.h"
-#include "GUIHelpers.h"
-#include <QThread>
#include <QDebug>
+#include <QThread>
JobQueueData::JobQueueData(JobModel *jobModel)
: m_jobModel(jobModel)
diff --git a/GUI/coregui/Models/JobQueueData.h b/GUI/coregui/Models/JobQueueData.h
index 6599eaef5f07ba1c555db4624325a88fb9edc4b3..05825d35ec47cdc03d26f04ea093cdc87cb20e29 100644
--- a/GUI/coregui/Models/JobQueueData.h
+++ b/GUI/coregui/Models/JobQueueData.h
@@ -17,8 +17,8 @@
#ifndef JOBQUEUEDATA_H
#define JOBQUEUEDATA_H
-#include <QObject>
#include <QMap>
+#include <QObject>
class JobItem;
class JobModel;
diff --git a/GUI/coregui/Models/MaskItems.cpp b/GUI/coregui/Models/MaskItems.cpp
index 84031cabcc73d859f66db96806d791a6062a9eea..1f71b297fcd457e257d9af5d3295266af3c7d50e 100644
--- a/GUI/coregui/Models/MaskItems.cpp
+++ b/GUI/coregui/Models/MaskItems.cpp
@@ -15,12 +15,12 @@
// ************************************************************************** //
#include "MaskItems.h"
-#include "Rectangle.h"
-#include "Polygon.h"
-#include "Line.h"
#include "Ellipse.h"
-#include "InfinitePlane.h"
#include "GUIHelpers.h"
+#include "InfinitePlane.h"
+#include "Line.h"
+#include "Polygon.h"
+#include "Rectangle.h"
MaskContainerItem::MaskContainerItem()
diff --git a/GUI/coregui/Models/MaterialItem.cpp b/GUI/coregui/Models/MaterialItem.cpp
index 2fc02d2005598f732d410693cd956a2114fbac2c..393c0192c314a330b6045481615dce694a4d0060 100644
--- a/GUI/coregui/Models/MaterialItem.cpp
+++ b/GUI/coregui/Models/MaterialItem.cpp
@@ -15,10 +15,10 @@
// ************************************************************************** //
#include "MaterialItem.h"
-#include "MaterialUtils.h"
-#include "RefractiveIndexItem.h"
#include "GUIHelpers.h"
#include "HomogeneousMaterial.h"
+#include "MaterialUtils.h"
+#include "RefractiveIndexItem.h"
#include <QUuid>
diff --git a/GUI/coregui/Models/MaterialModel.cpp b/GUI/coregui/Models/MaterialModel.cpp
index 1e7d9cf7aa153549a69bd9b9b47d733a0104c7a3..fa4af2a8c2c15e290070777d1cef1fcdfb28bd33 100644
--- a/GUI/coregui/Models/MaterialModel.cpp
+++ b/GUI/coregui/Models/MaterialModel.cpp
@@ -15,11 +15,11 @@
// ************************************************************************** //
#include "MaterialModel.h"
-#include "RefractiveIndexItem.h"
-#include "MaterialUtils.h"
#include "IconProvider.h"
-#include <QUuid>
+#include "MaterialUtils.h"
+#include "RefractiveIndexItem.h"
#include <QDebug>
+#include <QUuid>
MaterialModel::MaterialModel(QObject *parent)
: SessionModel(SessionXML::MaterialModelTag, parent)
diff --git a/GUI/coregui/Models/MinimizerItem.cpp b/GUI/coregui/Models/MinimizerItem.cpp
index d5b5d1848614d87f2af7c19aa90693bcab7b2a1a..beabc4002cfd79b5ebbe33d08583a753dbd6f543 100644
--- a/GUI/coregui/Models/MinimizerItem.cpp
+++ b/GUI/coregui/Models/MinimizerItem.cpp
@@ -15,8 +15,8 @@
// ************************************************************************** //
#include "MinimizerItem.h"
-#include "MinimizerItemCatalogue.h"
#include "MinimizerFactory.h"
+#include "MinimizerItemCatalogue.h"
#include <QDebug>
// ----------------------------------------------------------------------------
diff --git a/GUI/coregui/Models/MinimizerItemCatalogue.cpp b/GUI/coregui/Models/MinimizerItemCatalogue.cpp
index 4fe841748767f1e200bf3dcf05b5c77ebc097f4e..9e72ba1af79f099c4daa706bd51fec9b2a5746dd 100644
--- a/GUI/coregui/Models/MinimizerItemCatalogue.cpp
+++ b/GUI/coregui/Models/MinimizerItemCatalogue.cpp
@@ -15,9 +15,9 @@
// ************************************************************************** //
#include "MinimizerItemCatalogue.h"
+#include "BornAgainNamespace.h"
#include "GUIHelpers.h"
#include "MinimizerItem.h"
-#include "BornAgainNamespace.h"
MinimizerLibrary::Catalogue MinimizerItemCatalogue::m_catalogue = MinimizerLibrary::Catalogue();
diff --git a/GUI/coregui/Models/MinimizerItemCatalogue.h b/GUI/coregui/Models/MinimizerItemCatalogue.h
index 678cc5b4e69f45d22697280987be1a941812022a..1e1a90434c7a9afc37cf24e53ddddcb6e1f22aad 100644
--- a/GUI/coregui/Models/MinimizerItemCatalogue.h
+++ b/GUI/coregui/Models/MinimizerItemCatalogue.h
@@ -17,8 +17,8 @@
#ifndef MINIMIZERITEMCATALOGUE_H
#define MINIMIZERITEMCATALOGUE_H
-#include "MinimizerLibrary.h"
#include "ComboProperty.h"
+#include "MinimizerLibrary.h"
class MinimizerItem;
diff --git a/GUI/coregui/Models/ModelMapper.h b/GUI/coregui/Models/ModelMapper.h
index 1fc356aa0d548883b5c24e0f3957296d8b29ef4a..9bff42f13fef847ea426671ffae367a5d394b9bc 100644
--- a/GUI/coregui/Models/ModelMapper.h
+++ b/GUI/coregui/Models/ModelMapper.h
@@ -18,8 +18,8 @@
#define MODELMAPPER_H
-#include <functional>
#include <QModelIndex>
+#include <functional>
class SessionModel;
class SessionItem;
diff --git a/GUI/coregui/Models/ModelPath.h b/GUI/coregui/Models/ModelPath.h
index 004f6fd49f699f4f6952d0a7c3ab0fd53a3a9017..c86bb2c3e93bd53ab1bfc1c21c0798602ea73876 100644
--- a/GUI/coregui/Models/ModelPath.h
+++ b/GUI/coregui/Models/ModelPath.h
@@ -18,8 +18,8 @@
#define MODELPATH_H
#include "ParameterTranslators.h"
-#include <vector>
#include <memory>
+#include <vector>
class SessionItem;
class QModelIndex;
diff --git a/GUI/coregui/Models/ParameterTranslators.cpp b/GUI/coregui/Models/ParameterTranslators.cpp
index 1e0c7c4441fafd0506027482fa69015660561d37..9a2facbf1bc7c3f74dbf0e0eac6f9f48ad373eba 100644
--- a/GUI/coregui/Models/ParameterTranslators.cpp
+++ b/GUI/coregui/Models/ParameterTranslators.cpp
@@ -16,8 +16,8 @@
#include "ParameterTranslators.h"
#include "ParticleItem.h"
-#include "VectorItem.h"
#include "RotationItems.h"
+#include "VectorItem.h"
PositionTranslator::PositionTranslator()
diff --git a/GUI/coregui/Models/ParameterTreeBuilder.cpp b/GUI/coregui/Models/ParameterTreeBuilder.cpp
index f1176c0053bbda274f3a6675c0053c9b77978ea0..6dd3c0d8b2f96d90a7563a2a478afdfbc4840abf 100644
--- a/GUI/coregui/Models/ParameterTreeBuilder.cpp
+++ b/GUI/coregui/Models/ParameterTreeBuilder.cpp
@@ -15,13 +15,13 @@
// ************************************************************************** //
#include "ParameterTreeBuilder.h"
-#include "SampleModel.h"
-#include "JobItem.h"
-#include "MultiLayerItem.h"
+#include "FitParameterHelper.h"
#include "GroupItem.h"
+#include "JobItem.h"
#include "ModelPath.h"
+#include "MultiLayerItem.h"
#include "ParameterTreeItems.h"
-#include "FitParameterHelper.h"
+#include "SampleModel.h"
#include <QStack>
void ParameterTreeBuilder::createParameterTree(JobItem *item, const QString &tag)
diff --git a/GUI/coregui/Models/ParameterTuningModel.cpp b/GUI/coregui/Models/ParameterTuningModel.cpp
index 9a701f58d0484717c5375538c54cea31dfa69fb1..6fad6af95bf56e5bfb5bd49510e37af97e32214d 100644
--- a/GUI/coregui/Models/ParameterTuningModel.cpp
+++ b/GUI/coregui/Models/ParameterTuningModel.cpp
@@ -16,8 +16,8 @@
#include "ParameterTuningModel.h"
#include "FitParameterHelper.h"
-#include "SessionModel.h"
#include "ParameterTreeItems.h"
+#include "SessionModel.h"
#include <QDebug>
#include <QMimeData>
diff --git a/GUI/coregui/Models/ParticleCompositionItem.cpp b/GUI/coregui/Models/ParticleCompositionItem.cpp
index fbc53e8e744203a66983140889e0db2ee081bed1..96cd7c23db9781a89c25580acfdc985a78685026 100644
--- a/GUI/coregui/Models/ParticleCompositionItem.cpp
+++ b/GUI/coregui/Models/ParticleCompositionItem.cpp
@@ -15,11 +15,11 @@
// ************************************************************************** //
#include "ParticleCompositionItem.h"
+#include "GUIHelpers.h"
+#include "ModelPath.h"
#include "ParticleCoreShellItem.h"
#include "ParticleItem.h"
#include "TransformToDomain.h"
-#include "GUIHelpers.h"
-#include "ModelPath.h"
const QString ParticleCompositionItem::T_PARTICLES = "Particle Tag";
diff --git a/GUI/coregui/Models/ParticleCoreShellItem.cpp b/GUI/coregui/Models/ParticleCoreShellItem.cpp
index cf6d118976c39d96dd5dd1a2bd3c51e47b933cd1..92c50fe9caa7610be4136f73273363c6253bb623 100644
--- a/GUI/coregui/Models/ParticleCoreShellItem.cpp
+++ b/GUI/coregui/Models/ParticleCoreShellItem.cpp
@@ -15,10 +15,10 @@
// ************************************************************************** //
#include "ParticleCoreShellItem.h"
-#include "ParticleItem.h"
-#include "TransformToDomain.h"
#include "GUIHelpers.h"
#include "ModelPath.h"
+#include "ParticleItem.h"
+#include "TransformToDomain.h"
const QString ParticleCoreShellItem::T_CORE = "Core Tag";
const QString ParticleCoreShellItem::T_SHELL = "Shell Tag";
diff --git a/GUI/coregui/Models/ParticleDistributionItem.cpp b/GUI/coregui/Models/ParticleDistributionItem.cpp
index 8aa79b02f2f9128ca609b705cd5b11f7702c0184..154331c3e7cb97c9d7be38eb902c3fb586c1ec57 100644
--- a/GUI/coregui/Models/ParticleDistributionItem.cpp
+++ b/GUI/coregui/Models/ParticleDistributionItem.cpp
@@ -15,14 +15,14 @@
// ************************************************************************** //
#include "ParticleDistributionItem.h"
-#include "ParticleItem.h"
-#include "TransformToDomain.h"
-#include "TransformFromDomain.h"
+#include "ComboProperty.h"
#include "DistributionItem.h"
#include "Distributions.h"
-#include "ComboProperty.h"
#include "GUIHelpers.h"
#include "ModelPath.h"
+#include "ParticleItem.h"
+#include "TransformFromDomain.h"
+#include "TransformToDomain.h"
#include <QDebug>
const QString ParticleDistributionItem::P_DISTRIBUTED_PARAMETER = "Distributed parameter";
diff --git a/GUI/coregui/Models/ParticleItem.cpp b/GUI/coregui/Models/ParticleItem.cpp
index 94a2108d4802cd91f163b2b617bf1f18de3bb096..4900c1095195861655df02804191c84c64ef2a8b 100644
--- a/GUI/coregui/Models/ParticleItem.cpp
+++ b/GUI/coregui/Models/ParticleItem.cpp
@@ -15,13 +15,13 @@
// ************************************************************************** //
#include "ParticleItem.h"
-#include "ParticleCoreShellItem.h"
#include "FormFactorItems.h"
-#include "MaterialUtils.h"
-#include "VectorItem.h"
-#include "TransformToDomain.h"
#include "GUIHelpers.h"
+#include "MaterialUtils.h"
#include "ModelPath.h"
+#include "ParticleCoreShellItem.h"
+#include "TransformToDomain.h"
+#include "VectorItem.h"
const QString ParticleItem::P_FORM_FACTOR = "Form Factor";
diff --git a/GUI/coregui/Models/PropertyAttribute.h b/GUI/coregui/Models/PropertyAttribute.h
index db4a870fabfd20dd1b8d911ce1aaaf737b30dfd2..410876de40c83ed0e80c4878ff8d139f9fbca145 100644
--- a/GUI/coregui/Models/PropertyAttribute.h
+++ b/GUI/coregui/Models/PropertyAttribute.h
@@ -18,9 +18,9 @@
#define PROPERTYATTRIBUTE_H
-#include <QString>
#include "AttLimits.h"
#include <QMetaType>
+#include <QString>
class SessionItem;
diff --git a/GUI/coregui/Models/RealDataItem.cpp b/GUI/coregui/Models/RealDataItem.cpp
index 4b0f3291d9acd68ac2e9e33d682a9f0745467501..c938d8e1d73ec6133b52699d3b2cf988b23c1c55 100644
--- a/GUI/coregui/Models/RealDataItem.cpp
+++ b/GUI/coregui/Models/RealDataItem.cpp
@@ -15,8 +15,8 @@
// ************************************************************************** //
#include "RealDataItem.h"
-#include "IntensityDataItem.h"
#include "GUIHelpers.h"
+#include "IntensityDataItem.h"
const QString RealDataItem::T_INTENSITY_DATA = "Intensity data";
diff --git a/GUI/coregui/Models/RealDataModel.cpp b/GUI/coregui/Models/RealDataModel.cpp
index 577eff51f69bc5a6ae0bb292beefdad4d4fcbb07..6fa8620d09503f569cc271b98f673327e7671cae 100644
--- a/GUI/coregui/Models/RealDataModel.cpp
+++ b/GUI/coregui/Models/RealDataModel.cpp
@@ -15,8 +15,8 @@
// ************************************************************************** //
#include "RealDataModel.h"
-#include "RealDataItem.h"
#include "ImportDataAssistant.h"
+#include "RealDataItem.h"
RealDataModel::RealDataModel(QObject *parent)
: SessionModel(SessionXML::RealDataModelTag, parent)
diff --git a/GUI/coregui/Models/RectangularDetectorItem.cpp b/GUI/coregui/Models/RectangularDetectorItem.cpp
index 177ef7522708bc82c6cccddf926ece38d5b277bd..66bc2016a457446a8ae3c850b8cebbdc5c3a4a8d 100644
--- a/GUI/coregui/Models/RectangularDetectorItem.cpp
+++ b/GUI/coregui/Models/RectangularDetectorItem.cpp
@@ -16,11 +16,11 @@
#include "RectangularDetectorItem.h"
#include "AxesItems.h"
-#include "VectorItem.h"
#include "ComboProperty.h"
+#include "GUIHelpers.h"
#include "RectangularDetector.h"
#include "ResolutionFunctionItems.h"
-#include "GUIHelpers.h"
+#include "VectorItem.h"
#include <QDebug>
namespace {
diff --git a/GUI/coregui/Models/ResolutionFunctionItems.h b/GUI/coregui/Models/ResolutionFunctionItems.h
index 645dc366fbe6c3898c26ff85732bc86c22d0a6ee..263c248f4e4acb9dc434355ac73d35a6695ba03c 100644
--- a/GUI/coregui/Models/ResolutionFunctionItems.h
+++ b/GUI/coregui/Models/ResolutionFunctionItems.h
@@ -17,8 +17,8 @@
#ifndef RESOLUTIONFUNCTIONITEMS_H
#define RESOLUTIONFUNCTIONITEMS_H
-#include "SessionItem.h"
#include "ResolutionFunction2DGaussian.h"
+#include "SessionItem.h"
class BA_CORE_API_ ResolutionFunctionItem : public SessionItem
diff --git a/GUI/coregui/Models/RotationItems.h b/GUI/coregui/Models/RotationItems.h
index 7b111286689ed6307bac6311c19963e6260b6af0..d92b371fb1c3a63e61f201ee343c95e2ac56ae23 100644
--- a/GUI/coregui/Models/RotationItems.h
+++ b/GUI/coregui/Models/RotationItems.h
@@ -17,8 +17,8 @@
#ifndef ROTATIONITEMS_H
#define ROTATIONITEMS_H
-#include "SessionItem.h"
#include "Rotations.h"
+#include "SessionItem.h"
class RotationItem : public SessionItem
{
diff --git a/GUI/coregui/Models/SampleValidator.cpp b/GUI/coregui/Models/SampleValidator.cpp
index 6bdc8195bbc5e1ab39e81a6bfcbc2b76db96a821..6ae21d8a1ce6af0348b43e196edc9b8fa5a77bd1 100644
--- a/GUI/coregui/Models/SampleValidator.cpp
+++ b/GUI/coregui/Models/SampleValidator.cpp
@@ -15,12 +15,12 @@
// ************************************************************************** //
#include "SampleValidator.h"
-#include "MultiLayerItem.h"
#include "LayerItem.h"
-#include "ParticleLayoutItem.h"
+#include "MultiLayerItem.h"
#include "ParticleCompositionItem.h"
#include "ParticleCoreShellItem.h"
#include "ParticleDistributionItem.h"
+#include "ParticleLayoutItem.h"
SampleValidator::SampleValidator()
: m_valid_sample(true)
diff --git a/GUI/coregui/Models/SessionItem.cpp b/GUI/coregui/Models/SessionItem.cpp
index aed48b023fe7093360dc0a72ee2829dc18f6cf5f..552602787aab2907ebea809b4d79786f05a04aaa 100644
--- a/GUI/coregui/Models/SessionItem.cpp
+++ b/GUI/coregui/Models/SessionItem.cpp
@@ -14,12 +14,11 @@
//
// ************************************************************************** //
-#include "SessionModel.h"
-#include "GroupPropertyRegistry.h"
+#include "GUIHelpers.h"
#include "GroupItem.h"
+#include "GroupPropertyRegistry.h"
#include "ItemFactory.h"
-#include "GUIHelpers.h"
-
+#include "SessionModel.h"
#include <QDebug>
class SessionItemData
diff --git a/GUI/coregui/Models/SessionItem.h b/GUI/coregui/Models/SessionItem.h
index e2790ab3ae6072d4da69b07be5d15d84bfbbcb99..57043011855cf506e1a684cf6905e7e6b7c2652b 100644
--- a/GUI/coregui/Models/SessionItem.h
+++ b/GUI/coregui/Models/SessionItem.h
@@ -17,9 +17,9 @@
#ifndef SESSIONITEM_H
#define SESSIONITEM_H
-#include "item_constants.h"
-#include "ModelMapper.h"
#include "AttLimits.h"
+#include "ModelMapper.h"
+#include "item_constants.h"
#include <QStringList>
#include <memory>
diff --git a/GUI/coregui/Models/SessionModel.cpp b/GUI/coregui/Models/SessionModel.cpp
index f55b556ab71f6751aa59f6350e35b9d74bf16117..58948d9fab12a7df35763d15c387277d5a114bdf 100644
--- a/GUI/coregui/Models/SessionModel.cpp
+++ b/GUI/coregui/Models/SessionModel.cpp
@@ -15,12 +15,12 @@
// ************************************************************************** //
#include "SessionModel.h"
-#include "ItemFactory.h"
#include "GUIHelpers.h"
#include "IconProvider.h"
+#include "ItemFactory.h"
+#include <QDebug>
#include <QFile>
#include <QMimeData>
-#include <QDebug>
namespace
{
diff --git a/GUI/coregui/Models/SessionXML.cpp b/GUI/coregui/Models/SessionXML.cpp
index 3b4ef82d584fda8c4be1534b27b9578785531118..b72e8d035f8b6bacd7d007cd988d302171901f7e 100644
--- a/GUI/coregui/Models/SessionXML.cpp
+++ b/GUI/coregui/Models/SessionXML.cpp
@@ -14,15 +14,15 @@
//
// ************************************************************************** //
-#include "SessionModel.h"
-#include "MaterialProperty.h"
-#include "ComboProperty.h"
-#include "ScientificDoubleProperty.h"
-#include "ColorProperty.h"
#include "AngleProperty.h"
+#include "ColorProperty.h"
+#include "ComboProperty.h"
#include "GUIHelpers.h"
-#include "ItemFactory.h"
#include "GroupItem.h"
+#include "ItemFactory.h"
+#include "MaterialProperty.h"
+#include "ScientificDoubleProperty.h"
+#include "SessionModel.h"
#include "WarningMessageService.h"
#include <QDebug>
diff --git a/GUI/coregui/Models/SphericalDetectorItem.cpp b/GUI/coregui/Models/SphericalDetectorItem.cpp
index d71c711c3c493345e5a708b6c5280d3cf573a913..52db388c2082b1fc6631a7529f70a57cf7de8b61 100644
--- a/GUI/coregui/Models/SphericalDetectorItem.cpp
+++ b/GUI/coregui/Models/SphericalDetectorItem.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
-#include "Units.h"
#include "SphericalDetectorItem.h"
#include "AxesItems.h"
-#include "SphericalDetector.h"
#include "ResolutionFunctionItems.h"
+#include "SphericalDetector.h"
+#include "Units.h"
const QString SphericalDetectorItem::P_PHI_AXIS = "Phi axis";
const QString SphericalDetectorItem::P_ALPHA_AXIS = "Alpha axis";
diff --git a/GUI/coregui/Models/TransformToDomain.cpp b/GUI/coregui/Models/TransformToDomain.cpp
index adcadf276112616446030483452b428cb027c682..beed69dd0cffbafd70937cda5b716c2155eb2c5f 100644
--- a/GUI/coregui/Models/TransformToDomain.cpp
+++ b/GUI/coregui/Models/TransformToDomain.cpp
@@ -25,11 +25,11 @@
#include "FTDistributionItems.h"
#include "GISASSimulation.h"
#include "GUIHelpers.h"
-#include "InterferenceFunctionItems.h"
-#include "InterferenceFunctionRadialParaCrystal.h"
#include "InterferenceFunction1DLattice.h"
#include "InterferenceFunction2DLattice.h"
#include "InterferenceFunction2DParaCrystal.h"
+#include "InterferenceFunctionItems.h"
+#include "InterferenceFunctionRadialParaCrystal.h"
#include "LatticeTypeItems.h"
#include "LayerItem.h"
#include "LayerRoughnessItems.h"
diff --git a/GUI/coregui/Models/TransformToDomain.h b/GUI/coregui/Models/TransformToDomain.h
index 7f23e6d702a72ad2eb5aac570b065d270a04e577..1b3b6993c4958a970abbb564864dd28a956683b1 100644
--- a/GUI/coregui/Models/TransformToDomain.h
+++ b/GUI/coregui/Models/TransformToDomain.h
@@ -17,8 +17,6 @@
#ifndef TRANSFORMTODOMAIN_H
#define TRANSFORMTODOMAIN_H
-#include <memory>
-
#include "Beam.h"
#include "Distributions.h" // for IDistribution1D
#include "IInterferenceFunction.h"
@@ -30,6 +28,7 @@
#include "MultiLayer.h"
#include "ParticleDistribution.h"
#include "ParticleLayout.h"
+#include <memory>
class GISASSimulation;
class SessionItem;
diff --git a/GUI/coregui/Views/CommonWidgets/InfoPanel.cpp b/GUI/coregui/Views/CommonWidgets/InfoPanel.cpp
index a48fd600bc5d9b13fd18462a2469051002086cf7..1f5aad2c61ea4293902bb6eaa35111168b9d01e9 100644
--- a/GUI/coregui/Views/CommonWidgets/InfoPanel.cpp
+++ b/GUI/coregui/Views/CommonWidgets/InfoPanel.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include "InfoPanelToolBar.h"
#include "InfoPanel.h"
+#include "InfoPanelToolBar.h"
#include <QBoxLayout>
#include <QDebug>
#include <QResizeEvent>
diff --git a/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp
index 44338981b5210b10b954c48471955ee8f7f078fc..f6a15e3c6238488df3dc7a56bf9a5dfa319ae0ca 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "ItemComboWidget.h"
#include "ItemComboToolBar.h"
#include "SessionItemWidget.h"
-#include "ItemComboWidget.h"
#include <QComboBox>
#include <QDebug>
#include <QEvent>
diff --git a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
index e21591c1860be3fd1467ad34aba00a2d4faf1d95..940ba058d20bf775781be976afa63899687223b6 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
+#include "ItemSelectorWidget.h"
#include "SessionItem.h"
#include "SessionModel.h"
#include "mainwindow_constants.h"
-#include "ItemSelectorWidget.h"
#include <QDebug>
#include <QListView>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
index 5498215850974f1acd0bf3a5ffd745f474ba2f1d..0d0130769084606edb04cafccf8f8e500b4e92cf 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "ItemStackWidget.h"
#include "GUIHelpers.h"
#include "SessionModel.h"
-#include "ItemStackWidget.h"
#include <QDebug>
#include <QStackedWidget>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp b/GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp
index 40c39b7145f732537a4090df282119289223b067..0e540dd9baa5b2c517bd996fd5ba4feeb9ce0f97 100644
--- a/GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "FitActivityPanel.h"
#include "FitSuiteWidget.h"
#include "JobItem.h"
#include "JobMessagePanel.h"
@@ -21,7 +22,6 @@
#include "JobRealTimeWidget.h"
#include "RunFitControlWidget.h"
#include "mainwindow_constants.h"
-#include "FitActivityPanel.h"
#include <QPushButton>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
index bcbdea1a9b9651c797b80eebe8f905ead903fa0c..aa29b90ae2c6561d804012f9e33fcd3238c26246 100644
--- a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "FitComparisonWidget.h"
#include "AxesItems.h"
#include "ColorMapCanvas.h"
#include "ColorMapLabel.h"
@@ -23,7 +24,6 @@
#include "JobItem.h"
#include "RealDataItem.h"
#include "SessionModel.h"
-#include "FitComparisonWidget.h"
#include <QAction>
#include <QDebug>
#include <QGridLayout>
diff --git a/GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp b/GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp
index ed0bdbdee40c20cb93afcdc56a7d54ebc99b3c20..066d72764601f9a85220b4afc71b94fff7aec5d6 100644
--- a/GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "FitFlowWidget.h"
#include "FitSuiteItem.h"
#include "HistogramPlot.h"
-#include "FitFlowWidget.h"
#include <QDebug>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp b/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
index 7da3b17e3605991000b43e029c8b791dc6028984..faa8204853878e11df47e69f5aa4acb5701bc382 100644
--- a/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "FitParameterWidget.h"
#include "CustomEventFilters.h"
#include "FilterPropertyProxy.h"
#include "FitParameterHelper.h"
@@ -27,7 +28,6 @@
#include "ParameterTuningWidget.h"
#include "SessionModelDelegate.h"
#include "mainwindow_constants.h"
-#include "FitParameterWidget.h"
#include <QAction>
#include <QDebug>
#include <QMenu>
diff --git a/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp b/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp
index daa6458ecc1006adc5cafde2cd06f6535d18fa5c..94ffd5f2ce38c28b830a916af951d5b67888802a 100644
--- a/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "FitSuiteWidget.h"
#include "DomainFittingBuilder.h"
#include "FitParameterItems.h"
#include "FitParameterWidget.h"
@@ -31,7 +32,6 @@
#include "ParameterTreeItems.h"
#include "RunFitManager.h"
#include "mainwindow_constants.h"
-#include "FitSuiteWidget.h"
#include <QDebug>
#include <QMessageBox>
#include <QTabWidget>
diff --git a/GUI/coregui/Views/FitWidgets/FittingWorker.cpp b/GUI/coregui/Views/FitWidgets/FittingWorker.cpp
index 5766d474057a3f47c8ccd5ad0ddde43756e52e94..4ae4e209ffb57f0ffe37f600ecce3c3533f67c9b 100644
--- a/GUI/coregui/Views/FitWidgets/FittingWorker.cpp
+++ b/GUI/coregui/Views/FitWidgets/FittingWorker.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include "FitSuite.h"
#include "FittingWorker.h"
+#include "FitSuite.h"
#include <QDateTime>
#include <QDebug>
diff --git a/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp b/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
index dcc34970d78a397571aff60ef98cd3bc8a6121f5..e37b391c1578687ee3a4ab5bd8fcb152ac06c544 100644
--- a/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
+++ b/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
+#include "GUIFitObserver.h"
#include "FitParameter.h"
#include "FitProgressInfo.h"
#include "FitSuite.h"
#include "FitSuiteParameters.h"
#include "GUIHelpers.h"
#include "IntensityDataItem.h"
-#include "GUIFitObserver.h"
#include <QDebug>
#include <QVector>
diff --git a/GUI/coregui/Views/FitWidgets/HistogramPlot.cpp b/GUI/coregui/Views/FitWidgets/HistogramPlot.cpp
index 8b2643283942b707ba1387403f9277f70a0b5064..d622531127f59d080120e4f965b9711e6be206d4 100644
--- a/GUI/coregui/Views/FitWidgets/HistogramPlot.cpp
+++ b/GUI/coregui/Views/FitWidgets/HistogramPlot.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include "plot_constants.h"
#include "HistogramPlot.h"
+#include "plot_constants.h"
HistogramPlot::HistogramPlot(QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
index 4e74a0ae698f6623aff681ad87ce4a096b23a9c4..12dc5f04107c4d225598aa47f4c8a3137ab1c593 100644
--- a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
+#include "MinimizerSettingsWidget.h"
#include "ComponentEditor.h"
#include "FitSuiteItem.h"
#include "JobItem.h"
#include "MinimizerItem.h"
-#include "MinimizerSettingsWidget.h"
#include <QDebug>
#include <QPushButton>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp b/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
index d8edb93ee2657e65c04b6975b843e688349ed9c1..f3f27167cb321ce859c2e0dc57654114114ebd23 100644
--- a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
+#include "RunFitControlWidget.h"
#include "DesignerHelper.h"
#include "FitSuiteItem.h"
#include "JobItem.h"
#include "JobMessagePanel.h"
#include "WarningSignWidget.h"
#include "mainwindow_constants.h"
-#include "RunFitControlWidget.h"
#include <QDebug>
#include <QFont>
#include <QHBoxLayout>
diff --git a/GUI/coregui/Views/FitWidgets/RunFitManager.cpp b/GUI/coregui/Views/FitWidgets/RunFitManager.cpp
index 0cb8b84d1f60dd50be644fe323e394d9571158f3..4ad26f81c6eab7691ad6d21194d8e2853e86acaa 100644
--- a/GUI/coregui/Views/FitWidgets/RunFitManager.cpp
+++ b/GUI/coregui/Views/FitWidgets/RunFitManager.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "RunFitManager.h"
#include "FitSuite.h"
#include "FittingWorker.h"
-#include "RunFitManager.h"
#include <QDebug>
#include <QThread>
#include <memory>
diff --git a/GUI/coregui/Views/FitWidgets/TestFitWidgets.cpp b/GUI/coregui/Views/FitWidgets/TestFitWidgets.cpp
index 3877dab23cb294d70579c1699063c1d55f412ec4..0706151b7f94ff839be3044edec4265a0c5d1dc5 100644
--- a/GUI/coregui/Views/FitWidgets/TestFitWidgets.cpp
+++ b/GUI/coregui/Views/FitWidgets/TestFitWidgets.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "TestFitWidgets.h"
#include "FitParameterItems.h"
#include "FitParameterWidget.h"
#include "FitSuiteItem.h"
@@ -22,7 +23,6 @@
#include "ParameterTuningWidget.h"
#include "item_constants.h"
#include "mainwindow.h"
-#include "TestFitWidgets.h"
#include <QHBoxLayout>
#include <QTreeView>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/ImportDataView.cpp b/GUI/coregui/Views/ImportDataView.cpp
index ff239aef6ec316b40cabd1758c24d3e107d4ec90..e53f5a01072870db1d8f9a8236a827c63bfdf901 100644
--- a/GUI/coregui/Views/ImportDataView.cpp
+++ b/GUI/coregui/Views/ImportDataView.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
+#include "ImportDataView.h"
#include "ImportDataToolBar.h"
#include "ItemSelectorWidget.h"
#include "RealDataModel.h"
#include "mainwindow.h"
#include "mainwindow_constants.h"
#include "minisplitter.h"
-#include "ImportDataView.h"
#include <QVBoxLayout>
ImportDataView::ImportDataView(MainWindow *mainWindow)
diff --git a/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp b/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
index b53e4c872491402ebf586783b5e955d4909c8120..85bd71f7b09b8d5ad3a38f0ece05576a3105a805 100644
--- a/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
+#include "ImportDataAssistant.h"
#include "AppSvc.h"
#include "GUIHelpers.h"
#include "IntensityDataIOFactory.h"
#include "IntensityDataItem.h"
#include "RealDataItem.h"
#include "projectmanager.h"
-#include "ImportDataAssistant.h"
#include <QDebug>
#include <QFileDialog>
#include <QFileInfo>
diff --git a/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp b/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp
index baff9c222e6e96b29561b2f1c771bd17eb5da072..879913557004c86b495dd091770d0d5b867a12b9 100644
--- a/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp
@@ -14,6 +14,8 @@
//
// ************************************************************************** //
+#include "ImportDataToolBar.h"
+#include "ImportDataToolBar.h"
#include "ComboProperty.h"
#include "DetectorItems.h"
#include "IDetector2D.h"
@@ -28,8 +30,6 @@
#include "RectangularDetectorItem.h"
#include "SessionItem.h"
#include "SphericalDetectorItem.h"
-#include "ImportDataToolBar.h"
-#include "ImportDataToolBar.h"
#include <QAction>
#include <QDebug>
#include <QItemSelectionModel>
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp
index fb80f66dd0a1e4356f9461c6d1356435505decff..c5250cf06ebbec309a332f6b0d207e191990e2a6 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
+#include "RealDataEditorWidget.h"
#include "IntensityDataItem.h"
#include "IntensityDataPropertyWidget.h"
#include "IntensityDataWidget.h"
#include "RealDataItem.h"
#include "SessionItem.h"
-#include "RealDataEditorWidget.h"
#include <QAction>
#include <QBoxLayout>
#include <QDebug>
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp b/GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp
index 0600c5dca351bce86c521282ed02bc8d1ca4e2ef..4d3af5f873e39084750f625b3646304620f3b989 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp
+++ b/GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "DistributionDialog.h"
#include "DistributionEditor.h"
#include "SessionItem.h"
-#include "DistributionDialog.h"
#include <QHBoxLayout>
#include <QPushButton>
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp b/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
index 54068c53b3a6f7120ab4f82fbbe8c4b8b9ef9bcf..ab92a61f7ab614a543fff788460dba24a57d3d29 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
+++ b/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "DistributionEditor.h"
#include "BeamWavelengthItem.h"
#include "ComponentBoxEditor.h"
#include "DistributionDialog.h"
@@ -23,7 +24,6 @@
#include "GroupItem.h"
#include "SessionItem.h"
#include "qcustomplot.h"
-#include "DistributionEditor.h"
#include <QDebug>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp b/GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp
index 07d6a9e3af314505f28b17929aec64aa4d9e7602..a24659e70b9308d4c8b89fac79f90e921ab37f42 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
+#include "DistributionWidget.h"
#include "DistributionItem.h"
#include "Distributions.h"
#include "qcustomplot.h"
-#include "DistributionWidget.h"
#include <QLabel>
#include <QVBoxLayout>
#include <sstream>
diff --git a/GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp b/GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp
index 4e2e89894ef5fd8ad161de0b0060906c6102f35a..a586b094c8b2e9bbba38e75e2e2186fc3ca62cae 100644
--- a/GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp
+++ b/GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include "hostosinfo.h"
#include "GroupInfoBox.h"
+#include "hostosinfo.h"
#include <QApplication>
#include <QDebug>
#include <QMouseEvent>
diff --git a/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp b/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp
index 88b72816499023d81366c774627a2c6faad1c8cf..9910cdc2b13dac0b242e72672b485e476ad9c4e4 100644
--- a/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "InfoWidget.h"
#include "InfoToolBar.h"
#include "PySampleWidget.h"
-#include "InfoWidget.h"
#include <QDebug>
#include <QResizeEvent>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp b/GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp
index c94f539b61d628535e4a4743e2a2caf7dd2e0ed2..c85d924ba7af88ca3469b8d1554fee0ea215ee24 100644
--- a/GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp
+++ b/GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include "OverlayLabelWidget.h"
#include "OverlayLabelController.h"
+#include "OverlayLabelWidget.h"
#include <QAbstractScrollArea>
#include <QDebug>
#include <QEvent>
diff --git a/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.cpp b/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.cpp
index 2121e440e135812498e0ccd386610614c1b2dd8d..4e85057cb6f9e79662b8b06b3b35ae13aaed1a27 100644
--- a/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include "DesignerHelper.h"
#include "OverlayLabelWidget.h"
+#include "DesignerHelper.h"
#include <QColor>
#include <QFont>
#include <QPainter>
diff --git a/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp b/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp
index 130ee20b6ed2ecadf757eea7a91a859bdf73cf4d..34bb7347c71ceefc4d5d2bd0c6f5dd45b32b051f 100644
--- a/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp
+++ b/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
+#include "ProjectLoadWarningDialog.h"
#include "DesignerHelper.h"
#include "GUIHelpers.h"
#include "GUIMessage.h"
#include "MessageContainer.h"
#include "SessionModel.h"
#include "WarningMessageService.h"
-#include "ProjectLoadWarningDialog.h"
#include <QBoxLayout>
#include <QDebug>
#include <QFrame>
diff --git a/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp b/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
index 18983a412560d3ee40cc27e448a48b224b7d8435..804225450acd9c638010dcf4276edb987198b13f 100644
--- a/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "PySampleWidget.h"
#include "DesignerHelper.h"
#include "DomainObjectBuilder.h"
#include "InstrumentModel.h"
@@ -22,7 +23,6 @@
#include "PythonSyntaxHighlighter.h"
#include "SampleModel.h"
#include "WarningSignWidget.h"
-#include "PySampleWidget.h"
#include <QDebug>
#include <QFile>
#include <QModelIndex>
diff --git a/GUI/coregui/Views/InstrumentView.cpp b/GUI/coregui/Views/InstrumentView.cpp
index 99fb9c55589ec7e0761197dda4b3a5a668014aa2..6a01019e6921a0065163f2c4a4dbbc6f4817ffd4 100644
--- a/GUI/coregui/Views/InstrumentView.cpp
+++ b/GUI/coregui/Views/InstrumentView.cpp
@@ -24,10 +24,10 @@
#include <QAction> // need detected by TeamCity
#include <QBoxLayout>
#include <QDebug>
+#include <QDebug>
#include <QListView>
#include <QStackedWidget>
#include <QToolButton>
-#include <QDebug>
InstrumentView::InstrumentView(MainWindow *mainWindow)
: QWidget(mainWindow)
diff --git a/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.cpp
index c6b7556b5862ed593bb4d5dcb35714452e61526a..c551de19d03370c610fb16b217b3ce4182567032 100644
--- a/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "BeamEditorWidget.h"
#include "BeamDistributionItem.h"
#include "BeamItem.h"
#include "ComponentBoxEditor.h"
@@ -22,7 +23,6 @@
#include "GUIHelpers.h"
#include "GroupInfoBox.h"
#include "LayerItem.h"
-#include "BeamEditorWidget.h"
#include <QComboBox>
#include <QDebug>
#include <QGroupBox>
diff --git a/GUI/coregui/Views/InstrumentWidgets/ComboWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/ComboWidget.cpp
index 44e5b87cf5d338e4a86a26e6649733defb2284dd..71a5519caf85d55d6e8e33bdf77e528aea39835e 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ComboWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/ComboWidget.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include "GUIHelpers.h"
#include "ComboWidget.h"
+#include "GUIHelpers.h"
#include <QBoxLayout>
#include <QComboBox>
#include <QDebug>
diff --git a/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.cpp b/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.cpp
index 36e2e515e718ea359325f0205148f9ca1f652010..6e738d00ce545ef97daf32f3639341229690656d 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include "ComponentBoxEditor.h"
#include "ComponentInfoBox.h"
+#include "ComponentBoxEditor.h"
#include <QGroupBox>
#include <QVBoxLayout>
#include <iostream>
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
index 2ca8e5fe51936ed1986bf45da9ccf2acf5e998f9..f2cee32bfd1a5a08fca35b02a2b1fabf9c1b18e5 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "DetectorEditorWidget.h"
#include "ComponentBoxEditor.h"
#include "DetectorItems.h"
#include "DetectorItems.h"
@@ -23,7 +24,6 @@
#include "RectangularDetectorWidget.h"
#include "SphericalDetectorWidget.h"
#include "columnresizer.h"
-#include "DetectorEditorWidget.h"
#include <QDebug>
#include <QGroupBox>
#include <QLabel>
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
index a34348e07e504bfbfb82af955d76cfd88e9a2857..67abd7f2130f461886aa1473e63e7ceb3698f5be 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "DetectorMaskDelegate.h"
#include "AxesItems.h"
#include "ComboProperty.h"
#include "DetectorItems.h"
@@ -24,7 +25,6 @@
#include "MaskItems.h"
#include "MaskModel.h"
#include "OutputData.h"
-#include "DetectorMaskDelegate.h"
#include <QDebug>
DetectorMaskDelegate::DetectorMaskDelegate(QObject *parent)
diff --git a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp b/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
index 83912c7dbd46a2d2a058baebd59e88c5c0d2f7dc..af76c25000890867e8c729d758d55c806561f49e 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
+#include "ExtendedDetectorDialog.h"
#include "CustomEventFilters.h"
#include "DetectorMaskDelegate.h"
#include "MaskEditor.h"
#include "MaskModel.h"
#include "mainwindow_constants.h"
-#include "ExtendedDetectorDialog.h"
#include <QDebug>
#include <QKeyEvent>
#include <QModelIndex>
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
index f49c775e0b91e124761472d0e469381167aff695..2bbba296e2a7afb92ebd6a8655e001e0a2a3dfa8 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
+#include "InstrumentComponentsWidget.h"
#include "BeamEditorWidget.h"
#include "DetectorEditorWidget.h"
#include "columnresizer.h"
-#include "InstrumentComponentsWidget.h"
#include <QDebug>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
index a41c639077a29556ad9df2a4655a319d945848f6..bf35102dd37ed8c64e399ffec773590c0d30de27 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "InstrumentEditorWidget.h"
#include "BeamEditorWidget.h"
#include "BeamItem.h"
#include "DetectorEditorWidget.h"
@@ -21,7 +22,6 @@
#include "InstrumentComponentsWidget.h"
#include "InstrumentItem.h"
#include "SessionItem.h"
-#include "InstrumentEditorWidget.h"
#include <QBoxLayout>
#include <QComboBox>
#include <QDebug>
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
index 9f5724481559df3962f55cdffa88ff279abddc92..ea005c1ac9ea46f09561d4fc3a8a409e50b1bd49 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "InstrumentSelectorWidget.h"
#include "InstrumentModel.h"
#include "SessionItem.h"
-#include "InstrumentSelectorWidget.h"
#include <QAction>
#include <QDebug>
#include <QListView>
diff --git a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp
index a737d40010b30f1e37de252f7b9cca41e137c4dd..fb8e1af5b06b657b9fd95016fcf82cfe6344c95a 100644
--- a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "RectangularDetectorWidget.h"
#include "ComboProperty.h"
#include "ComponentBoxEditor.h"
#include "ComponentEditor.h"
@@ -21,7 +22,6 @@
#include "ExtendedDetectorDialog.h"
#include "GroupInfoBox.h"
#include "columnresizer.h"
-#include "RectangularDetectorWidget.h"
#include <QDebug>
#include <QGroupBox>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
index 30792378524b7206b70e74e952389082c7fd6684..c20de312aa172f3f568244c0e0643e014a9db670 100644
--- a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
+#include "SphericalDetectorWidget.h"
#include "ComponentBoxEditor.h"
#include "DetectorItems.h"
#include "ExtendedDetectorDialog.h"
#include "GroupInfoBox.h"
#include "columnresizer.h"
-#include "SphericalDetectorWidget.h"
#include <QDebug>
#include <QGroupBox>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp
index b73732d1fd39e40823a275d9ff4e2ac2018e74d0..ce0f249f18442bff016637851796dd3f2010ed18 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "ColorMap.h"
#include "AxesItems.h"
#include "ColorMapEvent.h"
#include "ColorMapHelper.h"
@@ -22,7 +23,6 @@
#include "Units.h"
#include "UpdateTimer.h"
#include "plot_constants.h"
-#include "ColorMap.h"
#include <QDebug>
namespace {
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp
index b769cf2769fa62eecb63872e1997b3bf13543e75..a73c89f4942993f73a58160925e72ad3d88960bf 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
+#include "ColorMapCanvas.h"
#include "ColorMap.h"
#include "ColorMapCanvasEvent.h"
#include "ColorMapLabel.h"
#include "IntensityDataItem.h"
#include "StatusLabel.h"
-#include "ColorMapCanvas.h"
#include <QDebug>
#include <QLabel>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.cpp
index 63295ad2abcaa2995a92ec8928955f1c20d61b8b..d1620ae549c303c65a50a336fb22b70fe1660ffd 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
+#include "ColorMapCanvasEvent.h"
#include "ColorMap.h"
#include "ColorMapCanvas.h"
#include "qcustomplot.h"
-#include "ColorMapCanvasEvent.h"
#include <QDebug>
#include <QLabel>
#include <QRect>
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.cpp
index 160e2b28ad50cb5c16843bb40580c6dc34a6d623..56460f17d96ce77700ddc622cfd8f2875a684136 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include "ColorMap.h"
#include "ColorMapEvent.h"
+#include "ColorMap.h"
#include <QDebug>
#include <QMouseEvent>
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapHelper.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapHelper.cpp
index a6195ce2eefc6ccefd4c4300747d6c7d0a5259bc..205a918089b52c2afb2ebdb44b3a297f6b0aa37e 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapHelper.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapHelper.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
+#include "ColorMapHelper.h"
#include "GUIHelpers.h"
#include "IntensityDataItem.h"
#include "item_constants.h"
-#include "ColorMapHelper.h"
namespace {
ColorMapHelper::gradient_map_t createGradientMap() {
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.cpp
index 2106851a4ff43db9584ae08b48af792e0f9a72f0..693b2a15739951b877a414670ccf3a32247d01e6 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "ColorMapLabel.h"
#include "ColorMap.h"
#include "ColorMapCanvas.h"
-#include "ColorMapLabel.h"
//namespace {
//const int min_size = 0;
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.cpp
index 9dabac1a3cc898d0686004bcebabe5500d916228..12b63e87847a2f74a3e1e5370b1d65974aadf664 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
+#include "ColorMapPlot.h"
#include "AxesItems.h"
#include "ColorMapHelper.h"
#include "GUIHelpers.h"
#include "IntensityDataItem.h"
#include "Units.h"
#include "UpdateTimer.h"
-#include "ColorMapPlot.h"
#include <QDebug>
namespace {
diff --git a/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.cpp b/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.cpp
index c129900222213419017cc8600ab35736c70d9de3..0aeff7ab28f07be67dda3f1624f443f77510d183 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
+#include "HorizontalSlicePlot.h"
#include "AxesItems.h"
#include "IntensityDataItem.h"
#include "Units.h"
#include "qcustomplot.h"
-#include "HorizontalSlicePlot.h"
#include <QVBoxLayout>
HorizontalSlicePlot::HorizontalSlicePlot(QWidget *parent)
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
index 4b7177023f7a91275dd71d69ca452f6d8284bc6e..6ee3a7ab888db002df07ad3e3977708202b44ff1 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
+#include "IntensityDataPropertyWidget.h"
#include "ComponentEditor.h"
#include "IntensityDataItem.h"
#include "JobModel.h"
-#include "IntensityDataPropertyWidget.h"
#include <QAction>
#include <QDebug>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp
index c63c4df4afafbfe5cba74da378a8b4982d90c4b0..36f9cdb624a0e81be46dd3de3f36b749a8d4e15a 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
+#include "IntensityDataWidget.h"
#include "AppSvc.h"
#include "ColorMapCanvas.h"
#include "IntensityDataItem.h"
#include "SavePlotAssistant.h"
#include "projectmanager.h"
-#include "IntensityDataWidget.h"
#include <QAction>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataPlotWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataPlotWidget.cpp
index 10042b6281213c165f788f38643fd084a7b1fc1a..f21e3f70772cb68ee2ed0159cdb6964794058113 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataPlotWidget.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataPlotWidget.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
+#include "ObsoleteIntensityDataPlotWidget.h"
#include "ColorMapPlot.h"
#include "HorizontalSlicePlot.h"
#include "IntensityDataItem.h"
#include "SavePlotAssistant.h"
#include "VerticalSlicePlot.h"
#include "qcustomplot.h"
-#include "ObsoleteIntensityDataPlotWidget.h"
#include <QDebug>
#include <QLabel>
#include <QSplitter>
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidget.cpp
index 06bcd16122dcf99f6a931339f9c08a2a417402e8..ed49fa7082e6c61ab5fecc7c72e3496b49f72dc0 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidget.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidget.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "ObsoleteIntensityDataWidget.h"
#include "AppSvc.h"
#include "IntensityDataItem.h"
#include "IntensityDataPropertyWidget.h"
@@ -22,7 +23,6 @@
#include "ObsoleteIntensityDataPlotWidget.h"
#include "ObsoleteIntensityDataWidgetActions.h"
#include "projectmanager.h"
-#include "ObsoleteIntensityDataWidget.h"
#include <QDebug>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
index a6bc76abcab5553abb975b809adb28c2e2fcf267..55390f61c214158a7d849b512eb5a73ce9e9ba29 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
+#include "SavePlotAssistant.h"
#include "ColorMapPlot.h"
#include "IntensityDataIOFactory.h"
#include "IntensityDataItem.h"
-#include "SavePlotAssistant.h"
#include <QDebug>
#include <QFileDialog>
#include <QMessageBox>
diff --git a/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.cpp b/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.cpp
index 41c31d39c92b0e52f1be713724be1b82d636f500..75249cc0a2a52e53de373c6822fc949a7eb3fe08 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
+#include "VerticalSlicePlot.h"
#include "AxesItems.h"
#include "IntensityDataItem.h"
#include "Units.h"
#include "qcustomplot.h"
-#include "VerticalSlicePlot.h"
#include <QVBoxLayout>
VerticalSlicePlot::VerticalSlicePlot(QWidget *parent)
diff --git a/GUI/coregui/Views/JobView.cpp b/GUI/coregui/Views/JobView.cpp
index 3bd68623c9fc9aa0a0cb2f8e42a75da8d046ce47..8904a9dcf060425ba4a0612ee54061051063b8c8 100644
--- a/GUI/coregui/Views/JobView.cpp
+++ b/GUI/coregui/Views/JobView.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "JobView.h"
#include "JobActivityStatusBar.h"
#include "JobItem.h"
#include "JobModel.h"
@@ -22,7 +23,6 @@
#include "JobSelectorWidget.h"
#include "JobViewDocks.h"
#include "mainwindow.h"
-#include "JobView.h"
#include <QMenu>
JobView::JobView(MainWindow *mainWindow)
diff --git a/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.cpp b/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.cpp
index c53d014de6b264ee9da65e757236edafa0245583..76247c60b28e5f5b50c5e724718c9c794b1a37ce 100644
--- a/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "JobActivityStatusBar.h"
#include "JobViewActivities.h"
#include "mainwindow.h"
-#include "JobActivityStatusBar.h"
#include <QComboBox>
#include <QHBoxLayout>
#include <QStatusBar>
diff --git a/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp b/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp
index 8af82aff8581b861ee193f7d77f032a7f5a56b79..f74249b50efc83b9a113bf53696140b418e2df55 100644
--- a/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
+#include "JobListViewDelegate.h"
#include "JobItem.h"
#include "JobModel.h"
#include "hostosinfo.h"
#include "progressbar.h"
-#include "JobListViewDelegate.h"
#include <QApplication>
#include <QDebug>
#include <QMouseEvent>
diff --git a/GUI/coregui/Views/JobWidgets/JobListWidget.cpp b/GUI/coregui/Views/JobWidgets/JobListWidget.cpp
index a444ab35b52dd0abc0514dde9aab204ffe934733..b11538c27a23f1fbdc11fecb2c5acaddadb36bc3 100644
--- a/GUI/coregui/Views/JobWidgets/JobListWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobListWidget.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
+#include "JobListWidget.h"
#include "ItemSelectorWidget.h"
#include "JobItem.h"
#include "JobListViewDelegate.h"
#include "JobModel.h"
-#include "JobListWidget.h"
#include <QItemSelectionModel>
#include <QListView>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/JobWidgets/JobMessagePanel.cpp b/GUI/coregui/Views/JobWidgets/JobMessagePanel.cpp
index 9020674bea74a68faf0a7e9360c1355914d0cd61..f9db9a4a57f2c90695fc8dc86da3a376fff0e028 100644
--- a/GUI/coregui/Views/JobWidgets/JobMessagePanel.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobMessagePanel.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include "mainwindow_constants.h"
#include "JobMessagePanel.h"
+#include "mainwindow_constants.h"
#include <QScrollBar>
#include <QStackedWidget>
#include <QTextEdit>
diff --git a/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp b/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp
index 68a230ff6f2ba38fd0308f641e55d41a7f635c2d..9d17cd405b0c7179d09ddc0a50e877c36903e57a 100644
--- a/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
+#include "JobOutputDataWidget.h"
#include "JobItem.h"
#include "JobModel.h"
#include "JobResultsPresenter.h"
#include "JobViewFlags.h"
#include "ObsoleteIntensityDataWidget.h"
#include "mainwindow_constants.h"
-#include "JobOutputDataWidget.h"
#include <QVBoxLayout>
JobOutputDataWidget::JobOutputDataWidget(JobModel *jobModel, QWidget *parent)
diff --git a/GUI/coregui/Views/JobWidgets/JobProgressAssistant.cpp b/GUI/coregui/Views/JobWidgets/JobProgressAssistant.cpp
index d644534d97c5fd031767690af48816533b9c5123..1e667bc604022bf7766c001d96a1fd8fa5ed0f1d 100644
--- a/GUI/coregui/Views/JobWidgets/JobProgressAssistant.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobProgressAssistant.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
+#include "JobProgressAssistant.h"
#include "JobModel.h"
#include "JobQueueData.h"
#include "mainwindow.h"
#include "progressbar.h"
-#include "JobProgressAssistant.h"
JobProgressAssistant::JobProgressAssistant(MainWindow *mainWindow)
: QObject(mainWindow)
diff --git a/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp b/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp
index 0a6e7f0e8babc5eeb5d277ed090d6044fe1e09f4..db0faa95a4f5b67fe5a03a7dada9fd05ac529635 100644
--- a/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
+#include "JobPropertiesWidget.h"
#include "ComponentEditor.h"
#include "JobItem.h"
#include "mainwindow_constants.h"
-#include "JobPropertiesWidget.h"
#include <QTabBar>
#include <QTabWidget>
#include <QTextEdit>
diff --git a/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.cpp b/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.cpp
index 52457c6208afeb6d866b5b4820d00e32f2df290b..62e6dcb221e1db0ba3b9cd184c9a8314e4aa4f29 100644
--- a/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
+#include "JobRealTimeWidget.h"
#include "JobItem.h"
#include "JobModel.h"
#include "JobRealTimeToolBar.h"
#include "ParameterTuningWidget.h"
#include "mainwindow_constants.h"
-#include "JobRealTimeWidget.h"
#include <QVBoxLayout>
JobRealTimeWidget::JobRealTimeWidget(JobModel *jobModel, QWidget *parent)
diff --git a/GUI/coregui/Views/JobWidgets/JobResultsPresenter.cpp b/GUI/coregui/Views/JobWidgets/JobResultsPresenter.cpp
index f107a22b053359fbc0fca5f965071e80cdd4d5ef..ee173a0908f4b6ecfee88c9473882016887ac283 100644
--- a/GUI/coregui/Views/JobWidgets/JobResultsPresenter.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobResultsPresenter.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
+#include "JobResultsPresenter.h"
#include "FitComparisonWidget.h"
#include "JobItem.h"
#include "ObsoleteIntensityDataWidget.h"
#include "mainwindow_constants.h"
-#include "JobResultsPresenter.h"
#include <QBoxLayout>
JobResultsPresenter::JobResultsPresenter(QWidget *parent)
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp b/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp
index 8bf2bf494112ec5c515a061e4bb36c9b8ecf17dd..230d2910fcff9a57eb55dc7842a39e00ad79a99d 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
+#include "JobSelectorActions.h"
#include "JobItem.h"
#include "JobModel.h"
#include "StyledToolBar.h"
-#include "JobSelectorActions.h"
#include <QAction>
#include <QDebug>
#include <QItemSelectionModel>
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp b/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp
index 3c9703f0524f7685b563ce15228595ef2b397b3e..474aaa2ee2a6a08e183a571e98c0c8f12ca7b96d 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "JobSelectorWidget.h"
#include "JobItem.h"
#include "JobListWidget.h"
#include "JobModel.h"
@@ -22,7 +23,6 @@
#include "StyledToolBar.h"
#include "mainwindow_constants.h"
#include "minisplitter.h"
-#include "JobSelectorWidget.h"
#include <QHBoxLayout>
diff --git a/GUI/coregui/Views/JobWidgets/JobViewActivities.cpp b/GUI/coregui/Views/JobWidgets/JobViewActivities.cpp
index 03a67b90ba8b14f5aec7afcd183d2ee245a0d70d..7836d7d8c0840f0ce5d6360dc00b56257a01c887 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewActivities.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobViewActivities.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "JobViewActivities.h"
#include "GUIHelpers.h"
#include "mainwindow_constants.h"
-#include "JobViewActivities.h"
namespace {
JobViewActivities::activity_map_t createActivityMap()
diff --git a/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp b/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp
index de30839daa56c5818281b178788afe989e821aca..072e3a4c224c6e98c1065783759b2bd95b713b42 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "JobViewDocks.h"
#include "FitActivityPanel.h"
#include "JobMessagePanel.h"
#include "JobModel.h"
@@ -22,7 +23,6 @@
#include "JobSelectorWidget.h"
#include "JobView.h"
#include "JobViewActivities.h"
-#include "JobViewDocks.h"
#include <QAbstractItemView>
#include <QAction>
#include <QDockWidget>
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp b/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
index a7f26c0e6ee6f9f838d00435cfd6fe045485a23c..076bf4836216799f6abc810c58dff39693c9cafb 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
+#include "ParameterTuningDelegate.h"
#include "GUIHelpers.h"
#include "ModelPath.h"
#include "ParameterTreeItems.h"
#include "ParameterTuningModel.h"
#include "SessionModel.h"
-#include "ParameterTuningDelegate.h"
#include <QAbstractItemModel>
#include <QApplication>
#include <QDebug>
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
index 499c03afad250064426b7c7f11ca11ba5e13354a..cdd0ee8a40934d90e0c2cb1592208643036ab5e7 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "ParameterTuningWidget.h"
#include "DesignerHelper.h"
#include "GUIHelpers.h"
#include "InstrumentModel.h"
@@ -28,7 +29,6 @@
#include "SampleModel.h"
#include "SliderSettingsWidget.h"
#include "WarningSignWidget.h"
-#include "ParameterTuningWidget.h"
#include <QApplication>
#include <QDebug>
#include <QItemSelectionModel>
diff --git a/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp b/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
index a4164c6d7ff5bad836c2ecaf05e1fde13a6b8673..5ca4cb2da9a20c792042d4b89030e048b4a965b2 100644
--- a/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
+++ b/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include "ColorMapPlot.h"
#include "ColorMapSceneAdaptor.h"
+#include "ColorMapPlot.h"
#include <QDebug>
ColorMapSceneAdaptor::ColorMapSceneAdaptor()
diff --git a/GUI/coregui/Views/MaskWidgets/EllipseView.cpp b/GUI/coregui/Views/MaskWidgets/EllipseView.cpp
index 3d50056284958765d4054e489c780d4bd3b5d0ca..de6e810d2e2711c71817875a5d95e7269cfb6461 100644
--- a/GUI/coregui/Views/MaskWidgets/EllipseView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/EllipseView.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
+#include "EllipseView.h"
#include "ISceneAdaptor.h"
#include "MaskEditorHelper.h"
#include "MaskItems.h"
#include "SizeHandleElement.h"
-#include "EllipseView.h"
#include <QDebug>
#include <QGraphicsSceneMouseEvent>
#include <QMarginsF>
diff --git a/GUI/coregui/Views/MaskWidgets/IMaskView.cpp b/GUI/coregui/Views/MaskWidgets/IMaskView.cpp
index 7e6e7c90d39f769aa2b1a37bb1016afc67200b97..8541b8d50da3b15715268231e1590cde4df854ba 100644
--- a/GUI/coregui/Views/MaskWidgets/IMaskView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/IMaskView.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
+#include "IMaskView.h"
#include "ISceneAdaptor.h"
#include "MaskItems.h"
#include "SessionItem.h"
-#include "IMaskView.h"
#include <QAction>
#include <QDebug>
#include <QGraphicsSceneContextMenuEvent>
diff --git a/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp b/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp
index ff2660d798da3b656de9c884ebd45464bc7891ab..dc4c1c599bfa4234c5fbe73c1fe00a818595f088 100644
--- a/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include "ISceneAdaptor.h"
#include "IntensityDataView.h"
+#include "ISceneAdaptor.h"
#include <QBrush>
#include <QDebug>
#include <QPainter>
diff --git a/GUI/coregui/Views/MaskWidgets/LineViews.cpp b/GUI/coregui/Views/MaskWidgets/LineViews.cpp
index fed0a94207756469a974228695df236919da847e..e82285bdc4c8e81ecccc7f26bc0078d8e2aae00c 100644
--- a/GUI/coregui/Views/MaskWidgets/LineViews.cpp
+++ b/GUI/coregui/Views/MaskWidgets/LineViews.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
+#include "LineViews.h"
#include "ColorMapSceneAdaptor.h"
#include "MaskEditorHelper.h"
#include "MaskItems.h"
-#include "LineViews.h"
#include <QCursor>
#include <QDebug>
#include <QPainter>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp b/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
index d32d5a0be8f6d3d07f94b83e77dfea0912b3b9dc..080cea859f424a431cd8bf52486faac8a9c5faac 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
+#include "MaskAllView.h"
#include "ColorMapSceneAdaptor.h"
#include "MaskEditorHelper.h"
#include "MaskItems.h"
-#include "MaskAllView.h"
#include <QBrush>
#include <QDebug>
#include <QPainter>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp b/GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp
index fcd76825f5afb78ce0164696c6c7d30a7cf42a59..f3a1d62ad23d55e4de7323a3a6e4a51375091eba 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include "ISceneAdaptor.h"
#include "MaskContainerView.h"
+#include "ISceneAdaptor.h"
#include <QBrush>
#include <QDebug>
#include <QPainter>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp
index 63976587d92e110e0c25d030a320aacb7493a5ca..9945794e17cf907cd0b6e449e364bf01f0c69a71 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "MaskEditorActions.h"
#include "MaskItems.h"
#include "SessionModel.h"
-#include "MaskEditorActions.h"
#include <QAction>
#include <QDebug>
#include <QItemSelectionModel>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp
index 27af8a0d0763ae7357be63f2e58d6c98eaf2f384..6c3c49fb5a6c636d6b4924468bc123b2d96fed2d 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
+#include "MaskEditorCanvas.h"
#include "MaskGraphicsProxy.h"
#include "MaskGraphicsScene.h"
#include "MaskGraphicsView.h"
#include "MaskResultsPresenter.h"
#include "SessionModel.h"
-#include "MaskEditorCanvas.h"
#include <QDebug>
#include <QDebug>
#include <QGraphicsRectItem>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
index dad2fde38973adcdd88eadabd809acc743f55640..4b6b54a8b5848c1b3ca68a5b808bb030c2ab234e 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
+#include "MaskEditorPropertyPanel.h"
#include "AccordionWidget.h"
#include "ComponentEditor.h"
#include "ContentPane.h"
#include "IntensityDataItem.h"
#include "MaskEditorFlags.h"
#include "SessionModel.h"
-#include "MaskEditorPropertyPanel.h"
#include <QButtonGroup>
#include <QDebug>
#include <QGridLayout>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp
index 6d1e35fc2e72b9e4fdd75b0a401e3e2e41102ec3..e051ed1d718b54561c2893fa83258bb68578d9af 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include "MaskEditorActions.h"
#include "MaskEditorToolBar.h"
+#include "MaskEditorActions.h"
#include <QButtonGroup>
#include <QDebug>
#include <QLabel>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
index bfcf3fbdfb2451518e88f8383a9dcf3f3ff1fdc9..86378441836bfe21f0bc658d4c9f25b26a76b5e5 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
+#include "MaskGraphicsProxy.h"
#include "ColorMapPlot.h"
#include "ColorMapSceneAdaptor.h"
#include "IntensityDataItem.h"
-#include "MaskGraphicsProxy.h"
#include <QDebug>
#include <QGraphicsSceneMouseEvent>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
index dab11edaf004f32c0ec1520dcc7b733ac51eb6cc..fa284e95acdb8ad274c12f5abdd235182f4c5adf 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "MaskGraphicsScene.h"
#include "ColorMapSceneAdaptor.h"
#include "IMaskView.h"
#include "ISceneAdaptor.h"
@@ -26,7 +27,6 @@
#include "SessionItem.h"
#include "SessionModel.h"
#include "item_constants.h"
-#include "MaskGraphicsScene.h"
#include <QDebug>
#include <QGraphicsItem>
#include <QItemSelection>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp
index db57bbabfd4ca4134a70cd1637f795761a42aeff..64aa65de2c353fcec9b5bc19fa2390eab11bc192 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "MaskGraphicsView.h"
#include "MaskGraphicsProxy.h"
#include "MaskGraphicsScene.h"
-#include "MaskGraphicsView.h"
#include <QDebug>
#include <QGraphicsScene>
#include <QScrollBar>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
index ccf9f204b1b94e0c2c95781b742f8f50e03c334a..cabb27b4c1ea701d3067ff1edff621f50c37f29b 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "MaskResultsPresenter.h"
#include "ColorMapPlot.h"
#include "DetectorMask.h"
#include "IShape2D.h"
@@ -21,7 +22,6 @@
#include "MaskItems.h"
#include "OutputData.h"
#include "SessionModel.h"
-#include "MaskResultsPresenter.h"
#include <QDebug>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp b/GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp
index f8308b6ca87284f187c7012a6365c5694b025e8a..b587eb4f4aba4a92c434e50f047903299150aaaf 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "MaskViewFactory.h"
#include "EllipseView.h"
#include "GUIHelpers.h"
#include "IMaskView.h"
@@ -26,7 +27,6 @@
#include "RectangleView.h"
#include "SessionItem.h"
#include "item_constants.h"
-#include "MaskViewFactory.h"
IMaskView *MaskViewFactory::createMaskView(SessionItem *item,
ISceneAdaptor *adaptor)
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp b/GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp
index 0242e8f3846f09a9247dd61d9611588e52d22ebc..e1deca573852dd465faad73d9a72ea863f8af85c 100644
--- a/GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
+#include "PolygonPointView.h"
#include "ISceneAdaptor.h"
#include "MaskEditorHelper.h"
#include "MaskItems.h"
-#include "PolygonPointView.h"
#include <QCursor>
#include <QDebug>
#include <QGraphicsSceneMouseEvent>
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonView.cpp b/GUI/coregui/Views/MaskWidgets/PolygonView.cpp
index c393384784dc8fd20193acfd9d3e4ed50b986446..fef267a7a079743e837e36cf1ff8fff8df9202dc 100644
--- a/GUI/coregui/Views/MaskWidgets/PolygonView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/PolygonView.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
+#include "PolygonView.h"
#include "ISceneAdaptor.h"
#include "MaskEditorHelper.h"
#include "MaskItems.h"
#include "PolygonPointView.h"
-#include "PolygonView.h"
#include <QCursor>
#include <QDebug>
#include <QGraphicsItem>
diff --git a/GUI/coregui/Views/MaskWidgets/RectangleView.cpp b/GUI/coregui/Views/MaskWidgets/RectangleView.cpp
index 643817e640b417de9f686613acd328a16fdd7fa8..f4876c9226e539baa41335bfef0028b71b032de0 100644
--- a/GUI/coregui/Views/MaskWidgets/RectangleView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/RectangleView.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
+#include "RectangleView.h"
#include "ISceneAdaptor.h"
#include "MaskEditorHelper.h"
#include "MaskItems.h"
#include "SizeHandleElement.h"
-#include "RectangleView.h"
#include <QDebug>
#include <QGraphicsSceneMouseEvent>
#include <QMarginsF>
diff --git a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp b/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
index 736cc6597ea471d40a06a4b72a6c1445c8a19739..96a88dae3864f5a0160dabb637b8174ba5ecef9b 100644
--- a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
+++ b/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "SizeHandleElement.h"
#include "ISceneAdaptor.h"
#include "MaskEditorHelper.h"
-#include "SizeHandleElement.h"
#include <QDebug>
#include <QGraphicsSceneHoverEvent>
#include <QPainter>
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp b/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp
index 0b8d3d56b2988135ebad620817b6fa65d87d69c0..c93aceadb36d7c3f9f0cb7ba3695464e69f17d2f 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
+#include "MaterialEditor.h"
#include "ComponentEditor.h"
#include "MaterialEditorToolBar.h"
#include "MaterialItem.h"
#include "MaterialModel.h"
-#include "MaterialEditor.h"
#include <QListView>
#include <QSplitter>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
index 3febed09517677edf3eaac65e9c1b101b8c28047..85ffa0c6b8f9b1050f0b3c1a755f2e3e40b45586 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
+#include "MaterialEditorDialog.h"
#include "MaterialEditor.h"
#include "MaterialModel.h"
#include "MaterialUtils.h"
#include "mainwindow_constants.h"
-#include "MaterialEditorDialog.h"
#include <QAction>
#include <QDebug>
#include <QPushButton>
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp b/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp
index 65aeff11f965edb1f237d1f6ffce701c7a3b73d8..99bc96f04cb5eab97dec60a3d57bb1ec3de5d316 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "MaterialEditorToolBar.h"
#include "MaterialItem.h"
#include "MaterialModel.h"
-#include "MaterialEditorToolBar.h"
#include <QAction>
#include <QDebug>
#include <QItemSelectionModel>
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialProperty.cpp b/GUI/coregui/Views/MaterialEditor/MaterialProperty.cpp
index 13959f7ca9018eb6d3da00722d66003587bd5095..2ff15b28d6c1727bef420dedb01472f603bb2d8d 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialProperty.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialProperty.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
+#include "MaterialProperty.h"
#include "MaterialItem.h"
#include "MaterialModel.h"
#include "MaterialSvc.h"
-#include "MaterialProperty.h"
QString MaterialProperty::getName() const
{
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp b/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp
index 563a6dc0d04b1d63f50c6de414d83256665f247e..d2394ff111d380043d5e5b668154698d151e6824 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
+#include "MaterialSvc.h"
#include "MaterialEditorDialog.h"
#include "MaterialItem.h"
#include "MaterialModel.h"
#include "MaterialUtils.h"
#include "SessionModel.h"
-#include "MaterialSvc.h"
#include <QDebug>
MaterialSvc *MaterialSvc::m_instance = 0;
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialUtils.cpp b/GUI/coregui/Views/MaterialEditor/MaterialUtils.cpp
index c31c1ed85136212ee380dbb37685ad746ac58394..2feee946bb67ad3b4f49b6e55f1d570363e8d055 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialUtils.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialUtils.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "MaterialUtils.h"
#include "ComboProperty.h"
#include "DesignerHelper.h"
#include "GUIHelpers.h"
@@ -23,7 +24,6 @@
#include "MaterialModel.h"
#include "MaterialSvc.h"
#include "RefractiveIndexItem.h"
-#include "MaterialUtils.h"
#include <QDebug>
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentBoxEditor.cpp b/GUI/coregui/Views/PropertyEditor/ComponentBoxEditor.cpp
index a978b74c19d7f77372c58297f2f744079b5ea458..7bb4a0a645206e92cee6e173ca6c8a664ee30af7 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentBoxEditor.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ComponentBoxEditor.cpp
@@ -13,10 +13,10 @@
//! @authors Walter Van Herck, Joachim Wuttke
//
// ************************************************************************** //
+#include "ComponentBoxEditor.h"
#include "ComponentEditorPrivate.h"
#include "CustomEventFilters.h"
#include "SessionModel.h"
-#include "ComponentBoxEditor.h"
#include <QModelIndex>
ComponentBoxEditor::ComponentBoxEditor(QWidget *parent)
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp b/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp
index 1594ed23bc03210b86f06df01fbd83dd852d0efc..f3628285e42996aed9123af004fdbd579eb371e8 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp
@@ -13,6 +13,7 @@
//! @authors Walter Van Herck, Joachim Wuttke
//
// ************************************************************************** //
+#include "ComponentEditor.h"
#include "ComponentEditorPrivate.h"
#include "GUIHelpers.h"
#include "GroupItem.h"
@@ -20,7 +21,6 @@
#include "SessionItem.h"
#include "SessionModel.h"
#include "qtpropertybrowser.h"
-#include "ComponentEditor.h"
#include <QVBoxLayout>
#include <QVariant>
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.cpp b/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.cpp
index a516c6deb9f019dde2f1eae3c010620eda82b16d..6109b9d047b02a38a9d9b1272d924f69853e3b7a 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "ComponentEditorPrivate.h"
#include "CustomEventFilters.h"
#include "GUIHelpers.h"
-#include "ComponentEditorPrivate.h"
#include <QComboBox>
#include <QDebug>
#include <QString>
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp b/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp
index ab2d52a943b39aab6dc68cb5537ae7b8330e064b..deba857736d61088e6464e45df3d8f9d885831b3 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "PropertyBrowserUtils.h"
#include "GUIHelpers.h"
#include "MaterialSvc.h"
-#include "PropertyBrowserUtils.h"
#include <QColorDialog>
#include <QComboBox>
#include <QDebug>
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.cpp b/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.cpp
index 090d3cab12c3953891e306a96b4025b669c532bc..f9ff27e5a5b0196420ab874d167885dbba1bcb61 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "PropertyVariantFactory.h"
#include "PropertyBrowserUtils.h"
#include "PropertyVariantManager.h"
-#include "PropertyVariantFactory.h"
#include <QDebug>
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.cpp b/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.cpp
index 7322996a2cba4ccd69dd17ef04a0a1c5bbebebc4..c4a706e78db416e5d3b05914d381d840146910e0 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "PropertyVariantManager.h"
#include "DesignerHelper.h"
#include "SessionItem.h"
-#include "PropertyVariantManager.h"
#include <QDebug>
PropertyVariantManager::PropertyVariantManager(QObject *parent)
diff --git a/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp b/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
index a2bbaa839654d808ce03d89ddce34a68eef37e6e..94cb0cad0091818f4d815b953817b33ce68ac4a2 100644
--- a/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
+#include "ConnectableView.h"
#include "DesignerHelper.h"
#include "GUIHelpers.h"
#include "NodeEditorConnection.h"
#include "NodeEditorPort.h"
#include "SessionItem.h"
-#include "ConnectableView.h"
#include <QDebug>
#include <QObject>
#include <QPainter>
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp b/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
index 4eb09c091a81fd7b63d99274fda1b5cd6fc05516..9d225f572134ad8f8ac66d285f15c7bda29e54fe 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include "item_constants.h"
#include "DesignerHelper.h"
+#include "item_constants.h"
#include <QDebug>
#include <QPainter>
#include <QtGlobal>
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerMimeData.cpp b/GUI/coregui/Views/SampleDesigner/DesignerMimeData.cpp
index b1aa9ecd755bf3809719c75d0ca4958e6543f15f..a04c1303d48da0901d6427c580fed957c74471fb 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerMimeData.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerMimeData.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include "DesignerHelper.h"
#include "DesignerMimeData.h"
+#include "DesignerHelper.h"
#include <QBitmap>
#include <QByteArray>
#include <QDataStream>
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
index f3854ca500d857da323696590262725e7c042c0f..7a2a03549aea08a0f2b2747cda51c625dfdfc88b 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "DesignerScene.h"
#include "ConnectableView.h"
#include "DesignerHelper.h"
#include "DesignerMimeData.h"
@@ -34,7 +35,6 @@
#include "SampleViewAligner.h"
#include "SampleViewFactory.h"
#include "SessionGraphicsItem.h"
-#include "DesignerScene.h"
#include <QDebug>
#include <QGraphicsSceneMouseEvent>
#include <QItemSelection>
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerView.cpp b/GUI/coregui/Views/SampleDesigner/DesignerView.cpp
index a5a46119673ce6c25f9626f70223239a6ed197aa..bf564cd7af6972c470baf226dfaf0c0a65c37930 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerView.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
+#include "DesignerView.h"
#include "DesignerHelper.h"
#include "DesignerMimeData.h"
#include "DesignerScene.h"
#include "GUIHelpers.h"
-#include "DesignerView.h"
#include <QDebug>
#include <QDragEnterEvent>
#include <QGraphicsScene>
diff --git a/GUI/coregui/Views/SampleDesigner/ILayerView.cpp b/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
index a0d4e0560e023c0ca1069fc2486123e63f3aa439..0f4cb2dc207f9d5a09305ec393929c3bcde379bf 100644
--- a/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "ILayerView.h"
#include "DesignerHelper.h"
#include "DesignerScene.h"
#include "GUIHelpers.h"
@@ -22,7 +23,6 @@
#include "MultiLayerView.h"
#include "SampleModel.h"
#include "SessionItem.h"
-#include "ILayerView.h"
#include <QDebug>
#include <QGraphicsSceneMouseEvent>
diff --git a/GUI/coregui/Views/SampleDesigner/IView.cpp b/GUI/coregui/Views/SampleDesigner/IView.cpp
index 4167a321b50ddcfb1a1a1706a45423e9e65d9ee7..e457c6acba75492dd5479f38c1506c1f9d8aab42 100644
--- a/GUI/coregui/Views/SampleDesigner/IView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/IView.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "IView.h"
#include "ModelMapper.h"
#include "SessionGraphicsItem.h"
-#include "IView.h"
#include <QDebug>
#include <QString>
diff --git a/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.cpp b/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.cpp
index 792edc82aa63bee4f753e1f7569acda0a6e35038..4614f62febb81578484cb809a780e8a2f4624483 100644
--- a/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.cpp
+++ b/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "InterferenceFunctionViews.h"
#include "DesignerHelper.h"
#include "item_constants.h"
-#include "InterferenceFunctionViews.h"
InterferenceFunctionRadialParaCrystalView::InterferenceFunctionRadialParaCrystalView(QGraphicsItem *parent)
diff --git a/GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp b/GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp
index 5f48e60357dc991da4d1912af031fb995ab62c0c..e7a56850a1dab1cbd1a7bbfb4957339a0292b71d 100644
--- a/GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "ItemTreeView.h"
#include "GUIHelpers.h"
#include "SessionModel.h"
-#include "ItemTreeView.h"
#include <QDragMoveEvent>
#include <QMimeData>
diff --git a/GUI/coregui/Views/SampleDesigner/LayerView.cpp b/GUI/coregui/Views/SampleDesigner/LayerView.cpp
index 56852379c96953bfd35025b7ad930e24cbc77f24..9d48eefb472e4dcea2e61a145af2d141bc8e90a0 100644
--- a/GUI/coregui/Views/SampleDesigner/LayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/LayerView.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
+#include "LayerView.h"
#include "LayerItem.h"
#include "MaterialProperty.h"
#include "MultiLayerView.h"
#include "ParticleLayoutView.h"
#include "SessionItem.h"
#include "tooltipdatabase.h"
-#include "LayerView.h"
#include <QDebug>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp b/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
index 566d57c02c049983271360209420fe06b9d95070..3edb2fd2fcc7e4c1846b4cdbe2d8f21132185ec9 100644
--- a/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
+#include "MultiLayerView.h"
#include "DesignerHelper.h"
#include "DesignerMimeData.h"
#include "DesignerScene.h"
#include "LayerView.h"
#include "SampleModel.h"
#include "SessionItem.h"
-#include "MultiLayerView.h"
#include <QDebug>
#include <QGraphicsSceneMouseEvent>
#include <QPainter>
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditor.cpp b/GUI/coregui/Views/SampleDesigner/NodeEditor.cpp
index 76ec37a55078123e71ea0241a86636ab25093dd2..28a8b978a57cb65111aeff1f9f751a1932ca5397 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditor.cpp
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditor.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
+#include "NodeEditor.h"
#include "DesignerView.h"
#include "NodeEditorConnection.h"
#include "NodeEditorPort.h"
-#include "NodeEditor.h"
#include <QEvent>
#include <QGraphicsScene>
#include <QGraphicsSceneMouseEvent>
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp b/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp
index b2f01138d5244e73118a83563f43bcc3f4c68927..ed904af862ebdef563d294e2a50b8df7592d293d 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "NodeEditorConnection.h"
#include "ConnectableView.h"
#include "NodeEditorPort.h"
-#include "NodeEditorConnection.h"
#include <QBrush>
#include <QDebug>
#include <QGraphicsScene>
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp b/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp
index ff7e825efcddb676d928f5b02710f51711092e8a..d90c87194fd576a2f0b209625f825d063d550708 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include "NodeEditorConnection.h"
#include "NodeEditorPort.h"
+#include "NodeEditorConnection.h"
#include <QDebug>
#include <QFontMetrics>
#include <QGraphicsScene>
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
index 853f2895e3d88a2c8106c0df9411533b5b98d4b8..14ac8bf032bb9554f6dc8e44beb643f84d980a47 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
+#include "ParticleCompositionView.h"
#include "ParticleCompositionItem.h"
#include "ParticleItem.h"
#include "SessionItem.h"
-#include "ParticleCompositionView.h"
#include <QDebug>
ParticleCompositionView::ParticleCompositionView(QGraphicsItem *parent) : ConnectableView(parent)
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
index 388e2a3c8e625784f93e424d6ade22802d16e914..7a2c0d403ddbaf25aa31ba57840f8da505d78c1f 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "ParticleCoreShellView.h"
#include "ParticleCoreShellItem.h"
#include "SessionItem.h"
-#include "ParticleCoreShellView.h"
#include <QDebug>
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
index fa099cba0cfb0638c56d677e392e7244be0bff13..ee2af84263dfc463b2ce47cf5031d4dc6b080061 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include "SessionItem.h"
#include "ParticleDistributionView.h"
+#include "SessionItem.h"
#include <QDebug>
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
index 330bcdaa92619eb0b5a1ce8ff54cd3752f23ac46..b7e4651b713d4e335134705f9b5dae956ffdac7f 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
+#include "ParticleLayoutView.h"
#include "DesignerHelper.h"
#include "GUIHelpers.h"
#include "ParticleView.h"
#include "SessionItem.h"
-#include "ParticleLayoutView.h"
#include <QDebug>
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleView.cpp
index 783f9e2b0c4f1eb3f1792c42830d7db8a89a2553..614552a28bdf7eebe7eee7255fb870bb1ca035ff 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleView.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
+#include "ParticleView.h"
#include "GUIHelpers.h"
#include "GroupItem.h"
#include "GroupProperty.h"
#include "ParticleItem.h"
-#include "ParticleView.h"
#include <QDebug>
#include <QObject>
#include <QPainter>
diff --git a/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp b/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
index 28e08e0b05132ce0fd3997ee656aeb94298d7bbd..17b533f356f0182a0ba9a0bc365c315437b67fe4 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
+#include "SampleDesigner.h"
#include "DesignerScene.h"
#include "DesignerView.h"
#include "FilterPropertyProxy.h"
#include "ISample.h"
#include "MultiLayerView.h"
-#include "SampleDesigner.h"
#include <QDebug>
SampleDesigner::SampleDesigner(QWidget *parent)
diff --git a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp b/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
index 1f320fb7f2a739f547ccee1522e8a334320cf578..26c916f1f2ec2c921c07e5b493c28809c6714b3a 100644
--- a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "SamplePropertyWidget.h"
#include "ComponentEditor.h"
#include "SessionItem.h"
-#include "SamplePropertyWidget.h"
#include <QDebug>
#include <QItemSelection>
#include <QModelIndexList>
diff --git a/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp b/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
index 133da3fb3a248c42638fe82e6949ddbaf601e86f..c764857711c25196a97bae7c2b06f657f017fac8 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
+#include "SampleToolBar.h"
#include "DesignerView.h"
#include "MaterialProperty.h"
#include "MaterialSvc.h"
-#include "SampleToolBar.h"
#include <QAction>
#include <QButtonGroup>
#include <QComboBox>
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp b/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp
index 4bc6f6b02cf1fca95897eba4e47b1b982d7736bb..186d5c0603075e3d0c59164d941abc0191301268 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
+#include "SampleViewAligner.h"
#include "DesignerScene.h"
#include "IView.h"
#include "SampleModel.h"
-#include "SampleViewAligner.h"
#include <QDebug>
#include <QModelIndex>
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp b/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
index 87dfe26a3ec8b5c335e9b80ab7f770708189b930..c9a0d00158ef525150e2f1402035710f23a28ed3 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "SampleViewFactory.h"
#include "GUIHelpers.h"
#include "InterferenceFunctionViews.h"
#include "LayerView.h"
@@ -25,7 +26,6 @@
#include "ParticleView.h"
#include "TransformationView.h"
#include "item_constants.h"
-#include "SampleViewFactory.h"
#include <QDebug>
diff --git a/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp b/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp
index 57871a546d872f08d199e7b15513955a7209d66a..81afa403bb1065c5c8fd9f297a363501381ea784 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "SampleWidgetBox.h"
#include "styledbar.h"
#include "widgetbox.h"
-#include "SampleWidgetBox.h"
#include <QVBoxLayout>
#if QT_VERSION < 0x050000
diff --git a/GUI/coregui/Views/SampleDesigner/TransformationView.cpp b/GUI/coregui/Views/SampleDesigner/TransformationView.cpp
index e078ffced9c021a59f8dc600728528ad486c2a44..71d1b940709f0a2de88e5b5feb1245d2606a1274 100644
--- a/GUI/coregui/Views/SampleDesigner/TransformationView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/TransformationView.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "TransformationView.h"
#include "DesignerHelper.h"
#include "item_constants.h"
-#include "TransformationView.h"
TransformationView::TransformationView(QGraphicsItem *parent)
diff --git a/GUI/coregui/Views/SampleView.cpp b/GUI/coregui/Views/SampleView.cpp
index d37fd2cf5d0d3da8263a36ef5f63b1910f60d50a..9af19a0f36504be2c49897e843e55934b4bd2078 100644
--- a/GUI/coregui/Views/SampleView.cpp
+++ b/GUI/coregui/Views/SampleView.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "SampleView.h"
#include "FilterPropertyProxy.h"
#include "InfoWidget.h"
#include "ItemFactory.h"
@@ -22,7 +23,6 @@
#include "SampleToolBar.h"
#include "SampleViewComponents.h"
#include "mainwindow.h"
-#include "SampleView.h"
#include <QDebug>
#include <QDockWidget>
#include <QMenu>
diff --git a/GUI/coregui/Views/SampleViewComponents.cpp b/GUI/coregui/Views/SampleViewComponents.cpp
index befd002c89ef82938b06badb5f3f641ca39825d1..c5eefe1cc9555e1330ab537f18d76ea590ae625c 100644
--- a/GUI/coregui/Views/SampleViewComponents.cpp
+++ b/GUI/coregui/Views/SampleViewComponents.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include "FilterPropertyProxy.h"
#include "SampleViewComponents.h"
+#include "FilterPropertyProxy.h"
SampleWidgetBox *SampleViewComponents::createWidgetBox(
diff --git a/GUI/coregui/Views/SessionModelView.cpp b/GUI/coregui/Views/SessionModelView.cpp
index 850090585087743592f5d0690a0b7aca6b4402ac..1f73017f0cc810d5d28deaf9a59f0695c1503c65 100644
--- a/GUI/coregui/Views/SessionModelView.cpp
+++ b/GUI/coregui/Views/SessionModelView.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "SessionModelView.h"
#include "InstrumentModel.h"
#include "JobModel.h"
#include "MaterialModel.h"
@@ -21,7 +22,6 @@
#include "SampleModel.h"
#include "SessionModelDelegate.h"
#include "mainwindow.h"
-#include "SessionModelView.h"
#include <QToolBar>
#include <QToolButton>
#include <QTreeView>
diff --git a/GUI/coregui/Views/SimulationView.cpp b/GUI/coregui/Views/SimulationView.cpp
index e824a1e6888ab688aba03d44f88d4e34da0b9b79..5ae271198fe1c7c0af3abebcce974bb5d97c6480 100644
--- a/GUI/coregui/Views/SimulationView.cpp
+++ b/GUI/coregui/Views/SimulationView.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
+#include "SimulationView.h"
#include "SimulationSetupWidget.h"
#include "StyledToolBar.h"
#include "mainwindow.h"
-#include "SimulationView.h"
#include <QVBoxLayout>
SimulationView::SimulationView(MainWindow *mainWindow)
diff --git a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
index 9d5ed6909fcf54a6346b7cfffb90f3c8f2f2b533..719ecead601262979492e7f8f8765820781a8695 100644
--- a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "PythonScriptWidget.h"
#include "DesignerHelper.h"
#include "DomainSimulationBuilder.h"
#include "GISASSimulation.h"
@@ -25,7 +26,6 @@
#include "WarningSignWidget.h"
#include "projectdocument.h"
#include "projectmanager.h"
-#include "PythonScriptWidget.h"
#include <QDebug>
#include <QDir>
#include <QFile>
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp b/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
index 06f6030d677275de54a7bd02f2a641f91bd5baf8..884e4b99d7c6992bd59b79a8873900027a2d843b 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "SimulationDataSelectorWidget.h"
#include "ApplicationModels.h"
#include "InstrumentItem.h"
#include "InstrumentModel.h"
@@ -21,7 +22,6 @@
#include "RealDataItem.h"
#include "RealDataModel.h"
#include "SampleModel.h"
-#include "SimulationDataSelectorWidget.h"
#include <QComboBox>
#include <QDebug>
#include <QFileDialog>
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp b/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp
index 9c1714ca7121a8a961cac9d875032cb4804d5941..ccd1efeeb07311d492150dc0c83cf0cadf1bcf67 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
+#include "SimulationOptionsWidget.h"
#include "ComponentBoxEditor.h"
#include "ComponentEditor.h"
#include "SimulationOptionsItem.h"
-#include "SimulationOptionsWidget.h"
#include <QGroupBox>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp b/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp
index 820c590729f940047d9c16b1a63c7649df03f03a..f75ef684c4a7f849a655480af03732c1f7bcaf75 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "SimulationSetupAssistant.h"
#include "AxesItems.h"
#include "DetectorItems.h"
#include "IAxis.h"
@@ -22,7 +23,6 @@
#include "IntensityDataItem.h"
#include "RealDataItem.h"
#include "SampleValidator.h"
-#include "SimulationSetupAssistant.h"
#include <QDebug>
#include <QMessageBox>
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp b/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp
index 67cb9f452b71a50e1fd02e228f2e2c9b336a6302..7cbd927b8689fa33e16e708cf3b8f10e6c677420 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "SimulationSetupWidget.h"
#include "AppSvc.h"
#include "ApplicationModels.h"
#include "DocumentModel.h"
@@ -24,7 +25,6 @@
#include "SimulationOptionsWidget.h"
#include "SimulationSetupAssistant.h"
#include "projectmanager.h"
-#include "SimulationSetupWidget.h"
#include <QDebug>
#include <QMessageBox>
#include <QPushButton>
diff --git a/GUI/coregui/Views/TestComponentView.cpp b/GUI/coregui/Views/TestComponentView.cpp
index fd21c017d6fe493f0f6b634c57dd827406799cd2..db0c394a26c179398616026ea71fb9c3ef6ef2bb 100644
--- a/GUI/coregui/Views/TestComponentView.cpp
+++ b/GUI/coregui/Views/TestComponentView.cpp
@@ -13,10 +13,10 @@
//! @authors Walter Van Herck, Joachim Wuttke
//
// ************************************************************************** //
+#include "TestComponentView.h"
#include "ComponentEditor.h"
#include "SampleModel.h"
#include "mainwindow.h"
-#include "TestComponentView.h"
#include <QHBoxLayout>
#include <QTreeView>
diff --git a/GUI/coregui/Views/TestView.cpp b/GUI/coregui/Views/TestView.cpp
index f11775071bb54e7c123df2a4a35c2ebf39e639fb..e6c30987341665085ee316294d09c423695f0898 100644
--- a/GUI/coregui/Views/TestView.cpp
+++ b/GUI/coregui/Views/TestView.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "TestView.h"
#include "AccordionWidget.h"
#include "JobModel.h"
#include "MaskEditor.h"
@@ -21,7 +22,6 @@
#include "MinimizerItem.h"
#include "MinimizerSettingsWidget.h"
#include "mainwindow.h"
-#include "TestView.h"
#include <QCheckBox>
#include <QLineEdit>
diff --git a/GUI/coregui/Views/WelcomeView.cpp b/GUI/coregui/Views/WelcomeView.cpp
index d50f13023b2ab2009a300fecab4148809e8b032d..11f4c4f4684b5ffaa7055a5a6d80042e0b7f5078 100644
--- a/GUI/coregui/Views/WelcomeView.cpp
+++ b/GUI/coregui/Views/WelcomeView.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "WelcomeView.h"
#include "DesignerHelper.h"
#include "FancyLabel.h"
#include "mainwindow.h"
@@ -21,7 +22,6 @@
#include "projectdocument.h"
#include "projectmanager.h"
#include "qstringutils.h"
-#include "WelcomeView.h"
#include <QCommandLinkButton>
#include <QDebug>
#include <QDesktopServices>