From 3c2a8cadd5948e7d39768626d68f3ecd24b36598 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 14 Aug 2020 17:07:05 +0200
Subject: [PATCH] fix guards and headers

---
 Core/Correlations/FTDecay1D.h                | 6 +++---
 Core/Correlations/FTDecay2D.h                | 6 +++---
 Core/Correlations/FTDistributions1D.h        | 6 +++---
 Core/Correlations/FTDistributions2D.h        | 6 +++---
 Core/Correlations/IDistribution1DSampler.h   | 6 +++---
 Core/Correlations/IDistribution2DSampler.h   | 6 +++---
 Core/Correlations/ILayout.h                  | 6 +++---
 Core/Correlations/IPeakShape.h               | 6 +++---
 Core/Export/OrderedMap.h                     | 6 +++---
 Core/HardParticle/FormFactorCosineRipple.h   | 6 +++---
 Core/HardParticle/FormFactorSawtoothRipple.h | 6 +++---
 Core/HardParticle/IProfileRipple.h           | 6 +++---
 Core/Multilayer/SpecularSimulationElement.h  | 6 +++---
 Core/Parametrization/Distributions.cpp       | 2 +-
 Core/RT/ILayerRTCoefficients.h               | 6 +++---
 Core/RT/MatrixRTCoefficients.h               | 6 +++---
 Core/RT/MatrixRTCoefficients_v2.h            | 6 +++---
 Core/RT/ScalarRTCoefficients.h               | 6 +++---
 Core/Simulation/SimulationFactory.h          | 6 +++---
 Core/Simulation/StandardSimulations.h        | 6 +++---
 20 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/Core/Correlations/FTDecay1D.h b/Core/Correlations/FTDecay1D.h
index 1a6de9bd76b..977f31d385a 100644
--- a/Core/Correlations/FTDecay1D.h
+++ b/Core/Correlations/FTDecay1D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_AGGREGATE_FTDECAY1D_H
-#define BORNAGAIN_CORE_AGGREGATE_FTDECAY1D_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_FTDECAY1D_H
+#define BORNAGAIN_CORE_CORRELATIONS_FTDECAY1D_H
 
 #include "Core/Basics/ICloneable.h"
 #include "Core/Basics/MathConstants.h"
@@ -100,4 +100,4 @@ private:
     const double& m_eta;
 };
 
-#endif // BORNAGAIN_CORE_AGGREGATE_FTDECAY1D_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_FTDECAY1D_H
diff --git a/Core/Correlations/FTDecay2D.h b/Core/Correlations/FTDecay2D.h
index 315d8e40d1d..a7c1cd57f91 100644
--- a/Core/Correlations/FTDecay2D.h
+++ b/Core/Correlations/FTDecay2D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_AGGREGATE_FTDECAY2D_H
-#define BORNAGAIN_CORE_AGGREGATE_FTDECAY2D_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_FTDECAY2D_H
+#define BORNAGAIN_CORE_CORRELATIONS_FTDECAY2D_H
 
 #include "Core/Basics/ICloneable.h"
 #include "Core/Basics/MathConstants.h"
@@ -103,4 +103,4 @@ protected:
     const double& m_eta;
 };
 
-#endif // BORNAGAIN_CORE_AGGREGATE_FTDECAY2D_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_FTDECAY2D_H
diff --git a/Core/Correlations/FTDistributions1D.h b/Core/Correlations/FTDistributions1D.h
index 4702ae179a2..85987b95377 100644
--- a/Core/Correlations/FTDistributions1D.h
+++ b/Core/Correlations/FTDistributions1D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS1D_H
-#define BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS1D_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS1D_H
+#define BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS1D_H
 
 #include "Core/Basics/ICloneable.h"
 #include "Core/Correlations/IDistribution1DSampler.h"
@@ -176,4 +176,4 @@ protected:
     const double& m_eta;
 };
 
-#endif // BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS1D_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS1D_H
diff --git a/Core/Correlations/FTDistributions2D.h b/Core/Correlations/FTDistributions2D.h
index 59fba08a012..b9af89f7d0f 100644
--- a/Core/Correlations/FTDistributions2D.h
+++ b/Core/Correlations/FTDistributions2D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS2D_H
-#define BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS2D_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS2D_H
+#define BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS2D_H
 
 #include "Core/Basics/ICloneable.h"
 #include "Core/Basics/MathConstants.h"
@@ -156,4 +156,4 @@ protected:
     const double& m_eta;
 };
 
-#endif // BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS2D_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS2D_H
diff --git a/Core/Correlations/IDistribution1DSampler.h b/Core/Correlations/IDistribution1DSampler.h
index 8ec301b8c18..db8ca13d39a 100644
--- a/Core/Correlations/IDistribution1DSampler.h
+++ b/Core/Correlations/IDistribution1DSampler.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION1DSAMPLER_H
-#define BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION1DSAMPLER_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION1DSAMPLER_H
+#define BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION1DSAMPLER_H
 
 #include "Wrap/WinDllMacros.h"
 
@@ -76,4 +76,4 @@ private:
     double m_omega;
 };
 
-#endif // BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION1DSAMPLER_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION1DSAMPLER_H
diff --git a/Core/Correlations/IDistribution2DSampler.h b/Core/Correlations/IDistribution2DSampler.h
index c47f5383936..6415d938c5b 100644
--- a/Core/Correlations/IDistribution2DSampler.h
+++ b/Core/Correlations/IDistribution2DSampler.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION2DSAMPLER_H
-#define BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION2DSAMPLER_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION2DSAMPLER_H
+#define BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION2DSAMPLER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <utility>
@@ -79,4 +79,4 @@ private:
     double m_omega_x, m_omega_y;
 };
 
-#endif // BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION2DSAMPLER_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION2DSAMPLER_H
diff --git a/Core/Correlations/ILayout.h b/Core/Correlations/ILayout.h
index 9f236f1a241..2f5c0adf9cb 100644
--- a/Core/Correlations/ILayout.h
+++ b/Core/Correlations/ILayout.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_AGGREGATE_ILAYOUT_H
-#define BORNAGAIN_CORE_AGGREGATE_ILAYOUT_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_ILAYOUT_H
+#define BORNAGAIN_CORE_CORRELATIONS_ILAYOUT_H
 
 #include "Core/Scattering/ISample.h"
 #include "Core/Tools/SafePointerVector.h"
@@ -63,4 +63,4 @@ protected:
     double m_weight;
 };
 
-#endif // BORNAGAIN_CORE_AGGREGATE_ILAYOUT_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_ILAYOUT_H
diff --git a/Core/Correlations/IPeakShape.h b/Core/Correlations/IPeakShape.h
index 0f369626916..0067487823f 100644
--- a/Core/Correlations/IPeakShape.h
+++ b/Core/Correlations/IPeakShape.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_AGGREGATE_IPEAKSHAPE_H
-#define BORNAGAIN_CORE_AGGREGATE_IPEAKSHAPE_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_IPEAKSHAPE_H
+#define BORNAGAIN_CORE_CORRELATIONS_IPEAKSHAPE_H
 
 #include "Core/Scattering/ISample.h"
 #include "Core/Tools/Integrator.h"
@@ -197,4 +197,4 @@ private:
     mutable RealIntegrator m_integrator;
 };
 
-#endif // BORNAGAIN_CORE_AGGREGATE_IPEAKSHAPE_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_IPEAKSHAPE_H
diff --git a/Core/Export/OrderedMap.h b/Core/Export/OrderedMap.h
index 585e22be315..616a930c708 100644
--- a/Core/Export/OrderedMap.h
+++ b/Core/Export/OrderedMap.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_TOOLS_ORDEREDMAP_H
-#define BORNAGAIN_CORE_TOOLS_ORDEREDMAP_H
+#ifndef BORNAGAIN_CORE_EXPORT_ORDEREDMAP_H
+#define BORNAGAIN_CORE_EXPORT_ORDEREDMAP_H
 
 #include "Core/Basics/Assert.h"
 #include <iostream>
@@ -108,4 +108,4 @@ private:
     list_t m_list;
 };
 
-#endif // BORNAGAIN_CORE_TOOLS_ORDEREDMAP_H
+#endif // BORNAGAIN_CORE_EXPORT_ORDEREDMAP_H
diff --git a/Core/HardParticle/FormFactorCosineRipple.h b/Core/HardParticle/FormFactorCosineRipple.h
index 2bf7ebd90d3..863396cc177 100644
--- a/Core/HardParticle/FormFactorCosineRipple.h
+++ b/Core/HardParticle/FormFactorCosineRipple.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE1_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE1_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCOSINERIPPLE_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCOSINERIPPLE_H
 
 #include "Core/HardParticle/IProfileRipple.h"
 
@@ -59,4 +59,4 @@ private:
     complex_t factor_x(complex_t qx) const override final;
 };
 
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE1_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCOSINERIPPLE_H
diff --git a/Core/HardParticle/FormFactorSawtoothRipple.h b/Core/HardParticle/FormFactorSawtoothRipple.h
index d335a40670f..3637acaa3b7 100644
--- a/Core/HardParticle/FormFactorSawtoothRipple.h
+++ b/Core/HardParticle/FormFactorSawtoothRipple.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE2_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE2_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORSAWTOOTHRIPPLE_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORSAWTOOTHRIPPLE_H
 
 #include "Core/HardParticle/IProfileRipple.h"
 
@@ -59,4 +59,4 @@ private:
     complex_t factor_x(complex_t qx) const override final;
 };
 
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE2_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORSAWTOOTHRIPPLE_H
diff --git a/Core/HardParticle/IProfileRipple.h b/Core/HardParticle/IProfileRipple.h
index 03060794493..c8c2be88181 100644
--- a/Core/HardParticle/IProfileRipple.h
+++ b/Core/HardParticle/IProfileRipple.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_PROFILERIPPLE2_H
-#define BORNAGAIN_CORE_HARDPARTICLE_PROFILERIPPLE2_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_IPROFILERIPPLE_H
+#define BORNAGAIN_CORE_HARDPARTICLE_IPROFILERIPPLE_H
 
 #include "Core/Scattering/IFormFactorBorn.h"
 
@@ -83,4 +83,4 @@ private:
     complex_t factor_yz(complex_t qy, complex_t qz) const final;
 };
 
-#endif // BORNAGAIN_CORE_HARDPARTICLE_PROFILERIPPLE2_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_IPROFILERIPPLE_H
diff --git a/Core/Multilayer/SpecularSimulationElement.h b/Core/Multilayer/SpecularSimulationElement.h
index cc632d70c33..ade4a2f685e 100644
--- a/Core/Multilayer/SpecularSimulationElement.h
+++ b/Core/Multilayer/SpecularSimulationElement.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_SIMULATIONELEMENT_SPECULARSIMULATIONELEMENT_H
-#define BORNAGAIN_CORE_SIMULATIONELEMENT_SPECULARSIMULATIONELEMENT_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARSIMULATIONELEMENT_H
+#define BORNAGAIN_CORE_MULTILAYER_SPECULARSIMULATIONELEMENT_H
 
 #include "Core/Basics/Complex.h"
 #include "Core/SimulationElement/PolarizationHandler.h"
@@ -67,4 +67,4 @@ private:
     std::function<std::vector<complex_t>(const std::vector<Slice>&)> m_kz_computation;
 };
 
-#endif // BORNAGAIN_CORE_SIMULATIONELEMENT_SPECULARSIMULATIONELEMENT_H
+#endif // BORNAGAIN_CORE_MULTILAYER_SPECULARSIMULATIONELEMENT_H
diff --git a/Core/Parametrization/Distributions.cpp b/Core/Parametrization/Distributions.cpp
index 211c42bc8d8..9b2debaad75 100644
--- a/Core/Parametrization/Distributions.cpp
+++ b/Core/Parametrization/Distributions.cpp
@@ -16,8 +16,8 @@
 #include "Core/Basics/Exceptions.h"
 #include "Core/Basics/MathConstants.h"
 #include "Core/Parametrization/ParameterPool.h"
-#include "Core/Parametrization/RealParameter.h"
 #include "Core/Parametrization/ParameterSample.h"
+#include "Core/Parametrization/RealParameter.h"
 #include <algorithm>
 #include <cmath>
 #include <limits>
diff --git a/Core/RT/ILayerRTCoefficients.h b/Core/RT/ILayerRTCoefficients.h
index 2ef9d2f726f..dfeba8d7162 100644
--- a/Core/RT/ILayerRTCoefficients.h
+++ b/Core/RT/ILayerRTCoefficients.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_MULTILAYER_ILAYERRTCOEFFICIENTS_H
-#define BORNAGAIN_CORE_MULTILAYER_ILAYERRTCOEFFICIENTS_H
+#ifndef BORNAGAIN_CORE_RT_ILAYERRTCOEFFICIENTS_H
+#define BORNAGAIN_CORE_RT_ILAYERRTCOEFFICIENTS_H
 
 #include "Core/Basics/Complex.h"
 #include "Core/Basics/Exceptions.h"
@@ -62,4 +62,4 @@ public:
     }
 };
 
-#endif // BORNAGAIN_CORE_MULTILAYER_ILAYERRTCOEFFICIENTS_H
+#endif // BORNAGAIN_CORE_RT_ILAYERRTCOEFFICIENTS_H
diff --git a/Core/RT/MatrixRTCoefficients.h b/Core/RT/MatrixRTCoefficients.h
index 75335d0855d..b8c6424a945 100644
--- a/Core/RT/MatrixRTCoefficients.h
+++ b/Core/RT/MatrixRTCoefficients.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_H
-#define BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_H
+#ifndef BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_H
+#define BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_H
 
 #include "Core/RT/ILayerRTCoefficients.h"
 
@@ -67,4 +67,4 @@ public:
                                      //!< lambda=0
 };
 
-#endif // BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_H
+#endif // BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_H
diff --git a/Core/RT/MatrixRTCoefficients_v2.h b/Core/RT/MatrixRTCoefficients_v2.h
index bd04b2044ee..46aad9b26f7 100644
--- a/Core/RT/MatrixRTCoefficients_v2.h
+++ b/Core/RT/MatrixRTCoefficients_v2.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_V2_H
-#define BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_V2_H
+#ifndef BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_V2_H
+#define BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_V2_H
 
 #include "Core/RT/ILayerRTCoefficients.h"
 #include "Core/Vector/Vectors3D.h"
@@ -65,4 +65,4 @@ private:
                          //!< the second eigenmode
 };
 
-#endif // BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_V2_H
+#endif // BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_V2_H
diff --git a/Core/RT/ScalarRTCoefficients.h b/Core/RT/ScalarRTCoefficients.h
index 206fcabcfdb..9f1d4bffee6 100644
--- a/Core/RT/ScalarRTCoefficients.h
+++ b/Core/RT/ScalarRTCoefficients.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_MULTILAYER_SCALARRTCOEFFICIENTS_H
-#define BORNAGAIN_CORE_MULTILAYER_SCALARRTCOEFFICIENTS_H
+#ifndef BORNAGAIN_CORE_RT_SCALARRTCOEFFICIENTS_H
+#define BORNAGAIN_CORE_RT_SCALARRTCOEFFICIENTS_H
 
 #include "Core/Basics/Complex.h"
 #include "Core/RT/ILayerRTCoefficients.h"
@@ -139,4 +139,4 @@ inline complex_t ScalarRTCoefficients::getScalarT() const
     return t_r(0);
 }
 
-#endif // BORNAGAIN_CORE_MULTILAYER_SCALARRTCOEFFICIENTS_H
+#endif // BORNAGAIN_CORE_RT_SCALARRTCOEFFICIENTS_H
diff --git a/Core/Simulation/SimulationFactory.h b/Core/Simulation/SimulationFactory.h
index 4af257cb2c7..af9421d159b 100644
--- a/Core/Simulation/SimulationFactory.h
+++ b/Core/Simulation/SimulationFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_SIMULATIONFACTORY_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_SIMULATIONFACTORY_H
+#ifndef BORNAGAIN_CORE_SIMULATION_SIMULATIONFACTORY_H
+#define BORNAGAIN_CORE_SIMULATION_SIMULATIONFACTORY_H
 
 #include "Core/Simulation/GISASSimulation.h"
 #include "Fit/TestEngine/IFactory.h"
@@ -29,4 +29,4 @@ public:
     SimulationFactory();
 };
 
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_SIMULATIONFACTORY_H
+#endif // BORNAGAIN_CORE_SIMULATION_SIMULATIONFACTORY_H
diff --git a/Core/Simulation/StandardSimulations.h b/Core/Simulation/StandardSimulations.h
index 2af738b7c91..9593bf24549 100644
--- a/Core/Simulation/StandardSimulations.h
+++ b/Core/Simulation/StandardSimulations.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_STANDARDSIMULATIONS_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_STANDARDSIMULATIONS_H
+#ifndef BORNAGAIN_CORE_SIMULATION_STANDARDSIMULATIONS_H
+#define BORNAGAIN_CORE_SIMULATION_STANDARDSIMULATIONS_H
 
 #include "Wrap/WinDllMacros.h"
 
@@ -82,4 +82,4 @@ BA_CORE_API_ DepthProbeSimulation* BasicDepthProbe();
 
 } // namespace StandardSimulations
 
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_STANDARDSIMULATIONS_H
+#endif // BORNAGAIN_CORE_SIMULATION_STANDARDSIMULATIONS_H
-- 
GitLab