From 033d76132522dde022c5a3ecf7ba00209625be7c Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Mon, 2 Nov 2020 20:17:48 +0100
Subject: [PATCH] update include guards
---
Base/Axis/Bin.h | 6 +++---
Base/Axis/ConstKBinAxis.h | 6 +++---
Base/Axis/CustomBinAxis.h | 6 +++---
Base/Axis/FixedBinAxis.h | 6 +++---
Base/Axis/IAxis.h | 6 +++---
Base/Axis/PointwiseAxis.h | 6 +++---
Base/Axis/VariableBinAxis.h | 6 +++---
Base/Pixel/IPixel.h | 6 +++---
Base/Pixel/PolarizationHandler.h | 6 +++---
Base/Pixel/SimulationElement.h | 6 +++---
Base/Utils/PyEmbeddedUtils.h | 6 +++---
Base/Utils/PyFmt.h | 6 +++---
Base/Utils/ThreadInfo.h | 6 +++---
Core/Scan/AngularSpecScan.h | 6 +++---
Core/Scan/ISpecularScan.h | 6 +++---
Core/Scan/QSpecScan.h | 6 +++---
Core/Scan/SpecularSimulationElement.h | 6 +++---
Core/Scan/UnitConverter1D.h | 6 +++---
Device/Beam/Beam.h | 6 +++---
Device/Beam/FootprintGauss.h | 6 +++---
Device/Beam/FootprintSquare.h | 6 +++---
Device/Beam/IFootprintFactor.h | 6 +++---
Device/Data/CumulativeValue.h | 6 +++---
Device/Data/LLData.h | 6 +++---
Device/Data/OutputData.h | 6 +++---
Device/Data/OutputDataIterator.h | 6 +++---
Device/Detector/DetectionProperties.h | 6 +++---
Device/Detector/DetectorContext.h | 6 +++---
Device/Detector/DetectorMask.h | 6 +++---
Device/Detector/IDetector.h | 6 +++---
Device/Detector/IDetector2D.h | 6 +++---
Device/Detector/IsGISAXSDetector.h | 6 +++---
Device/Detector/RectangularDetector.h | 6 +++---
Device/Detector/RectangularPixel.h | 6 +++---
Device/Detector/RegionOfInterest.h | 6 +++---
Device/Detector/SimpleUnitConverters.h | 6 +++---
Device/Detector/SimulationArea.h | 6 +++---
Device/Detector/SimulationAreaIterator.h | 6 +++---
Device/Detector/SpecularDetector1D.h | 6 +++---
Device/Detector/SphericalDetector.h | 6 +++---
Device/Detector/SphericalPixel.h | 6 +++---
Device/Histo/Histogram1D.h | 6 +++---
Device/Histo/Histogram2D.h | 6 +++---
Device/Histo/IHistogram.h | 6 +++---
Device/Histo/IntensityDataIOFactory.h | 6 +++---
Device/Histo/SimulationResult.h | 6 +++---
Device/InputOutput/DataFormatUtils.h | 6 +++---
Device/InputOutput/OutputDataReadFactory.h | 6 +++---
Device/InputOutput/OutputDataReadStrategy.h | 6 +++---
Device/InputOutput/OutputDataReader.h | 6 +++---
Device/InputOutput/OutputDataWriteFactory.h | 6 +++---
Device/InputOutput/OutputDataWriteStrategy.h | 6 +++---
Device/InputOutput/OutputDataWriter.h | 6 +++---
Device/InputOutput/TiffHandler.h | 6 +++---
Device/InputOutput/boost_streams.h | 6 +++---
Device/Instrument/ChiSquaredModule.h | 6 +++---
Device/Instrument/FourierTransform.h | 6 +++---
Device/Instrument/IChiSquaredModule.h | 6 +++---
Device/Instrument/Instrument.h | 6 +++---
Device/Instrument/IntensityDataFunctions.h | 6 +++---
Device/Instrument/PyArrayImportUtils.h | 6 +++---
Device/Instrument/PyFmt2.h | 6 +++---
Device/Instrument/SpectrumUtils.h | 6 +++---
Device/Instrument/VarianceFunctions.h | 6 +++---
Device/Intensity/ArrayUtils.h | 6 +++---
Device/Intensity/IIntensityFunction.h | 6 +++---
Device/Mask/Ellipse.h | 6 +++---
Device/Mask/IShape2D.h | 6 +++---
Device/Mask/InfinitePlane.h | 6 +++---
Device/Mask/Line.h | 6 +++---
Device/Mask/Polygon.h | 6 +++---
Device/Mask/Rectangle.h | 6 +++---
Device/Resolution/ConvolutionDetectorResolution.h | 6 +++---
Device/Resolution/Convolve.h | 6 +++---
Device/Resolution/IDetectorResolution.h | 6 +++---
Device/Resolution/IResolutionFunction2D.h | 6 +++---
Device/Resolution/ResolutionFunction2DGaussian.h | 6 +++---
Device/Resolution/ScanResolution.h | 6 +++---
Device/Unit/AxisNames.h | 6 +++---
Device/Unit/IUnitConverter.h | 6 +++---
Param/Base/IParameter.h | 6 +++---
Param/Base/IParameterized.h | 6 +++---
Param/Base/ParameterPool.h | 6 +++---
Param/Base/RealParameter.h | 6 +++---
Param/Base/Unit.h | 6 +++---
Param/Distrib/DistributionHandler.h | 6 +++---
Param/Distrib/Distributions.h | 6 +++---
Param/Distrib/ParameterDistribution.h | 6 +++---
Param/Distrib/RangedDistributions.h | 6 +++---
Param/Node/INode.h | 6 +++---
Param/Node/INodeVisitor.h | 6 +++---
Param/Node/IterationStrategy.h | 6 +++---
Param/Node/NodeIterator.h | 6 +++---
Param/Node/NodeUtils.h | 6 +++---
Param/Varia/ParameterPattern.h | 6 +++---
Param/Varia/ParameterSample.h | 6 +++---
Param/Varia/ParameterUtils.h | 6 +++---
Param/Varia/PyFmtLimits.h | 6 +++---
Sample/Aggregate/IInterferenceFunction.h | 6 +++---
Sample/Aggregate/InterferenceFunction1DLattice.h | 6 +++---
Sample/Aggregate/InterferenceFunction2DLattice.h | 6 +++---
Sample/Aggregate/InterferenceFunction2DParaCrystal.h | 6 +++---
Sample/Aggregate/InterferenceFunction2DSuperLattice.h | 6 +++---
Sample/Aggregate/InterferenceFunction3DLattice.h | 6 +++---
Sample/Aggregate/InterferenceFunctionFinite2DLattice.h | 6 +++---
Sample/Aggregate/InterferenceFunctionFinite3DLattice.h | 6 +++---
Sample/Aggregate/InterferenceFunctionHardDisk.h | 6 +++---
Sample/Aggregate/InterferenceFunctionNone.h | 6 +++---
Sample/Aggregate/InterferenceFunctionRadialParaCrystal.h | 6 +++---
Sample/Aggregate/InterferenceFunctionTwin.h | 6 +++---
Sample/Aggregate/InterferenceFunctions.h | 6 +++---
Sample/Aggregate/ParticleLayout.h | 6 +++---
Sample/Correlations/FTDecay1D.h | 6 +++---
Sample/Correlations/FTDecay2D.h | 6 +++---
Sample/Correlations/FTDistributions1D.h | 6 +++---
Sample/Correlations/FTDistributions2D.h | 6 +++---
Sample/Correlations/IDistribution1DSampler.h | 6 +++---
Sample/Correlations/IDistribution2DSampler.h | 6 +++---
Sample/Correlations/ILayout.h | 6 +++---
Sample/Correlations/IPeakShape.h | 6 +++---
Sample/Fresnel/FormFactorCoherentPart.h | 6 +++---
Sample/Fresnel/FormFactorCoherentSum.h | 6 +++---
Sample/Fresnel/IFresnelMap.h | 6 +++---
Sample/Fresnel/MatrixFresnelMap.h | 6 +++---
Sample/Fresnel/ScalarFresnelMap.h | 6 +++---
Sample/HardParticle/FormFactorAnisoPyramid.h | 6 +++---
Sample/HardParticle/FormFactorBar.h | 6 +++---
Sample/HardParticle/FormFactorBox.h | 6 +++---
Sample/HardParticle/FormFactorCantellatedCube.h | 6 +++---
Sample/HardParticle/FormFactorCone.h | 6 +++---
Sample/HardParticle/FormFactorCone6.h | 6 +++---
Sample/HardParticle/FormFactorCosineRipple.h | 6 +++---
Sample/HardParticle/FormFactorCuboctahedron.h | 6 +++---
Sample/HardParticle/FormFactorCylinder.h | 6 +++---
Sample/HardParticle/FormFactorDodecahedron.h | 6 +++---
Sample/HardParticle/FormFactorDot.h | 6 +++---
Sample/HardParticle/FormFactorEllipsoidalCylinder.h | 6 +++---
Sample/HardParticle/FormFactorFullSphere.h | 6 +++---
Sample/HardParticle/FormFactorFullSpheroid.h | 6 +++---
Sample/HardParticle/FormFactorHemiEllipsoid.h | 6 +++---
Sample/HardParticle/FormFactorHollowSphere.h | 6 +++---
Sample/HardParticle/FormFactorIcosahedron.h | 6 +++---
Sample/HardParticle/FormFactorLongBoxGauss.h | 6 +++---
Sample/HardParticle/FormFactorLongBoxLorentz.h | 6 +++---
Sample/HardParticle/FormFactorPrism3.h | 6 +++---
Sample/HardParticle/FormFactorPrism6.h | 6 +++---
Sample/HardParticle/FormFactorPyramid.h | 6 +++---
Sample/HardParticle/FormFactorSawtoothRipple.h | 6 +++---
Sample/HardParticle/FormFactorTetrahedron.h | 6 +++---
Sample/HardParticle/FormFactorTruncatedCube.h | 6 +++---
Sample/HardParticle/FormFactorTruncatedSphere.h | 6 +++---
Sample/HardParticle/FormFactorTruncatedSpheroid.h | 6 +++---
Sample/HardParticle/HardParticles.h | 6 +++---
Sample/HardParticle/IFormFactorPolyhedron.h | 6 +++---
Sample/HardParticle/IFormFactorPrism.h | 6 +++---
Sample/HardParticle/IProfileRipple.h | 6 +++---
Sample/HardParticle/PolyhedralComponents.h | 6 +++---
Sample/HardParticle/PolyhedralTopology.h | 6 +++---
Sample/HardParticle/Polyhedron.h | 6 +++---
Sample/HardParticle/Prism.h | 6 +++---
Sample/HardParticle/Ripples.h | 6 +++---
Sample/Interference/DecouplingApproximationStrategy.h | 6 +++---
Sample/Interference/FormFactorPrecompute.h | 6 +++---
Sample/Interference/IInterferenceFunctionStrategy.h | 6 +++---
Sample/Interference/SSCAHelper.h | 6 +++---
Sample/Interference/SSCApproximationStrategy.h | 6 +++---
Sample/Lattice/ILatticeOrientation.h | 6 +++---
Sample/Lattice/ISelectionRule.h | 6 +++---
Sample/Lattice/Lattice.h | 6 +++---
Sample/Lattice/Lattice2D.h | 6 +++---
Sample/Lattice/LatticeUtils.h | 6 +++---
Sample/LibFF/SomeFormFactors.h | 6 +++---
Sample/Material/BaseMaterialImpl.h | 6 +++---
Sample/Material/MagneticMaterialImpl.h | 6 +++---
Sample/Material/Material.h | 6 +++---
Sample/Material/MaterialBySLDImpl.h | 6 +++---
Sample/Material/MaterialFactoryFuncs.h | 6 +++---
Sample/Material/MaterialUtils.h | 6 +++---
Sample/Material/RefractiveMaterialImpl.h | 6 +++---
Sample/Material/WavevectorInfo.h | 6 +++---
Sample/Multilayer/Layer.h | 6 +++---
Sample/Multilayer/MultiLayer.h | 6 +++---
Sample/Multilayer/MultiLayerUtils.h | 6 +++---
Sample/Multilayer/PyImport.h | 6 +++---
Sample/Multilayer/RoughnessModels.h | 6 +++---
Sample/Particle/Crystal.h | 6 +++---
Sample/Particle/FormFactorCoreShell.h | 6 +++---
Sample/Particle/FormFactorCrystal.h | 6 +++---
Sample/Particle/FormFactorWeighted.h | 6 +++---
Sample/Particle/HomogeneousRegion.h | 6 +++---
Sample/Particle/IAbstractParticle.h | 6 +++---
Sample/Particle/IClusteredParticles.h | 6 +++---
Sample/Particle/IParticle.h | 6 +++---
Sample/Particle/MesoCrystal.h | 6 +++---
Sample/Particle/Particle.h | 6 +++---
Sample/Particle/ParticleComposition.h | 6 +++---
Sample/Particle/ParticleCoreShell.h | 6 +++---
Sample/Particle/ParticleDistribution.h | 6 +++---
Sample/Particle/SlicedParticle.h | 6 +++---
Sample/Particle/TRange.h | 6 +++---
Sample/RT/ILayerRTCoefficients.h | 6 +++---
Sample/RT/MatrixRTCoefficients.h | 6 +++---
Sample/RT/MatrixRTCoefficients_v2.h | 6 +++---
Sample/RT/MatrixRTCoefficients_v3.h | 6 +++---
Sample/RT/ScalarRTCoefficients.h | 6 +++---
Sample/RT/SimulationOptions.h | 6 +++---
Sample/SampleBuilderEngine/FixedBuilder.h | 6 +++---
Sample/SampleBuilderEngine/IRegistry.h | 6 +++---
Sample/SampleBuilderEngine/ISampleBuilder.h | 6 +++---
Sample/SampleBuilderEngine/SampleBuilderNode.h | 6 +++---
Sample/SampleBuilderEngine/SampleComponents.h | 6 +++---
Sample/SampleBuilderEngine/SampleProvider.h | 6 +++---
Sample/Scattering/FormFactorBAPol.h | 6 +++---
Sample/Scattering/FormFactorDWBA.h | 6 +++---
Sample/Scattering/FormFactorDWBAPol.h | 6 +++---
Sample/Scattering/FormFactorDecoratorMaterial.h | 6 +++---
Sample/Scattering/FormFactorDecoratorPositionFactor.h | 6 +++---
Sample/Scattering/FormFactorDecoratorRotation.h | 6 +++---
Sample/Scattering/IFormFactor.h | 6 +++---
Sample/Scattering/IFormFactorBorn.h | 6 +++---
Sample/Scattering/IFormFactorDecorator.h | 6 +++---
Sample/Scattering/ISample.h | 6 +++---
Sample/Scattering/LayerFillLimits.h | 6 +++---
Sample/Scattering/Rotations.h | 6 +++---
Sample/Scattering/ZLimits.h | 6 +++---
Sample/Shapes/Box.h | 6 +++---
Sample/Shapes/DoubleEllipse.h | 6 +++---
Sample/Shapes/IShape.h | 6 +++---
Sample/Shapes/RippleCosine.h | 6 +++---
Sample/Shapes/RippleSawtooth.h | 6 +++---
Sample/Shapes/TruncatedEllipsoid.h | 6 +++---
Sample/Slice/KzComputation.h | 6 +++---
Sample/Slice/LayerInterface.h | 6 +++---
Sample/Slice/LayerRoughness.h | 6 +++---
Sample/Slice/Slice.h | 6 +++---
Sample/Slice/SlicedFormFactorList.h | 6 +++---
Sample/SoftParticle/FormFactorGauss.h | 6 +++---
Sample/SoftParticle/FormFactorSphereGaussianRadius.h | 6 +++---
Sample/SoftParticle/FormFactorSphereLogNormalRadius.h | 6 +++---
Sample/SoftParticle/SoftParticles.h | 6 +++---
Sample/Specular/ISpecularStrategy.h | 6 +++---
Sample/Specular/SpecularMagneticNewNCStrategy.h | 6 +++---
Sample/Specular/SpecularMagneticNewStrategy.h | 6 +++---
Sample/Specular/SpecularMagneticNewTanhStrategy.h | 6 +++---
Sample/Specular/SpecularMagneticOldStrategy.h | 6 +++---
Sample/Specular/SpecularMagneticStrategy.h | 6 +++---
Sample/Specular/SpecularScalarNCStrategy.h | 6 +++---
Sample/Specular/SpecularScalarStrategy.h | 6 +++---
Sample/Specular/SpecularScalarTanhStrategy.h | 6 +++---
Sample/StandardSamples/BoxCompositionBuilder.h | 6 +++---
Sample/StandardSamples/BoxesSquareLatticeBuilder.h | 6 +++---
Sample/StandardSamples/CoreShellParticleBuilder.h | 6 +++---
Sample/StandardSamples/CustomMorphologyBuilder.h | 6 +++---
Sample/StandardSamples/CylindersAndPrismsBuilder.h | 6 +++---
Sample/StandardSamples/CylindersBuilder.h | 6 +++---
Sample/StandardSamples/FeNiBilayerBuilder.h | 6 +++---
Sample/StandardSamples/HomogeneousMultilayerBuilder.h | 6 +++---
Sample/StandardSamples/LatticeBuilder.h | 6 +++---
Sample/StandardSamples/LayersWithAbsorptionBuilder.h | 6 +++---
Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.h | 6 +++---
Sample/StandardSamples/MagneticLayersBuilder.h | 6 +++---
Sample/StandardSamples/MagneticParticlesBuilder.h | 6 +++---
Sample/StandardSamples/MesoCrystalBuilder.h | 6 +++---
Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h | 6 +++---
Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h | 6 +++---
Sample/StandardSamples/MultipleLayoutBuilder.h | 6 +++---
Sample/StandardSamples/ParaCrystalBuilder.h | 6 +++---
Sample/StandardSamples/ParticleCompositionBuilder.h | 6 +++---
Sample/StandardSamples/ParticleDistributionsBuilder.h | 6 +++---
Sample/StandardSamples/ParticleInVacuumBuilder.h | 6 +++---
Sample/StandardSamples/PercusYevickBuilder.h | 6 +++---
Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h | 6 +++---
Sample/StandardSamples/ReferenceMaterials.h | 6 +++---
Sample/StandardSamples/ResonatorBuilder.h | 6 +++---
Sample/StandardSamples/RipplesBuilder.h | 6 +++---
Sample/StandardSamples/RotatedPyramidsBuilder.h | 6 +++---
Sample/StandardSamples/SampleBuilderFactory.h | 6 +++---
Sample/StandardSamples/SizeDistributionModelsBuilder.h | 6 +++---
Sample/StandardSamples/SlicedCompositionBuilder.h | 6 +++---
Sample/StandardSamples/SlicedCylindersBuilder.h | 6 +++---
Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h | 6 +++---
Sample/StandardSamples/TransformationsBuilder.h | 6 +++---
Sample/StandardSamples/TwoDimLatticeBuilder.h | 6 +++---
Sample/StandardSamples/TwoLayerRoughnessBuilder.h | 6 +++---
284 files changed, 852 insertions(+), 852 deletions(-)
diff --git a/Base/Axis/Bin.h b/Base/Axis/Bin.h
index a495510e850..cb819757e30 100644
--- a/Base/Axis/Bin.h
+++ b/Base/Axis/Bin.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AXIS_BIN_H
-#define BORNAGAIN_CORE_AXIS_BIN_H
+#ifndef BORNAGAIN_BASE_AXIS_BIN_H
+#define BORNAGAIN_BASE_AXIS_BIN_H
#include "Base/Vector/Vectors3D.h"
@@ -61,4 +61,4 @@ public:
cvector_t m_q_upper; //!< upper bound of the bin
};
-#endif // BORNAGAIN_CORE_AXIS_BIN_H
+#endif // BORNAGAIN_BASE_AXIS_BIN_H
diff --git a/Base/Axis/ConstKBinAxis.h b/Base/Axis/ConstKBinAxis.h
index 154c7b6e202..0520cbd239c 100644
--- a/Base/Axis/ConstKBinAxis.h
+++ b/Base/Axis/ConstKBinAxis.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AXIS_CONSTKBINAXIS_H
-#define BORNAGAIN_CORE_AXIS_CONSTKBINAXIS_H
+#ifndef BORNAGAIN_BASE_AXIS_CONSTKBINAXIS_H
+#define BORNAGAIN_BASE_AXIS_CONSTKBINAXIS_H
#include "Base/Axis/VariableBinAxis.h"
@@ -45,4 +45,4 @@ protected:
double m_end;
};
-#endif // BORNAGAIN_CORE_AXIS_CONSTKBINAXIS_H
+#endif // BORNAGAIN_BASE_AXIS_CONSTKBINAXIS_H
diff --git a/Base/Axis/CustomBinAxis.h b/Base/Axis/CustomBinAxis.h
index 109c5ae7028..47c1ffd4753 100644
--- a/Base/Axis/CustomBinAxis.h
+++ b/Base/Axis/CustomBinAxis.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AXIS_CUSTOMBINAXIS_H
-#define BORNAGAIN_CORE_AXIS_CUSTOMBINAXIS_H
+#ifndef BORNAGAIN_BASE_AXIS_CUSTOMBINAXIS_H
+#define BORNAGAIN_BASE_AXIS_CUSTOMBINAXIS_H
#include "Base/Axis/VariableBinAxis.h"
@@ -49,4 +49,4 @@ protected:
std::vector<double> m_bin_centers;
};
-#endif // BORNAGAIN_CORE_AXIS_CUSTOMBINAXIS_H
+#endif // BORNAGAIN_BASE_AXIS_CUSTOMBINAXIS_H
diff --git a/Base/Axis/FixedBinAxis.h b/Base/Axis/FixedBinAxis.h
index 59a8b14b19d..1f056086893 100644
--- a/Base/Axis/FixedBinAxis.h
+++ b/Base/Axis/FixedBinAxis.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AXIS_FIXEDBINAXIS_H
-#define BORNAGAIN_CORE_AXIS_FIXEDBINAXIS_H
+#ifndef BORNAGAIN_BASE_AXIS_FIXEDBINAXIS_H
+#define BORNAGAIN_BASE_AXIS_FIXEDBINAXIS_H
#include "Base/Axis/IAxis.h"
@@ -64,4 +64,4 @@ private:
double m_end;
};
-#endif // BORNAGAIN_CORE_AXIS_FIXEDBINAXIS_H
+#endif // BORNAGAIN_BASE_AXIS_FIXEDBINAXIS_H
diff --git a/Base/Axis/IAxis.h b/Base/Axis/IAxis.h
index de17be4028b..be7894669fd 100644
--- a/Base/Axis/IAxis.h
+++ b/Base/Axis/IAxis.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AXIS_IAXIS_H
-#define BORNAGAIN_CORE_AXIS_IAXIS_H
+#ifndef BORNAGAIN_BASE_AXIS_IAXIS_H
+#define BORNAGAIN_BASE_AXIS_IAXIS_H
#include "Base/Axis/Bin.h"
#include <vector>
@@ -98,4 +98,4 @@ inline bool HaveSameNameAndShape(const IAxis& left, const IAxis& right)
return left == right;
}
-#endif // BORNAGAIN_CORE_AXIS_IAXIS_H
+#endif // BORNAGAIN_BASE_AXIS_IAXIS_H
diff --git a/Base/Axis/PointwiseAxis.h b/Base/Axis/PointwiseAxis.h
index 795204cb7c4..ce669519eb8 100644
--- a/Base/Axis/PointwiseAxis.h
+++ b/Base/Axis/PointwiseAxis.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AXIS_POINTWISEAXIS_H
-#define BORNAGAIN_CORE_AXIS_POINTWISEAXIS_H
+#ifndef BORNAGAIN_BASE_AXIS_POINTWISEAXIS_H
+#define BORNAGAIN_BASE_AXIS_POINTWISEAXIS_H
#include "Base/Axis/IAxis.h"
@@ -87,4 +87,4 @@ private:
std::vector<double> m_coordinates;
};
-#endif // BORNAGAIN_CORE_AXIS_POINTWISEAXIS_H
+#endif // BORNAGAIN_BASE_AXIS_POINTWISEAXIS_H
diff --git a/Base/Axis/VariableBinAxis.h b/Base/Axis/VariableBinAxis.h
index f9e7ac67635..33be3a4e517 100644
--- a/Base/Axis/VariableBinAxis.h
+++ b/Base/Axis/VariableBinAxis.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AXIS_VARIABLEBINAXIS_H
-#define BORNAGAIN_CORE_AXIS_VARIABLEBINAXIS_H
+#ifndef BORNAGAIN_BASE_AXIS_VARIABLEBINAXIS_H
+#define BORNAGAIN_BASE_AXIS_VARIABLEBINAXIS_H
#include "Base/Axis/IAxis.h"
@@ -66,4 +66,4 @@ private:
std::vector<double> m_bin_boundaries; //!< vector containing the bin limits
};
-#endif // BORNAGAIN_CORE_AXIS_VARIABLEBINAXIS_H
+#endif // BORNAGAIN_BASE_AXIS_VARIABLEBINAXIS_H
diff --git a/Base/Pixel/IPixel.h b/Base/Pixel/IPixel.h
index 94ad46176f0..c99d4819164 100644
--- a/Base/Pixel/IPixel.h
+++ b/Base/Pixel/IPixel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PIXEL_IPIXEL_H
-#define BORNAGAIN_CORE_PIXEL_IPIXEL_H
+#ifndef BORNAGAIN_BASE_PIXEL_IPIXEL_H
+#define BORNAGAIN_BASE_PIXEL_IPIXEL_H
#include "Base/Vector/Vectors3D.h"
@@ -33,4 +33,4 @@ public:
virtual double getSolidAngle() const = 0;
};
-#endif // BORNAGAIN_CORE_PIXEL_IPIXEL_H
+#endif // BORNAGAIN_BASE_PIXEL_IPIXEL_H
diff --git a/Base/Pixel/PolarizationHandler.h b/Base/Pixel/PolarizationHandler.h
index e86d24b2de1..9c42b06fc16 100644
--- a/Base/Pixel/PolarizationHandler.h
+++ b/Base/Pixel/PolarizationHandler.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PIXEL_POLARIZATIONHANDLER_H
-#define BORNAGAIN_CORE_PIXEL_POLARIZATIONHANDLER_H
+#ifndef BORNAGAIN_BASE_PIXEL_POLARIZATIONHANDLER_H
+#define BORNAGAIN_BASE_PIXEL_POLARIZATIONHANDLER_H
#include "Base/Vector/EigenCore.h"
@@ -45,4 +45,4 @@ private:
Eigen::Matrix2cd m_analyzer_operator; //!< polarization analyzer operator
};
-#endif // BORNAGAIN_CORE_PIXEL_POLARIZATIONHANDLER_H
+#endif // BORNAGAIN_BASE_PIXEL_POLARIZATIONHANDLER_H
diff --git a/Base/Pixel/SimulationElement.h b/Base/Pixel/SimulationElement.h
index d063c2ffafd..2d75227e30f 100644
--- a/Base/Pixel/SimulationElement.h
+++ b/Base/Pixel/SimulationElement.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PIXEL_SIMULATIONELEMENT_H
-#define BORNAGAIN_CORE_PIXEL_SIMULATIONELEMENT_H
+#ifndef BORNAGAIN_BASE_PIXEL_SIMULATIONELEMENT_H
+#define BORNAGAIN_BASE_PIXEL_SIMULATIONELEMENT_H
#include "Base/Pixel/PolarizationHandler.h"
#include "Base/Types/Complex.h"
@@ -80,4 +80,4 @@ private:
double m_intensity; //!< simulated intensity for detector cell
};
-#endif // BORNAGAIN_CORE_PIXEL_SIMULATIONELEMENT_H
+#endif // BORNAGAIN_BASE_PIXEL_SIMULATIONELEMENT_H
diff --git a/Base/Utils/PyEmbeddedUtils.h b/Base/Utils/PyEmbeddedUtils.h
index b612a0f2706..ccd9adc0dd6 100644
--- a/Base/Utils/PyEmbeddedUtils.h
+++ b/Base/Utils/PyEmbeddedUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PYIO_PYEMBEDDEDUTILS_H
-#define BORNAGAIN_CORE_PYIO_PYEMBEDDEDUTILS_H
+#ifndef BORNAGAIN_BASE_UTILS_PYEMBEDDEDUTILS_H
+#define BORNAGAIN_BASE_UTILS_PYEMBEDDEDUTILS_H
#ifdef BORNAGAIN_PYTHON
@@ -49,4 +49,4 @@ std::string pythonStackTrace();
#endif // BORNAGAIN_PYTHON
-#endif // BORNAGAIN_CORE_PYIO_PYEMBEDDEDUTILS_H
+#endif // BORNAGAIN_BASE_UTILS_PYEMBEDDEDUTILS_H
diff --git a/Base/Utils/PyFmt.h b/Base/Utils/PyFmt.h
index 12a75b1b983..69dd88f348c 100644
--- a/Base/Utils/PyFmt.h
+++ b/Base/Utils/PyFmt.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARAMETRIZATION_PYFMT_H
-#define BORNAGAIN_CORE_PARAMETRIZATION_PYFMT_H
+#ifndef BORNAGAIN_BASE_UTILS_PYFMT_H
+#define BORNAGAIN_BASE_UTILS_PYFMT_H
#include "Base/Vector/Vectors3D.h"
#include <string>
@@ -48,4 +48,4 @@ std::string indent(size_t width = 4u);
} // namespace pyfmt
-#endif // BORNAGAIN_CORE_PARAMETRIZATION_PYFMT_H
+#endif // BORNAGAIN_BASE_UTILS_PYFMT_H
diff --git a/Base/Utils/ThreadInfo.h b/Base/Utils/ThreadInfo.h
index e1faf19856b..5f0da9e3d47 100644
--- a/Base/Utils/ThreadInfo.h
+++ b/Base/Utils/ThreadInfo.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARAMETRIZATION_THREADINFO_H
-#define BORNAGAIN_CORE_PARAMETRIZATION_THREADINFO_H
+#ifndef BORNAGAIN_BASE_UTILS_THREADINFO_H
+#define BORNAGAIN_BASE_UTILS_THREADINFO_H
//! Information to run simulation with dedicated number of threads.
//! @ingroup simulation
@@ -27,4 +27,4 @@ struct ThreadInfo {
inline ThreadInfo::ThreadInfo() : n_threads(0), n_batches(1), current_batch(0) {}
-#endif // BORNAGAIN_CORE_PARAMETRIZATION_THREADINFO_H
+#endif // BORNAGAIN_BASE_UTILS_THREADINFO_H
diff --git a/Core/Scan/AngularSpecScan.h b/Core/Scan/AngularSpecScan.h
index 5ccb3e12b14..1ed1aadaf86 100644
--- a/Core/Scan/AngularSpecScan.h
+++ b/Core/Scan/AngularSpecScan.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INSTRUMENT_ANGULARSPECSCAN_H
-#define BORNAGAIN_CORE_INSTRUMENT_ANGULARSPECSCAN_H
+#ifndef BORNAGAIN_CORE_SCAN_ANGULARSPECSCAN_H
+#define BORNAGAIN_CORE_SCAN_ANGULARSPECSCAN_H
#include "Core/Scan/ISpecularScan.h"
#include <memory>
@@ -127,4 +127,4 @@ private:
mutable DistrOutput m_inc_res_cache;
};
-#endif // BORNAGAIN_CORE_INSTRUMENT_ANGULARSPECSCAN_H
+#endif // BORNAGAIN_CORE_SCAN_ANGULARSPECSCAN_H
diff --git a/Core/Scan/ISpecularScan.h b/Core/Scan/ISpecularScan.h
index 9093d0b4da3..f499ba180ac 100644
--- a/Core/Scan/ISpecularScan.h
+++ b/Core/Scan/ISpecularScan.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INSTRUMENT_ISPECULARSCAN_H
-#define BORNAGAIN_CORE_INSTRUMENT_ISPECULARSCAN_H
+#ifndef BORNAGAIN_CORE_SCAN_ISPECULARSCAN_H
+#define BORNAGAIN_CORE_SCAN_ISPECULARSCAN_H
#include "Base/Types/ICloneable.h"
@@ -64,4 +64,4 @@ inline std::ostream& operator<<(std::ostream& os, const ISpecularScan& scan)
{
return os << scan.print();
}
-#endif // BORNAGAIN_CORE_INSTRUMENT_ISPECULARSCAN_H
+#endif // BORNAGAIN_CORE_SCAN_ISPECULARSCAN_H
diff --git a/Core/Scan/QSpecScan.h b/Core/Scan/QSpecScan.h
index 768d33ec85b..a366ea39e72 100644
--- a/Core/Scan/QSpecScan.h
+++ b/Core/Scan/QSpecScan.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INSTRUMENT_QSPECSCAN_H
-#define BORNAGAIN_CORE_INSTRUMENT_QSPECSCAN_H
+#ifndef BORNAGAIN_CORE_SCAN_QSPECSCAN_H
+#define BORNAGAIN_CORE_SCAN_QSPECSCAN_H
#include "Core/Scan/ISpecularScan.h"
#include <memory>
@@ -94,4 +94,4 @@ private:
mutable std::vector<std::vector<ParameterSample>> m_q_res_cache;
};
-#endif // BORNAGAIN_CORE_INSTRUMENT_QSPECSCAN_H
+#endif // BORNAGAIN_CORE_SCAN_QSPECSCAN_H
diff --git a/Core/Scan/SpecularSimulationElement.h b/Core/Scan/SpecularSimulationElement.h
index 88d06d5dc03..8a3825ad386 100644
--- a/Core/Scan/SpecularSimulationElement.h
+++ b/Core/Scan/SpecularSimulationElement.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARSIMULATIONELEMENT_H
-#define BORNAGAIN_CORE_MULTILAYER_SPECULARSIMULATIONELEMENT_H
+#ifndef BORNAGAIN_CORE_SCAN_SPECULARSIMULATIONELEMENT_H
+#define BORNAGAIN_CORE_SCAN_SPECULARSIMULATIONELEMENT_H
#include "Base/Pixel/PolarizationHandler.h"
#include "Base/Types/Complex.h"
@@ -60,4 +60,4 @@ private:
const std::function<std::vector<complex_t>(const std::vector<Slice>&)> m_kz_computation;
};
-#endif // BORNAGAIN_CORE_MULTILAYER_SPECULARSIMULATIONELEMENT_H
+#endif // BORNAGAIN_CORE_SCAN_SPECULARSIMULATIONELEMENT_H
diff --git a/Core/Scan/UnitConverter1D.h b/Core/Scan/UnitConverter1D.h
index be72cd6f57a..19d64dbf06d 100644
--- a/Core/Scan/UnitConverter1D.h
+++ b/Core/Scan/UnitConverter1D.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INTENSITY_UNITCONVERTER1D_H
-#define BORNAGAIN_CORE_INTENSITY_UNITCONVERTER1D_H
+#ifndef BORNAGAIN_CORE_SCAN_UNITCONVERTER1D_H
+#define BORNAGAIN_CORE_SCAN_UNITCONVERTER1D_H
#include "Device/Unit/IUnitConverter.h"
@@ -129,4 +129,4 @@ protected:
std::unique_ptr<IAxis> m_axis; //!< qz values (in inv. nm).
};
-#endif // BORNAGAIN_CORE_INTENSITY_UNITCONVERTER1D_H
+#endif // BORNAGAIN_CORE_SCAN_UNITCONVERTER1D_H
diff --git a/Device/Beam/Beam.h b/Device/Beam/Beam.h
index 6db494d389e..746bd5d2bd8 100644
--- a/Device/Beam/Beam.h
+++ b/Device/Beam/Beam.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_BEAM_BEAM_H
-#define BORNAGAIN_CORE_BEAM_BEAM_H
+#ifndef BORNAGAIN_DEVICE_BEAM_BEAM_H
+#define BORNAGAIN_DEVICE_BEAM_BEAM_H
#include "Base/Vector/EigenCore.h"
#include "Param/Node/INode.h"
@@ -82,4 +82,4 @@ private:
kvector_t m_bloch_vector; //!< Bloch vector encoding the beam's polarization
};
-#endif // BORNAGAIN_CORE_BEAM_BEAM_H
+#endif // BORNAGAIN_DEVICE_BEAM_BEAM_H
diff --git a/Device/Beam/FootprintGauss.h b/Device/Beam/FootprintGauss.h
index a41bb77e4b7..445c551000b 100644
--- a/Device/Beam/FootprintGauss.h
+++ b/Device/Beam/FootprintGauss.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_BEAM_FOOTPRINTGAUSS_H
-#define BORNAGAIN_CORE_BEAM_FOOTPRINTGAUSS_H
+#ifndef BORNAGAIN_DEVICE_BEAM_FOOTPRINTGAUSS_H
+#define BORNAGAIN_DEVICE_BEAM_FOOTPRINTGAUSS_H
#include "Device/Beam/IFootprintFactor.h"
@@ -39,4 +39,4 @@ public:
std::string print() const override;
};
-#endif // BORNAGAIN_CORE_BEAM_FOOTPRINTGAUSS_H
+#endif // BORNAGAIN_DEVICE_BEAM_FOOTPRINTGAUSS_H
diff --git a/Device/Beam/FootprintSquare.h b/Device/Beam/FootprintSquare.h
index 7736073d66a..fecfc821ee1 100644
--- a/Device/Beam/FootprintSquare.h
+++ b/Device/Beam/FootprintSquare.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_BEAM_FOOTPRINTSQUARE_H
-#define BORNAGAIN_CORE_BEAM_FOOTPRINTSQUARE_H
+#ifndef BORNAGAIN_DEVICE_BEAM_FOOTPRINTSQUARE_H
+#define BORNAGAIN_DEVICE_BEAM_FOOTPRINTSQUARE_H
#include "Device/Beam/IFootprintFactor.h"
@@ -37,4 +37,4 @@ public:
std::string print() const override;
};
-#endif // BORNAGAIN_CORE_BEAM_FOOTPRINTSQUARE_H
+#endif // BORNAGAIN_DEVICE_BEAM_FOOTPRINTSQUARE_H
diff --git a/Device/Beam/IFootprintFactor.h b/Device/Beam/IFootprintFactor.h
index de87d24f263..255bd949331 100644
--- a/Device/Beam/IFootprintFactor.h
+++ b/Device/Beam/IFootprintFactor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_BEAM_IFOOTPRINTFACTOR_H
-#define BORNAGAIN_CORE_BEAM_IFOOTPRINTFACTOR_H
+#ifndef BORNAGAIN_DEVICE_BEAM_IFOOTPRINTFACTOR_H
+#define BORNAGAIN_DEVICE_BEAM_IFOOTPRINTFACTOR_H
#include "Base/Types/ICloneable.h"
#include "Param/Node/INode.h"
@@ -54,4 +54,4 @@ inline std::ostream& operator<<(std::ostream& os, const IFootprintFactor& f_fact
return os << f_factor.print();
}
-#endif // BORNAGAIN_CORE_BEAM_IFOOTPRINTFACTOR_H
+#endif // BORNAGAIN_DEVICE_BEAM_IFOOTPRINTFACTOR_H
diff --git a/Device/Data/CumulativeValue.h b/Device/Data/CumulativeValue.h
index bd135adbb44..b04ee2b29eb 100644
--- a/Device/Data/CumulativeValue.h
+++ b/Device/Data/CumulativeValue.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INTENSITY_CUMULATIVEVALUE_H
-#define BORNAGAIN_CORE_INTENSITY_CUMULATIVEVALUE_H
+#ifndef BORNAGAIN_DEVICE_DATA_CUMULATIVEVALUE_H
+#define BORNAGAIN_DEVICE_DATA_CUMULATIVEVALUE_H
//! The cumulative value with average and rms on-the-flight calculations.
//! @ingroup tools
@@ -43,4 +43,4 @@ private:
bool operator<(const CumulativeValue& lhs, const CumulativeValue& rhs);
bool operator>(const CumulativeValue& lhs, const CumulativeValue& rhs);
-#endif // BORNAGAIN_CORE_INTENSITY_CUMULATIVEVALUE_H
+#endif // BORNAGAIN_DEVICE_DATA_CUMULATIVEVALUE_H
diff --git a/Device/Data/LLData.h b/Device/Data/LLData.h
index 1da2e6985c1..ec311b77154 100644
--- a/Device/Data/LLData.h
+++ b/Device/Data/LLData.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INTENSITY_LLDATA_H
-#define BORNAGAIN_CORE_INTENSITY_LLDATA_H
+#ifndef BORNAGAIN_DEVICE_DATA_LLDATA_H
+#define BORNAGAIN_DEVICE_DATA_LLDATA_H
#include "Base/Types/Exceptions.h"
#include "Base/Vector/EigenCore.h"
@@ -306,4 +306,4 @@ template <class T> bool HaveSameDimensions(const LLData<T>& left, const LLData<T
return true;
}
-#endif // BORNAGAIN_CORE_INTENSITY_LLDATA_H
+#endif // BORNAGAIN_DEVICE_DATA_LLDATA_H
diff --git a/Device/Data/OutputData.h b/Device/Data/OutputData.h
index 905392c0ef5..ca2eea1272e 100644
--- a/Device/Data/OutputData.h
+++ b/Device/Data/OutputData.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INTENSITY_OUTPUTDATA_H
-#define BORNAGAIN_CORE_INTENSITY_OUTPUTDATA_H
+#ifndef BORNAGAIN_DEVICE_DATA_OUTPUTDATA_H
+#define BORNAGAIN_DEVICE_DATA_OUTPUTDATA_H
#include "Base/Axis/FixedBinAxis.h"
#include "Base/Types/SafePointerVector.h"
@@ -627,4 +627,4 @@ template <class T> bool OutputData<T>::axisNameExists(const std::string& axis_na
return false;
}
-#endif // BORNAGAIN_CORE_INTENSITY_OUTPUTDATA_H
+#endif // BORNAGAIN_DEVICE_DATA_OUTPUTDATA_H
diff --git a/Device/Data/OutputDataIterator.h b/Device/Data/OutputDataIterator.h
index 0dd65d58a7c..ee175d9eec4 100644
--- a/Device/Data/OutputDataIterator.h
+++ b/Device/Data/OutputDataIterator.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INTENSITY_OUTPUTDATAITERATOR_H
-#define BORNAGAIN_CORE_INTENSITY_OUTPUTDATAITERATOR_H
+#ifndef BORNAGAIN_DEVICE_DATA_OUTPUTDATAITERATOR_H
+#define BORNAGAIN_DEVICE_DATA_OUTPUTDATAITERATOR_H
#include <cstddef>
#include <iterator>
@@ -211,4 +211,4 @@ bool operator!=(const OutputDataIterator<TValue1, TContainer1>& left,
return !(left == right);
}
-#endif // BORNAGAIN_CORE_INTENSITY_OUTPUTDATAITERATOR_H
+#endif // BORNAGAIN_DEVICE_DATA_OUTPUTDATAITERATOR_H
diff --git a/Device/Detector/DetectionProperties.h b/Device/Detector/DetectionProperties.h
index 64f03f8b9fa..3af8862abf4 100644
--- a/Device/Detector/DetectionProperties.h
+++ b/Device/Detector/DetectionProperties.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_DETECTOR_DETECTIONPROPERTIES_H
-#define BORNAGAIN_CORE_DETECTOR_DETECTIONPROPERTIES_H
+#ifndef BORNAGAIN_DEVICE_DETECTOR_DETECTIONPROPERTIES_H
+#define BORNAGAIN_DEVICE_DETECTOR_DETECTIONPROPERTIES_H
#include "Base/Vector/EigenCore.h"
#include "Param/Node/INode.h"
@@ -54,4 +54,4 @@ private:
double m_total_transmission; //!< total transmission of polarization analysis
};
-#endif // BORNAGAIN_CORE_DETECTOR_DETECTIONPROPERTIES_H
+#endif // BORNAGAIN_DEVICE_DETECTOR_DETECTIONPROPERTIES_H
diff --git a/Device/Detector/DetectorContext.h b/Device/Detector/DetectorContext.h
index 846e9c35050..a05f61f3c2d 100644
--- a/Device/Detector/DetectorContext.h
+++ b/Device/Detector/DetectorContext.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_DETECTOR_DETECTORCONTEXT_H
-#define BORNAGAIN_CORE_DETECTOR_DETECTORCONTEXT_H
+#ifndef BORNAGAIN_DEVICE_DETECTOR_DETECTORCONTEXT_H
+#define BORNAGAIN_DEVICE_DETECTOR_DETECTORCONTEXT_H
#include "Base/Pixel/IPixel.h"
#include "Base/Vector/EigenCore.h"
@@ -47,4 +47,4 @@ private:
std::vector<size_t> active_indices; //! The sequence of detector bin indices (unmasked, in ROI)
};
-#endif // BORNAGAIN_CORE_DETECTOR_DETECTORCONTEXT_H
+#endif // BORNAGAIN_DEVICE_DETECTOR_DETECTORCONTEXT_H
diff --git a/Device/Detector/DetectorMask.h b/Device/Detector/DetectorMask.h
index adf6cb95e62..237ddc1925e 100644
--- a/Device/Detector/DetectorMask.h
+++ b/Device/Detector/DetectorMask.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_DETECTOR_DETECTORMASK_H
-#define BORNAGAIN_CORE_DETECTOR_DETECTORMASK_H
+#ifndef BORNAGAIN_DEVICE_DETECTOR_DETECTORMASK_H
+#define BORNAGAIN_DEVICE_DETECTOR_DETECTORMASK_H
#include "Device/Data/OutputData.h"
#include "Device/Mask/IShape2D.h"
@@ -70,4 +70,4 @@ private:
int m_number_of_masked_channels;
};
-#endif // BORNAGAIN_CORE_DETECTOR_DETECTORMASK_H
+#endif // BORNAGAIN_DEVICE_DETECTOR_DETECTORMASK_H
diff --git a/Device/Detector/IDetector.h b/Device/Detector/IDetector.h
index 57e3788cd52..87049a5c6b4 100644
--- a/Device/Detector/IDetector.h
+++ b/Device/Detector/IDetector.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_DETECTOR_IDETECTOR_H
-#define BORNAGAIN_CORE_DETECTOR_IDETECTOR_H
+#ifndef BORNAGAIN_DEVICE_DETECTOR_IDETECTOR_H
+#define BORNAGAIN_DEVICE_DETECTOR_IDETECTOR_H
#include "Base/Types/CloneableVector.h"
#include "Device/Detector/DetectionProperties.h"
@@ -128,4 +128,4 @@ private:
std::unique_ptr<IDetectorResolution> m_detector_resolution;
};
-#endif // BORNAGAIN_CORE_DETECTOR_IDETECTOR_H
+#endif // BORNAGAIN_DEVICE_DETECTOR_IDETECTOR_H
diff --git a/Device/Detector/IDetector2D.h b/Device/Detector/IDetector2D.h
index d7ef1fce314..07da13a34d5 100644
--- a/Device/Detector/IDetector2D.h
+++ b/Device/Detector/IDetector2D.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_DETECTOR_IDETECTOR2D_H
-#define BORNAGAIN_CORE_DETECTOR_IDETECTOR2D_H
+#ifndef BORNAGAIN_DEVICE_DETECTOR_IDETECTOR2D_H
+#define BORNAGAIN_DEVICE_DETECTOR_IDETECTOR2D_H
#include "Device/Detector/DetectorMask.h"
#include "Device/Detector/IDetector.h"
@@ -90,4 +90,4 @@ private:
std::unique_ptr<RegionOfInterest> m_region_of_interest;
};
-#endif // BORNAGAIN_CORE_DETECTOR_IDETECTOR2D_H
+#endif // BORNAGAIN_DEVICE_DETECTOR_IDETECTOR2D_H
diff --git a/Device/Detector/IsGISAXSDetector.h b/Device/Detector/IsGISAXSDetector.h
index da4a8a74cdd..d4a6f7efedd 100644
--- a/Device/Detector/IsGISAXSDetector.h
+++ b/Device/Detector/IsGISAXSDetector.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_DETECTOR_ISGISAXSDETECTOR_H
-#define BORNAGAIN_CORE_DETECTOR_ISGISAXSDETECTOR_H
+#ifndef BORNAGAIN_DEVICE_DETECTOR_ISGISAXSDETECTOR_H
+#define BORNAGAIN_DEVICE_DETECTOR_ISGISAXSDETECTOR_H
#include "Device/Detector/SphericalDetector.h"
@@ -43,4 +43,4 @@ protected:
size_t indexOfSpecular(const Beam& beam) const override;
};
-#endif // BORNAGAIN_CORE_DETECTOR_ISGISAXSDETECTOR_H
+#endif // BORNAGAIN_DEVICE_DETECTOR_ISGISAXSDETECTOR_H
diff --git a/Device/Detector/RectangularDetector.h b/Device/Detector/RectangularDetector.h
index 4cb9e6ab485..64dd29735bd 100644
--- a/Device/Detector/RectangularDetector.h
+++ b/Device/Detector/RectangularDetector.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_DETECTOR_RECTANGULARDETECTOR_H
-#define BORNAGAIN_CORE_DETECTOR_RECTANGULARDETECTOR_H
+#ifndef BORNAGAIN_DEVICE_DETECTOR_RECTANGULARDETECTOR_H
+#define BORNAGAIN_DEVICE_DETECTOR_RECTANGULARDETECTOR_H
#include "Device/Detector/IDetector2D.h"
@@ -108,4 +108,4 @@ private:
kvector_t m_v_unit;
};
-#endif // BORNAGAIN_CORE_DETECTOR_RECTANGULARDETECTOR_H
+#endif // BORNAGAIN_DEVICE_DETECTOR_RECTANGULARDETECTOR_H
diff --git a/Device/Detector/RectangularPixel.h b/Device/Detector/RectangularPixel.h
index 6fc1b938a05..c67b9f418e1 100644
--- a/Device/Detector/RectangularPixel.h
+++ b/Device/Detector/RectangularPixel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_DETECTOR_RECTANGULARPIXEL_H
-#define BORNAGAIN_CORE_DETECTOR_RECTANGULARPIXEL_H
+#ifndef BORNAGAIN_DEVICE_DETECTOR_RECTANGULARPIXEL_H
+#define BORNAGAIN_DEVICE_DETECTOR_RECTANGULARPIXEL_H
#include "Base/Pixel/IPixel.h"
@@ -42,4 +42,4 @@ private:
mutable double m_solid_angle;
};
-#endif // BORNAGAIN_CORE_DETECTOR_RECTANGULARPIXEL_H
+#endif // BORNAGAIN_DEVICE_DETECTOR_RECTANGULARPIXEL_H
diff --git a/Device/Detector/RegionOfInterest.h b/Device/Detector/RegionOfInterest.h
index ef12ad7f570..a5bcb48f1b9 100644
--- a/Device/Detector/RegionOfInterest.h
+++ b/Device/Detector/RegionOfInterest.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_DETECTOR_REGIONOFINTEREST_H
-#define BORNAGAIN_CORE_DETECTOR_REGIONOFINTEREST_H
+#ifndef BORNAGAIN_DEVICE_DETECTOR_REGIONOFINTEREST_H
+#define BORNAGAIN_DEVICE_DETECTOR_REGIONOFINTEREST_H
#include "Base/Types/ICloneable.h"
#include <memory>
@@ -87,4 +87,4 @@ inline size_t RegionOfInterest::ycoord(size_t index, const std::vector<size_t>&
return index % dims[1];
}
-#endif // BORNAGAIN_CORE_DETECTOR_REGIONOFINTEREST_H
+#endif // BORNAGAIN_DEVICE_DETECTOR_REGIONOFINTEREST_H
diff --git a/Device/Detector/SimpleUnitConverters.h b/Device/Detector/SimpleUnitConverters.h
index fa2f1ac3247..40a10c4a475 100644
--- a/Device/Detector/SimpleUnitConverters.h
+++ b/Device/Detector/SimpleUnitConverters.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INTENSITY_SIMPLEUNITCONVERTERS_H
-#define BORNAGAIN_CORE_INTENSITY_SIMPLEUNITCONVERTERS_H
+#ifndef BORNAGAIN_DEVICE_DETECTOR_SIMPLEUNITCONVERTERS_H
+#define BORNAGAIN_DEVICE_DETECTOR_SIMPLEUNITCONVERTERS_H
#include "Base/Vector/Vectors3D.h"
#include "Device/Unit/IUnitConverter.h"
@@ -165,4 +165,4 @@ private:
void checkUnits(Axes::Units units_type) const;
};
-#endif // BORNAGAIN_CORE_INTENSITY_SIMPLEUNITCONVERTERS_H
+#endif // BORNAGAIN_DEVICE_DETECTOR_SIMPLEUNITCONVERTERS_H
diff --git a/Device/Detector/SimulationArea.h b/Device/Detector/SimulationArea.h
index b49141152df..6419bb243ca 100644
--- a/Device/Detector/SimulationArea.h
+++ b/Device/Detector/SimulationArea.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_DETECTOR_SIMULATIONAREA_H
-#define BORNAGAIN_CORE_DETECTOR_SIMULATIONAREA_H
+#ifndef BORNAGAIN_DEVICE_DETECTOR_SIMULATIONAREA_H
+#define BORNAGAIN_DEVICE_DETECTOR_SIMULATIONAREA_H
#include "Device/Detector/SimulationAreaIterator.h"
@@ -66,4 +66,4 @@ public:
virtual bool isMasked(size_t) const;
};
-#endif // BORNAGAIN_CORE_DETECTOR_SIMULATIONAREA_H
+#endif // BORNAGAIN_DEVICE_DETECTOR_SIMULATIONAREA_H
diff --git a/Device/Detector/SimulationAreaIterator.h b/Device/Detector/SimulationAreaIterator.h
index f6fdf696003..f04d0aa72e0 100644
--- a/Device/Detector/SimulationAreaIterator.h
+++ b/Device/Detector/SimulationAreaIterator.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_DETECTOR_SIMULATIONAREAITERATOR_H
-#define BORNAGAIN_CORE_DETECTOR_SIMULATIONAREAITERATOR_H
+#ifndef BORNAGAIN_DEVICE_DETECTOR_SIMULATIONAREAITERATOR_H
+#define BORNAGAIN_DEVICE_DETECTOR_SIMULATIONAREAITERATOR_H
#include <cstdlib>
class SimulationArea;
@@ -57,4 +57,4 @@ inline bool SimulationAreaIterator::operator!=(const SimulationAreaIterator& rig
return !(*this == right);
}
-#endif // BORNAGAIN_CORE_DETECTOR_SIMULATIONAREAITERATOR_H
+#endif // BORNAGAIN_DEVICE_DETECTOR_SIMULATIONAREAITERATOR_H
diff --git a/Device/Detector/SpecularDetector1D.h b/Device/Detector/SpecularDetector1D.h
index fbd995e7b0d..b24ed89ef60 100644
--- a/Device/Detector/SpecularDetector1D.h
+++ b/Device/Detector/SpecularDetector1D.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_DETECTOR_SPECULARDETECTOR1D_H
-#define BORNAGAIN_CORE_DETECTOR_SPECULARDETECTOR1D_H
+#ifndef BORNAGAIN_DEVICE_DETECTOR_SPECULARDETECTOR1D_H
+#define BORNAGAIN_DEVICE_DETECTOR_SPECULARDETECTOR1D_H
#include "Device/Detector/IDetector.h"
@@ -52,4 +52,4 @@ protected:
void initialize();
};
-#endif // BORNAGAIN_CORE_DETECTOR_SPECULARDETECTOR1D_H
+#endif // BORNAGAIN_DEVICE_DETECTOR_SPECULARDETECTOR1D_H
diff --git a/Device/Detector/SphericalDetector.h b/Device/Detector/SphericalDetector.h
index ea6fdbd5ed4..3186b0d3f5d 100644
--- a/Device/Detector/SphericalDetector.h
+++ b/Device/Detector/SphericalDetector.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_DETECTOR_SPHERICALDETECTOR_H
-#define BORNAGAIN_CORE_DETECTOR_SPHERICALDETECTOR_H
+#ifndef BORNAGAIN_DEVICE_DETECTOR_SPHERICALDETECTOR_H
+#define BORNAGAIN_DEVICE_DETECTOR_SPHERICALDETECTOR_H
#include "Device/Detector/IDetector2D.h"
@@ -62,4 +62,4 @@ protected:
size_t indexOfSpecular(const Beam& beam) const override;
};
-#endif // BORNAGAIN_CORE_DETECTOR_SPHERICALDETECTOR_H
+#endif // BORNAGAIN_DEVICE_DETECTOR_SPHERICALDETECTOR_H
diff --git a/Device/Detector/SphericalPixel.h b/Device/Detector/SphericalPixel.h
index 27a2b859c35..7e23334c824 100644
--- a/Device/Detector/SphericalPixel.h
+++ b/Device/Detector/SphericalPixel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_DETECTOR_SPHERICALPIXEL_H
-#define BORNAGAIN_CORE_DETECTOR_SPHERICALPIXEL_H
+#ifndef BORNAGAIN_DEVICE_DETECTOR_SPHERICALPIXEL_H
+#define BORNAGAIN_DEVICE_DETECTOR_SPHERICALPIXEL_H
#include "Base/Pixel/IPixel.h"
@@ -40,4 +40,4 @@ private:
mutable double m_solid_angle;
};
-#endif // BORNAGAIN_CORE_DETECTOR_SPHERICALPIXEL_H
+#endif // BORNAGAIN_DEVICE_DETECTOR_SPHERICALPIXEL_H
diff --git a/Device/Histo/Histogram1D.h b/Device/Histo/Histogram1D.h
index 48b0dd2fbb6..723ef812f1d 100644
--- a/Device/Histo/Histogram1D.h
+++ b/Device/Histo/Histogram1D.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INTENSITY_HISTOGRAM1D_H
-#define BORNAGAIN_CORE_INTENSITY_HISTOGRAM1D_H
+#ifndef BORNAGAIN_DEVICE_HISTO_HISTOGRAM1D_H
+#define BORNAGAIN_DEVICE_HISTO_HISTOGRAM1D_H
#include "Device/Histo/IHistogram.h"
@@ -69,4 +69,4 @@ public:
Histogram1D* crop(double xmin, double xmax);
};
-#endif // BORNAGAIN_CORE_INTENSITY_HISTOGRAM1D_H
+#endif // BORNAGAIN_DEVICE_HISTO_HISTOGRAM1D_H
diff --git a/Device/Histo/Histogram2D.h b/Device/Histo/Histogram2D.h
index abb8eeabc6d..f3db774f025 100644
--- a/Device/Histo/Histogram2D.h
+++ b/Device/Histo/Histogram2D.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INTENSITY_HISTOGRAM2D_H
-#define BORNAGAIN_CORE_INTENSITY_HISTOGRAM2D_H
+#ifndef BORNAGAIN_DEVICE_HISTO_HISTOGRAM2D_H
+#define BORNAGAIN_DEVICE_HISTO_HISTOGRAM2D_H
#include "Device/Histo/IHistogram.h"
#include "Device/Intensity/ArrayUtils.h"
@@ -126,4 +126,4 @@ template <typename T> void Histogram2D::initFromShape(const T& data)
m_data.addAxis(FixedBinAxis("y-axis", nrows, 0.0, static_cast<double>(nrows)));
}
-#endif // BORNAGAIN_CORE_INTENSITY_HISTOGRAM2D_H
+#endif // BORNAGAIN_DEVICE_HISTO_HISTOGRAM2D_H
diff --git a/Device/Histo/IHistogram.h b/Device/Histo/IHistogram.h
index 974adcafea2..f27aeef472c 100644
--- a/Device/Histo/IHistogram.h
+++ b/Device/Histo/IHistogram.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INTENSITY_IHISTOGRAM_H
-#define BORNAGAIN_CORE_INTENSITY_IHISTOGRAM_H
+#ifndef BORNAGAIN_DEVICE_HISTO_IHISTOGRAM_H
+#define BORNAGAIN_DEVICE_HISTO_IHISTOGRAM_H
#include "Device/Data/CumulativeValue.h"
#include "Device/Data/OutputData.h"
@@ -193,4 +193,4 @@ protected:
OutputData<CumulativeValue> m_data;
};
-#endif // BORNAGAIN_CORE_INTENSITY_IHISTOGRAM_H
+#endif // BORNAGAIN_DEVICE_HISTO_IHISTOGRAM_H
diff --git a/Device/Histo/IntensityDataIOFactory.h b/Device/Histo/IntensityDataIOFactory.h
index 9c757d3023e..e4648d2deb1 100644
--- a/Device/Histo/IntensityDataIOFactory.h
+++ b/Device/Histo/IntensityDataIOFactory.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INPUTOUTPUT_INTENSITYDATAIOFACTORY_H
-#define BORNAGAIN_CORE_INPUTOUTPUT_INTENSITYDATAIOFACTORY_H
+#ifndef BORNAGAIN_DEVICE_HISTO_INTENSITYDATAIOFACTORY_H
+#define BORNAGAIN_DEVICE_HISTO_INTENSITYDATAIOFACTORY_H
#include <string>
@@ -63,4 +63,4 @@ public:
static void writeSimulationResult(const SimulationResult& result, const std::string& file_name);
};
-#endif // BORNAGAIN_CORE_INPUTOUTPUT_INTENSITYDATAIOFACTORY_H
+#endif // BORNAGAIN_DEVICE_HISTO_INTENSITYDATAIOFACTORY_H
diff --git a/Device/Histo/SimulationResult.h b/Device/Histo/SimulationResult.h
index d5185f6d71e..dee399c5d59 100644
--- a/Device/Histo/SimulationResult.h
+++ b/Device/Histo/SimulationResult.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INSTRUMENT_SIMULATIONRESULT_H
-#define BORNAGAIN_CORE_INSTRUMENT_SIMULATIONRESULT_H
+#ifndef BORNAGAIN_DEVICE_HISTO_SIMULATIONRESULT_H
+#define BORNAGAIN_DEVICE_HISTO_SIMULATIONRESULT_H
#include "Base/Utils/PyObject.h"
#include "Device/Unit/IUnitConverter.h"
@@ -87,4 +87,4 @@ private:
std::unique_ptr<IUnitConverter> m_unit_converter;
};
-#endif // BORNAGAIN_CORE_INSTRUMENT_SIMULATIONRESULT_H
+#endif // BORNAGAIN_DEVICE_HISTO_SIMULATIONRESULT_H
diff --git a/Device/InputOutput/DataFormatUtils.h b/Device/InputOutput/DataFormatUtils.h
index 6172fe968a9..a8e001ae745 100644
--- a/Device/InputOutput/DataFormatUtils.h
+++ b/Device/InputOutput/DataFormatUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INPUTOUTPUT_DATAFORMATUTILS_H
-#define BORNAGAIN_CORE_INPUTOUTPUT_DATAFORMATUTILS_H
+#ifndef BORNAGAIN_DEVICE_INPUTOUTPUT_DATAFORMATUTILS_H
+#define BORNAGAIN_DEVICE_INPUTOUTPUT_DATAFORMATUTILS_H
#include <memory>
#include <string>
@@ -53,4 +53,4 @@ std::vector<double> parse_doubles(const std::string& str);
void readLineOfDoubles(std::vector<double>& buffer, std::istringstream& iss);
} // namespace DataFormatUtils
-#endif // BORNAGAIN_CORE_INPUTOUTPUT_DATAFORMATUTILS_H
+#endif // BORNAGAIN_DEVICE_INPUTOUTPUT_DATAFORMATUTILS_H
diff --git a/Device/InputOutput/OutputDataReadFactory.h b/Device/InputOutput/OutputDataReadFactory.h
index 4d27bd5b6dc..cd154cfc4f9 100644
--- a/Device/InputOutput/OutputDataReadFactory.h
+++ b/Device/InputOutput/OutputDataReadFactory.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAREADFACTORY_H
-#define BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAREADFACTORY_H
+#ifndef BORNAGAIN_DEVICE_INPUTOUTPUT_OUTPUTDATAREADFACTORY_H
+#define BORNAGAIN_DEVICE_INPUTOUTPUT_OUTPUTDATAREADFACTORY_H
#include "Device/InputOutput/OutputDataReader.h"
@@ -30,4 +30,4 @@ private:
static IOutputDataReadStrategy* getReadStrategy(const std::string& file_name);
};
-#endif // BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAREADFACTORY_H
+#endif // BORNAGAIN_DEVICE_INPUTOUTPUT_OUTPUTDATAREADFACTORY_H
diff --git a/Device/InputOutput/OutputDataReadStrategy.h b/Device/InputOutput/OutputDataReadStrategy.h
index 0eeda75002f..07a57fc273e 100644
--- a/Device/InputOutput/OutputDataReadStrategy.h
+++ b/Device/InputOutput/OutputDataReadStrategy.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAREADSTRATEGY_H
-#define BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAREADSTRATEGY_H
+#ifndef BORNAGAIN_DEVICE_INPUTOUTPUT_OUTPUTDATAREADSTRATEGY_H
+#define BORNAGAIN_DEVICE_INPUTOUTPUT_OUTPUTDATAREADSTRATEGY_H
#include <istream>
@@ -75,4 +75,4 @@ private:
};
#endif // BORNAGAIN_TIFF_SUPPORT
-#endif // BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAREADSTRATEGY_H
+#endif // BORNAGAIN_DEVICE_INPUTOUTPUT_OUTPUTDATAREADSTRATEGY_H
diff --git a/Device/InputOutput/OutputDataReader.h b/Device/InputOutput/OutputDataReader.h
index 80de5a5a52d..688d6de7282 100644
--- a/Device/InputOutput/OutputDataReader.h
+++ b/Device/InputOutput/OutputDataReader.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAREADER_H
-#define BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAREADER_H
+#ifndef BORNAGAIN_DEVICE_INPUTOUTPUT_OUTPUTDATAREADER_H
+#define BORNAGAIN_DEVICE_INPUTOUTPUT_OUTPUTDATAREADER_H
#include "Device/InputOutput/OutputDataReadStrategy.h"
#include <memory>
@@ -39,4 +39,4 @@ private:
std::unique_ptr<IOutputDataReadStrategy> m_read_strategy;
};
-#endif // BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAREADER_H
+#endif // BORNAGAIN_DEVICE_INPUTOUTPUT_OUTPUTDATAREADER_H
diff --git a/Device/InputOutput/OutputDataWriteFactory.h b/Device/InputOutput/OutputDataWriteFactory.h
index bd671675089..335e82a10ad 100644
--- a/Device/InputOutput/OutputDataWriteFactory.h
+++ b/Device/InputOutput/OutputDataWriteFactory.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAWRITEFACTORY_H
-#define BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAWRITEFACTORY_H
+#ifndef BORNAGAIN_DEVICE_INPUTOUTPUT_OUTPUTDATAWRITEFACTORY_H
+#define BORNAGAIN_DEVICE_INPUTOUTPUT_OUTPUTDATAWRITEFACTORY_H
#include "Device/InputOutput/OutputDataWriter.h"
@@ -29,4 +29,4 @@ private:
static IOutputDataWriteStrategy* getWriteStrategy(const std::string& file_name);
};
-#endif // BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAWRITEFACTORY_H
+#endif // BORNAGAIN_DEVICE_INPUTOUTPUT_OUTPUTDATAWRITEFACTORY_H
diff --git a/Device/InputOutput/OutputDataWriteStrategy.h b/Device/InputOutput/OutputDataWriteStrategy.h
index eb70b33910a..e38b0d4e9c2 100644
--- a/Device/InputOutput/OutputDataWriteStrategy.h
+++ b/Device/InputOutput/OutputDataWriteStrategy.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAWRITESTRATEGY_H
-#define BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAWRITESTRATEGY_H
+#ifndef BORNAGAIN_DEVICE_INPUTOUTPUT_OUTPUTDATAWRITESTRATEGY_H
+#define BORNAGAIN_DEVICE_INPUTOUTPUT_OUTPUTDATAWRITESTRATEGY_H
#include <istream>
@@ -69,4 +69,4 @@ private:
#endif // BORNAGAIN_TIFF_SUPPORT
-#endif // BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAWRITESTRATEGY_H
+#endif // BORNAGAIN_DEVICE_INPUTOUTPUT_OUTPUTDATAWRITESTRATEGY_H
diff --git a/Device/InputOutput/OutputDataWriter.h b/Device/InputOutput/OutputDataWriter.h
index 924b55e9185..4beadbedf88 100644
--- a/Device/InputOutput/OutputDataWriter.h
+++ b/Device/InputOutput/OutputDataWriter.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAWRITER_H
-#define BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAWRITER_H
+#ifndef BORNAGAIN_DEVICE_INPUTOUTPUT_OUTPUTDATAWRITER_H
+#define BORNAGAIN_DEVICE_INPUTOUTPUT_OUTPUTDATAWRITER_H
#include "Device/InputOutput/OutputDataWriteStrategy.h"
#include <memory>
@@ -39,4 +39,4 @@ private:
std::unique_ptr<IOutputDataWriteStrategy> m_write_strategy;
};
-#endif // BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAWRITER_H
+#endif // BORNAGAIN_DEVICE_INPUTOUTPUT_OUTPUTDATAWRITER_H
diff --git a/Device/InputOutput/TiffHandler.h b/Device/InputOutput/TiffHandler.h
index 9776d9a1727..b61318e4131 100644
--- a/Device/InputOutput/TiffHandler.h
+++ b/Device/InputOutput/TiffHandler.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INPUTOUTPUT_TIFFHANDLER_H
-#define BORNAGAIN_CORE_INPUTOUTPUT_TIFFHANDLER_H
+#ifndef BORNAGAIN_DEVICE_INPUTOUTPUT_TIFFHANDLER_H
+#define BORNAGAIN_DEVICE_INPUTOUTPUT_TIFFHANDLER_H
#ifdef BORNAGAIN_TIFF_SUPPORT
@@ -52,4 +52,4 @@ private:
#endif // BORNAGAIN_TIFF_SUPPORT
-#endif // BORNAGAIN_CORE_INPUTOUTPUT_TIFFHANDLER_H
+#endif // BORNAGAIN_DEVICE_INPUTOUTPUT_TIFFHANDLER_H
diff --git a/Device/InputOutput/boost_streams.h b/Device/InputOutput/boost_streams.h
index 699aa7c655d..9202f843bf3 100644
--- a/Device/InputOutput/boost_streams.h
+++ b/Device/InputOutput/boost_streams.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INPUTOUTPUT_BOOST_STREAMS_H
-#define BORNAGAIN_CORE_INPUTOUTPUT_BOOST_STREAMS_H
+#ifndef BORNAGAIN_DEVICE_INPUTOUTPUT_BOOST_STREAMS_H
+#define BORNAGAIN_DEVICE_INPUTOUTPUT_BOOST_STREAMS_H
#include <boost/iostreams/copy.hpp>
#include <boost/iostreams/filtering_stream.hpp>
@@ -27,4 +27,4 @@
#pragma warning(pop)
#endif
-#endif // BORNAGAIN_CORE_INPUTOUTPUT_BOOST_STREAMS_H
+#endif // BORNAGAIN_DEVICE_INPUTOUTPUT_BOOST_STREAMS_H
diff --git a/Device/Instrument/ChiSquaredModule.h b/Device/Instrument/ChiSquaredModule.h
index d86b3a442bd..c4086c112e9 100644
--- a/Device/Instrument/ChiSquaredModule.h
+++ b/Device/Instrument/ChiSquaredModule.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INSTRUMENT_CHISQUAREDMODULE_H
-#define BORNAGAIN_CORE_INSTRUMENT_CHISQUAREDMODULE_H
+#ifndef BORNAGAIN_DEVICE_INSTRUMENT_CHISQUAREDMODULE_H
+#define BORNAGAIN_DEVICE_INSTRUMENT_CHISQUAREDMODULE_H
#include "Device/Instrument/IChiSquaredModule.h"
@@ -32,4 +32,4 @@ public:
virtual double residual(double a, double b, double weight);
};
-#endif // BORNAGAIN_CORE_INSTRUMENT_CHISQUAREDMODULE_H
+#endif // BORNAGAIN_DEVICE_INSTRUMENT_CHISQUAREDMODULE_H
diff --git a/Device/Instrument/FourierTransform.h b/Device/Instrument/FourierTransform.h
index 7adfe6209b0..31a9c152e41 100644
--- a/Device/Instrument/FourierTransform.h
+++ b/Device/Instrument/FourierTransform.h
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INSTRUMENT_FOURIERTRANSFORM_H
-#define BORNAGAIN_CORE_INSTRUMENT_FOURIERTRANSFORM_H
+#ifndef BORNAGAIN_DEVICE_INSTRUMENT_FOURIERTRANSFORM_H
+#define BORNAGAIN_DEVICE_INSTRUMENT_FOURIERTRANSFORM_H
#include <fftw3.h>
#include <vector>
@@ -91,4 +91,4 @@ private:
Workspace ws;
};
-#endif // BORNAGAIN_CORE_INSTRUMENT_FOURIERTRANSFORM_H
+#endif // BORNAGAIN_DEVICE_INSTRUMENT_FOURIERTRANSFORM_H
diff --git a/Device/Instrument/IChiSquaredModule.h b/Device/Instrument/IChiSquaredModule.h
index 0dd95cc0777..8be5212e258 100644
--- a/Device/Instrument/IChiSquaredModule.h
+++ b/Device/Instrument/IChiSquaredModule.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INSTRUMENT_ICHISQUAREDMODULE_H
-#define BORNAGAIN_CORE_INSTRUMENT_ICHISQUAREDMODULE_H
+#ifndef BORNAGAIN_DEVICE_INSTRUMENT_ICHISQUAREDMODULE_H
+#define BORNAGAIN_DEVICE_INSTRUMENT_ICHISQUAREDMODULE_H
#include "Base/Types/ICloneable.h"
#include <memory>
@@ -54,4 +54,4 @@ protected:
std::unique_ptr<IIntensityFunction> m_intensity_function;
};
-#endif // BORNAGAIN_CORE_INSTRUMENT_ICHISQUAREDMODULE_H
+#endif // BORNAGAIN_DEVICE_INSTRUMENT_ICHISQUAREDMODULE_H
diff --git a/Device/Instrument/Instrument.h b/Device/Instrument/Instrument.h
index 0fa54a17322..fea83b48116 100644
--- a/Device/Instrument/Instrument.h
+++ b/Device/Instrument/Instrument.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INSTRUMENT_INSTRUMENT_H
-#define BORNAGAIN_CORE_INSTRUMENT_INSTRUMENT_H
+#ifndef BORNAGAIN_DEVICE_INSTRUMENT_INSTRUMENT_H
+#define BORNAGAIN_DEVICE_INSTRUMENT_INSTRUMENT_H
#include "Device/Beam/Beam.h"
#include <memory>
@@ -94,4 +94,4 @@ protected:
Beam m_beam;
};
-#endif // BORNAGAIN_CORE_INSTRUMENT_INSTRUMENT_H
+#endif // BORNAGAIN_DEVICE_INSTRUMENT_INSTRUMENT_H
diff --git a/Device/Instrument/IntensityDataFunctions.h b/Device/Instrument/IntensityDataFunctions.h
index 5aa79fbd26b..3f66e25ba2a 100644
--- a/Device/Instrument/IntensityDataFunctions.h
+++ b/Device/Instrument/IntensityDataFunctions.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INTENSITY_INTENSITYDATAFUNCTIONS_H
-#define BORNAGAIN_CORE_INTENSITY_INTENSITYDATAFUNCTIONS_H
+#ifndef BORNAGAIN_DEVICE_INSTRUMENT_INTENSITYDATAFUNCTIONS_H
+#define BORNAGAIN_DEVICE_INSTRUMENT_INTENSITYDATAFUNCTIONS_H
#include "Device/Data/OutputData.h"
#include <memory>
@@ -84,4 +84,4 @@ std::unique_ptr<OutputData<double>> createFFT(const OutputData<double>& data);
}; // namespace IntensityDataFunctions
-#endif // BORNAGAIN_CORE_INTENSITY_INTENSITYDATAFUNCTIONS_H
+#endif // BORNAGAIN_DEVICE_INSTRUMENT_INTENSITYDATAFUNCTIONS_H
diff --git a/Device/Instrument/PyArrayImportUtils.h b/Device/Instrument/PyArrayImportUtils.h
index c59509cb2e1..23becfda818 100644
--- a/Device/Instrument/PyArrayImportUtils.h
+++ b/Device/Instrument/PyArrayImportUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INSTRUMENT_PYARRAYIMPORTUTILS_H
-#define BORNAGAIN_CORE_INSTRUMENT_PYARRAYIMPORTUTILS_H
+#ifndef BORNAGAIN_DEVICE_INSTRUMENT_PYARRAYIMPORTUTILS_H
+#define BORNAGAIN_DEVICE_INSTRUMENT_PYARRAYIMPORTUTILS_H
#include <vector>
@@ -32,4 +32,4 @@ OutputData<double>* importArrayToOutputData(const std::vector<std::vector<double
} // namespace PyArrayImport
-#endif // BORNAGAIN_CORE_INSTRUMENT_PYARRAYIMPORTUTILS_H
+#endif // BORNAGAIN_DEVICE_INSTRUMENT_PYARRAYIMPORTUTILS_H
diff --git a/Device/Instrument/PyFmt2.h b/Device/Instrument/PyFmt2.h
index 08ad87d23ff..266dc95736a 100644
--- a/Device/Instrument/PyFmt2.h
+++ b/Device/Instrument/PyFmt2.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PYIO_PYTHONFORMATTING_H
-#define BORNAGAIN_CORE_PYIO_PYTHONFORMATTING_H
+#ifndef BORNAGAIN_DEVICE_INSTRUMENT_PYFMT2_H
+#define BORNAGAIN_DEVICE_INSTRUMENT_PYFMT2_H
#include <functional>
#include <string>
@@ -42,4 +42,4 @@ std::string printParameterDistribution(const ParameterDistribution& par_distr,
const std::string& units = "");
} // namespace pyfmt2
-#endif // BORNAGAIN_CORE_PYIO_PYTHONFORMATTING_H
+#endif // BORNAGAIN_DEVICE_INSTRUMENT_PYFMT2_H
diff --git a/Device/Instrument/SpectrumUtils.h b/Device/Instrument/SpectrumUtils.h
index e2d2bf82f91..4630f234874 100644
--- a/Device/Instrument/SpectrumUtils.h
+++ b/Device/Instrument/SpectrumUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INSTRUMENT_SPECTRUMUTILS_H
-#define BORNAGAIN_CORE_INSTRUMENT_SPECTRUMUTILS_H
+#ifndef BORNAGAIN_DEVICE_INSTRUMENT_SPECTRUMUTILS_H
+#define BORNAGAIN_DEVICE_INSTRUMENT_SPECTRUMUTILS_H
#include "Device/Histo/Histogram2D.h"
#include <string>
@@ -31,4 +31,4 @@ std::vector<std::pair<double, double>> FindPeaks(const Histogram2D& hist, double
double threshold = 0.05);
}
-#endif // BORNAGAIN_CORE_INSTRUMENT_SPECTRUMUTILS_H
+#endif // BORNAGAIN_DEVICE_INSTRUMENT_SPECTRUMUTILS_H
diff --git a/Device/Instrument/VarianceFunctions.h b/Device/Instrument/VarianceFunctions.h
index ef060f08a49..9e68f2d3ce5 100644
--- a/Device/Instrument/VarianceFunctions.h
+++ b/Device/Instrument/VarianceFunctions.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INSTRUMENT_VARIANCEFUNCTIONS_H
-#define BORNAGAIN_CORE_INSTRUMENT_VARIANCEFUNCTIONS_H
+#ifndef BORNAGAIN_DEVICE_INSTRUMENT_VARIANCEFUNCTIONS_H
+#define BORNAGAIN_DEVICE_INSTRUMENT_VARIANCEFUNCTIONS_H
//! Variance function interface.
//! @ingroup fitting_internal
@@ -54,4 +54,4 @@ private:
double m_epsilon;
};
-#endif // BORNAGAIN_CORE_INSTRUMENT_VARIANCEFUNCTIONS_H
+#endif // BORNAGAIN_DEVICE_INSTRUMENT_VARIANCEFUNCTIONS_H
diff --git a/Device/Intensity/ArrayUtils.h b/Device/Intensity/ArrayUtils.h
index 8caa05aa6e7..ea9615f6ef7 100644
--- a/Device/Intensity/ArrayUtils.h
+++ b/Device/Intensity/ArrayUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INTENSITY_ARRAYUTILS_H
-#define BORNAGAIN_CORE_INTENSITY_ARRAYUTILS_H
+#ifndef BORNAGAIN_DEVICE_INTENSITY_ARRAYUTILS_H
+#define BORNAGAIN_DEVICE_INTENSITY_ARRAYUTILS_H
#include "Device/Data/OutputData.h"
#include <memory>
@@ -164,4 +164,4 @@ template <class T> decltype(auto) ArrayUtils::createVector2D(const T& data)
return result;
}
-#endif // BORNAGAIN_CORE_INTENSITY_ARRAYUTILS_H
+#endif // BORNAGAIN_DEVICE_INTENSITY_ARRAYUTILS_H
diff --git a/Device/Intensity/IIntensityFunction.h b/Device/Intensity/IIntensityFunction.h
index 430fb7293f1..1f5a57f80ec 100644
--- a/Device/Intensity/IIntensityFunction.h
+++ b/Device/Intensity/IIntensityFunction.h
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INTENSITY_IINTENSITYFUNCTION_H
-#define BORNAGAIN_CORE_INTENSITY_IINTENSITYFUNCTION_H
+#ifndef BORNAGAIN_DEVICE_INTENSITY_IINTENSITYFUNCTION_H
+#define BORNAGAIN_DEVICE_INTENSITY_IINTENSITYFUNCTION_H
//! Interface for applying arbitrary function to the measured intensity.
//! @ingroup algorithms_internal
@@ -47,4 +47,4 @@ public:
virtual double evaluate(double value) const;
};
-#endif // BORNAGAIN_CORE_INTENSITY_IINTENSITYFUNCTION_H
+#endif // BORNAGAIN_DEVICE_INTENSITY_IINTENSITYFUNCTION_H
diff --git a/Device/Mask/Ellipse.h b/Device/Mask/Ellipse.h
index 8712dd389f0..87cf61e3745 100644
--- a/Device/Mask/Ellipse.h
+++ b/Device/Mask/Ellipse.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MASK_ELLIPSE_H
-#define BORNAGAIN_CORE_MASK_ELLIPSE_H
+#ifndef BORNAGAIN_DEVICE_MASK_ELLIPSE_H
+#define BORNAGAIN_DEVICE_MASK_ELLIPSE_H
#include "Device/Mask/IShape2D.h"
@@ -39,4 +39,4 @@ private:
double m_xc, m_yc, m_xr, m_yr, m_theta;
};
-#endif // BORNAGAIN_CORE_MASK_ELLIPSE_H
+#endif // BORNAGAIN_DEVICE_MASK_ELLIPSE_H
diff --git a/Device/Mask/IShape2D.h b/Device/Mask/IShape2D.h
index af1951183df..aba831b4139 100644
--- a/Device/Mask/IShape2D.h
+++ b/Device/Mask/IShape2D.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MASK_ISHAPE2D_H
-#define BORNAGAIN_CORE_MASK_ISHAPE2D_H
+#ifndef BORNAGAIN_DEVICE_MASK_ISHAPE2D_H
+#define BORNAGAIN_DEVICE_MASK_ISHAPE2D_H
#include "Base/Types/ICloneable.h"
#include <iostream>
@@ -49,4 +49,4 @@ private:
const char* const m_name;
};
-#endif // BORNAGAIN_CORE_MASK_ISHAPE2D_H
+#endif // BORNAGAIN_DEVICE_MASK_ISHAPE2D_H
diff --git a/Device/Mask/InfinitePlane.h b/Device/Mask/InfinitePlane.h
index 1de5eb92039..02df9e3121d 100644
--- a/Device/Mask/InfinitePlane.h
+++ b/Device/Mask/InfinitePlane.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MASK_INFINITEPLANE_H
-#define BORNAGAIN_CORE_MASK_INFINITEPLANE_H
+#ifndef BORNAGAIN_DEVICE_MASK_INFINITEPLANE_H
+#define BORNAGAIN_DEVICE_MASK_INFINITEPLANE_H
#include "Device/Mask/IShape2D.h"
@@ -30,4 +30,4 @@ public:
bool contains(const Bin1D&, const Bin1D&) const { return true; }
};
-#endif // BORNAGAIN_CORE_MASK_INFINITEPLANE_H
+#endif // BORNAGAIN_DEVICE_MASK_INFINITEPLANE_H
diff --git a/Device/Mask/Line.h b/Device/Mask/Line.h
index 263e49be893..583895ec902 100644
--- a/Device/Mask/Line.h
+++ b/Device/Mask/Line.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MASK_LINE_H
-#define BORNAGAIN_CORE_MASK_LINE_H
+#ifndef BORNAGAIN_DEVICE_MASK_LINE_H
+#define BORNAGAIN_DEVICE_MASK_LINE_H
#include "Device/Mask/IShape2D.h"
@@ -69,4 +69,4 @@ private:
double m_y;
};
-#endif // BORNAGAIN_CORE_MASK_LINE_H
+#endif // BORNAGAIN_DEVICE_MASK_LINE_H
diff --git a/Device/Mask/Polygon.h b/Device/Mask/Polygon.h
index 3c6abba5794..b13475a2ce4 100644
--- a/Device/Mask/Polygon.h
+++ b/Device/Mask/Polygon.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MASK_POLYGON_H
-#define BORNAGAIN_CORE_MASK_POLYGON_H
+#ifndef BORNAGAIN_DEVICE_MASK_POLYGON_H
+#define BORNAGAIN_DEVICE_MASK_POLYGON_H
#include "Device/Mask/IShape2D.h"
#include <vector>
@@ -52,4 +52,4 @@ private:
PolygonPrivate* m_d;
};
-#endif // BORNAGAIN_CORE_MASK_POLYGON_H
+#endif // BORNAGAIN_DEVICE_MASK_POLYGON_H
diff --git a/Device/Mask/Rectangle.h b/Device/Mask/Rectangle.h
index 30b1a194d1a..fa3446c8e0c 100644
--- a/Device/Mask/Rectangle.h
+++ b/Device/Mask/Rectangle.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MASK_RECTANGLE_H
-#define BORNAGAIN_CORE_MASK_RECTANGLE_H
+#ifndef BORNAGAIN_DEVICE_MASK_RECTANGLE_H
+#define BORNAGAIN_DEVICE_MASK_RECTANGLE_H
#include "Device/Mask/IShape2D.h"
@@ -40,4 +40,4 @@ private:
double m_xlow, m_ylow, m_xup, m_yup;
};
-#endif // BORNAGAIN_CORE_MASK_RECTANGLE_H
+#endif // BORNAGAIN_DEVICE_MASK_RECTANGLE_H
diff --git a/Device/Resolution/ConvolutionDetectorResolution.h b/Device/Resolution/ConvolutionDetectorResolution.h
index 9fce46e2e51..97f6f800ec8 100644
--- a/Device/Resolution/ConvolutionDetectorResolution.h
+++ b/Device/Resolution/ConvolutionDetectorResolution.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_DETECTOR_CONVOLUTIONDETECTORRESOLUTION_H
-#define BORNAGAIN_CORE_DETECTOR_CONVOLUTIONDETECTORRESOLUTION_H
+#ifndef BORNAGAIN_DEVICE_RESOLUTION_CONVOLUTIONDETECTORRESOLUTION_H
+#define BORNAGAIN_DEVICE_RESOLUTION_CONVOLUTIONDETECTORRESOLUTION_H
#include "Device/Resolution/IDetectorResolution.h"
#include "Device/Resolution/IResolutionFunction2D.h"
@@ -67,4 +67,4 @@ inline const IResolutionFunction2D* ConvolutionDetectorResolution::getResolution
return m_res_function_2d.get();
}
-#endif // BORNAGAIN_CORE_DETECTOR_CONVOLUTIONDETECTORRESOLUTION_H
+#endif // BORNAGAIN_DEVICE_RESOLUTION_CONVOLUTIONDETECTORRESOLUTION_H
diff --git a/Device/Resolution/Convolve.h b/Device/Resolution/Convolve.h
index ee4157a5703..93937d9917a 100644
--- a/Device/Resolution/Convolve.h
+++ b/Device/Resolution/Convolve.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_DETECTOR_CONVOLVE_H
-#define BORNAGAIN_CORE_DETECTOR_CONVOLVE_H
+#ifndef BORNAGAIN_DEVICE_RESOLUTION_CONVOLVE_H
+#define BORNAGAIN_DEVICE_RESOLUTION_CONVOLVE_H
#include <fftw3.h>
#include <vector>
@@ -119,4 +119,4 @@ private:
std::vector<size_t> m_implemented_factors; // favorite factorization terms of fftw3
};
-#endif // BORNAGAIN_CORE_DETECTOR_CONVOLVE_H
+#endif // BORNAGAIN_DEVICE_RESOLUTION_CONVOLVE_H
diff --git a/Device/Resolution/IDetectorResolution.h b/Device/Resolution/IDetectorResolution.h
index e2d9d5ff6e4..925ecb08d68 100644
--- a/Device/Resolution/IDetectorResolution.h
+++ b/Device/Resolution/IDetectorResolution.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_DETECTOR_IDETECTORRESOLUTION_H
-#define BORNAGAIN_CORE_DETECTOR_IDETECTORRESOLUTION_H
+#ifndef BORNAGAIN_DEVICE_RESOLUTION_IDETECTORRESOLUTION_H
+#define BORNAGAIN_DEVICE_RESOLUTION_IDETECTORRESOLUTION_H
#include "Base/Types/ICloneable.h"
#include "Device/Data/OutputData.h"
@@ -35,4 +35,4 @@ public:
virtual IDetectorResolution* clone() const = 0;
};
-#endif // BORNAGAIN_CORE_DETECTOR_IDETECTORRESOLUTION_H
+#endif // BORNAGAIN_DEVICE_RESOLUTION_IDETECTORRESOLUTION_H
diff --git a/Device/Resolution/IResolutionFunction2D.h b/Device/Resolution/IResolutionFunction2D.h
index 7fd5fb9b96f..7207ece5f12 100644
--- a/Device/Resolution/IResolutionFunction2D.h
+++ b/Device/Resolution/IResolutionFunction2D.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_DETECTOR_IRESOLUTIONFUNCTION2D_H
-#define BORNAGAIN_CORE_DETECTOR_IRESOLUTIONFUNCTION2D_H
+#ifndef BORNAGAIN_DEVICE_RESOLUTION_IRESOLUTIONFUNCTION2D_H
+#define BORNAGAIN_DEVICE_RESOLUTION_IRESOLUTIONFUNCTION2D_H
#include "Base/Types/ICloneable.h"
#include "Param/Node/INode.h"
@@ -33,4 +33,4 @@ public:
virtual IResolutionFunction2D* clone() const = 0;
};
-#endif // BORNAGAIN_CORE_DETECTOR_IRESOLUTIONFUNCTION2D_H
+#endif // BORNAGAIN_DEVICE_RESOLUTION_IRESOLUTIONFUNCTION2D_H
diff --git a/Device/Resolution/ResolutionFunction2DGaussian.h b/Device/Resolution/ResolutionFunction2DGaussian.h
index 37ca3c19327..1ac407e9851 100644
--- a/Device/Resolution/ResolutionFunction2DGaussian.h
+++ b/Device/Resolution/ResolutionFunction2DGaussian.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_DETECTOR_RESOLUTIONFUNCTION2DGAUSSIAN_H
-#define BORNAGAIN_CORE_DETECTOR_RESOLUTIONFUNCTION2DGAUSSIAN_H
+#ifndef BORNAGAIN_DEVICE_RESOLUTION_RESOLUTIONFUNCTION2DGAUSSIAN_H
+#define BORNAGAIN_DEVICE_RESOLUTION_RESOLUTIONFUNCTION2DGAUSSIAN_H
#include "Device/Resolution/IResolutionFunction2D.h"
@@ -44,4 +44,4 @@ private:
double m_sigma_y;
};
-#endif // BORNAGAIN_CORE_DETECTOR_RESOLUTIONFUNCTION2DGAUSSIAN_H
+#endif // BORNAGAIN_DEVICE_RESOLUTION_RESOLUTIONFUNCTION2DGAUSSIAN_H
diff --git a/Device/Resolution/ScanResolution.h b/Device/Resolution/ScanResolution.h
index 6361e54f5fa..f632cf01f6c 100644
--- a/Device/Resolution/ScanResolution.h
+++ b/Device/Resolution/ScanResolution.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_DETECTOR_SCANRESOLUTION_H
-#define BORNAGAIN_CORE_DETECTOR_SCANRESOLUTION_H
+#ifndef BORNAGAIN_DEVICE_RESOLUTION_SCANRESOLUTION_H
+#define BORNAGAIN_DEVICE_RESOLUTION_SCANRESOLUTION_H
#include "Base/Types/ICloneable.h"
#include "Param/Varia/ParameterSample.h"
@@ -69,4 +69,4 @@ inline std::ostream& operator<<(std::ostream& os, const ScanResolution& scan_res
return os << scan_resolution.print();
}
-#endif // BORNAGAIN_CORE_DETECTOR_SCANRESOLUTION_H
+#endif // BORNAGAIN_DEVICE_RESOLUTION_SCANRESOLUTION_H
diff --git a/Device/Unit/AxisNames.h b/Device/Unit/AxisNames.h
index a367a4af0ac..1bfccc9c570 100644
--- a/Device/Unit/AxisNames.h
+++ b/Device/Unit/AxisNames.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INTENSITY_AXISNAMES_H
-#define BORNAGAIN_CORE_INTENSITY_AXISNAMES_H
+#ifndef BORNAGAIN_DEVICE_UNIT_AXISNAMES_H
+#define BORNAGAIN_DEVICE_UNIT_AXISNAMES_H
#include "Device/Unit/IUnitConverter.h"
#include <map>
@@ -35,4 +35,4 @@ std::map<Axes::Units, std::string> InitSpecAxisQ();
std::map<Axes::Units, std::string> InitSampleDepthAxis();
} // namespace AxisNames
-#endif // BORNAGAIN_CORE_INTENSITY_AXISNAMES_H
+#endif // BORNAGAIN_DEVICE_UNIT_AXISNAMES_H
diff --git a/Device/Unit/IUnitConverter.h b/Device/Unit/IUnitConverter.h
index 29ddc1f61ab..0b9d0312317 100644
--- a/Device/Unit/IUnitConverter.h
+++ b/Device/Unit/IUnitConverter.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_INTENSITY_IUNITCONVERTER_H
-#define BORNAGAIN_CORE_INTENSITY_IUNITCONVERTER_H
+#ifndef BORNAGAIN_DEVICE_UNIT_IUNITCONVERTER_H
+#define BORNAGAIN_DEVICE_UNIT_IUNITCONVERTER_H
#include "Base/Types/ICloneable.h"
#include <map>
@@ -79,4 +79,4 @@ private:
virtual std::vector<std::map<Axes::Units, std::string>> createNameMaps() const = 0;
};
-#endif // BORNAGAIN_CORE_INTENSITY_IUNITCONVERTER_H
+#endif // BORNAGAIN_DEVICE_UNIT_IUNITCONVERTER_H
diff --git a/Param/Base/IParameter.h b/Param/Base/IParameter.h
index 1570d9cfe40..162178c7451 100644
--- a/Param/Base/IParameter.h
+++ b/Param/Base/IParameter.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARAMETRIZATION_IPARAMETER_H
-#define BORNAGAIN_CORE_PARAMETRIZATION_IPARAMETER_H
+#ifndef BORNAGAIN_PARAM_BASE_IPARAMETER_H
+#define BORNAGAIN_PARAM_BASE_IPARAMETER_H
#include <functional>
#include <stdexcept>
@@ -74,4 +74,4 @@ template <class T> bool IParameter<T>::hasSameData(const IParameter<T>& other)
return &getData() == &other.getData();
}
-#endif // BORNAGAIN_CORE_PARAMETRIZATION_IPARAMETER_H
+#endif // BORNAGAIN_PARAM_BASE_IPARAMETER_H
diff --git a/Param/Base/IParameterized.h b/Param/Base/IParameterized.h
index 0beecd0878d..93a9fdb9778 100644
--- a/Param/Base/IParameterized.h
+++ b/Param/Base/IParameterized.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARAMETRIZATION_IPARAMETERIZED_H
-#define BORNAGAIN_CORE_PARAMETRIZATION_IPARAMETERIZED_H
+#ifndef BORNAGAIN_PARAM_BASE_IPARAMETERIZED_H
+#define BORNAGAIN_PARAM_BASE_IPARAMETERIZED_H
#include "Base/Vector/Vectors3D.h"
#include <memory>
@@ -73,4 +73,4 @@ private:
std::unique_ptr<ParameterPool> m_pool; //!< parameter pool (kind of pointer-to-implementation)
};
-#endif // BORNAGAIN_CORE_PARAMETRIZATION_IPARAMETERIZED_H
+#endif // BORNAGAIN_PARAM_BASE_IPARAMETERIZED_H
diff --git a/Param/Base/ParameterPool.h b/Param/Base/ParameterPool.h
index 971ead24e1b..a77d7ef7d70 100644
--- a/Param/Base/ParameterPool.h
+++ b/Param/Base/ParameterPool.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERPOOL_H
-#define BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERPOOL_H
+#ifndef BORNAGAIN_PARAM_BASE_PARAMETERPOOL_H
+#define BORNAGAIN_PARAM_BASE_PARAMETERPOOL_H
#include "Base/Types/ICloneable.h"
#include <ostream>
@@ -84,4 +84,4 @@ private:
std::vector<RealParameter*> m_params;
};
-#endif // BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERPOOL_H
+#endif // BORNAGAIN_PARAM_BASE_PARAMETERPOOL_H
diff --git a/Param/Base/RealParameter.h b/Param/Base/RealParameter.h
index 7e190512339..f825f74cd89 100644
--- a/Param/Base/RealParameter.h
+++ b/Param/Base/RealParameter.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARAMETRIZATION_REALPARAMETER_H
-#define BORNAGAIN_CORE_PARAMETRIZATION_REALPARAMETER_H
+#ifndef BORNAGAIN_PARAM_BASE_REALPARAMETER_H
+#define BORNAGAIN_PARAM_BASE_REALPARAMETER_H
#include "Fit/Tools/Attributes.h"
#include "Fit/Tools/RealLimits.h"
@@ -61,4 +61,4 @@ protected:
Unit m_unit;
};
-#endif // BORNAGAIN_CORE_PARAMETRIZATION_REALPARAMETER_H
+#endif // BORNAGAIN_PARAM_BASE_REALPARAMETER_H
diff --git a/Param/Base/Unit.h b/Param/Base/Unit.h
index 703fe11df69..297fd17111a 100644
--- a/Param/Base/Unit.h
+++ b/Param/Base/Unit.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARAMETRIZATION_UNIT_H
-#define BORNAGAIN_CORE_PARAMETRIZATION_UNIT_H
+#ifndef BORNAGAIN_PARAM_BASE_UNIT_H
+#define BORNAGAIN_PARAM_BASE_UNIT_H
#include <string>
@@ -30,4 +30,4 @@ private:
std::string m_name;
};
-#endif // BORNAGAIN_CORE_PARAMETRIZATION_UNIT_H
+#endif // BORNAGAIN_PARAM_BASE_UNIT_H
diff --git a/Param/Distrib/DistributionHandler.h b/Param/Distrib/DistributionHandler.h
index 7e6d7a45991..a8874de53d5 100644
--- a/Param/Distrib/DistributionHandler.h
+++ b/Param/Distrib/DistributionHandler.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARAMETRIZATION_DISTRIBUTIONHANDLER_H
-#define BORNAGAIN_CORE_PARAMETRIZATION_DISTRIBUTIONHANDLER_H
+#ifndef BORNAGAIN_PARAM_DISTRIB_DISTRIBUTIONHANDLER_H
+#define BORNAGAIN_PARAM_DISTRIB_DISTRIBUTIONHANDLER_H
#include "Param/Distrib/ParameterDistribution.h"
#include <vector>
@@ -57,4 +57,4 @@ private:
std::vector<std::vector<ParameterSample>> m_cached_samples;
};
-#endif // BORNAGAIN_CORE_PARAMETRIZATION_DISTRIBUTIONHANDLER_H
+#endif // BORNAGAIN_PARAM_DISTRIB_DISTRIBUTIONHANDLER_H
diff --git a/Param/Distrib/Distributions.h b/Param/Distrib/Distributions.h
index 8ebdf4e239c..be1ca122f87 100644
--- a/Param/Distrib/Distributions.h
+++ b/Param/Distrib/Distributions.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARAMETRIZATION_DISTRIBUTIONS_H
-#define BORNAGAIN_CORE_PARAMETRIZATION_DISTRIBUTIONS_H
+#ifndef BORNAGAIN_PARAM_DISTRIB_DISTRIBUTIONS_H
+#define BORNAGAIN_PARAM_DISTRIB_DISTRIBUTIONS_H
#include "Base/Types/ICloneable.h"
#include "Fit/Tools/RealLimits.h"
@@ -291,4 +291,4 @@ private:
const double& m_right;
};
-#endif // BORNAGAIN_CORE_PARAMETRIZATION_DISTRIBUTIONS_H
+#endif // BORNAGAIN_PARAM_DISTRIB_DISTRIBUTIONS_H
diff --git a/Param/Distrib/ParameterDistribution.h b/Param/Distrib/ParameterDistribution.h
index 92004eba3a8..0710954e548 100644
--- a/Param/Distrib/ParameterDistribution.h
+++ b/Param/Distrib/ParameterDistribution.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERDISTRIBUTION_H
-#define BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERDISTRIBUTION_H
+#ifndef BORNAGAIN_PARAM_DISTRIB_PARAMETERDISTRIBUTION_H
+#define BORNAGAIN_PARAM_DISTRIB_PARAMETERDISTRIBUTION_H
#include "Fit/Tools/RealLimits.h"
#include "Param/Base/IParameterized.h"
@@ -77,4 +77,4 @@ private:
double m_xmax;
};
-#endif // BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERDISTRIBUTION_H
+#endif // BORNAGAIN_PARAM_DISTRIB_PARAMETERDISTRIBUTION_H
diff --git a/Param/Distrib/RangedDistributions.h b/Param/Distrib/RangedDistributions.h
index b2e44a5545d..66feb41f91c 100644
--- a/Param/Distrib/RangedDistributions.h
+++ b/Param/Distrib/RangedDistributions.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARAMETRIZATION_RANGEDDISTRIBUTIONS_H
-#define BORNAGAIN_CORE_PARAMETRIZATION_RANGEDDISTRIBUTIONS_H
+#ifndef BORNAGAIN_PARAM_DISTRIB_RANGEDDISTRIBUTIONS_H
+#define BORNAGAIN_PARAM_DISTRIB_RANGEDDISTRIBUTIONS_H
#include "Base/Types/ICloneable.h"
#include "Fit/Tools/RealLimits.h"
@@ -222,4 +222,4 @@ inline std::ostream& operator<<(std::ostream& os, const RangedDistribution& dist
return os << distribution.pyString();
}
-#endif // BORNAGAIN_CORE_PARAMETRIZATION_RANGEDDISTRIBUTIONS_H
+#endif // BORNAGAIN_PARAM_DISTRIB_RANGEDDISTRIBUTIONS_H
diff --git a/Param/Node/INode.h b/Param/Node/INode.h
index 775a8642e11..b7f4e1f6d96 100644
--- a/Param/Node/INode.h
+++ b/Param/Node/INode.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARAMETRIZATION_INODE_H
-#define BORNAGAIN_CORE_PARAMETRIZATION_INODE_H
+#ifndef BORNAGAIN_PARAM_NODE_INODE_H
+#define BORNAGAIN_PARAM_NODE_INODE_H
#include "Param/Base/IParameterized.h"
#include "Param/Node/INodeVisitor.h" // not forward declared because used by all children
@@ -131,4 +131,4 @@ inline std::vector<const INode*>& operator<<(std::vector<const INode*>&& v_node,
return v_node;
}
-#endif // BORNAGAIN_CORE_PARAMETRIZATION_INODE_H
+#endif // BORNAGAIN_PARAM_NODE_INODE_H
diff --git a/Param/Node/INodeVisitor.h b/Param/Node/INodeVisitor.h
index 748dc302c70..8358ace6a2f 100644
--- a/Param/Node/INodeVisitor.h
+++ b/Param/Node/INodeVisitor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARAMETRIZATION_INODEVISITOR_H
-#define BORNAGAIN_CORE_PARAMETRIZATION_INODEVISITOR_H
+#ifndef BORNAGAIN_PARAM_NODE_INODEVISITOR_H
+#define BORNAGAIN_PARAM_NODE_INODEVISITOR_H
class BasicLattice;
class Beam;
@@ -289,4 +289,4 @@ private:
void VisitNodesPreorder(const INode& node, INodeVisitor& visitor);
void VisitNodesPostorder(const INode& node, INodeVisitor& visitor);
-#endif // BORNAGAIN_CORE_PARAMETRIZATION_INODEVISITOR_H
+#endif // BORNAGAIN_PARAM_NODE_INODEVISITOR_H
diff --git a/Param/Node/IterationStrategy.h b/Param/Node/IterationStrategy.h
index eb3d0d4561e..af52ca26817 100644
--- a/Param/Node/IterationStrategy.h
+++ b/Param/Node/IterationStrategy.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARAMETRIZATION_ITERATIONSTRATEGY_H
-#define BORNAGAIN_CORE_PARAMETRIZATION_ITERATIONSTRATEGY_H
+#ifndef BORNAGAIN_PARAM_NODE_ITERATIONSTRATEGY_H
+#define BORNAGAIN_PARAM_NODE_ITERATIONSTRATEGY_H
class INode;
class IteratorMemento;
@@ -58,4 +58,4 @@ public:
virtual bool isDone(IteratorMemento& iterator_stack) const;
};
-#endif // BORNAGAIN_CORE_PARAMETRIZATION_ITERATIONSTRATEGY_H
+#endif // BORNAGAIN_PARAM_NODE_ITERATIONSTRATEGY_H
diff --git a/Param/Node/NodeIterator.h b/Param/Node/NodeIterator.h
index ceebe1fc520..f3786c39c78 100644
--- a/Param/Node/NodeIterator.h
+++ b/Param/Node/NodeIterator.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARAMETRIZATION_NODEITERATOR_H
-#define BORNAGAIN_CORE_PARAMETRIZATION_NODEITERATOR_H
+#ifndef BORNAGAIN_PARAM_NODE_NODEITERATOR_H
+#define BORNAGAIN_PARAM_NODE_NODEITERATOR_H
#include "Param/Node/INode.h"
#include <ostream>
@@ -134,4 +134,4 @@ template <class Strategy> inline int NodeIterator<Strategy>::depth() const
return static_cast<int>(m_memento_itor.size());
}
-#endif // BORNAGAIN_CORE_PARAMETRIZATION_NODEITERATOR_H
+#endif // BORNAGAIN_PARAM_NODE_NODEITERATOR_H
diff --git a/Param/Node/NodeUtils.h b/Param/Node/NodeUtils.h
index 12190382a89..8987680b570 100644
--- a/Param/Node/NodeUtils.h
+++ b/Param/Node/NodeUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARAMETRIZATION_NODEUTILS_H
-#define BORNAGAIN_CORE_PARAMETRIZATION_NODEUTILS_H
+#ifndef BORNAGAIN_PARAM_NODE_NODEUTILS_H
+#define BORNAGAIN_PARAM_NODE_NODEUTILS_H
#include <string>
@@ -30,4 +30,4 @@ std::string nodePath(const INode& node, const INode* root = nullptr);
} // namespace NodeUtils
-#endif // BORNAGAIN_CORE_PARAMETRIZATION_NODEUTILS_H
+#endif // BORNAGAIN_PARAM_NODE_NODEUTILS_H
diff --git a/Param/Varia/ParameterPattern.h b/Param/Varia/ParameterPattern.h
index d9fa77f39e0..9b3b965de86 100644
--- a/Param/Varia/ParameterPattern.h
+++ b/Param/Varia/ParameterPattern.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERPATTERN_H
-#define BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERPATTERN_H
+#ifndef BORNAGAIN_PARAM_VARIA_PARAMETERPATTERN_H
+#define BORNAGAIN_PARAM_VARIA_PARAMETERPATTERN_H
#include <string>
@@ -35,4 +35,4 @@ private:
std::string m_pattern;
};
-#endif // BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERPATTERN_H
+#endif // BORNAGAIN_PARAM_VARIA_PARAMETERPATTERN_H
diff --git a/Param/Varia/ParameterSample.h b/Param/Varia/ParameterSample.h
index 4e5ef0bf0b4..78fb1178da4 100644
--- a/Param/Varia/ParameterSample.h
+++ b/Param/Varia/ParameterSample.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERSAMPLE_H
-#define BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERSAMPLE_H
+#ifndef BORNAGAIN_PARAM_VARIA_PARAMETERSAMPLE_H
+#define BORNAGAIN_PARAM_VARIA_PARAMETERSAMPLE_H
//! A parameter value with a weight, as obtained when sampling from a distribution.
//! @ingroup algorithms_internal
@@ -26,4 +26,4 @@ public:
double weight;
};
-#endif // BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERSAMPLE_H
+#endif // BORNAGAIN_PARAM_VARIA_PARAMETERSAMPLE_H
diff --git a/Param/Varia/ParameterUtils.h b/Param/Varia/ParameterUtils.h
index 62ab00cb17a..6711626a289 100644
--- a/Param/Varia/ParameterUtils.h
+++ b/Param/Varia/ParameterUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERUTILS_H
-#define BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERUTILS_H
+#ifndef BORNAGAIN_PARAM_VARIA_PARAMETERUTILS_H
+#define BORNAGAIN_PARAM_VARIA_PARAMETERUTILS_H
#include <string>
@@ -30,4 +30,4 @@ std::string poolParameterUnits(const IParameterized& node, const std::string& pa
} // namespace ParameterUtils
-#endif // BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERUTILS_H
+#endif // BORNAGAIN_PARAM_VARIA_PARAMETERUTILS_H
diff --git a/Param/Varia/PyFmtLimits.h b/Param/Varia/PyFmtLimits.h
index 1e74aaa935c..ba2f703b83c 100644
--- a/Param/Varia/PyFmtLimits.h
+++ b/Param/Varia/PyFmtLimits.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARAMETRIZATION_PYFMTLIMITS_H
-#define BORNAGAIN_CORE_PARAMETRIZATION_PYFMTLIMITS_H
+#ifndef BORNAGAIN_PARAM_VARIA_PYFMTLIMITS_H
+#define BORNAGAIN_PARAM_VARIA_PYFMTLIMITS_H
#include <string>
@@ -27,4 +27,4 @@ std::string printRealLimits(const RealLimits& limits, const std::string& units =
std::string printRealLimitsArg(const RealLimits& limits, const std::string& units = "");
} // namespace pyfmt
-#endif // BORNAGAIN_CORE_PARAMETRIZATION_PYFMTLIMITS_H
+#endif // BORNAGAIN_PARAM_VARIA_PYFMTLIMITS_H
diff --git a/Sample/Aggregate/IInterferenceFunction.h b/Sample/Aggregate/IInterferenceFunction.h
index f8ad14b72fb..ad4f99361a3 100644
--- a/Sample/Aggregate/IInterferenceFunction.h
+++ b/Sample/Aggregate/IInterferenceFunction.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AGGREGATE_IINTERFERENCEFUNCTION_H
-#define BORNAGAIN_CORE_AGGREGATE_IINTERFERENCEFUNCTION_H
+#ifndef BORNAGAIN_SAMPLE_AGGREGATE_IINTERFERENCEFUNCTION_H
+#define BORNAGAIN_SAMPLE_AGGREGATE_IINTERFERENCEFUNCTION_H
#include "Sample/Scattering/ISample.h"
@@ -58,4 +58,4 @@ protected:
virtual double iff_without_dw(const kvector_t q) const = 0;
};
-#endif // BORNAGAIN_CORE_AGGREGATE_IINTERFERENCEFUNCTION_H
+#endif // BORNAGAIN_SAMPLE_AGGREGATE_IINTERFERENCEFUNCTION_H
diff --git a/Sample/Aggregate/InterferenceFunction1DLattice.h b/Sample/Aggregate/InterferenceFunction1DLattice.h
index fdb4d43966e..8dff487f2cb 100644
--- a/Sample/Aggregate/InterferenceFunction1DLattice.h
+++ b/Sample/Aggregate/InterferenceFunction1DLattice.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION1DLATTICE_H
-#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION1DLATTICE_H
+#ifndef BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTION1DLATTICE_H
+#define BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTION1DLATTICE_H
#include "Sample/Aggregate/IInterferenceFunction.h"
@@ -48,4 +48,4 @@ private:
int m_na; //!< determines the number of reciprocal lattice points to use
};
-#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION1DLATTICE_H
+#endif // BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTION1DLATTICE_H
diff --git a/Sample/Aggregate/InterferenceFunction2DLattice.h b/Sample/Aggregate/InterferenceFunction2DLattice.h
index 3df8ab38aaf..173d061d261 100644
--- a/Sample/Aggregate/InterferenceFunction2DLattice.h
+++ b/Sample/Aggregate/InterferenceFunction2DLattice.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION2DLATTICE_H
-#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION2DLATTICE_H
+#ifndef BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTION2DLATTICE_H
+#define BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTION2DLATTICE_H
#include "Sample/Aggregate/IInterferenceFunction.h"
#include "Sample/Correlations/FTDecay1D.h"
@@ -83,4 +83,4 @@ private:
mutable double m_qy;
};
-#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION2DLATTICE_H
+#endif // BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTION2DLATTICE_H
diff --git a/Sample/Aggregate/InterferenceFunction2DParaCrystal.h b/Sample/Aggregate/InterferenceFunction2DParaCrystal.h
index 0bcc1680762..b333d35cec2 100644
--- a/Sample/Aggregate/InterferenceFunction2DParaCrystal.h
+++ b/Sample/Aggregate/InterferenceFunction2DParaCrystal.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION2DPARACRYSTAL_H
-#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION2DPARACRYSTAL_H
+#ifndef BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTION2DPARACRYSTAL_H
+#define BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTION2DPARACRYSTAL_H
#include "Base/Types/Complex.h"
#include "Sample/Aggregate/IInterferenceFunction.h"
@@ -92,4 +92,4 @@ private:
mutable double m_qy;
};
-#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION2DPARACRYSTAL_H
+#endif // BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTION2DPARACRYSTAL_H
diff --git a/Sample/Aggregate/InterferenceFunction2DSuperLattice.h b/Sample/Aggregate/InterferenceFunction2DSuperLattice.h
index ae2f84c704f..9f6cff8f562 100644
--- a/Sample/Aggregate/InterferenceFunction2DSuperLattice.h
+++ b/Sample/Aggregate/InterferenceFunction2DSuperLattice.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION2DSUPERLATTICE_H
-#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION2DSUPERLATTICE_H
+#ifndef BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTION2DSUPERLATTICE_H
+#define BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTION2DSUPERLATTICE_H
#include "Sample/Aggregate/IInterferenceFunction.h"
#include "Sample/Lattice/Lattice2D.h"
@@ -69,4 +69,4 @@ private:
mutable double m_xi;
};
-#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION2DSUPERLATTICE_H
+#endif // BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTION2DSUPERLATTICE_H
diff --git a/Sample/Aggregate/InterferenceFunction3DLattice.h b/Sample/Aggregate/InterferenceFunction3DLattice.h
index 2ae4e7b8843..848ed23399c 100644
--- a/Sample/Aggregate/InterferenceFunction3DLattice.h
+++ b/Sample/Aggregate/InterferenceFunction3DLattice.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION3DLATTICE_H
-#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION3DLATTICE_H
+#ifndef BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTION3DLATTICE_H
+#define BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTION3DLATTICE_H
#include "Sample/Aggregate/IInterferenceFunction.h"
#include "Sample/Lattice/Lattice.h"
@@ -52,4 +52,4 @@ private:
double m_rec_radius; //!< radius in reciprocal space defining the nearest q vectors to use
};
-#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION3DLATTICE_H
+#endif // BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTION3DLATTICE_H
diff --git a/Sample/Aggregate/InterferenceFunctionFinite2DLattice.h b/Sample/Aggregate/InterferenceFunctionFinite2DLattice.h
index 01c31243d5d..1cd85527e6b 100644
--- a/Sample/Aggregate/InterferenceFunctionFinite2DLattice.h
+++ b/Sample/Aggregate/InterferenceFunctionFinite2DLattice.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONFINITE2DLATTICE_H
-#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONFINITE2DLATTICE_H
+#ifndef BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTIONFINITE2DLATTICE_H
+#define BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTIONFINITE2DLATTICE_H
#include "Sample/Aggregate/IInterferenceFunction.h"
#include "Sample/Lattice/Lattice2D.h"
@@ -64,4 +64,4 @@ private:
mutable double m_qy;
};
-#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONFINITE2DLATTICE_H
+#endif // BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTIONFINITE2DLATTICE_H
diff --git a/Sample/Aggregate/InterferenceFunctionFinite3DLattice.h b/Sample/Aggregate/InterferenceFunctionFinite3DLattice.h
index 65e7809f2ce..a393780d95f 100644
--- a/Sample/Aggregate/InterferenceFunctionFinite3DLattice.h
+++ b/Sample/Aggregate/InterferenceFunctionFinite3DLattice.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONFINITE3DLATTICE_H
-#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONFINITE3DLATTICE_H
+#ifndef BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTIONFINITE3DLATTICE_H
+#define BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTIONFINITE3DLATTICE_H
#include "Sample/Aggregate/IInterferenceFunction.h"
#include "Sample/Lattice/Lattice.h"
@@ -50,4 +50,4 @@ private:
unsigned m_N_1, m_N_2, m_N_3; //!< Size of the finite lattice in lattice units
};
-#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONFINITE3DLATTICE_H
+#endif // BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTIONFINITE3DLATTICE_H
diff --git a/Sample/Aggregate/InterferenceFunctionHardDisk.h b/Sample/Aggregate/InterferenceFunctionHardDisk.h
index b6c05443644..e4cacad57e0 100644
--- a/Sample/Aggregate/InterferenceFunctionHardDisk.h
+++ b/Sample/Aggregate/InterferenceFunctionHardDisk.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONHARDDISK_H
-#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONHARDDISK_H
+#ifndef BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTIONHARDDISK_H
+#define BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTIONHARDDISK_H
#include "Sample/Aggregate/IInterferenceFunction.h"
@@ -50,4 +50,4 @@ private:
mutable double m_q, m_c_zero, m_s2, m_packing;
};
-#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONHARDDISK_H
+#endif // BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTIONHARDDISK_H
diff --git a/Sample/Aggregate/InterferenceFunctionNone.h b/Sample/Aggregate/InterferenceFunctionNone.h
index c3a20af5c94..7623b4df939 100644
--- a/Sample/Aggregate/InterferenceFunctionNone.h
+++ b/Sample/Aggregate/InterferenceFunctionNone.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONNONE_H
-#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONNONE_H
+#ifndef BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTIONNONE_H
+#define BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTIONNONE_H
#include "Sample/Aggregate/IInterferenceFunction.h"
@@ -33,4 +33,4 @@ private:
double iff_without_dw(const kvector_t q) const override final;
};
-#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONNONE_H
+#endif // BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTIONNONE_H
diff --git a/Sample/Aggregate/InterferenceFunctionRadialParaCrystal.h b/Sample/Aggregate/InterferenceFunctionRadialParaCrystal.h
index 7b22ebda42b..984a288d432 100644
--- a/Sample/Aggregate/InterferenceFunctionRadialParaCrystal.h
+++ b/Sample/Aggregate/InterferenceFunctionRadialParaCrystal.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONRADIALPARACRYSTAL_H
-#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONRADIALPARACRYSTAL_H
+#ifndef BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTIONRADIALPARACRYSTAL_H
+#define BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTIONRADIALPARACRYSTAL_H
#include "Base/Types/Complex.h"
#include "Sample/Aggregate/IInterferenceFunction.h"
@@ -62,4 +62,4 @@ private:
double m_domain_size; //!< Size of coherence domain
};
-#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONRADIALPARACRYSTAL_H
+#endif // BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTIONRADIALPARACRYSTAL_H
diff --git a/Sample/Aggregate/InterferenceFunctionTwin.h b/Sample/Aggregate/InterferenceFunctionTwin.h
index 89c6ac3f923..5f8c4ef8615 100644
--- a/Sample/Aggregate/InterferenceFunctionTwin.h
+++ b/Sample/Aggregate/InterferenceFunctionTwin.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONTWIN_H
-#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONTWIN_H
+#ifndef BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTIONTWIN_H
+#define BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTIONTWIN_H
#include "Sample/Aggregate/IInterferenceFunction.h"
@@ -42,4 +42,4 @@ private:
double m_std_dev;
};
-#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONTWIN_H
+#endif // BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTIONTWIN_H
diff --git a/Sample/Aggregate/InterferenceFunctions.h b/Sample/Aggregate/InterferenceFunctions.h
index 22b3ca51220..a1ecb133584 100644
--- a/Sample/Aggregate/InterferenceFunctions.h
+++ b/Sample/Aggregate/InterferenceFunctions.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONS_H
-#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONS_H
+#ifndef BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTIONS_H
+#define BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTIONS_H
#include "Sample/Aggregate/InterferenceFunction1DLattice.h"
#include "Sample/Aggregate/InterferenceFunction2DLattice.h"
@@ -27,4 +27,4 @@
#include "Sample/Aggregate/InterferenceFunctionRadialParaCrystal.h"
#include "Sample/Aggregate/InterferenceFunctionTwin.h"
-#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONS_H
+#endif // BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCEFUNCTIONS_H
diff --git a/Sample/Aggregate/ParticleLayout.h b/Sample/Aggregate/ParticleLayout.h
index e72043f2939..ddb434c3a28 100644
--- a/Sample/Aggregate/ParticleLayout.h
+++ b/Sample/Aggregate/ParticleLayout.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AGGREGATE_PARTICLELAYOUT_H
-#define BORNAGAIN_CORE_AGGREGATE_PARTICLELAYOUT_H
+#ifndef BORNAGAIN_SAMPLE_AGGREGATE_PARTICLELAYOUT_H
+#define BORNAGAIN_SAMPLE_AGGREGATE_PARTICLELAYOUT_H
#include "Sample/Correlations/ILayout.h"
#include "Sample/Scattering/Rotations.h"
@@ -65,4 +65,4 @@ private:
double m_total_particle_density;
};
-#endif // BORNAGAIN_CORE_AGGREGATE_PARTICLELAYOUT_H
+#endif // BORNAGAIN_SAMPLE_AGGREGATE_PARTICLELAYOUT_H
diff --git a/Sample/Correlations/FTDecay1D.h b/Sample/Correlations/FTDecay1D.h
index f72741bcbf4..a48b4ea8c9f 100644
--- a/Sample/Correlations/FTDecay1D.h
+++ b/Sample/Correlations/FTDecay1D.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_CORRELATIONS_FTDECAY1D_H
-#define BORNAGAIN_CORE_CORRELATIONS_FTDECAY1D_H
+#ifndef BORNAGAIN_SAMPLE_CORRELATIONS_FTDECAY1D_H
+#define BORNAGAIN_SAMPLE_CORRELATIONS_FTDECAY1D_H
#include "Base/Const/MathConstants.h"
#include "Base/Types/ICloneable.h"
@@ -97,4 +97,4 @@ private:
const double& m_eta;
};
-#endif // BORNAGAIN_CORE_CORRELATIONS_FTDECAY1D_H
+#endif // BORNAGAIN_SAMPLE_CORRELATIONS_FTDECAY1D_H
diff --git a/Sample/Correlations/FTDecay2D.h b/Sample/Correlations/FTDecay2D.h
index 442546a9bb5..9ff297709f2 100644
--- a/Sample/Correlations/FTDecay2D.h
+++ b/Sample/Correlations/FTDecay2D.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_CORRELATIONS_FTDECAY2D_H
-#define BORNAGAIN_CORE_CORRELATIONS_FTDECAY2D_H
+#ifndef BORNAGAIN_SAMPLE_CORRELATIONS_FTDECAY2D_H
+#define BORNAGAIN_SAMPLE_CORRELATIONS_FTDECAY2D_H
#include "Base/Const/MathConstants.h"
#include "Base/Types/ICloneable.h"
@@ -103,4 +103,4 @@ protected:
const double& m_eta;
};
-#endif // BORNAGAIN_CORE_CORRELATIONS_FTDECAY2D_H
+#endif // BORNAGAIN_SAMPLE_CORRELATIONS_FTDECAY2D_H
diff --git a/Sample/Correlations/FTDistributions1D.h b/Sample/Correlations/FTDistributions1D.h
index ce14bcaf060..fb171cee037 100644
--- a/Sample/Correlations/FTDistributions1D.h
+++ b/Sample/Correlations/FTDistributions1D.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS1D_H
-#define BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS1D_H
+#ifndef BORNAGAIN_SAMPLE_CORRELATIONS_FTDISTRIBUTIONS1D_H
+#define BORNAGAIN_SAMPLE_CORRELATIONS_FTDISTRIBUTIONS1D_H
#include "Base/Types/ICloneable.h"
#include "Param/Node/INode.h"
@@ -173,4 +173,4 @@ protected:
const double& m_eta;
};
-#endif // BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS1D_H
+#endif // BORNAGAIN_SAMPLE_CORRELATIONS_FTDISTRIBUTIONS1D_H
diff --git a/Sample/Correlations/FTDistributions2D.h b/Sample/Correlations/FTDistributions2D.h
index 6766a215bdf..04c42cf4d78 100644
--- a/Sample/Correlations/FTDistributions2D.h
+++ b/Sample/Correlations/FTDistributions2D.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS2D_H
-#define BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS2D_H
+#ifndef BORNAGAIN_SAMPLE_CORRELATIONS_FTDISTRIBUTIONS2D_H
+#define BORNAGAIN_SAMPLE_CORRELATIONS_FTDISTRIBUTIONS2D_H
#include "Base/Const/MathConstants.h"
#include "Base/Types/ICloneable.h"
@@ -152,4 +152,4 @@ protected:
const double& m_eta;
};
-#endif // BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS2D_H
+#endif // BORNAGAIN_SAMPLE_CORRELATIONS_FTDISTRIBUTIONS2D_H
diff --git a/Sample/Correlations/IDistribution1DSampler.h b/Sample/Correlations/IDistribution1DSampler.h
index 34bf7ea933c..e4d89567998 100644
--- a/Sample/Correlations/IDistribution1DSampler.h
+++ b/Sample/Correlations/IDistribution1DSampler.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION1DSAMPLER_H
-#define BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION1DSAMPLER_H
+#ifndef BORNAGAIN_SAMPLE_CORRELATIONS_IDISTRIBUTION1DSAMPLER_H
+#define BORNAGAIN_SAMPLE_CORRELATIONS_IDISTRIBUTION1DSAMPLER_H
class IDistribution1DSampler
{
@@ -74,4 +74,4 @@ private:
double m_omega;
};
-#endif // BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION1DSAMPLER_H
+#endif // BORNAGAIN_SAMPLE_CORRELATIONS_IDISTRIBUTION1DSAMPLER_H
diff --git a/Sample/Correlations/IDistribution2DSampler.h b/Sample/Correlations/IDistribution2DSampler.h
index 77cd814a1a5..96949c004db 100644
--- a/Sample/Correlations/IDistribution2DSampler.h
+++ b/Sample/Correlations/IDistribution2DSampler.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION2DSAMPLER_H
-#define BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION2DSAMPLER_H
+#ifndef BORNAGAIN_SAMPLE_CORRELATIONS_IDISTRIBUTION2DSAMPLER_H
+#define BORNAGAIN_SAMPLE_CORRELATIONS_IDISTRIBUTION2DSAMPLER_H
#include <utility>
@@ -78,4 +78,4 @@ private:
double m_omega_x, m_omega_y;
};
-#endif // BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION2DSAMPLER_H
+#endif // BORNAGAIN_SAMPLE_CORRELATIONS_IDISTRIBUTION2DSAMPLER_H
diff --git a/Sample/Correlations/ILayout.h b/Sample/Correlations/ILayout.h
index 34cc093403a..8ec537dc5a5 100644
--- a/Sample/Correlations/ILayout.h
+++ b/Sample/Correlations/ILayout.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_CORRELATIONS_ILAYOUT_H
-#define BORNAGAIN_CORE_CORRELATIONS_ILAYOUT_H
+#ifndef BORNAGAIN_SAMPLE_CORRELATIONS_ILAYOUT_H
+#define BORNAGAIN_SAMPLE_CORRELATIONS_ILAYOUT_H
#include "Base/Types/SafePointerVector.h"
#include "Sample/Scattering/ISample.h"
@@ -63,4 +63,4 @@ protected:
double m_weight;
};
-#endif // BORNAGAIN_CORE_CORRELATIONS_ILAYOUT_H
+#endif // BORNAGAIN_SAMPLE_CORRELATIONS_ILAYOUT_H
diff --git a/Sample/Correlations/IPeakShape.h b/Sample/Correlations/IPeakShape.h
index 7dd1a85db4f..320673c559e 100644
--- a/Sample/Correlations/IPeakShape.h
+++ b/Sample/Correlations/IPeakShape.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_CORRELATIONS_IPEAKSHAPE_H
-#define BORNAGAIN_CORE_CORRELATIONS_IPEAKSHAPE_H
+#ifndef BORNAGAIN_SAMPLE_CORRELATIONS_IPEAKSHAPE_H
+#define BORNAGAIN_SAMPLE_CORRELATIONS_IPEAKSHAPE_H
#include "Sample/Scattering/ISample.h"
@@ -193,4 +193,4 @@ private:
mutable kvector_t m_ux, m_uy, m_p;
};
-#endif // BORNAGAIN_CORE_CORRELATIONS_IPEAKSHAPE_H
+#endif // BORNAGAIN_SAMPLE_CORRELATIONS_IPEAKSHAPE_H
diff --git a/Sample/Fresnel/FormFactorCoherentPart.h b/Sample/Fresnel/FormFactorCoherentPart.h
index 4efc9c8b172..d3d75f882b3 100644
--- a/Sample/Fresnel/FormFactorCoherentPart.h
+++ b/Sample/Fresnel/FormFactorCoherentPart.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_FORMFACTORCOHERENTPART_H
-#define BORNAGAIN_CORE_MULTILAYER_FORMFACTORCOHERENTPART_H
+#ifndef BORNAGAIN_SAMPLE_FRESNEL_FORMFACTORCOHERENTPART_H
+#define BORNAGAIN_SAMPLE_FRESNEL_FORMFACTORCOHERENTPART_H
#include "Base/Types/Complex.h"
#include "Base/Vector/EigenCore.h"
@@ -50,4 +50,4 @@ private:
size_t m_layer_index;
};
-#endif // BORNAGAIN_CORE_MULTILAYER_FORMFACTORCOHERENTPART_H
+#endif // BORNAGAIN_SAMPLE_FRESNEL_FORMFACTORCOHERENTPART_H
diff --git a/Sample/Fresnel/FormFactorCoherentSum.h b/Sample/Fresnel/FormFactorCoherentSum.h
index 504bbb89556..ed1239a2823 100644
--- a/Sample/Fresnel/FormFactorCoherentSum.h
+++ b/Sample/Fresnel/FormFactorCoherentSum.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_FORMFACTORCOHERENTSUM_H
-#define BORNAGAIN_CORE_MULTILAYER_FORMFACTORCOHERENTSUM_H
+#ifndef BORNAGAIN_SAMPLE_FRESNEL_FORMFACTORCOHERENTSUM_H
+#define BORNAGAIN_SAMPLE_FRESNEL_FORMFACTORCOHERENTSUM_H
#include "Sample/Fresnel/FormFactorCoherentPart.h"
#include <vector>
@@ -46,4 +46,4 @@ private:
double m_abundance;
};
-#endif // BORNAGAIN_CORE_MULTILAYER_FORMFACTORCOHERENTSUM_H
+#endif // BORNAGAIN_SAMPLE_FRESNEL_FORMFACTORCOHERENTSUM_H
diff --git a/Sample/Fresnel/IFresnelMap.h b/Sample/Fresnel/IFresnelMap.h
index 0377ce8ba0b..c21e7669914 100644
--- a/Sample/Fresnel/IFresnelMap.h
+++ b/Sample/Fresnel/IFresnelMap.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_IFRESNELMAP_H
-#define BORNAGAIN_CORE_MULTILAYER_IFRESNELMAP_H
+#ifndef BORNAGAIN_SAMPLE_FRESNEL_IFRESNELMAP_H
+#define BORNAGAIN_SAMPLE_FRESNEL_IFRESNELMAP_H
#include "Sample/Specular/ISpecularStrategy.h"
#include <memory>
@@ -60,4 +60,4 @@ protected:
std::unique_ptr<ISpecularStrategy> m_Strategy;
};
-#endif // BORNAGAIN_CORE_MULTILAYER_IFRESNELMAP_H
+#endif // BORNAGAIN_SAMPLE_FRESNEL_IFRESNELMAP_H
diff --git a/Sample/Fresnel/MatrixFresnelMap.h b/Sample/Fresnel/MatrixFresnelMap.h
index 234bdd146ab..d567a0b614f 100644
--- a/Sample/Fresnel/MatrixFresnelMap.h
+++ b/Sample/Fresnel/MatrixFresnelMap.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_MATRIXFRESNELMAP_H
-#define BORNAGAIN_CORE_MULTILAYER_MATRIXFRESNELMAP_H
+#ifndef BORNAGAIN_SAMPLE_FRESNEL_MATRIXFRESNELMAP_H
+#define BORNAGAIN_SAMPLE_FRESNEL_MATRIXFRESNELMAP_H
#include "Sample/Fresnel/IFresnelMap.h"
#include "Sample/RT/MatrixRTCoefficients.h"
@@ -71,4 +71,4 @@ private:
CoefficientHash& hash_table) const;
};
-#endif // BORNAGAIN_CORE_MULTILAYER_MATRIXFRESNELMAP_H
+#endif // BORNAGAIN_SAMPLE_FRESNEL_MATRIXFRESNELMAP_H
diff --git a/Sample/Fresnel/ScalarFresnelMap.h b/Sample/Fresnel/ScalarFresnelMap.h
index 244a4691e21..878a0940730 100644
--- a/Sample/Fresnel/ScalarFresnelMap.h
+++ b/Sample/Fresnel/ScalarFresnelMap.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_SCALARFRESNELMAP_H
-#define BORNAGAIN_CORE_MULTILAYER_SCALARFRESNELMAP_H
+#ifndef BORNAGAIN_SAMPLE_FRESNEL_SCALARFRESNELMAP_H
+#define BORNAGAIN_SAMPLE_FRESNEL_SCALARFRESNELMAP_H
#include "Sample/Fresnel/IFresnelMap.h"
#include "Sample/RT/ScalarRTCoefficients.h"
@@ -56,4 +56,4 @@ private:
m_cache;
};
-#endif // BORNAGAIN_CORE_MULTILAYER_SCALARFRESNELMAP_H
+#endif // BORNAGAIN_SAMPLE_FRESNEL_SCALARFRESNELMAP_H
diff --git a/Sample/HardParticle/FormFactorAnisoPyramid.h b/Sample/HardParticle/FormFactorAnisoPyramid.h
index a27a81254e4..0835f6e8796 100644
--- a/Sample/HardParticle/FormFactorAnisoPyramid.h
+++ b/Sample/HardParticle/FormFactorAnisoPyramid.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORANISOPYRAMID_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORANISOPYRAMID_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORANISOPYRAMID_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORANISOPYRAMID_H
#include "Sample/HardParticle/IFormFactorPolyhedron.h"
@@ -52,4 +52,4 @@ private:
const double& m_alpha;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORANISOPYRAMID_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORANISOPYRAMID_H
diff --git a/Sample/HardParticle/FormFactorBar.h b/Sample/HardParticle/FormFactorBar.h
index ac4734e75ad..de85188f8a9 100644
--- a/Sample/HardParticle/FormFactorBar.h
+++ b/Sample/HardParticle/FormFactorBar.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORBAR_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORBAR_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORBAR_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORBAR_H
#include "Sample/HardParticle/IProfileRipple.h"
@@ -45,4 +45,4 @@ private:
complex_t factor_x(complex_t qx) const final;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORBAR_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORBAR_H
diff --git a/Sample/HardParticle/FormFactorBox.h b/Sample/HardParticle/FormFactorBox.h
index daf1ce53d42..c1aa908f65e 100644
--- a/Sample/HardParticle/FormFactorBox.h
+++ b/Sample/HardParticle/FormFactorBox.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORBOX_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORBOX_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORBOX_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORBOX_H
#include "Sample/HardParticle/IFormFactorPrism.h"
@@ -53,4 +53,4 @@ private:
const double& m_height;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORBOX_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORBOX_H
diff --git a/Sample/HardParticle/FormFactorCantellatedCube.h b/Sample/HardParticle/FormFactorCantellatedCube.h
index 1405ccc8b08..472f7b129fd 100644
--- a/Sample/HardParticle/FormFactorCantellatedCube.h
+++ b/Sample/HardParticle/FormFactorCantellatedCube.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCANTELLATEDCUBE_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCANTELLATEDCUBE_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORCANTELLATEDCUBE_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORCANTELLATEDCUBE_H
#include "Sample/HardParticle/IFormFactorPolyhedron.h"
@@ -44,4 +44,4 @@ private:
const double& m_removed_length;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCANTELLATEDCUBE_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORCANTELLATEDCUBE_H
diff --git a/Sample/HardParticle/FormFactorCone.h b/Sample/HardParticle/FormFactorCone.h
index 932a59aadc6..a02facab854 100644
--- a/Sample/HardParticle/FormFactorCone.h
+++ b/Sample/HardParticle/FormFactorCone.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCONE_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCONE_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORCONE_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORCONE_H
#include "Sample/Scattering/IFormFactorBorn.h"
@@ -56,4 +56,4 @@ private:
mutable cvector_t m_q;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCONE_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORCONE_H
diff --git a/Sample/HardParticle/FormFactorCone6.h b/Sample/HardParticle/FormFactorCone6.h
index 8aafce2c708..849761c3d6e 100644
--- a/Sample/HardParticle/FormFactorCone6.h
+++ b/Sample/HardParticle/FormFactorCone6.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCONE6_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCONE6_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORCONE6_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORCONE6_H
#include "Sample/HardParticle/IFormFactorPolyhedron.h"
@@ -49,4 +49,4 @@ private:
const double& m_alpha;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCONE6_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORCONE6_H
diff --git a/Sample/HardParticle/FormFactorCosineRipple.h b/Sample/HardParticle/FormFactorCosineRipple.h
index 846fa52db4b..b1ac68bd89d 100644
--- a/Sample/HardParticle/FormFactorCosineRipple.h
+++ b/Sample/HardParticle/FormFactorCosineRipple.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCOSINERIPPLE_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCOSINERIPPLE_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORCOSINERIPPLE_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORCOSINERIPPLE_H
#include "Sample/HardParticle/IProfileRipple.h"
@@ -59,4 +59,4 @@ private:
complex_t factor_x(complex_t qx) const override final;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCOSINERIPPLE_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORCOSINERIPPLE_H
diff --git a/Sample/HardParticle/FormFactorCuboctahedron.h b/Sample/HardParticle/FormFactorCuboctahedron.h
index 469f1745547..fee2ccc43b6 100644
--- a/Sample/HardParticle/FormFactorCuboctahedron.h
+++ b/Sample/HardParticle/FormFactorCuboctahedron.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCUBOCTAHEDRON_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCUBOCTAHEDRON_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORCUBOCTAHEDRON_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORCUBOCTAHEDRON_H
#include "Sample/HardParticle/IFormFactorPolyhedron.h"
@@ -52,4 +52,4 @@ private:
const double& m_alpha;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCUBOCTAHEDRON_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORCUBOCTAHEDRON_H
diff --git a/Sample/HardParticle/FormFactorCylinder.h b/Sample/HardParticle/FormFactorCylinder.h
index 1696ba1dfd8..3d9edc1566e 100644
--- a/Sample/HardParticle/FormFactorCylinder.h
+++ b/Sample/HardParticle/FormFactorCylinder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCYLINDER_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCYLINDER_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORCYLINDER_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORCYLINDER_H
#include "Sample/Scattering/IFormFactorBorn.h"
@@ -50,4 +50,4 @@ private:
const double& m_height;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCYLINDER_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORCYLINDER_H
diff --git a/Sample/HardParticle/FormFactorDodecahedron.h b/Sample/HardParticle/FormFactorDodecahedron.h
index 79f78056fb5..fad5fc3b8cc 100644
--- a/Sample/HardParticle/FormFactorDodecahedron.h
+++ b/Sample/HardParticle/FormFactorDodecahedron.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORDODECAHEDRON_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORDODECAHEDRON_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORDODECAHEDRON_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORDODECAHEDRON_H
#include "Sample/HardParticle/IFormFactorPolyhedron.h"
@@ -42,4 +42,4 @@ private:
const double& m_edge;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORDODECAHEDRON_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORDODECAHEDRON_H
diff --git a/Sample/HardParticle/FormFactorDot.h b/Sample/HardParticle/FormFactorDot.h
index d668c9a9a8b..8a81d080eeb 100644
--- a/Sample/HardParticle/FormFactorDot.h
+++ b/Sample/HardParticle/FormFactorDot.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORDOT_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORDOT_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORDOT_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORDOT_H
#include "Sample/Scattering/IFormFactorBorn.h"
@@ -45,4 +45,4 @@ private:
const double& m_radius;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORDOT_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORDOT_H
diff --git a/Sample/HardParticle/FormFactorEllipsoidalCylinder.h b/Sample/HardParticle/FormFactorEllipsoidalCylinder.h
index 035afe0c4dd..0b47e6bbf62 100644
--- a/Sample/HardParticle/FormFactorEllipsoidalCylinder.h
+++ b/Sample/HardParticle/FormFactorEllipsoidalCylinder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORELLIPSOIDALCYLINDER_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORELLIPSOIDALCYLINDER_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORELLIPSOIDALCYLINDER_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORELLIPSOIDALCYLINDER_H
#include "Sample/Scattering/IFormFactorBorn.h"
@@ -52,4 +52,4 @@ private:
const double& m_height;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORELLIPSOIDALCYLINDER_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORELLIPSOIDALCYLINDER_H
diff --git a/Sample/HardParticle/FormFactorFullSphere.h b/Sample/HardParticle/FormFactorFullSphere.h
index d2b185fa693..cd7a26f4adf 100644
--- a/Sample/HardParticle/FormFactorFullSphere.h
+++ b/Sample/HardParticle/FormFactorFullSphere.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORFULLSPHERE_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORFULLSPHERE_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORFULLSPHERE_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORFULLSPHERE_H
#include "Sample/Scattering/IFormFactorBorn.h"
@@ -55,4 +55,4 @@ private:
bool m_position_at_center;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORFULLSPHERE_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORFULLSPHERE_H
diff --git a/Sample/HardParticle/FormFactorFullSpheroid.h b/Sample/HardParticle/FormFactorFullSpheroid.h
index 16f753fcf9e..5c46920e4bb 100644
--- a/Sample/HardParticle/FormFactorFullSpheroid.h
+++ b/Sample/HardParticle/FormFactorFullSpheroid.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORFULLSPHEROID_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORFULLSPHEROID_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORFULLSPHEROID_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORFULLSPHEROID_H
#include "Sample/Scattering/IFormFactorBorn.h"
@@ -50,4 +50,4 @@ private:
const double& m_height;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORFULLSPHEROID_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORFULLSPHEROID_H
diff --git a/Sample/HardParticle/FormFactorHemiEllipsoid.h b/Sample/HardParticle/FormFactorHemiEllipsoid.h
index 186e6bbf85d..5c7a61e1e3a 100644
--- a/Sample/HardParticle/FormFactorHemiEllipsoid.h
+++ b/Sample/HardParticle/FormFactorHemiEllipsoid.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORHEMIELLIPSOID_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORHEMIELLIPSOID_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORHEMIELLIPSOID_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORHEMIELLIPSOID_H
#include "Sample/Scattering/IFormFactorBorn.h"
@@ -54,4 +54,4 @@ private:
mutable cvector_t m_q;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORHEMIELLIPSOID_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORHEMIELLIPSOID_H
diff --git a/Sample/HardParticle/FormFactorHollowSphere.h b/Sample/HardParticle/FormFactorHollowSphere.h
index 7287e5226f2..f4601ff96f8 100644
--- a/Sample/HardParticle/FormFactorHollowSphere.h
+++ b/Sample/HardParticle/FormFactorHollowSphere.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORHOLLOWSPHERE_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORHOLLOWSPHERE_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORHOLLOWSPHERE_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORHOLLOWSPHERE_H
#include "Sample/HardParticle/FormFactorFullSphere.h"
@@ -45,4 +45,4 @@ private:
const double& m_full_width; //!< This is the full width of the radius distribution
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORHOLLOWSPHERE_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORHOLLOWSPHERE_H
diff --git a/Sample/HardParticle/FormFactorIcosahedron.h b/Sample/HardParticle/FormFactorIcosahedron.h
index 4647288a49a..f38d5114d39 100644
--- a/Sample/HardParticle/FormFactorIcosahedron.h
+++ b/Sample/HardParticle/FormFactorIcosahedron.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORICOSAHEDRON_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORICOSAHEDRON_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORICOSAHEDRON_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORICOSAHEDRON_H
#include "Sample/HardParticle/IFormFactorPolyhedron.h"
@@ -42,4 +42,4 @@ private:
const double& m_edge;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORICOSAHEDRON_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORICOSAHEDRON_H
diff --git a/Sample/HardParticle/FormFactorLongBoxGauss.h b/Sample/HardParticle/FormFactorLongBoxGauss.h
index e3cc09f47a6..8ebea56bf0d 100644
--- a/Sample/HardParticle/FormFactorLongBoxGauss.h
+++ b/Sample/HardParticle/FormFactorLongBoxGauss.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORLONGBOXGAUSS_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORLONGBOXGAUSS_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORLONGBOXGAUSS_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORLONGBOXGAUSS_H
#include "Sample/Scattering/IFormFactorBorn.h"
@@ -51,4 +51,4 @@ private:
const double& m_height;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORLONGBOXGAUSS_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORLONGBOXGAUSS_H
diff --git a/Sample/HardParticle/FormFactorLongBoxLorentz.h b/Sample/HardParticle/FormFactorLongBoxLorentz.h
index 04113ada9b7..19bef0c5a9d 100644
--- a/Sample/HardParticle/FormFactorLongBoxLorentz.h
+++ b/Sample/HardParticle/FormFactorLongBoxLorentz.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORLONGBOXLORENTZ_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORLONGBOXLORENTZ_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORLONGBOXLORENTZ_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORLONGBOXLORENTZ_H
#include "Sample/Scattering/IFormFactorBorn.h"
@@ -52,4 +52,4 @@ private:
const double& m_height;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORLONGBOXLORENTZ_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORLONGBOXLORENTZ_H
diff --git a/Sample/HardParticle/FormFactorPrism3.h b/Sample/HardParticle/FormFactorPrism3.h
index 0f9d710be36..5ee97ccc278 100644
--- a/Sample/HardParticle/FormFactorPrism3.h
+++ b/Sample/HardParticle/FormFactorPrism3.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPRISM3_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPRISM3_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORPRISM3_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORPRISM3_H
#include "Sample/HardParticle/IFormFactorPrism.h"
@@ -46,4 +46,4 @@ private:
const double& m_height;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPRISM3_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORPRISM3_H
diff --git a/Sample/HardParticle/FormFactorPrism6.h b/Sample/HardParticle/FormFactorPrism6.h
index 0726adbaa7b..acaf30fb471 100644
--- a/Sample/HardParticle/FormFactorPrism6.h
+++ b/Sample/HardParticle/FormFactorPrism6.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPRISM6_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPRISM6_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORPRISM6_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORPRISM6_H
#include "Sample/HardParticle/IFormFactorPrism.h"
@@ -46,4 +46,4 @@ private:
const double& m_height;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPRISM6_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORPRISM6_H
diff --git a/Sample/HardParticle/FormFactorPyramid.h b/Sample/HardParticle/FormFactorPyramid.h
index 6b77766468c..cf1bf2bc0a4 100644
--- a/Sample/HardParticle/FormFactorPyramid.h
+++ b/Sample/HardParticle/FormFactorPyramid.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPYRAMID_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPYRAMID_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORPYRAMID_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORPYRAMID_H
#include "Sample/HardParticle/IFormFactorPolyhedron.h"
@@ -50,4 +50,4 @@ private:
const double& m_alpha;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPYRAMID_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORPYRAMID_H
diff --git a/Sample/HardParticle/FormFactorSawtoothRipple.h b/Sample/HardParticle/FormFactorSawtoothRipple.h
index 55c9ccfa6e7..d8f095f4930 100644
--- a/Sample/HardParticle/FormFactorSawtoothRipple.h
+++ b/Sample/HardParticle/FormFactorSawtoothRipple.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORSAWTOOTHRIPPLE_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORSAWTOOTHRIPPLE_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORSAWTOOTHRIPPLE_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORSAWTOOTHRIPPLE_H
#include "Sample/HardParticle/IProfileRipple.h"
@@ -59,4 +59,4 @@ private:
complex_t factor_x(complex_t qx) const override final;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORSAWTOOTHRIPPLE_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORSAWTOOTHRIPPLE_H
diff --git a/Sample/HardParticle/FormFactorTetrahedron.h b/Sample/HardParticle/FormFactorTetrahedron.h
index 704f009434f..f281578bae8 100644
--- a/Sample/HardParticle/FormFactorTetrahedron.h
+++ b/Sample/HardParticle/FormFactorTetrahedron.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTETRAHEDRON_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTETRAHEDRON_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORTETRAHEDRON_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORTETRAHEDRON_H
#include "Sample/HardParticle/IFormFactorPolyhedron.h"
@@ -49,4 +49,4 @@ private:
const double& m_alpha;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTETRAHEDRON_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORTETRAHEDRON_H
diff --git a/Sample/HardParticle/FormFactorTruncatedCube.h b/Sample/HardParticle/FormFactorTruncatedCube.h
index d5c5158853c..d67fecac939 100644
--- a/Sample/HardParticle/FormFactorTruncatedCube.h
+++ b/Sample/HardParticle/FormFactorTruncatedCube.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDCUBE_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDCUBE_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORTRUNCATEDCUBE_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORTRUNCATEDCUBE_H
#include "Sample/HardParticle/IFormFactorPolyhedron.h"
@@ -44,4 +44,4 @@ private:
const double& m_removed_length;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDCUBE_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORTRUNCATEDCUBE_H
diff --git a/Sample/HardParticle/FormFactorTruncatedSphere.h b/Sample/HardParticle/FormFactorTruncatedSphere.h
index 6773cadaba9..1ecd37eb220 100644
--- a/Sample/HardParticle/FormFactorTruncatedSphere.h
+++ b/Sample/HardParticle/FormFactorTruncatedSphere.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHERE_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHERE_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHERE_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHERE_H
#include "Sample/Scattering/IFormFactorBorn.h"
@@ -56,4 +56,4 @@ private:
mutable cvector_t m_q;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHERE_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHERE_H
diff --git a/Sample/HardParticle/FormFactorTruncatedSpheroid.h b/Sample/HardParticle/FormFactorTruncatedSpheroid.h
index b52a7828f4f..3c4cbee6135 100644
--- a/Sample/HardParticle/FormFactorTruncatedSpheroid.h
+++ b/Sample/HardParticle/FormFactorTruncatedSpheroid.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHEROID_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHEROID_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHEROID_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHEROID_H
#include "Sample/Scattering/IFormFactorBorn.h"
@@ -59,4 +59,4 @@ private:
mutable cvector_t m_q;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHEROID_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHEROID_H
diff --git a/Sample/HardParticle/HardParticles.h b/Sample/HardParticle/HardParticles.h
index 89776c3ee50..1484b324b78 100644
--- a/Sample/HardParticle/HardParticles.h
+++ b/Sample/HardParticle/HardParticles.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_HARDPARTICLES_H
-#define BORNAGAIN_CORE_HARDPARTICLE_HARDPARTICLES_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_HARDPARTICLES_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_HARDPARTICLES_H
#include "Sample/HardParticle/FormFactorAnisoPyramid.h"
#include "Sample/HardParticle/FormFactorBar.h"
@@ -42,4 +42,4 @@
#include "Sample/HardParticle/FormFactorTruncatedSphere.h"
#include "Sample/HardParticle/FormFactorTruncatedSpheroid.h"
-#endif // BORNAGAIN_CORE_HARDPARTICLE_HARDPARTICLES_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_HARDPARTICLES_H
diff --git a/Sample/HardParticle/IFormFactorPolyhedron.h b/Sample/HardParticle/IFormFactorPolyhedron.h
index 9db32caf064..4f69f454458 100644
--- a/Sample/HardParticle/IFormFactorPolyhedron.h
+++ b/Sample/HardParticle/IFormFactorPolyhedron.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_IFORMFACTORPOLYHEDRON_H
-#define BORNAGAIN_CORE_HARDPARTICLE_IFORMFACTORPOLYHEDRON_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_IFORMFACTORPOLYHEDRON_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_IFORMFACTORPOLYHEDRON_H
#include "Sample/HardParticle/PolyhedralTopology.h"
#include "Sample/Scattering/IFormFactorBorn.h"
@@ -52,4 +52,4 @@ private:
std::unique_ptr<Polyhedron> pimpl;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_IFORMFACTORPOLYHEDRON_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_IFORMFACTORPOLYHEDRON_H
diff --git a/Sample/HardParticle/IFormFactorPrism.h b/Sample/HardParticle/IFormFactorPrism.h
index d83199b46a3..7582c14fb9e 100644
--- a/Sample/HardParticle/IFormFactorPrism.h
+++ b/Sample/HardParticle/IFormFactorPrism.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_IFORMFACTORPRISM_H
-#define BORNAGAIN_CORE_HARDPARTICLE_IFORMFACTORPRISM_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_IFORMFACTORPRISM_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_IFORMFACTORPRISM_H
#include "Sample/Scattering/IFormFactorBorn.h"
#include <memory>
@@ -44,4 +44,4 @@ private:
std::unique_ptr<Prism> pimpl;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_IFORMFACTORPRISM_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_IFORMFACTORPRISM_H
diff --git a/Sample/HardParticle/IProfileRipple.h b/Sample/HardParticle/IProfileRipple.h
index c8a2e09d6bb..ebf75ade3ca 100644
--- a/Sample/HardParticle/IProfileRipple.h
+++ b/Sample/HardParticle/IProfileRipple.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_IPROFILERIPPLE_H
-#define BORNAGAIN_CORE_HARDPARTICLE_IPROFILERIPPLE_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_IPROFILERIPPLE_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_IPROFILERIPPLE_H
#include "Sample/Scattering/IFormFactorBorn.h"
@@ -83,4 +83,4 @@ private:
complex_t factor_yz(complex_t qy, complex_t qz) const final;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_IPROFILERIPPLE_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_IPROFILERIPPLE_H
diff --git a/Sample/HardParticle/PolyhedralComponents.h b/Sample/HardParticle/PolyhedralComponents.h
index dab7a26bb3d..990f2e43578 100644
--- a/Sample/HardParticle/PolyhedralComponents.h
+++ b/Sample/HardParticle/PolyhedralComponents.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_POLYHEDRALCOMPONENTS_H
-#define BORNAGAIN_CORE_HARDPARTICLE_POLYHEDRALCOMPONENTS_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_POLYHEDRALCOMPONENTS_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_POLYHEDRALCOMPONENTS_H
#include "Base/Types/Complex.h"
#include "Base/Vector/Vectors3D.h"
@@ -80,4 +80,4 @@ private:
double abslevel) const;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_POLYHEDRALCOMPONENTS_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_POLYHEDRALCOMPONENTS_H
diff --git a/Sample/HardParticle/PolyhedralTopology.h b/Sample/HardParticle/PolyhedralTopology.h
index c6bb1c2bcb9..6c9dfdce4a6 100644
--- a/Sample/HardParticle/PolyhedralTopology.h
+++ b/Sample/HardParticle/PolyhedralTopology.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_POLYHEDRALTOPOLOGY_H
-#define BORNAGAIN_CORE_HARDPARTICLE_POLYHEDRALTOPOLOGY_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_POLYHEDRALTOPOLOGY_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_POLYHEDRALTOPOLOGY_H
#include <vector>
@@ -33,4 +33,4 @@ public:
bool symmetry_Ci;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_POLYHEDRALTOPOLOGY_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_POLYHEDRALTOPOLOGY_H
diff --git a/Sample/HardParticle/Polyhedron.h b/Sample/HardParticle/Polyhedron.h
index ff850fa5ba2..0bba01eec76 100644
--- a/Sample/HardParticle/Polyhedron.h
+++ b/Sample/HardParticle/Polyhedron.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_POLYHEDRON_H
-#define BORNAGAIN_CORE_HARDPARTICLE_POLYHEDRON_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_POLYHEDRON_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_POLYHEDRON_H
#include "Sample/HardParticle/PolyhedralComponents.h"
#include "Sample/HardParticle/PolyhedralTopology.h"
@@ -46,4 +46,4 @@ private:
std::vector<kvector_t> m_vertices; //! for topZ, bottomZ computation only
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_POLYHEDRON_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_POLYHEDRON_H
diff --git a/Sample/HardParticle/Prism.h b/Sample/HardParticle/Prism.h
index ed0f4e1004f..62cc397c19a 100644
--- a/Sample/HardParticle/Prism.h
+++ b/Sample/HardParticle/Prism.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_PRISM_H
-#define BORNAGAIN_CORE_HARDPARTICLE_PRISM_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_PRISM_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_PRISM_H
#include "Sample/HardParticle/PolyhedralComponents.h"
#include "Sample/HardParticle/PolyhedralTopology.h"
@@ -35,4 +35,4 @@ private:
std::vector<kvector_t> m_vertices; //! for topZ, bottomZ computation only
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_PRISM_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_PRISM_H
diff --git a/Sample/HardParticle/Ripples.h b/Sample/HardParticle/Ripples.h
index 1e61ce3272a..5208bf87065 100644
--- a/Sample/HardParticle/Ripples.h
+++ b/Sample/HardParticle/Ripples.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_RIPPLES_H
-#define BORNAGAIN_CORE_HARDPARTICLE_RIPPLES_H
+#ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_RIPPLES_H
+#define BORNAGAIN_SAMPLE_HARDPARTICLE_RIPPLES_H
#include "Base/Types/Complex.h"
@@ -32,4 +32,4 @@ complex_t profile_yz_triangular(complex_t qy, complex_t qz, double width, double
} // namespace ripples
-#endif // BORNAGAIN_CORE_HARDPARTICLE_RIPPLES_H
+#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_RIPPLES_H
diff --git a/Sample/Interference/DecouplingApproximationStrategy.h b/Sample/Interference/DecouplingApproximationStrategy.h
index 4bb91db9aee..bb2569e9fd5 100644
--- a/Sample/Interference/DecouplingApproximationStrategy.h
+++ b/Sample/Interference/DecouplingApproximationStrategy.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_DECOUPLINGAPPROXIMATIONSTRATEGY_H
-#define BORNAGAIN_CORE_MULTILAYER_DECOUPLINGAPPROXIMATIONSTRATEGY_H
+#ifndef BORNAGAIN_SAMPLE_INTERFERENCE_DECOUPLINGAPPROXIMATIONSTRATEGY_H
+#define BORNAGAIN_SAMPLE_INTERFERENCE_DECOUPLINGAPPROXIMATIONSTRATEGY_H
#include "Sample/Interference/IInterferenceFunctionStrategy.h"
@@ -35,4 +35,4 @@ private:
double polarizedCalculation(const SimulationElement& sim_element) const override;
};
-#endif // BORNAGAIN_CORE_MULTILAYER_DECOUPLINGAPPROXIMATIONSTRATEGY_H
+#endif // BORNAGAIN_SAMPLE_INTERFERENCE_DECOUPLINGAPPROXIMATIONSTRATEGY_H
diff --git a/Sample/Interference/FormFactorPrecompute.h b/Sample/Interference/FormFactorPrecompute.h
index a4330109c60..6632f8ce369 100644
--- a/Sample/Interference/FormFactorPrecompute.h
+++ b/Sample/Interference/FormFactorPrecompute.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_INTERFERENCEFUNCTIONUTILS_H
-#define BORNAGAIN_CORE_MULTILAYER_INTERFERENCEFUNCTIONUTILS_H
+#ifndef BORNAGAIN_SAMPLE_INTERFERENCE_FORMFACTORPRECOMPUTE_H
+#define BORNAGAIN_SAMPLE_INTERFERENCE_FORMFACTORPRECOMPUTE_H
#include "Base/Types/Complex.h"
#include <Eigen/StdVector>
@@ -35,4 +35,4 @@ polarized(const SimulationElement& sim_element,
} // namespace FormFactorPrecompute
-#endif // BORNAGAIN_CORE_MULTILAYER_INTERFERENCEFUNCTIONUTILS_H
+#endif // BORNAGAIN_SAMPLE_INTERFERENCE_FORMFACTORPRECOMPUTE_H
diff --git a/Sample/Interference/IInterferenceFunctionStrategy.h b/Sample/Interference/IInterferenceFunctionStrategy.h
index 842d41a8014..9d6b5690882 100644
--- a/Sample/Interference/IInterferenceFunctionStrategy.h
+++ b/Sample/Interference/IInterferenceFunctionStrategy.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_IINTERFERENCEFUNCTIONSTRATEGY_H
-#define BORNAGAIN_CORE_MULTILAYER_IINTERFERENCEFUNCTIONSTRATEGY_H
+#ifndef BORNAGAIN_SAMPLE_INTERFERENCE_IINTERFERENCEFUNCTIONSTRATEGY_H
+#define BORNAGAIN_SAMPLE_INTERFERENCE_IINTERFERENCEFUNCTIONSTRATEGY_H
#include "Base/Types/Complex.h"
#include "Sample/RT/SimulationOptions.h"
@@ -70,4 +70,4 @@ private:
#endif
};
-#endif // BORNAGAIN_CORE_MULTILAYER_IINTERFERENCEFUNCTIONSTRATEGY_H
+#endif // BORNAGAIN_SAMPLE_INTERFERENCE_IINTERFERENCEFUNCTIONSTRATEGY_H
diff --git a/Sample/Interference/SSCAHelper.h b/Sample/Interference/SSCAHelper.h
index f5eade1c668..fcf75c4ca03 100644
--- a/Sample/Interference/SSCAHelper.h
+++ b/Sample/Interference/SSCAHelper.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_SSCAHELPER_H
-#define BORNAGAIN_CORE_MULTILAYER_SSCAHELPER_H
+#ifndef BORNAGAIN_SAMPLE_INTERFERENCE_SSCAHELPER_H
+#define BORNAGAIN_SAMPLE_INTERFERENCE_SSCAHELPER_H
#include "Sample/Interference/IInterferenceFunctionStrategy.h"
#include "Sample/Interference/FormFactorPrecompute.h"
@@ -49,4 +49,4 @@ private:
double m_mean_radius;
};
-#endif // BORNAGAIN_CORE_MULTILAYER_SSCAHELPER_H
+#endif // BORNAGAIN_SAMPLE_INTERFERENCE_SSCAHELPER_H
diff --git a/Sample/Interference/SSCApproximationStrategy.h b/Sample/Interference/SSCApproximationStrategy.h
index 0d4df12d676..073a478ab49 100644
--- a/Sample/Interference/SSCApproximationStrategy.h
+++ b/Sample/Interference/SSCApproximationStrategy.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_SSCAPPROXIMATIONSTRATEGY_H
-#define BORNAGAIN_CORE_MULTILAYER_SSCAPPROXIMATIONSTRATEGY_H
+#ifndef BORNAGAIN_SAMPLE_INTERFERENCE_SSCAPPROXIMATIONSTRATEGY_H
+#define BORNAGAIN_SAMPLE_INTERFERENCE_SSCAPPROXIMATIONSTRATEGY_H
#include "Sample/Interference/SSCAHelper.h"
@@ -36,4 +36,4 @@ private:
SSCAHelper m_helper;
};
-#endif // BORNAGAIN_CORE_MULTILAYER_SSCAPPROXIMATIONSTRATEGY_H
+#endif // BORNAGAIN_SAMPLE_INTERFERENCE_SSCAPPROXIMATIONSTRATEGY_H
diff --git a/Sample/Lattice/ILatticeOrientation.h b/Sample/Lattice/ILatticeOrientation.h
index ceeaa037e04..75b8d14a36a 100644
--- a/Sample/Lattice/ILatticeOrientation.h
+++ b/Sample/Lattice/ILatticeOrientation.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_LATTICE_ILATTICEORIENTATION_H
-#define BORNAGAIN_CORE_LATTICE_ILATTICEORIENTATION_H
+#ifndef BORNAGAIN_SAMPLE_LATTICE_ILATTICEORIENTATION_H
+#define BORNAGAIN_SAMPLE_LATTICE_ILATTICEORIENTATION_H
#include "Base/Vector/Transform3D.h"
#include "Sample/Lattice/Lattice.h"
@@ -63,4 +63,4 @@ private:
MillerIndex m_ind1, m_ind2;
};
-#endif // BORNAGAIN_CORE_LATTICE_ILATTICEORIENTATION_H
+#endif // BORNAGAIN_SAMPLE_LATTICE_ILATTICEORIENTATION_H
diff --git a/Sample/Lattice/ISelectionRule.h b/Sample/Lattice/ISelectionRule.h
index 5f37754c4f2..4de5813c517 100644
--- a/Sample/Lattice/ISelectionRule.h
+++ b/Sample/Lattice/ISelectionRule.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_LATTICE_ISELECTIONRULE_H
-#define BORNAGAIN_CORE_LATTICE_ISELECTIONRULE_H
+#ifndef BORNAGAIN_SAMPLE_LATTICE_ISELECTIONRULE_H
+#define BORNAGAIN_SAMPLE_LATTICE_ISELECTIONRULE_H
#include "Base/Vector/Vectors3D.h"
@@ -63,4 +63,4 @@ inline bool SimpleSelectionRule::coordinateSelected(const ivector_t& coordinate)
return (m_a * coordinate[0] + m_b * coordinate[1] + m_c * coordinate[2]) % m_mod == 0;
}
-#endif // BORNAGAIN_CORE_LATTICE_ISELECTIONRULE_H
+#endif // BORNAGAIN_SAMPLE_LATTICE_ISELECTIONRULE_H
diff --git a/Sample/Lattice/Lattice.h b/Sample/Lattice/Lattice.h
index 9350a4ac472..64a6b3f0f0d 100644
--- a/Sample/Lattice/Lattice.h
+++ b/Sample/Lattice/Lattice.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_LATTICE_LATTICE_H
-#define BORNAGAIN_CORE_LATTICE_LATTICE_H
+#ifndef BORNAGAIN_SAMPLE_LATTICE_LATTICE_H
+#define BORNAGAIN_SAMPLE_LATTICE_LATTICE_H
#include "Param/Node/INode.h"
#include <vector>
@@ -116,4 +116,4 @@ private:
mutable bool m_cache_ok;
};
-#endif // BORNAGAIN_CORE_LATTICE_LATTICE_H
+#endif // BORNAGAIN_SAMPLE_LATTICE_LATTICE_H
diff --git a/Sample/Lattice/Lattice2D.h b/Sample/Lattice/Lattice2D.h
index 038b96434d4..3cb822c7a87 100644
--- a/Sample/Lattice/Lattice2D.h
+++ b/Sample/Lattice/Lattice2D.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_LATTICE_LATTICE2D_H
-#define BORNAGAIN_CORE_LATTICE_LATTICE2D_H
+#ifndef BORNAGAIN_SAMPLE_LATTICE_LATTICE2D_H
+#define BORNAGAIN_SAMPLE_LATTICE_LATTICE2D_H
#include "Base/Types/ICloneable.h"
#include "Param/Node/INode.h"
@@ -102,4 +102,4 @@ private:
double m_length;
};
-#endif // BORNAGAIN_CORE_LATTICE_LATTICE2D_H
+#endif // BORNAGAIN_SAMPLE_LATTICE_LATTICE2D_H
diff --git a/Sample/Lattice/LatticeUtils.h b/Sample/Lattice/LatticeUtils.h
index 9dc6c846680..aa1b418938a 100644
--- a/Sample/Lattice/LatticeUtils.h
+++ b/Sample/Lattice/LatticeUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_LATTICE_LATTICEUTILS_H
-#define BORNAGAIN_CORE_LATTICE_LATTICEUTILS_H
+#ifndef BORNAGAIN_SAMPLE_LATTICE_LATTICEUTILS_H
+#define BORNAGAIN_SAMPLE_LATTICE_LATTICEUTILS_H
#include "Sample/Lattice/Lattice.h"
@@ -26,4 +26,4 @@ Lattice createHCPLattice(double a, double c, const ILatticeOrientation& orientat
Lattice createBCTLattice(double a, double c, const ILatticeOrientation& orientation);
} // namespace LatticeUtils
-#endif // BORNAGAIN_CORE_LATTICE_LATTICEUTILS_H
+#endif // BORNAGAIN_SAMPLE_LATTICE_LATTICEUTILS_H
diff --git a/Sample/LibFF/SomeFormFactors.h b/Sample/LibFF/SomeFormFactors.h
index e14e89aadef..209d55f1c74 100644
--- a/Sample/LibFF/SomeFormFactors.h
+++ b/Sample/LibFF/SomeFormFactors.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_LIBFF_SOMEFORMFACTORS_H
-#define BORNAGAIN_CORE_LIBFF_SOMEFORMFACTORS_H
+#ifndef BORNAGAIN_SAMPLE_LIBFF_SOMEFORMFACTORS_H
+#define BORNAGAIN_SAMPLE_LIBFF_SOMEFORMFACTORS_H
#include "Base/Types/Complex.h"
#include "Base/Vector/Vectors3D.h"
@@ -27,4 +27,4 @@ complex_t ffSphere(cvector_t q, double R);
} // namespace someff
-#endif // BORNAGAIN_CORE_LIBFF_SOMEFORMFACTORS_H
+#endif // BORNAGAIN_SAMPLE_LIBFF_SOMEFORMFACTORS_H
diff --git a/Sample/Material/BaseMaterialImpl.h b/Sample/Material/BaseMaterialImpl.h
index 164061f346a..c4a4be65b94 100644
--- a/Sample/Material/BaseMaterialImpl.h
+++ b/Sample/Material/BaseMaterialImpl.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MATERIAL_BASEMATERIALIMPL_H
-#define BORNAGAIN_CORE_MATERIAL_BASEMATERIALIMPL_H
+#ifndef BORNAGAIN_SAMPLE_MATERIAL_BASEMATERIALIMPL_H
+#define BORNAGAIN_SAMPLE_MATERIAL_BASEMATERIALIMPL_H
#include "Base/Types/Complex.h"
#include "Base/Vector/EigenCore.h"
@@ -81,4 +81,4 @@ private:
const std::string m_name;
};
-#endif // BORNAGAIN_CORE_MATERIAL_BASEMATERIALIMPL_H
+#endif // BORNAGAIN_SAMPLE_MATERIAL_BASEMATERIALIMPL_H
diff --git a/Sample/Material/MagneticMaterialImpl.h b/Sample/Material/MagneticMaterialImpl.h
index 4820e591fcb..a7e304b1c1a 100644
--- a/Sample/Material/MagneticMaterialImpl.h
+++ b/Sample/Material/MagneticMaterialImpl.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MATERIAL_MAGNETICMATERIALIMPL_H
-#define BORNAGAIN_CORE_MATERIAL_MAGNETICMATERIALIMPL_H
+#ifndef BORNAGAIN_SAMPLE_MATERIAL_MAGNETICMATERIALIMPL_H
+#define BORNAGAIN_SAMPLE_MATERIAL_MAGNETICMATERIALIMPL_H
#include "Sample/Material/BaseMaterialImpl.h"
@@ -59,4 +59,4 @@ private:
kvector_t m_magnetization; //!< magnetization
};
-#endif // BORNAGAIN_CORE_MATERIAL_MAGNETICMATERIALIMPL_H
+#endif // BORNAGAIN_SAMPLE_MATERIAL_MAGNETICMATERIALIMPL_H
diff --git a/Sample/Material/Material.h b/Sample/Material/Material.h
index 4846e035215..7d33e6d78d4 100644
--- a/Sample/Material/Material.h
+++ b/Sample/Material/Material.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MATERIAL_MATERIAL_H
-#define BORNAGAIN_CORE_MATERIAL_MATERIAL_H
+#ifndef BORNAGAIN_SAMPLE_MATERIAL_MATERIAL_H
+#define BORNAGAIN_SAMPLE_MATERIAL_MATERIAL_H
#include "Sample/Material/BaseMaterialImpl.h"
#include <memory>
@@ -103,4 +103,4 @@ bool operator==(const Material& left, const Material& right);
//! Comparison operator for material wrapper (inequality check)
bool operator!=(const Material& left, const Material& right);
-#endif // BORNAGAIN_CORE_MATERIAL_MATERIAL_H
+#endif // BORNAGAIN_SAMPLE_MATERIAL_MATERIAL_H
diff --git a/Sample/Material/MaterialBySLDImpl.h b/Sample/Material/MaterialBySLDImpl.h
index e501bb4e563..bb62940fe65 100644
--- a/Sample/Material/MaterialBySLDImpl.h
+++ b/Sample/Material/MaterialBySLDImpl.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MATERIAL_MATERIALBYSLDIMPL_H
-#define BORNAGAIN_CORE_MATERIAL_MATERIALBYSLDIMPL_H
+#ifndef BORNAGAIN_SAMPLE_MATERIAL_MATERIALBYSLDIMPL_H
+#define BORNAGAIN_SAMPLE_MATERIAL_MATERIALBYSLDIMPL_H
#include "Sample/Material/MagneticMaterialImpl.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
@@ -63,4 +63,4 @@ private:
double m_sld_imag; //!< imaginary part of scattering length density (negative by default)
};
-#endif // BORNAGAIN_CORE_MATERIAL_MATERIALBYSLDIMPL_H
+#endif // BORNAGAIN_SAMPLE_MATERIAL_MATERIALBYSLDIMPL_H
diff --git a/Sample/Material/MaterialFactoryFuncs.h b/Sample/Material/MaterialFactoryFuncs.h
index 65b15ceae3f..c01b0696581 100644
--- a/Sample/Material/MaterialFactoryFuncs.h
+++ b/Sample/Material/MaterialFactoryFuncs.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MATERIAL_MATERIALFACTORYFUNCS_H
-#define BORNAGAIN_CORE_MATERIAL_MATERIALFACTORYFUNCS_H
+#ifndef BORNAGAIN_SAMPLE_MATERIAL_MATERIALFACTORYFUNCS_H
+#define BORNAGAIN_SAMPLE_MATERIAL_MATERIALFACTORYFUNCS_H
#include "Sample/Material/Material.h"
@@ -62,4 +62,4 @@ Material MaterialBySLD();
Material MaterialBySLD(const std::string& name, double sld_real, double sld_imag,
kvector_t magnetization = {});
-#endif // BORNAGAIN_CORE_MATERIAL_MATERIALFACTORYFUNCS_H
+#endif // BORNAGAIN_SAMPLE_MATERIAL_MATERIALFACTORYFUNCS_H
diff --git a/Sample/Material/MaterialUtils.h b/Sample/Material/MaterialUtils.h
index 2393f938c17..ab0a14b25ff 100644
--- a/Sample/Material/MaterialUtils.h
+++ b/Sample/Material/MaterialUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MATERIAL_MATERIALUTILS_H
-#define BORNAGAIN_CORE_MATERIAL_MATERIALUTILS_H
+#ifndef BORNAGAIN_SAMPLE_MATERIAL_MATERIALUTILS_H
+#define BORNAGAIN_SAMPLE_MATERIAL_MATERIALUTILS_H
#include "Sample/Material/Material.h"
@@ -48,4 +48,4 @@ MATERIAL_TYPES checkMaterialTypes(const std::vector<const Material*>& materials)
} // namespace MaterialUtils
-#endif // BORNAGAIN_CORE_MATERIAL_MATERIALUTILS_H
+#endif // BORNAGAIN_SAMPLE_MATERIAL_MATERIALUTILS_H
diff --git a/Sample/Material/RefractiveMaterialImpl.h b/Sample/Material/RefractiveMaterialImpl.h
index fc551adfd43..005cd1684e0 100644
--- a/Sample/Material/RefractiveMaterialImpl.h
+++ b/Sample/Material/RefractiveMaterialImpl.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MATERIAL_REFRACTIVEMATERIALIMPL_H
-#define BORNAGAIN_CORE_MATERIAL_REFRACTIVEMATERIALIMPL_H
+#ifndef BORNAGAIN_SAMPLE_MATERIAL_REFRACTIVEMATERIALIMPL_H
+#define BORNAGAIN_SAMPLE_MATERIAL_REFRACTIVEMATERIALIMPL_H
#include "Sample/Material/MagneticMaterialImpl.h"
#include "Sample/Material/Material.h"
@@ -65,4 +65,4 @@ private:
double m_beta; //!< \f$\beta\f$ coefficient for refractive index \f$n = 1 - \delta + i \beta\f$
};
-#endif // BORNAGAIN_CORE_MATERIAL_REFRACTIVEMATERIALIMPL_H
+#endif // BORNAGAIN_SAMPLE_MATERIAL_REFRACTIVEMATERIALIMPL_H
diff --git a/Sample/Material/WavevectorInfo.h b/Sample/Material/WavevectorInfo.h
index 79224eb2abb..e9f4e6659c5 100644
--- a/Sample/Material/WavevectorInfo.h
+++ b/Sample/Material/WavevectorInfo.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MATERIAL_WAVEVECTORINFO_H
-#define BORNAGAIN_CORE_MATERIAL_WAVEVECTORINFO_H
+#ifndef BORNAGAIN_SAMPLE_MATERIAL_WAVEVECTORINFO_H
+#define BORNAGAIN_SAMPLE_MATERIAL_WAVEVECTORINFO_H
#include "Base/Vector/Vectors3D.h"
@@ -48,4 +48,4 @@ private:
double m_vacuum_wavelength;
};
-#endif // BORNAGAIN_CORE_MATERIAL_WAVEVECTORINFO_H
+#endif // BORNAGAIN_SAMPLE_MATERIAL_WAVEVECTORINFO_H
diff --git a/Sample/Multilayer/Layer.h b/Sample/Multilayer/Layer.h
index c904c2f0016..5d2b7fe3823 100644
--- a/Sample/Multilayer/Layer.h
+++ b/Sample/Multilayer/Layer.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_LAYER_H
-#define BORNAGAIN_CORE_MULTILAYER_LAYER_H
+#ifndef BORNAGAIN_SAMPLE_MULTILAYER_LAYER_H
+#define BORNAGAIN_SAMPLE_MULTILAYER_LAYER_H
#include "Base/Types/SafePointerVector.h"
#include "Sample/Material/Material.h"
@@ -60,4 +60,4 @@ private:
unsigned int m_n_slices = 1; //!< number of slices to create for graded layer approach
};
-#endif // BORNAGAIN_CORE_MULTILAYER_LAYER_H
+#endif // BORNAGAIN_SAMPLE_MULTILAYER_LAYER_H
diff --git a/Sample/Multilayer/MultiLayer.h b/Sample/Multilayer/MultiLayer.h
index 3d394f7a749..da2325fad30 100644
--- a/Sample/Multilayer/MultiLayer.h
+++ b/Sample/Multilayer/MultiLayer.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_MULTILAYER_H
-#define BORNAGAIN_CORE_MULTILAYER_MULTILAYER_H
+#ifndef BORNAGAIN_SAMPLE_MULTILAYER_MULTILAYER_H
+#define BORNAGAIN_SAMPLE_MULTILAYER_MULTILAYER_H
#include "Base/Types/SafePointerVector.h"
#include "Sample/Multilayer/RoughnessModels.h"
@@ -110,4 +110,4 @@ private:
RoughnessModel m_roughness_model{RoughnessModel::DEFAULT};
};
-#endif // BORNAGAIN_CORE_MULTILAYER_MULTILAYER_H
+#endif // BORNAGAIN_SAMPLE_MULTILAYER_MULTILAYER_H
diff --git a/Sample/Multilayer/MultiLayerUtils.h b/Sample/Multilayer/MultiLayerUtils.h
index 9ef842fd4e1..17721cd179c 100644
--- a/Sample/Multilayer/MultiLayerUtils.h
+++ b/Sample/Multilayer/MultiLayerUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_MULTILAYERUTILS_H
-#define BORNAGAIN_CORE_MULTILAYER_MULTILAYERUTILS_H
+#ifndef BORNAGAIN_SAMPLE_MULTILAYER_MULTILAYERUTILS_H
+#define BORNAGAIN_SAMPLE_MULTILAYER_MULTILAYERUTILS_H
#include <cstddef>
#include <vector>
@@ -50,4 +50,4 @@ std::vector<ZLimits> ParticleRegions(const MultiLayer& multilayer, bool use_slic
bool hasRoughness(const MultiLayer& sample);
} // namespace MultiLayerUtils
-#endif // BORNAGAIN_CORE_MULTILAYER_MULTILAYERUTILS_H
+#endif // BORNAGAIN_SAMPLE_MULTILAYER_MULTILAYERUTILS_H
diff --git a/Sample/Multilayer/PyImport.h b/Sample/Multilayer/PyImport.h
index b8fe77de467..55517a72182 100644
--- a/Sample/Multilayer/PyImport.h
+++ b/Sample/Multilayer/PyImport.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PYIO_PYIMPORT_H
-#define BORNAGAIN_CORE_PYIO_PYIMPORT_H
+#ifndef BORNAGAIN_SAMPLE_MULTILAYER_PYIMPORT_H
+#define BORNAGAIN_SAMPLE_MULTILAYER_PYIMPORT_H
#ifdef BORNAGAIN_PYTHON
@@ -45,4 +45,4 @@ std::vector<std::string> listOfFunctions(const std::string& script, const std::s
#endif // BORNAGAIN_PYTHON
-#endif // BORNAGAIN_CORE_PYIO_PYIMPORT_H
+#endif // BORNAGAIN_SAMPLE_MULTILAYER_PYIMPORT_H
diff --git a/Sample/Multilayer/RoughnessModels.h b/Sample/Multilayer/RoughnessModels.h
index 7c43a4a84a8..761d453e71e 100644
--- a/Sample/Multilayer/RoughnessModels.h
+++ b/Sample/Multilayer/RoughnessModels.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_ROUGHNESSMODELS_H
-#define BORNAGAIN_CORE_MULTILAYER_ROUGHNESSMODELS_H
+#ifndef BORNAGAIN_SAMPLE_MULTILAYER_ROUGHNESSMODELS_H
+#define BORNAGAIN_SAMPLE_MULTILAYER_ROUGHNESSMODELS_H
#include <string>
@@ -28,4 +28,4 @@ struct RoughnessModelWrap {
};
typedef RoughnessModelWrap::RoughnessModel RoughnessModel;
-#endif // BORNAGAIN_CORE_MULTILAYER_ROUGHNESSMODELS_H
+#endif // BORNAGAIN_SAMPLE_MULTILAYER_ROUGHNESSMODELS_H
diff --git a/Sample/Particle/Crystal.h b/Sample/Particle/Crystal.h
index 690840c1c3b..b60de864204 100644
--- a/Sample/Particle/Crystal.h
+++ b/Sample/Particle/Crystal.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARTICLE_CRYSTAL_H
-#define BORNAGAIN_CORE_PARTICLE_CRYSTAL_H
+#ifndef BORNAGAIN_SAMPLE_PARTICLE_CRYSTAL_H
+#define BORNAGAIN_SAMPLE_PARTICLE_CRYSTAL_H
#include "Sample/Lattice/Lattice.h"
#include "Sample/Particle/IClusteredParticles.h"
@@ -52,4 +52,4 @@ private:
double m_position_variance;
};
-#endif // BORNAGAIN_CORE_PARTICLE_CRYSTAL_H
+#endif // BORNAGAIN_SAMPLE_PARTICLE_CRYSTAL_H
diff --git a/Sample/Particle/FormFactorCoreShell.h b/Sample/Particle/FormFactorCoreShell.h
index 539d164da07..76a59df1f7d 100644
--- a/Sample/Particle/FormFactorCoreShell.h
+++ b/Sample/Particle/FormFactorCoreShell.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARTICLE_FORMFACTORCORESHELL_H
-#define BORNAGAIN_CORE_PARTICLE_FORMFACTORCORESHELL_H
+#ifndef BORNAGAIN_SAMPLE_PARTICLE_FORMFACTORCORESHELL_H
+#define BORNAGAIN_SAMPLE_PARTICLE_FORMFACTORCORESHELL_H
#include "Sample/Scattering/IFormFactor.h"
@@ -55,4 +55,4 @@ protected:
std::unique_ptr<IFormFactor> m_shell;
};
-#endif // BORNAGAIN_CORE_PARTICLE_FORMFACTORCORESHELL_H
+#endif // BORNAGAIN_SAMPLE_PARTICLE_FORMFACTORCORESHELL_H
diff --git a/Sample/Particle/FormFactorCrystal.h b/Sample/Particle/FormFactorCrystal.h
index 9fbe492b2ab..ea098a254b0 100644
--- a/Sample/Particle/FormFactorCrystal.h
+++ b/Sample/Particle/FormFactorCrystal.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARTICLE_FORMFACTORCRYSTAL_H
-#define BORNAGAIN_CORE_PARTICLE_FORMFACTORCRYSTAL_H
+#ifndef BORNAGAIN_SAMPLE_PARTICLE_FORMFACTORCRYSTAL_H
+#define BORNAGAIN_SAMPLE_PARTICLE_FORMFACTORCRYSTAL_H
#include "Sample/Lattice/Lattice.h"
#include "Sample/Scattering/IFormFactorBorn.h"
@@ -64,4 +64,4 @@ private:
double m_max_rec_length;
};
-#endif // BORNAGAIN_CORE_PARTICLE_FORMFACTORCRYSTAL_H
+#endif // BORNAGAIN_SAMPLE_PARTICLE_FORMFACTORCRYSTAL_H
diff --git a/Sample/Particle/FormFactorWeighted.h b/Sample/Particle/FormFactorWeighted.h
index 20ee91190f9..0b26dd44e3b 100644
--- a/Sample/Particle/FormFactorWeighted.h
+++ b/Sample/Particle/FormFactorWeighted.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARTICLE_FORMFACTORWEIGHTED_H
-#define BORNAGAIN_CORE_PARTICLE_FORMFACTORWEIGHTED_H
+#ifndef BORNAGAIN_SAMPLE_PARTICLE_FORMFACTORWEIGHTED_H
+#define BORNAGAIN_SAMPLE_PARTICLE_FORMFACTORWEIGHTED_H
#include "Sample/Scattering/IFormFactor.h"
@@ -57,4 +57,4 @@ protected:
std::vector<double> m_weights;
};
-#endif // BORNAGAIN_CORE_PARTICLE_FORMFACTORWEIGHTED_H
+#endif // BORNAGAIN_SAMPLE_PARTICLE_FORMFACTORWEIGHTED_H
diff --git a/Sample/Particle/HomogeneousRegion.h b/Sample/Particle/HomogeneousRegion.h
index f17a8f664de..738155b0fc8 100644
--- a/Sample/Particle/HomogeneousRegion.h
+++ b/Sample/Particle/HomogeneousRegion.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARTICLE_HOMOGENEOUSREGION_H
-#define BORNAGAIN_CORE_PARTICLE_HOMOGENEOUSREGION_H
+#ifndef BORNAGAIN_SAMPLE_PARTICLE_HOMOGENEOUSREGION_H
+#define BORNAGAIN_SAMPLE_PARTICLE_HOMOGENEOUSREGION_H
#include "Sample/Material/Material.h"
@@ -40,4 +40,4 @@ Material createAveragedMaterial(const Material& layer_mat,
#endif // SWIG
-#endif // BORNAGAIN_CORE_PARTICLE_HOMOGENEOUSREGION_H
+#endif // BORNAGAIN_SAMPLE_PARTICLE_HOMOGENEOUSREGION_H
diff --git a/Sample/Particle/IAbstractParticle.h b/Sample/Particle/IAbstractParticle.h
index 88bd93d9075..366ca1e47b8 100644
--- a/Sample/Particle/IAbstractParticle.h
+++ b/Sample/Particle/IAbstractParticle.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARTICLE_IABSTRACTPARTICLE_H
-#define BORNAGAIN_CORE_PARTICLE_IABSTRACTPARTICLE_H
+#ifndef BORNAGAIN_SAMPLE_PARTICLE_IABSTRACTPARTICLE_H
+#define BORNAGAIN_SAMPLE_PARTICLE_IABSTRACTPARTICLE_H
#include "Sample/Scattering/ISample.h"
@@ -53,4 +53,4 @@ protected:
double m_abundance{1.0}; // not a Parameter
};
-#endif // BORNAGAIN_CORE_PARTICLE_IABSTRACTPARTICLE_H
+#endif // BORNAGAIN_SAMPLE_PARTICLE_IABSTRACTPARTICLE_H
diff --git a/Sample/Particle/IClusteredParticles.h b/Sample/Particle/IClusteredParticles.h
index bf3da47ecbd..0b9ed83f9c5 100644
--- a/Sample/Particle/IClusteredParticles.h
+++ b/Sample/Particle/IClusteredParticles.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARTICLE_ICLUSTEREDPARTICLES_H
-#define BORNAGAIN_CORE_PARTICLE_ICLUSTEREDPARTICLES_H
+#ifndef BORNAGAIN_SAMPLE_PARTICLE_ICLUSTEREDPARTICLES_H
+#define BORNAGAIN_SAMPLE_PARTICLE_ICLUSTEREDPARTICLES_H
#include "Sample/Particle/HomogeneousRegion.h"
#include "Sample/Scattering/ISample.h"
@@ -39,4 +39,4 @@ public:
virtual std::vector<HomogeneousRegion> homogeneousRegions() const = 0;
};
-#endif // BORNAGAIN_CORE_PARTICLE_ICLUSTEREDPARTICLES_H
+#endif // BORNAGAIN_SAMPLE_PARTICLE_ICLUSTEREDPARTICLES_H
diff --git a/Sample/Particle/IParticle.h b/Sample/Particle/IParticle.h
index 17d25c98656..918f8e44398 100644
--- a/Sample/Particle/IParticle.h
+++ b/Sample/Particle/IParticle.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARTICLE_IPARTICLE_H
-#define BORNAGAIN_CORE_PARTICLE_IPARTICLE_H
+#ifndef BORNAGAIN_SAMPLE_PARTICLE_IPARTICLE_H
+#define BORNAGAIN_SAMPLE_PARTICLE_IPARTICLE_H
#include "Base/Types/SafePointerVector.h"
#include "Sample/Particle/IAbstractParticle.h"
@@ -95,4 +95,4 @@ protected:
std::unique_ptr<IRotation> m_rotation;
};
-#endif // BORNAGAIN_CORE_PARTICLE_IPARTICLE_H
+#endif // BORNAGAIN_SAMPLE_PARTICLE_IPARTICLE_H
diff --git a/Sample/Particle/MesoCrystal.h b/Sample/Particle/MesoCrystal.h
index f2312ad6794..401e9ac4ff7 100644
--- a/Sample/Particle/MesoCrystal.h
+++ b/Sample/Particle/MesoCrystal.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARTICLE_MESOCRYSTAL_H
-#define BORNAGAIN_CORE_PARTICLE_MESOCRYSTAL_H
+#ifndef BORNAGAIN_SAMPLE_PARTICLE_MESOCRYSTAL_H
+#define BORNAGAIN_SAMPLE_PARTICLE_MESOCRYSTAL_H
#include "Sample/Particle/IParticle.h"
@@ -44,4 +44,4 @@ private:
std::unique_ptr<IFormFactor> m_meso_form_factor; //!< Outer shape of this mesocrystal
};
-#endif // BORNAGAIN_CORE_PARTICLE_MESOCRYSTAL_H
+#endif // BORNAGAIN_SAMPLE_PARTICLE_MESOCRYSTAL_H
diff --git a/Sample/Particle/Particle.h b/Sample/Particle/Particle.h
index 6e3d88f9b5a..de7de4fd5a7 100644
--- a/Sample/Particle/Particle.h
+++ b/Sample/Particle/Particle.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARTICLE_PARTICLE_H
-#define BORNAGAIN_CORE_PARTICLE_PARTICLE_H
+#ifndef BORNAGAIN_SAMPLE_PARTICLE_PARTICLE_H
+#define BORNAGAIN_SAMPLE_PARTICLE_PARTICLE_H
#include "Sample/Particle/IParticle.h"
#include "Sample/Scattering/FormFactorDecoratorMaterial.h"
@@ -51,4 +51,4 @@ private:
void initialize();
};
-#endif // BORNAGAIN_CORE_PARTICLE_PARTICLE_H
+#endif // BORNAGAIN_SAMPLE_PARTICLE_PARTICLE_H
diff --git a/Sample/Particle/ParticleComposition.h b/Sample/Particle/ParticleComposition.h
index eb9da7db1d0..af46ca11514 100644
--- a/Sample/Particle/ParticleComposition.h
+++ b/Sample/Particle/ParticleComposition.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARTICLE_PARTICLECOMPOSITION_H
-#define BORNAGAIN_CORE_PARTICLE_PARTICLECOMPOSITION_H
+#ifndef BORNAGAIN_SAMPLE_PARTICLE_PARTICLECOMPOSITION_H
+#define BORNAGAIN_SAMPLE_PARTICLE_PARTICLECOMPOSITION_H
#include "Sample/Particle/IParticle.h"
#include <memory>
@@ -57,4 +57,4 @@ private:
void initialize();
};
-#endif // BORNAGAIN_CORE_PARTICLE_PARTICLECOMPOSITION_H
+#endif // BORNAGAIN_SAMPLE_PARTICLE_PARTICLECOMPOSITION_H
diff --git a/Sample/Particle/ParticleCoreShell.h b/Sample/Particle/ParticleCoreShell.h
index 8c38402582b..28dedf3e3c4 100644
--- a/Sample/Particle/ParticleCoreShell.h
+++ b/Sample/Particle/ParticleCoreShell.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARTICLE_PARTICLECORESHELL_H
-#define BORNAGAIN_CORE_PARTICLE_PARTICLECORESHELL_H
+#ifndef BORNAGAIN_SAMPLE_PARTICLE_PARTICLECORESHELL_H
+#define BORNAGAIN_SAMPLE_PARTICLE_PARTICLECORESHELL_H
#include "Sample/Particle/IParticle.h"
@@ -60,4 +60,4 @@ inline const Particle* ParticleCoreShell::shellParticle() const
return m_shell.get();
}
-#endif // BORNAGAIN_CORE_PARTICLE_PARTICLECORESHELL_H
+#endif // BORNAGAIN_SAMPLE_PARTICLE_PARTICLECORESHELL_H
diff --git a/Sample/Particle/ParticleDistribution.h b/Sample/Particle/ParticleDistribution.h
index 203c2e2d831..abb90cb3702 100644
--- a/Sample/Particle/ParticleDistribution.h
+++ b/Sample/Particle/ParticleDistribution.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARTICLE_PARTICLEDISTRIBUTION_H
-#define BORNAGAIN_CORE_PARTICLE_PARTICLEDISTRIBUTION_H
+#ifndef BORNAGAIN_SAMPLE_PARTICLE_PARTICLEDISTRIBUTION_H
+#define BORNAGAIN_SAMPLE_PARTICLE_PARTICLEDISTRIBUTION_H
#include "Base/Types/SafePointerVector.h"
#include "Param/Distrib/ParameterDistribution.h"
@@ -55,4 +55,4 @@ private:
ParameterDistribution m_par_distribution;
};
-#endif // BORNAGAIN_CORE_PARTICLE_PARTICLEDISTRIBUTION_H
+#endif // BORNAGAIN_SAMPLE_PARTICLE_PARTICLEDISTRIBUTION_H
diff --git a/Sample/Particle/SlicedParticle.h b/Sample/Particle/SlicedParticle.h
index 650d913a510..4b3780a70ed 100644
--- a/Sample/Particle/SlicedParticle.h
+++ b/Sample/Particle/SlicedParticle.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARTICLE_SLICEDPARTICLE_H
-#define BORNAGAIN_CORE_PARTICLE_SLICEDPARTICLE_H
+#ifndef BORNAGAIN_SAMPLE_PARTICLE_SLICEDPARTICLE_H
+#define BORNAGAIN_SAMPLE_PARTICLE_SLICEDPARTICLE_H
#include "Sample/Particle/HomogeneousRegion.h"
#include "Sample/Scattering/IFormFactor.h"
@@ -30,4 +30,4 @@ struct SlicedParticle {
std::vector<HomogeneousRegion> m_regions;
};
-#endif // BORNAGAIN_CORE_PARTICLE_SLICEDPARTICLE_H
+#endif // BORNAGAIN_SAMPLE_PARTICLE_SLICEDPARTICLE_H
diff --git a/Sample/Particle/TRange.h b/Sample/Particle/TRange.h
index 913e2c80682..efcc72b5345 100644
--- a/Sample/Particle/TRange.h
+++ b/Sample/Particle/TRange.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARTICLE_TRANGE_H
-#define BORNAGAIN_CORE_PARTICLE_TRANGE_H
+#ifndef BORNAGAIN_SAMPLE_PARTICLE_TRANGE_H
+#define BORNAGAIN_SAMPLE_PARTICLE_TRANGE_H
#include <cstddef>
@@ -52,4 +52,4 @@ private:
size_t m_n_samples;
};
-#endif // BORNAGAIN_CORE_PARTICLE_TRANGE_H
+#endif // BORNAGAIN_SAMPLE_PARTICLE_TRANGE_H
diff --git a/Sample/RT/ILayerRTCoefficients.h b/Sample/RT/ILayerRTCoefficients.h
index 54fb14be01b..fe05c7cda89 100644
--- a/Sample/RT/ILayerRTCoefficients.h
+++ b/Sample/RT/ILayerRTCoefficients.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_RT_ILAYERRTCOEFFICIENTS_H
-#define BORNAGAIN_CORE_RT_ILAYERRTCOEFFICIENTS_H
+#ifndef BORNAGAIN_SAMPLE_RT_ILAYERRTCOEFFICIENTS_H
+#define BORNAGAIN_SAMPLE_RT_ILAYERRTCOEFFICIENTS_H
#include "Base/Types/Complex.h"
#include "Base/Types/Exceptions.h"
@@ -67,4 +67,4 @@ public:
}
};
-#endif // BORNAGAIN_CORE_RT_ILAYERRTCOEFFICIENTS_H
+#endif // BORNAGAIN_SAMPLE_RT_ILAYERRTCOEFFICIENTS_H
diff --git a/Sample/RT/MatrixRTCoefficients.h b/Sample/RT/MatrixRTCoefficients.h
index ff4a1d47e69..9e16a4ff720 100644
--- a/Sample/RT/MatrixRTCoefficients.h
+++ b/Sample/RT/MatrixRTCoefficients.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_H
-#define BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_H
+#ifndef BORNAGAIN_SAMPLE_RT_MATRIXRTCOEFFICIENTS_H
+#define BORNAGAIN_SAMPLE_RT_MATRIXRTCOEFFICIENTS_H
#include "Sample/RT/ILayerRTCoefficients.h"
@@ -67,4 +67,4 @@ public:
//!< lambda=0
};
-#endif // BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_H
+#endif // BORNAGAIN_SAMPLE_RT_MATRIXRTCOEFFICIENTS_H
diff --git a/Sample/RT/MatrixRTCoefficients_v2.h b/Sample/RT/MatrixRTCoefficients_v2.h
index a1b6ae48386..c66ddd8373e 100644
--- a/Sample/RT/MatrixRTCoefficients_v2.h
+++ b/Sample/RT/MatrixRTCoefficients_v2.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_V2_H
-#define BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_V2_H
+#ifndef BORNAGAIN_SAMPLE_RT_MATRIXRTCOEFFICIENTS_V2_H
+#define BORNAGAIN_SAMPLE_RT_MATRIXRTCOEFFICIENTS_V2_H
#include "Base/Vector/Vectors3D.h"
#include "Sample/RT/ILayerRTCoefficients.h"
@@ -67,4 +67,4 @@ private:
//!< the second eigenmode
};
-#endif // BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_V2_H
+#endif // BORNAGAIN_SAMPLE_RT_MATRIXRTCOEFFICIENTS_V2_H
diff --git a/Sample/RT/MatrixRTCoefficients_v3.h b/Sample/RT/MatrixRTCoefficients_v3.h
index 0f7c99b80e9..5c4bd869a3a 100644
--- a/Sample/RT/MatrixRTCoefficients_v3.h
+++ b/Sample/RT/MatrixRTCoefficients_v3.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_V3_H
-#define BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_V3_H
+#ifndef BORNAGAIN_SAMPLE_RT_MATRIXRTCOEFFICIENTS_V3_H
+#define BORNAGAIN_SAMPLE_RT_MATRIXRTCOEFFICIENTS_V3_H
#include "Base/Vector/Vectors3D.h"
#include "Sample/RT/ILayerRTCoefficients.h"
@@ -80,4 +80,4 @@ private:
Eigen::Matrix2cd pMatrixHelper(double sign) const;
};
-#endif // BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_V3_H
+#endif // BORNAGAIN_SAMPLE_RT_MATRIXRTCOEFFICIENTS_V3_H
diff --git a/Sample/RT/ScalarRTCoefficients.h b/Sample/RT/ScalarRTCoefficients.h
index 1d6536c91d9..136dff9aa8c 100644
--- a/Sample/RT/ScalarRTCoefficients.h
+++ b/Sample/RT/ScalarRTCoefficients.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_RT_SCALARRTCOEFFICIENTS_H
-#define BORNAGAIN_CORE_RT_SCALARRTCOEFFICIENTS_H
+#ifndef BORNAGAIN_SAMPLE_RT_SCALARRTCOEFFICIENTS_H
+#define BORNAGAIN_SAMPLE_RT_SCALARRTCOEFFICIENTS_H
#include "Sample/RT/ILayerRTCoefficients.h"
@@ -137,4 +137,4 @@ inline complex_t ScalarRTCoefficients::getScalarT() const
return t_r(0);
}
-#endif // BORNAGAIN_CORE_RT_SCALARRTCOEFFICIENTS_H
+#endif // BORNAGAIN_SAMPLE_RT_SCALARRTCOEFFICIENTS_H
diff --git a/Sample/RT/SimulationOptions.h b/Sample/RT/SimulationOptions.h
index b8f0b681fa1..cc81e1c6f41 100644
--- a/Sample/RT/SimulationOptions.h
+++ b/Sample/RT/SimulationOptions.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_PARAMETRIZATION_SIMULATIONOPTIONS_H
-#define BORNAGAIN_CORE_PARAMETRIZATION_SIMULATIONOPTIONS_H
+#ifndef BORNAGAIN_SAMPLE_RT_SIMULATIONOPTIONS_H
+#define BORNAGAIN_SAMPLE_RT_SIMULATIONOPTIONS_H
#include "Base/Utils/ThreadInfo.h"
#include <cstddef>
@@ -71,4 +71,4 @@ private:
ThreadInfo m_thread_info;
};
-#endif // BORNAGAIN_CORE_PARAMETRIZATION_SIMULATIONOPTIONS_H
+#endif // BORNAGAIN_SAMPLE_RT_SIMULATIONOPTIONS_H
diff --git a/Sample/SampleBuilderEngine/FixedBuilder.h b/Sample/SampleBuilderEngine/FixedBuilder.h
index 919b2c75fff..1599cf208f9 100644
--- a/Sample/SampleBuilderEngine/FixedBuilder.h
+++ b/Sample/SampleBuilderEngine/FixedBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SAMPLEBUILDERENGINE_FIXEDBUILDER_H
-#define BORNAGAIN_CORE_SAMPLEBUILDERENGINE_FIXEDBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_SAMPLEBUILDERENGINE_FIXEDBUILDER_H
+#define BORNAGAIN_SAMPLE_SAMPLEBUILDERENGINE_FIXEDBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
#include <memory>
@@ -33,4 +33,4 @@ private:
std::unique_ptr<const MultiLayer> m_sample;
};
-#endif // BORNAGAIN_CORE_SAMPLEBUILDERENGINE_FIXEDBUILDER_H
+#endif // BORNAGAIN_SAMPLE_SAMPLEBUILDERENGINE_FIXEDBUILDER_H
diff --git a/Sample/SampleBuilderEngine/IRegistry.h b/Sample/SampleBuilderEngine/IRegistry.h
index cd0dfc0835b..8660aff3179 100644
--- a/Sample/SampleBuilderEngine/IRegistry.h
+++ b/Sample/SampleBuilderEngine/IRegistry.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SAMPLEBUILDERENGINE_IREGISTRY_H
-#define BORNAGAIN_CORE_SAMPLEBUILDERENGINE_IREGISTRY_H
+#ifndef BORNAGAIN_SAMPLE_SAMPLEBUILDERENGINE_IREGISTRY_H
+#define BORNAGAIN_SAMPLE_SAMPLEBUILDERENGINE_IREGISTRY_H
#include "Base/Types/Exceptions.h"
#include <map>
@@ -60,4 +60,4 @@ private:
std::map<std::string, std::unique_ptr<ValueType>> m_data;
};
-#endif // BORNAGAIN_CORE_SAMPLEBUILDERENGINE_IREGISTRY_H
+#endif // BORNAGAIN_SAMPLE_SAMPLEBUILDERENGINE_IREGISTRY_H
diff --git a/Sample/SampleBuilderEngine/ISampleBuilder.h b/Sample/SampleBuilderEngine/ISampleBuilder.h
index 6ec4a062414..a9937e3284c 100644
--- a/Sample/SampleBuilderEngine/ISampleBuilder.h
+++ b/Sample/SampleBuilderEngine/ISampleBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SAMPLEBUILDERENGINE_ISAMPLEBUILDER_H
-#define BORNAGAIN_CORE_SAMPLEBUILDERENGINE_ISAMPLEBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_SAMPLEBUILDERENGINE_ISAMPLEBUILDER_H
+#define BORNAGAIN_SAMPLE_SAMPLEBUILDERENGINE_ISAMPLEBUILDER_H
#include "Param/Base/IParameterized.h"
@@ -34,4 +34,4 @@ public:
virtual size_t size() { return 1; }
};
-#endif // BORNAGAIN_CORE_SAMPLEBUILDERENGINE_ISAMPLEBUILDER_H
+#endif // BORNAGAIN_SAMPLE_SAMPLEBUILDERENGINE_ISAMPLEBUILDER_H
diff --git a/Sample/SampleBuilderEngine/SampleBuilderNode.h b/Sample/SampleBuilderEngine/SampleBuilderNode.h
index a7fccd573de..5980425e38c 100644
--- a/Sample/SampleBuilderEngine/SampleBuilderNode.h
+++ b/Sample/SampleBuilderEngine/SampleBuilderNode.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SAMPLEBUILDERENGINE_SAMPLEBUILDERNODE_H
-#define BORNAGAIN_CORE_SAMPLEBUILDERENGINE_SAMPLEBUILDERNODE_H
+#ifndef BORNAGAIN_SAMPLE_SAMPLEBUILDERENGINE_SAMPLEBUILDERNODE_H
+#define BORNAGAIN_SAMPLE_SAMPLEBUILDERENGINE_SAMPLEBUILDERNODE_H
#include "Param/Node/INode.h"
#include <memory>
@@ -49,4 +49,4 @@ private:
std::shared_ptr<ISampleBuilder> m_sample_builder;
};
-#endif // BORNAGAIN_CORE_SAMPLEBUILDERENGINE_SAMPLEBUILDERNODE_H
+#endif // BORNAGAIN_SAMPLE_SAMPLEBUILDERENGINE_SAMPLEBUILDERNODE_H
diff --git a/Sample/SampleBuilderEngine/SampleComponents.h b/Sample/SampleBuilderEngine/SampleComponents.h
index b2f994bfbe1..fbbf3e4104b 100644
--- a/Sample/SampleBuilderEngine/SampleComponents.h
+++ b/Sample/SampleBuilderEngine/SampleComponents.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SAMPLEBUILDERENGINE_SAMPLECOMPONENTS_H
-#define BORNAGAIN_CORE_SAMPLEBUILDERENGINE_SAMPLECOMPONENTS_H
+#ifndef BORNAGAIN_SAMPLE_SAMPLEBUILDERENGINE_SAMPLECOMPONENTS_H
+#define BORNAGAIN_SAMPLE_SAMPLEBUILDERENGINE_SAMPLECOMPONENTS_H
#include "Sample/Correlations/FTDistributions2D.h"
#include "Sample/SampleBuilderEngine/IRegistry.h"
@@ -36,4 +36,4 @@ public:
FormFactorComponents();
};
-#endif // BORNAGAIN_CORE_SAMPLEBUILDERENGINE_SAMPLECOMPONENTS_H
+#endif // BORNAGAIN_SAMPLE_SAMPLEBUILDERENGINE_SAMPLECOMPONENTS_H
diff --git a/Sample/SampleBuilderEngine/SampleProvider.h b/Sample/SampleBuilderEngine/SampleProvider.h
index 2b7f40819fe..b620cdcce65 100644
--- a/Sample/SampleBuilderEngine/SampleProvider.h
+++ b/Sample/SampleBuilderEngine/SampleProvider.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SAMPLEBUILDERENGINE_SAMPLEPROVIDER_H
-#define BORNAGAIN_CORE_SAMPLEBUILDERENGINE_SAMPLEPROVIDER_H
+#ifndef BORNAGAIN_SAMPLE_SAMPLEBUILDERENGINE_SAMPLEPROVIDER_H
+#define BORNAGAIN_SAMPLE_SAMPLEBUILDERENGINE_SAMPLEPROVIDER_H
#include "Sample/SampleBuilderEngine/SampleBuilderNode.h"
@@ -51,4 +51,4 @@ private:
SampleBuilderNode m_sample_builder;
};
-#endif // BORNAGAIN_CORE_SAMPLEBUILDERENGINE_SAMPLEPROVIDER_H
+#endif // BORNAGAIN_SAMPLE_SAMPLEBUILDERENGINE_SAMPLEPROVIDER_H
diff --git a/Sample/Scattering/FormFactorBAPol.h b/Sample/Scattering/FormFactorBAPol.h
index 08dc5a83f1b..90d5928c7ae 100644
--- a/Sample/Scattering/FormFactorBAPol.h
+++ b/Sample/Scattering/FormFactorBAPol.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_FORMFACTORBAPOL_H
-#define BORNAGAIN_CORE_MULTILAYER_FORMFACTORBAPOL_H
+#ifndef BORNAGAIN_SAMPLE_SCATTERING_FORMFACTORBAPOL_H
+#define BORNAGAIN_SAMPLE_SCATTERING_FORMFACTORBAPOL_H
#include "Sample/Scattering/IFormFactor.h"
#include <memory>
@@ -56,4 +56,4 @@ private:
std::unique_ptr<IFormFactor> m_form_factor;
};
-#endif // BORNAGAIN_CORE_MULTILAYER_FORMFACTORBAPOL_H
+#endif // BORNAGAIN_SAMPLE_SCATTERING_FORMFACTORBAPOL_H
diff --git a/Sample/Scattering/FormFactorDWBA.h b/Sample/Scattering/FormFactorDWBA.h
index 6586bb0ab27..1eb7ccb0635 100644
--- a/Sample/Scattering/FormFactorDWBA.h
+++ b/Sample/Scattering/FormFactorDWBA.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_FORMFACTORDWBA_H
-#define BORNAGAIN_CORE_MULTILAYER_FORMFACTORDWBA_H
+#ifndef BORNAGAIN_SAMPLE_SCATTERING_FORMFACTORDWBA_H
+#define BORNAGAIN_SAMPLE_SCATTERING_FORMFACTORDWBA_H
#include "Sample/Scattering/IFormFactor.h"
#include <memory>
@@ -62,4 +62,4 @@ private:
std::unique_ptr<const ILayerRTCoefficients> m_out_coeffs;
};
-#endif // BORNAGAIN_CORE_MULTILAYER_FORMFACTORDWBA_H
+#endif // BORNAGAIN_SAMPLE_SCATTERING_FORMFACTORDWBA_H
diff --git a/Sample/Scattering/FormFactorDWBAPol.h b/Sample/Scattering/FormFactorDWBAPol.h
index 04a15dbcb41..e3ad30b3187 100644
--- a/Sample/Scattering/FormFactorDWBAPol.h
+++ b/Sample/Scattering/FormFactorDWBAPol.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_FORMFACTORDWBAPOL_H
-#define BORNAGAIN_CORE_MULTILAYER_FORMFACTORDWBAPOL_H
+#ifndef BORNAGAIN_SAMPLE_SCATTERING_FORMFACTORDWBAPOL_H
+#define BORNAGAIN_SAMPLE_SCATTERING_FORMFACTORDWBAPOL_H
#include "Sample/Scattering/IFormFactor.h"
#include <memory>
@@ -66,4 +66,4 @@ private:
std::unique_ptr<const ILayerRTCoefficients> m_out_coeffs;
};
-#endif // BORNAGAIN_CORE_MULTILAYER_FORMFACTORDWBAPOL_H
+#endif // BORNAGAIN_SAMPLE_SCATTERING_FORMFACTORDWBAPOL_H
diff --git a/Sample/Scattering/FormFactorDecoratorMaterial.h b/Sample/Scattering/FormFactorDecoratorMaterial.h
index 64cd9ff4462..77f40e401f4 100644
--- a/Sample/Scattering/FormFactorDecoratorMaterial.h
+++ b/Sample/Scattering/FormFactorDecoratorMaterial.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SCATTERING_FORMFACTORDECORATORMATERIAL_H
-#define BORNAGAIN_CORE_SCATTERING_FORMFACTORDECORATORMATERIAL_H
+#ifndef BORNAGAIN_SAMPLE_SCATTERING_FORMFACTORDECORATORMATERIAL_H
+#define BORNAGAIN_SAMPLE_SCATTERING_FORMFACTORDECORATORMATERIAL_H
#include "Sample/Material/Material.h"
#include "Sample/Scattering/IFormFactorDecorator.h"
@@ -53,4 +53,4 @@ private:
Material m_ambient_material;
};
-#endif // BORNAGAIN_CORE_SCATTERING_FORMFACTORDECORATORMATERIAL_H
+#endif // BORNAGAIN_SAMPLE_SCATTERING_FORMFACTORDECORATORMATERIAL_H
diff --git a/Sample/Scattering/FormFactorDecoratorPositionFactor.h b/Sample/Scattering/FormFactorDecoratorPositionFactor.h
index d3d36c61b98..15bde0d5d24 100644
--- a/Sample/Scattering/FormFactorDecoratorPositionFactor.h
+++ b/Sample/Scattering/FormFactorDecoratorPositionFactor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SCATTERING_FORMFACTORDECORATORPOSITIONFACTOR_H
-#define BORNAGAIN_CORE_SCATTERING_FORMFACTORDECORATORPOSITIONFACTOR_H
+#ifndef BORNAGAIN_SAMPLE_SCATTERING_FORMFACTORDECORATORPOSITIONFACTOR_H
+#define BORNAGAIN_SAMPLE_SCATTERING_FORMFACTORDECORATORPOSITIONFACTOR_H
#include "Sample/Scattering/IFormFactorDecorator.h"
@@ -47,4 +47,4 @@ private:
kvector_t m_position;
};
-#endif // BORNAGAIN_CORE_SCATTERING_FORMFACTORDECORATORPOSITIONFACTOR_H
+#endif // BORNAGAIN_SAMPLE_SCATTERING_FORMFACTORDECORATORPOSITIONFACTOR_H
diff --git a/Sample/Scattering/FormFactorDecoratorRotation.h b/Sample/Scattering/FormFactorDecoratorRotation.h
index 0241d2e69e0..937ae9819a5 100644
--- a/Sample/Scattering/FormFactorDecoratorRotation.h
+++ b/Sample/Scattering/FormFactorDecoratorRotation.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SCATTERING_FORMFACTORDECORATORROTATION_H
-#define BORNAGAIN_CORE_SCATTERING_FORMFACTORDECORATORROTATION_H
+#ifndef BORNAGAIN_SAMPLE_SCATTERING_FORMFACTORDECORATORROTATION_H
+#define BORNAGAIN_SAMPLE_SCATTERING_FORMFACTORDECORATORROTATION_H
#include "Base/Vector/Transform3D.h"
#include "Sample/Scattering/IFormFactorDecorator.h"
@@ -47,4 +47,4 @@ private:
FormFactorDecoratorRotation(const IFormFactor& form_factor, const Transform3D& transform);
};
-#endif // BORNAGAIN_CORE_SCATTERING_FORMFACTORDECORATORROTATION_H
+#endif // BORNAGAIN_SAMPLE_SCATTERING_FORMFACTORDECORATORROTATION_H
diff --git a/Sample/Scattering/IFormFactor.h b/Sample/Scattering/IFormFactor.h
index 603b2aadae1..4bb7234eeb7 100644
--- a/Sample/Scattering/IFormFactor.h
+++ b/Sample/Scattering/IFormFactor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SCATTERING_IFORMFACTOR_H
-#define BORNAGAIN_CORE_SCATTERING_IFORMFACTOR_H
+#ifndef BORNAGAIN_SAMPLE_SCATTERING_IFORMFACTOR_H
+#define BORNAGAIN_SAMPLE_SCATTERING_IFORMFACTOR_H
#include "Base/Types/Complex.h"
#include "Sample/Scattering/ISample.h"
@@ -91,4 +91,4 @@ protected:
IFormFactor* createTransformedFormFactor(const IFormFactor& formfactor, const IRotation& rot,
kvector_t translation);
-#endif // BORNAGAIN_CORE_SCATTERING_IFORMFACTOR_H
+#endif // BORNAGAIN_SAMPLE_SCATTERING_IFORMFACTOR_H
diff --git a/Sample/Scattering/IFormFactorBorn.h b/Sample/Scattering/IFormFactorBorn.h
index 30f87b3a587..314217c096f 100644
--- a/Sample/Scattering/IFormFactorBorn.h
+++ b/Sample/Scattering/IFormFactorBorn.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SCATTERING_IFORMFACTORBORN_H
-#define BORNAGAIN_CORE_SCATTERING_IFORMFACTORBORN_H
+#ifndef BORNAGAIN_SAMPLE_SCATTERING_IFORMFACTORBORN_H
+#define BORNAGAIN_SAMPLE_SCATTERING_IFORMFACTORBORN_H
#include "Sample/Scattering/IFormFactor.h"
@@ -109,4 +109,4 @@ public:
};
#endif
-#endif // BORNAGAIN_CORE_SCATTERING_IFORMFACTORBORN_H
+#endif // BORNAGAIN_SAMPLE_SCATTERING_IFORMFACTORBORN_H
diff --git a/Sample/Scattering/IFormFactorDecorator.h b/Sample/Scattering/IFormFactorDecorator.h
index e2ad8fc48aa..1c9ae667326 100644
--- a/Sample/Scattering/IFormFactorDecorator.h
+++ b/Sample/Scattering/IFormFactorDecorator.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SCATTERING_IFORMFACTORDECORATOR_H
-#define BORNAGAIN_CORE_SCATTERING_IFORMFACTORDECORATOR_H
+#ifndef BORNAGAIN_SAMPLE_SCATTERING_IFORMFACTORDECORATOR_H
+#define BORNAGAIN_SAMPLE_SCATTERING_IFORMFACTORDECORATOR_H
#include "Sample/Scattering/IFormFactor.h"
@@ -54,4 +54,4 @@ protected:
IFormFactor* m_form_factor;
};
-#endif // BORNAGAIN_CORE_SCATTERING_IFORMFACTORDECORATOR_H
+#endif // BORNAGAIN_SAMPLE_SCATTERING_IFORMFACTORDECORATOR_H
diff --git a/Sample/Scattering/ISample.h b/Sample/Scattering/ISample.h
index fb7acbd612b..b3817c7fc46 100644
--- a/Sample/Scattering/ISample.h
+++ b/Sample/Scattering/ISample.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SCATTERING_ISAMPLE_H
-#define BORNAGAIN_CORE_SCATTERING_ISAMPLE_H
+#ifndef BORNAGAIN_SAMPLE_SCATTERING_ISAMPLE_H
+#define BORNAGAIN_SAMPLE_SCATTERING_ISAMPLE_H
#include "Base/Types/ICloneable.h"
#include "Param/Node/INode.h"
@@ -40,4 +40,4 @@ public:
std::vector<const Material*> containedMaterials() const;
};
-#endif // BORNAGAIN_CORE_SCATTERING_ISAMPLE_H
+#endif // BORNAGAIN_SAMPLE_SCATTERING_ISAMPLE_H
diff --git a/Sample/Scattering/LayerFillLimits.h b/Sample/Scattering/LayerFillLimits.h
index 18712344b43..de3345e66e3 100644
--- a/Sample/Scattering/LayerFillLimits.h
+++ b/Sample/Scattering/LayerFillLimits.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_LAYERFILLLIMITS_H
-#define BORNAGAIN_CORE_MULTILAYER_LAYERFILLLIMITS_H
+#ifndef BORNAGAIN_SAMPLE_SCATTERING_LAYERFILLLIMITS_H
+#define BORNAGAIN_SAMPLE_SCATTERING_LAYERFILLLIMITS_H
#include "Sample/Scattering/ZLimits.h"
#include <cstddef>
@@ -46,4 +46,4 @@ private:
std::vector<ZLimits> m_layer_fill_limits;
};
-#endif // BORNAGAIN_CORE_MULTILAYER_LAYERFILLLIMITS_H
+#endif // BORNAGAIN_SAMPLE_SCATTERING_LAYERFILLLIMITS_H
diff --git a/Sample/Scattering/Rotations.h b/Sample/Scattering/Rotations.h
index 736ba50501f..1b4b94a6737 100644
--- a/Sample/Scattering/Rotations.h
+++ b/Sample/Scattering/Rotations.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SCATTERING_ROTATIONS_H
-#define BORNAGAIN_CORE_SCATTERING_ROTATIONS_H
+#ifndef BORNAGAIN_SAMPLE_SCATTERING_ROTATIONS_H
+#define BORNAGAIN_SAMPLE_SCATTERING_ROTATIONS_H
#include "Base/Types/ICloneable.h"
#include "Param/Node/INode.h"
@@ -152,4 +152,4 @@ protected:
double m_alpha, m_beta, m_gamma;
};
-#endif // BORNAGAIN_CORE_SCATTERING_ROTATIONS_H
+#endif // BORNAGAIN_SAMPLE_SCATTERING_ROTATIONS_H
diff --git a/Sample/Scattering/ZLimits.h b/Sample/Scattering/ZLimits.h
index c60a4a887eb..87abf697fbc 100644
--- a/Sample/Scattering/ZLimits.h
+++ b/Sample/Scattering/ZLimits.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SCATTERING_ZLIMITS_H
-#define BORNAGAIN_CORE_SCATTERING_ZLIMITS_H
+#ifndef BORNAGAIN_SAMPLE_SCATTERING_ZLIMITS_H
+#define BORNAGAIN_SAMPLE_SCATTERING_ZLIMITS_H
#include <iostream>
@@ -67,4 +67,4 @@ bool operator!=(const ZLimits& left, const ZLimits& right);
std::ostream& operator<<(std::ostream& ostr, const ZLimits& limits);
-#endif // BORNAGAIN_CORE_SCATTERING_ZLIMITS_H
+#endif // BORNAGAIN_SAMPLE_SCATTERING_ZLIMITS_H
diff --git a/Sample/Shapes/Box.h b/Sample/Shapes/Box.h
index a78982548f7..b77d836069d 100644
--- a/Sample/Shapes/Box.h
+++ b/Sample/Shapes/Box.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SHAPES_BOX_H
-#define BORNAGAIN_CORE_SHAPES_BOX_H
+#ifndef BORNAGAIN_SAMPLE_SHAPES_BOX_H
+#define BORNAGAIN_SAMPLE_SHAPES_BOX_H
#include "Sample/Shapes/IShape.h"
@@ -24,4 +24,4 @@ public:
~Box();
};
-#endif // BORNAGAIN_CORE_SHAPES_BOX_H
+#endif // BORNAGAIN_SAMPLE_SHAPES_BOX_H
diff --git a/Sample/Shapes/DoubleEllipse.h b/Sample/Shapes/DoubleEllipse.h
index e61575803cf..4119c928e8b 100644
--- a/Sample/Shapes/DoubleEllipse.h
+++ b/Sample/Shapes/DoubleEllipse.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SHAPES_DOUBLEELLIPSE_H
-#define BORNAGAIN_CORE_SHAPES_DOUBLEELLIPSE_H
+#ifndef BORNAGAIN_SAMPLE_SHAPES_DOUBLEELLIPSE_H
+#define BORNAGAIN_SAMPLE_SHAPES_DOUBLEELLIPSE_H
#include "Sample/Shapes/IShape.h"
@@ -24,4 +24,4 @@ public:
~DoubleEllipse();
};
-#endif // BORNAGAIN_CORE_SHAPES_DOUBLEELLIPSE_H
+#endif // BORNAGAIN_SAMPLE_SHAPES_DOUBLEELLIPSE_H
diff --git a/Sample/Shapes/IShape.h b/Sample/Shapes/IShape.h
index 48d18d4a3e3..f4b08c3bad2 100644
--- a/Sample/Shapes/IShape.h
+++ b/Sample/Shapes/IShape.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SHAPES_ISHAPE_H
-#define BORNAGAIN_CORE_SHAPES_ISHAPE_H
+#ifndef BORNAGAIN_SAMPLE_SHAPES_ISHAPE_H
+#define BORNAGAIN_SAMPLE_SHAPES_ISHAPE_H
#include "Base/Vector/Vectors3D.h"
#include <vector>
@@ -48,4 +48,4 @@ std::vector<kvector_t> RectangleVertices(double length, double width, double z);
//! Generate vertices of centered ellipse with given semi-axes at height z
std::vector<kvector_t> EllipseVertices(double r_x, double r_y, double z);
-#endif // BORNAGAIN_CORE_SHAPES_ISHAPE_H
+#endif // BORNAGAIN_SAMPLE_SHAPES_ISHAPE_H
diff --git a/Sample/Shapes/RippleCosine.h b/Sample/Shapes/RippleCosine.h
index 9e7009d53f9..fa8bcab7eb8 100644
--- a/Sample/Shapes/RippleCosine.h
+++ b/Sample/Shapes/RippleCosine.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SHAPES_RIPPLECOSINE_H
-#define BORNAGAIN_CORE_SHAPES_RIPPLECOSINE_H
+#ifndef BORNAGAIN_SAMPLE_SHAPES_RIPPLECOSINE_H
+#define BORNAGAIN_SAMPLE_SHAPES_RIPPLECOSINE_H
#include "Sample/Shapes/IShape.h"
@@ -24,4 +24,4 @@ public:
~RippleCosine();
};
-#endif // BORNAGAIN_CORE_SHAPES_RIPPLECOSINE_H
+#endif // BORNAGAIN_SAMPLE_SHAPES_RIPPLECOSINE_H
diff --git a/Sample/Shapes/RippleSawtooth.h b/Sample/Shapes/RippleSawtooth.h
index d1f1d607166..0f790cb3c63 100644
--- a/Sample/Shapes/RippleSawtooth.h
+++ b/Sample/Shapes/RippleSawtooth.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SHAPES_RIPPLESAWTOOTH_H
-#define BORNAGAIN_CORE_SHAPES_RIPPLESAWTOOTH_H
+#ifndef BORNAGAIN_SAMPLE_SHAPES_RIPPLESAWTOOTH_H
+#define BORNAGAIN_SAMPLE_SHAPES_RIPPLESAWTOOTH_H
#include "Sample/Shapes/IShape.h"
@@ -24,4 +24,4 @@ public:
~RippleSawtooth();
};
-#endif // BORNAGAIN_CORE_SHAPES_RIPPLESAWTOOTH_H
+#endif // BORNAGAIN_SAMPLE_SHAPES_RIPPLESAWTOOTH_H
diff --git a/Sample/Shapes/TruncatedEllipsoid.h b/Sample/Shapes/TruncatedEllipsoid.h
index 29726780df9..a1bad4d2bfe 100644
--- a/Sample/Shapes/TruncatedEllipsoid.h
+++ b/Sample/Shapes/TruncatedEllipsoid.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SHAPES_TRUNCATEDELLIPSOID_H
-#define BORNAGAIN_CORE_SHAPES_TRUNCATEDELLIPSOID_H
+#ifndef BORNAGAIN_SAMPLE_SHAPES_TRUNCATEDELLIPSOID_H
+#define BORNAGAIN_SAMPLE_SHAPES_TRUNCATEDELLIPSOID_H
#include "Sample/Shapes/IShape.h"
@@ -24,4 +24,4 @@ public:
~TruncatedEllipsoid();
};
-#endif // BORNAGAIN_CORE_SHAPES_TRUNCATEDELLIPSOID_H
+#endif // BORNAGAIN_SAMPLE_SHAPES_TRUNCATEDELLIPSOID_H
diff --git a/Sample/Slice/KzComputation.h b/Sample/Slice/KzComputation.h
index 6f5eeeab26c..f4af8ae9b50 100644
--- a/Sample/Slice/KzComputation.h
+++ b/Sample/Slice/KzComputation.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_KZCOMPUTATION_H
-#define BORNAGAIN_CORE_MULTILAYER_KZCOMPUTATION_H
+#ifndef BORNAGAIN_SAMPLE_SLICE_KZCOMPUTATION_H
+#define BORNAGAIN_SAMPLE_SLICE_KZCOMPUTATION_H
#include "Base/Types/Complex.h"
#include "Base/Vector/Vectors3D.h"
@@ -48,4 +48,4 @@ std::vector<complex_t> computeKzFromSLDs(const std::vector<Slice>& slices, doubl
std::vector<complex_t> computeKzFromRefIndices(const std::vector<Slice>& slices, kvector_t k);
} // namespace KzComputation
-#endif // BORNAGAIN_CORE_MULTILAYER_KZCOMPUTATION_H
+#endif // BORNAGAIN_SAMPLE_SLICE_KZCOMPUTATION_H
diff --git a/Sample/Slice/LayerInterface.h b/Sample/Slice/LayerInterface.h
index 0ad36e3f68a..edebd0104d7 100644
--- a/Sample/Slice/LayerInterface.h
+++ b/Sample/Slice/LayerInterface.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_LAYERINTERFACE_H
-#define BORNAGAIN_CORE_MULTILAYER_LAYERINTERFACE_H
+#ifndef BORNAGAIN_SAMPLE_SLICE_LAYERINTERFACE_H
+#define BORNAGAIN_SAMPLE_SLICE_LAYERINTERFACE_H
#include "Sample/Scattering/ISample.h"
#include <memory>
@@ -75,4 +75,4 @@ inline const Layer* LayerInterface::bottomLayer() const
return m_bottomLayer;
}
-#endif // BORNAGAIN_CORE_MULTILAYER_LAYERINTERFACE_H
+#endif // BORNAGAIN_SAMPLE_SLICE_LAYERINTERFACE_H
diff --git a/Sample/Slice/LayerRoughness.h b/Sample/Slice/LayerRoughness.h
index 4273c963c79..9a8281206b7 100644
--- a/Sample/Slice/LayerRoughness.h
+++ b/Sample/Slice/LayerRoughness.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_LAYERROUGHNESS_H
-#define BORNAGAIN_CORE_MULTILAYER_LAYERROUGHNESS_H
+#ifndef BORNAGAIN_SAMPLE_SLICE_LAYERROUGHNESS_H
+#define BORNAGAIN_SAMPLE_SLICE_LAYERROUGHNESS_H
#include "Sample/Scattering/ISample.h"
@@ -66,4 +66,4 @@ private:
double m_lateralCorrLength; //!< lateral correlation length of the roughness
};
-#endif // BORNAGAIN_CORE_MULTILAYER_LAYERROUGHNESS_H
+#endif // BORNAGAIN_SAMPLE_SLICE_LAYERROUGHNESS_H
diff --git a/Sample/Slice/Slice.h b/Sample/Slice/Slice.h
index c09a8c6013e..0bd9751b985 100644
--- a/Sample/Slice/Slice.h
+++ b/Sample/Slice/Slice.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_SLICE_H
-#define BORNAGAIN_CORE_MULTILAYER_SLICE_H
+#ifndef BORNAGAIN_SAMPLE_SLICE_SLICE_H
+#define BORNAGAIN_SAMPLE_SLICE_SLICE_H
#include "Sample/Material/Material.h"
#include <memory>
@@ -64,4 +64,4 @@ private:
std::unique_ptr<LayerRoughness> m_top_roughness;
};
-#endif // BORNAGAIN_CORE_MULTILAYER_SLICE_H
+#endif // BORNAGAIN_SAMPLE_SLICE_SLICE_H
diff --git a/Sample/Slice/SlicedFormFactorList.h b/Sample/Slice/SlicedFormFactorList.h
index ee05016bac4..84182826c9a 100644
--- a/Sample/Slice/SlicedFormFactorList.h
+++ b/Sample/Slice/SlicedFormFactorList.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_SLICEDFORMFACTORLIST_H
-#define BORNAGAIN_CORE_MULTILAYER_SLICEDFORMFACTORLIST_H
+#ifndef BORNAGAIN_SAMPLE_SLICE_SLICEDFORMFACTORLIST_H
+#define BORNAGAIN_SAMPLE_SLICE_SLICEDFORMFACTORLIST_H
#include "Sample/Particle/HomogeneousRegion.h"
#include "Sample/Scattering/IFormFactor.h"
@@ -52,4 +52,4 @@ private:
std::map<size_t, std::vector<HomogeneousRegion>> m_region_map;
};
-#endif // BORNAGAIN_CORE_MULTILAYER_SLICEDFORMFACTORLIST_H
+#endif // BORNAGAIN_SAMPLE_SLICE_SLICEDFORMFACTORLIST_H
diff --git a/Sample/SoftParticle/FormFactorGauss.h b/Sample/SoftParticle/FormFactorGauss.h
index 8962a24924d..9ad6ce54423 100644
--- a/Sample/SoftParticle/FormFactorGauss.h
+++ b/Sample/SoftParticle/FormFactorGauss.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORGAUSS_H
-#define BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORGAUSS_H
+#ifndef BORNAGAIN_SAMPLE_SOFTPARTICLE_FORMFACTORGAUSS_H
+#define BORNAGAIN_SAMPLE_SOFTPARTICLE_FORMFACTORGAUSS_H
#include "Sample/Scattering/IFormFactorBorn.h"
@@ -46,4 +46,4 @@ private:
void initialize();
};
-#endif // BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORGAUSS_H
+#endif // BORNAGAIN_SAMPLE_SOFTPARTICLE_FORMFACTORGAUSS_H
diff --git a/Sample/SoftParticle/FormFactorSphereGaussianRadius.h b/Sample/SoftParticle/FormFactorSphereGaussianRadius.h
index bfd89a98ec2..d4042de7b60 100644
--- a/Sample/SoftParticle/FormFactorSphereGaussianRadius.h
+++ b/Sample/SoftParticle/FormFactorSphereGaussianRadius.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORSPHEREGAUSSIANRADIUS_H
-#define BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORSPHEREGAUSSIANRADIUS_H
+#ifndef BORNAGAIN_SAMPLE_SOFTPARTICLE_FORMFACTORSPHEREGAUSSIANRADIUS_H
+#define BORNAGAIN_SAMPLE_SOFTPARTICLE_FORMFACTORSPHEREGAUSSIANRADIUS_H
#include "Sample/Scattering/IFormFactorBorn.h"
#include <memory>
@@ -49,4 +49,4 @@ private:
double m_mean_r3; //!< This is the radius that gives the mean volume
};
-#endif // BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORSPHEREGAUSSIANRADIUS_H
+#endif // BORNAGAIN_SAMPLE_SOFTPARTICLE_FORMFACTORSPHEREGAUSSIANRADIUS_H
diff --git a/Sample/SoftParticle/FormFactorSphereLogNormalRadius.h b/Sample/SoftParticle/FormFactorSphereLogNormalRadius.h
index f15a6a63728..c7b9c29da3b 100644
--- a/Sample/SoftParticle/FormFactorSphereLogNormalRadius.h
+++ b/Sample/SoftParticle/FormFactorSphereLogNormalRadius.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORSPHERELOGNORMALRADIUS_H
-#define BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORSPHERELOGNORMALRADIUS_H
+#ifndef BORNAGAIN_SAMPLE_SOFTPARTICLE_FORMFACTORSPHERELOGNORMALRADIUS_H
+#define BORNAGAIN_SAMPLE_SOFTPARTICLE_FORMFACTORSPHERELOGNORMALRADIUS_H
#include "Base/Types/SafePointerVector.h"
#include "Sample/Scattering/IFormFactorBorn.h"
@@ -48,4 +48,4 @@ private:
std::vector<double> m_probabilities;
};
-#endif // BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORSPHERELOGNORMALRADIUS_H
+#endif // BORNAGAIN_SAMPLE_SOFTPARTICLE_FORMFACTORSPHERELOGNORMALRADIUS_H
diff --git a/Sample/SoftParticle/SoftParticles.h b/Sample/SoftParticle/SoftParticles.h
index fdb65430c8d..7b0d844198d 100644
--- a/Sample/SoftParticle/SoftParticles.h
+++ b/Sample/SoftParticle/SoftParticles.h
@@ -12,11 +12,11 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SOFTPARTICLE_SOFTPARTICLES_H
-#define BORNAGAIN_CORE_SOFTPARTICLE_SOFTPARTICLES_H
+#ifndef BORNAGAIN_SAMPLE_SOFTPARTICLE_SOFTPARTICLES_H
+#define BORNAGAIN_SAMPLE_SOFTPARTICLE_SOFTPARTICLES_H
#include "Sample/SoftParticle/FormFactorGauss.h"
#include "Sample/SoftParticle/FormFactorSphereGaussianRadius.h"
#include "Sample/SoftParticle/FormFactorSphereLogNormalRadius.h"
-#endif // BORNAGAIN_CORE_SOFTPARTICLE_SOFTPARTICLES_H
+#endif // BORNAGAIN_SAMPLE_SOFTPARTICLE_SOFTPARTICLES_H
diff --git a/Sample/Specular/ISpecularStrategy.h b/Sample/Specular/ISpecularStrategy.h
index fef8fb11e58..7d1e37f73ad 100644
--- a/Sample/Specular/ISpecularStrategy.h
+++ b/Sample/Specular/ISpecularStrategy.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_ISPECULARSTRATEGY_H
-#define BORNAGAIN_CORE_MULTILAYER_ISPECULARSTRATEGY_H
+#ifndef BORNAGAIN_SAMPLE_SPECULAR_ISPECULARSTRATEGY_H
+#define BORNAGAIN_SAMPLE_SPECULAR_ISPECULARSTRATEGY_H
#include "Base/Types/Complex.h"
#include "Base/Vector/Vectors3D.h"
@@ -45,4 +45,4 @@ public:
const std::vector<complex_t>& kz) const = 0;
};
-#endif // BORNAGAIN_CORE_MULTILAYER_ISPECULARSTRATEGY_H
+#endif // BORNAGAIN_SAMPLE_SPECULAR_ISPECULARSTRATEGY_H
diff --git a/Sample/Specular/SpecularMagneticNewNCStrategy.h b/Sample/Specular/SpecularMagneticNewNCStrategy.h
index ab6c9fd0847..95e8d0028d2 100644
--- a/Sample/Specular/SpecularMagneticNewNCStrategy.h
+++ b/Sample/Specular/SpecularMagneticNewNCStrategy.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICNEWNCSTRATEGY_H
-#define BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICNEWNCSTRATEGY_H
+#ifndef BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICNEWNCSTRATEGY_H
+#define BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICNEWNCSTRATEGY_H
#include "Sample/Specular/SpecularMagneticNewStrategy.h"
#include <memory>
@@ -39,4 +39,4 @@ private:
const MatrixRTCoefficients_v3& coeff_i1, double sigma) const;
};
-#endif // BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICNEWNCSTRATEGY_H
+#endif // BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICNEWNCSTRATEGY_H
diff --git a/Sample/Specular/SpecularMagneticNewStrategy.h b/Sample/Specular/SpecularMagneticNewStrategy.h
index b314233671c..b02ae99bcfd 100644
--- a/Sample/Specular/SpecularMagneticNewStrategy.h
+++ b/Sample/Specular/SpecularMagneticNewStrategy.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICNEWSTRATEGY_H
-#define BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICNEWSTRATEGY_H
+#ifndef BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICNEWSTRATEGY_H
+#define BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICNEWSTRATEGY_H
#include "Sample/RT/MatrixRTCoefficients_v3.h"
#include "Sample/Specular/ISpecularStrategy.h"
@@ -54,4 +54,4 @@ private:
const std::vector<Slice>& slices) const;
};
-#endif // BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICNEWSTRATEGY_H
+#endif // BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICNEWSTRATEGY_H
diff --git a/Sample/Specular/SpecularMagneticNewTanhStrategy.h b/Sample/Specular/SpecularMagneticNewTanhStrategy.h
index 509871a6ad0..1ea39fb3d2b 100644
--- a/Sample/Specular/SpecularMagneticNewTanhStrategy.h
+++ b/Sample/Specular/SpecularMagneticNewTanhStrategy.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICNEWTANHSTRATEGY_H
-#define BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICNEWTANHSTRATEGY_H
+#ifndef BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICNEWTANHSTRATEGY_H
+#define BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICNEWTANHSTRATEGY_H
#include "Sample/Specular/SpecularMagneticNewStrategy.h"
@@ -36,4 +36,4 @@ private:
bool inverse = false) const;
};
-#endif // BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICNEWTANHSTRATEGY_H
+#endif // BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICNEWTANHSTRATEGY_H
diff --git a/Sample/Specular/SpecularMagneticOldStrategy.h b/Sample/Specular/SpecularMagneticOldStrategy.h
index 2ad65921c08..4283847c6c4 100644
--- a/Sample/Specular/SpecularMagneticOldStrategy.h
+++ b/Sample/Specular/SpecularMagneticOldStrategy.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICOLDSTRATEGY_H
-#define BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICOLDSTRATEGY_H
+#ifndef BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICOLDSTRATEGY_H
+#define BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICOLDSTRATEGY_H
#include "Sample/RT/MatrixRTCoefficients.h"
#include "Sample/Specular/ISpecularStrategy.h"
@@ -37,4 +37,4 @@ public:
}; // class SpecularMagneticOldStrategy
-#endif // BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICOLDSTRATEGY_H
+#endif // BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICOLDSTRATEGY_H
diff --git a/Sample/Specular/SpecularMagneticStrategy.h b/Sample/Specular/SpecularMagneticStrategy.h
index 4df0c0b365c..1dad6b1ade3 100644
--- a/Sample/Specular/SpecularMagneticStrategy.h
+++ b/Sample/Specular/SpecularMagneticStrategy.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICSTRATEGY_H
-#define BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICSTRATEGY_H
+#ifndef BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICSTRATEGY_H
+#define BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICSTRATEGY_H
#include "Sample/RT/MatrixRTCoefficients_v2.h"
#include "Sample/Specular/ISpecularStrategy.h"
@@ -68,4 +68,4 @@ private:
findNormalizationCoefficients(const MatrixRTCoefficients_v2& coeff);
};
-#endif // BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICSTRATEGY_H
+#endif // BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICSTRATEGY_H
diff --git a/Sample/Specular/SpecularScalarNCStrategy.h b/Sample/Specular/SpecularScalarNCStrategy.h
index ff99d9e22ad..bb6e39f5492 100644
--- a/Sample/Specular/SpecularScalarNCStrategy.h
+++ b/Sample/Specular/SpecularScalarNCStrategy.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARSCALARNCSTRATEGY_H
-#define BORNAGAIN_CORE_MULTILAYER_SPECULARSCALARNCSTRATEGY_H
+#ifndef BORNAGAIN_SAMPLE_SPECULAR_SPECULARSCALARNCSTRATEGY_H
+#define BORNAGAIN_SAMPLE_SPECULAR_SPECULARSCALARNCSTRATEGY_H
#include "Sample/Specular/SpecularScalarStrategy.h"
@@ -38,4 +38,4 @@ private:
double sigma) const override;
};
-#endif // BORNAGAIN_CORE_MULTILAYER_SPECULARSCALARNCSTRATEGY_H
+#endif // BORNAGAIN_SAMPLE_SPECULAR_SPECULARSCALARNCSTRATEGY_H
diff --git a/Sample/Specular/SpecularScalarStrategy.h b/Sample/Specular/SpecularScalarStrategy.h
index 9e4716538df..47348952e00 100644
--- a/Sample/Specular/SpecularScalarStrategy.h
+++ b/Sample/Specular/SpecularScalarStrategy.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARSCALARSTRATEGY_H
-#define BORNAGAIN_CORE_MULTILAYER_SPECULARSCALARSTRATEGY_H
+#ifndef BORNAGAIN_SAMPLE_SPECULAR_SPECULARSCALARSTRATEGY_H
+#define BORNAGAIN_SAMPLE_SPECULAR_SPECULARSCALARSTRATEGY_H
#include "Sample/RT/ScalarRTCoefficients.h"
#include "Sample/Specular/ISpecularStrategy.h"
@@ -55,4 +55,4 @@ private:
const std::vector<complex_t>& kz) const;
};
-#endif // BORNAGAIN_CORE_MULTILAYER_SPECULARSCALARSTRATEGY_H
+#endif // BORNAGAIN_SAMPLE_SPECULAR_SPECULARSCALARSTRATEGY_H
diff --git a/Sample/Specular/SpecularScalarTanhStrategy.h b/Sample/Specular/SpecularScalarTanhStrategy.h
index cc1434ffcfc..6c22c5a64e8 100644
--- a/Sample/Specular/SpecularScalarTanhStrategy.h
+++ b/Sample/Specular/SpecularScalarTanhStrategy.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARSCALARTANHSTRATEGY_H
-#define BORNAGAIN_CORE_MULTILAYER_SPECULARSCALARTANHSTRATEGY_H
+#ifndef BORNAGAIN_SAMPLE_SPECULAR_SPECULARSCALARTANHSTRATEGY_H
+#define BORNAGAIN_SAMPLE_SPECULAR_SPECULARSCALARTANHSTRATEGY_H
#include "Sample/Specular/SpecularScalarStrategy.h"
@@ -34,4 +34,4 @@ private:
double sigma) const override;
};
-#endif // BORNAGAIN_CORE_MULTILAYER_SPECULARSCALARTANHSTRATEGY_H
+#endif // BORNAGAIN_SAMPLE_SPECULAR_SPECULARSCALARTANHSTRATEGY_H
diff --git a/Sample/StandardSamples/BoxCompositionBuilder.h b/Sample/StandardSamples/BoxCompositionBuilder.h
index 804dd86ab55..2c287c6de44 100644
--- a/Sample/StandardSamples/BoxCompositionBuilder.h
+++ b/Sample/StandardSamples/BoxCompositionBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_BOXCOMPOSITIONBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_BOXCOMPOSITIONBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_BOXCOMPOSITIONBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_BOXCOMPOSITIONBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -62,4 +62,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_BOXCOMPOSITIONBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_BOXCOMPOSITIONBUILDER_H
diff --git a/Sample/StandardSamples/BoxesSquareLatticeBuilder.h b/Sample/StandardSamples/BoxesSquareLatticeBuilder.h
index 92851fee181..c1698475bb3 100644
--- a/Sample/StandardSamples/BoxesSquareLatticeBuilder.h
+++ b/Sample/StandardSamples/BoxesSquareLatticeBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_BOXESSQUARELATTICEBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_BOXESSQUARELATTICEBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_BOXESSQUARELATTICEBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_BOXESSQUARELATTICEBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -26,4 +26,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_BOXESSQUARELATTICEBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_BOXESSQUARELATTICEBUILDER_H
diff --git a/Sample/StandardSamples/CoreShellParticleBuilder.h b/Sample/StandardSamples/CoreShellParticleBuilder.h
index a4a48b87987..557ff0adf8b 100644
--- a/Sample/StandardSamples/CoreShellParticleBuilder.h
+++ b/Sample/StandardSamples/CoreShellParticleBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_CORESHELLPARTICLEBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_CORESHELLPARTICLEBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_CORESHELLPARTICLEBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_CORESHELLPARTICLEBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -35,4 +35,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_CORESHELLPARTICLEBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_CORESHELLPARTICLEBUILDER_H
diff --git a/Sample/StandardSamples/CustomMorphologyBuilder.h b/Sample/StandardSamples/CustomMorphologyBuilder.h
index d618b029848..6652dd83ffd 100644
--- a/Sample/StandardSamples/CustomMorphologyBuilder.h
+++ b/Sample/StandardSamples/CustomMorphologyBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_CUSTOMMORPHOLOGYBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_CUSTOMMORPHOLOGYBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_CUSTOMMORPHOLOGYBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_CUSTOMMORPHOLOGYBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -26,4 +26,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_CUSTOMMORPHOLOGYBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_CUSTOMMORPHOLOGYBUILDER_H
diff --git a/Sample/StandardSamples/CylindersAndPrismsBuilder.h b/Sample/StandardSamples/CylindersAndPrismsBuilder.h
index 5ff0743ed2a..1714872d398 100644
--- a/Sample/StandardSamples/CylindersAndPrismsBuilder.h
+++ b/Sample/StandardSamples/CylindersAndPrismsBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_CYLINDERSANDPRISMSBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_CYLINDERSANDPRISMSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_CYLINDERSANDPRISMSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_CYLINDERSANDPRISMSBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -26,4 +26,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_CYLINDERSANDPRISMSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_CYLINDERSANDPRISMSBUILDER_H
diff --git a/Sample/StandardSamples/CylindersBuilder.h b/Sample/StandardSamples/CylindersBuilder.h
index fb1d5d62e1c..b6829a590da 100644
--- a/Sample/StandardSamples/CylindersBuilder.h
+++ b/Sample/StandardSamples/CylindersBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_CYLINDERSBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_CYLINDERSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_CYLINDERSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_CYLINDERSBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -73,4 +73,4 @@ private:
double m_radius;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_CYLINDERSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_CYLINDERSBUILDER_H
diff --git a/Sample/StandardSamples/FeNiBilayerBuilder.h b/Sample/StandardSamples/FeNiBilayerBuilder.h
index 19c474da148..5bafeb99053 100644
--- a/Sample/StandardSamples/FeNiBilayerBuilder.h
+++ b/Sample/StandardSamples/FeNiBilayerBuilder.h
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_FENIBILAYERBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_FENIBILAYERBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_FENIBILAYERBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_FENIBILAYERBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -54,4 +54,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_FENIBILAYERBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_FENIBILAYERBUILDER_H
diff --git a/Sample/StandardSamples/HomogeneousMultilayerBuilder.h b/Sample/StandardSamples/HomogeneousMultilayerBuilder.h
index cf34e83f999..dc40568db49 100644
--- a/Sample/StandardSamples/HomogeneousMultilayerBuilder.h
+++ b/Sample/StandardSamples/HomogeneousMultilayerBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_HOMOGENEOUSMULTILAYERBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_HOMOGENEOUSMULTILAYERBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_HOMOGENEOUSMULTILAYERBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_HOMOGENEOUSMULTILAYERBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -28,4 +28,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_HOMOGENEOUSMULTILAYERBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_HOMOGENEOUSMULTILAYERBUILDER_H
diff --git a/Sample/StandardSamples/LatticeBuilder.h b/Sample/StandardSamples/LatticeBuilder.h
index 40927e6b3f6..7422110688c 100644
--- a/Sample/StandardSamples/LatticeBuilder.h
+++ b/Sample/StandardSamples/LatticeBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_LATTICEBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_LATTICEBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_LATTICEBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_LATTICEBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -26,4 +26,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_LATTICEBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_LATTICEBUILDER_H
diff --git a/Sample/StandardSamples/LayersWithAbsorptionBuilder.h b/Sample/StandardSamples/LayersWithAbsorptionBuilder.h
index 831552cc781..ca9fc153fe2 100644
--- a/Sample/StandardSamples/LayersWithAbsorptionBuilder.h
+++ b/Sample/StandardSamples/LayersWithAbsorptionBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
#include <memory>
@@ -41,4 +41,4 @@ private:
std::unique_ptr<IFormFactor> m_ff;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBUILDER_H
diff --git a/Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.h b/Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.h
index cdad81f661e..e5079a52ea0 100644
--- a/Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.h
+++ b/Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBYSLDBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBYSLDBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBYSLDBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBYSLDBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -28,4 +28,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBYSLDBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBYSLDBUILDER_H
diff --git a/Sample/StandardSamples/MagneticLayersBuilder.h b/Sample/StandardSamples/MagneticLayersBuilder.h
index 07a1d371aea..38b78b31e93 100644
--- a/Sample/StandardSamples/MagneticLayersBuilder.h
+++ b/Sample/StandardSamples/MagneticLayersBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_MAGNETICLAYERSBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_MAGNETICLAYERSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MAGNETICLAYERSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MAGNETICLAYERSBUILDER_H
#include "Sample/Multilayer/RoughnessModels.h"
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -66,4 +66,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_MAGNETICLAYERSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_MAGNETICLAYERSBUILDER_H
diff --git a/Sample/StandardSamples/MagneticParticlesBuilder.h b/Sample/StandardSamples/MagneticParticlesBuilder.h
index 61dbe20df86..2425ed9e98a 100644
--- a/Sample/StandardSamples/MagneticParticlesBuilder.h
+++ b/Sample/StandardSamples/MagneticParticlesBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_MAGNETICPARTICLESBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_MAGNETICPARTICLESBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MAGNETICPARTICLESBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MAGNETICPARTICLESBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -44,4 +44,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_MAGNETICPARTICLESBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_MAGNETICPARTICLESBUILDER_H
diff --git a/Sample/StandardSamples/MesoCrystalBuilder.h b/Sample/StandardSamples/MesoCrystalBuilder.h
index 5550875a6c8..4a883f414de 100644
--- a/Sample/StandardSamples/MesoCrystalBuilder.h
+++ b/Sample/StandardSamples/MesoCrystalBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_MESOCRYSTALBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_MESOCRYSTALBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MESOCRYSTALBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MESOCRYSTALBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -26,4 +26,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_MESOCRYSTALBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_MESOCRYSTALBUILDER_H
diff --git a/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h b/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h
index c1335734e93..327b514b512 100644
--- a/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h
+++ b/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_MULTILAYERWITHNCROUGHNESSBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_MULTILAYERWITHNCROUGHNESSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTILAYERWITHNCROUGHNESSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTILAYERWITHNCROUGHNESSBUILDER_H
#include "Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h"
@@ -26,4 +26,4 @@ public:
MultiLayer* buildSample() const override;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_MULTILAYERWITHNCROUGHNESSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTILAYERWITHNCROUGHNESSBUILDER_H
diff --git a/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h b/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h
index 904e0d7d776..80e9e666d6d 100644
--- a/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h
+++ b/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_MULTILAYERWITHROUGHNESSBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_MULTILAYERWITHROUGHNESSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTILAYERWITHROUGHNESSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTILAYERWITHROUGHNESSBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -26,4 +26,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_MULTILAYERWITHROUGHNESSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTILAYERWITHROUGHNESSBUILDER_H
diff --git a/Sample/StandardSamples/MultipleLayoutBuilder.h b/Sample/StandardSamples/MultipleLayoutBuilder.h
index 461bbb4ca01..c514480ddea 100644
--- a/Sample/StandardSamples/MultipleLayoutBuilder.h
+++ b/Sample/StandardSamples/MultipleLayoutBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_MULTIPLELAYOUTBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_MULTIPLELAYOUTBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTIPLELAYOUTBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTIPLELAYOUTBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -27,4 +27,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_MULTIPLELAYOUTBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTIPLELAYOUTBUILDER_H
diff --git a/Sample/StandardSamples/ParaCrystalBuilder.h b/Sample/StandardSamples/ParaCrystalBuilder.h
index b1964a8bf57..443c3443730 100644
--- a/Sample/StandardSamples/ParaCrystalBuilder.h
+++ b/Sample/StandardSamples/ParaCrystalBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_PARACRYSTALBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_PARACRYSTALBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARACRYSTALBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARACRYSTALBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
#include <memory>
@@ -66,4 +66,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_PARACRYSTALBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARACRYSTALBUILDER_H
diff --git a/Sample/StandardSamples/ParticleCompositionBuilder.h b/Sample/StandardSamples/ParticleCompositionBuilder.h
index 4bbbb3c2afb..52c214641c3 100644
--- a/Sample/StandardSamples/ParticleCompositionBuilder.h
+++ b/Sample/StandardSamples/ParticleCompositionBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_PARTICLECOMPOSITIONBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_PARTICLECOMPOSITIONBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLECOMPOSITIONBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLECOMPOSITIONBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -26,4 +26,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_PARTICLECOMPOSITIONBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLECOMPOSITIONBUILDER_H
diff --git a/Sample/StandardSamples/ParticleDistributionsBuilder.h b/Sample/StandardSamples/ParticleDistributionsBuilder.h
index 79a1ffa4c74..cc37caf205c 100644
--- a/Sample/StandardSamples/ParticleDistributionsBuilder.h
+++ b/Sample/StandardSamples/ParticleDistributionsBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_PARTICLEDISTRIBUTIONSBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_PARTICLEDISTRIBUTIONSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLEDISTRIBUTIONSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLEDISTRIBUTIONSBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -90,4 +90,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_PARTICLEDISTRIBUTIONSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLEDISTRIBUTIONSBUILDER_H
diff --git a/Sample/StandardSamples/ParticleInVacuumBuilder.h b/Sample/StandardSamples/ParticleInVacuumBuilder.h
index a29dade7f41..6270a16dc31 100644
--- a/Sample/StandardSamples/ParticleInVacuumBuilder.h
+++ b/Sample/StandardSamples/ParticleInVacuumBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_PARTICLEINVACUUMBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_PARTICLEINVACUUMBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLEINVACUUMBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLEINVACUUMBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
#include <memory>
@@ -38,4 +38,4 @@ protected:
std::unique_ptr<IFormFactor> m_ff;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_PARTICLEINVACUUMBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLEINVACUUMBUILDER_H
diff --git a/Sample/StandardSamples/PercusYevickBuilder.h b/Sample/StandardSamples/PercusYevickBuilder.h
index 9703fa7b3da..a1f0236ac11 100644
--- a/Sample/StandardSamples/PercusYevickBuilder.h
+++ b/Sample/StandardSamples/PercusYevickBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_PERCUSYEVICKBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_PERCUSYEVICKBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_PERCUSYEVICKBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_PERCUSYEVICKBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -26,4 +26,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_PERCUSYEVICKBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_PERCUSYEVICKBUILDER_H
diff --git a/Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h b/Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h
index 9b8f04f1150..a12d5b61127 100644
--- a/Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h
+++ b/Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_PLAINMULTILAYERBYSLDBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_PLAINMULTILAYERBYSLDBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_PLAINMULTILAYERBYSLDBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_PLAINMULTILAYERBYSLDBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -40,4 +40,4 @@ protected:
double m_thick_ni; //!< thickness of Ni layer
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_PLAINMULTILAYERBYSLDBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_PLAINMULTILAYERBYSLDBUILDER_H
diff --git a/Sample/StandardSamples/ReferenceMaterials.h b/Sample/StandardSamples/ReferenceMaterials.h
index 8e6f93ee60f..a7849cc0adc 100644
--- a/Sample/StandardSamples/ReferenceMaterials.h
+++ b/Sample/StandardSamples/ReferenceMaterials.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_REFERENCEMATERIALS_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_REFERENCEMATERIALS_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_REFERENCEMATERIALS_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_REFERENCEMATERIALS_H
#include "Sample/Material/MaterialFactoryFuncs.h"
@@ -34,4 +34,4 @@ static const Material Substrate2 = HomogeneousMaterial("Substrate2", 3.212e-6, 3
} // namespace refMat
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_REFERENCEMATERIALS_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_REFERENCEMATERIALS_H
diff --git a/Sample/StandardSamples/ResonatorBuilder.h b/Sample/StandardSamples/ResonatorBuilder.h
index 37b60e6c749..91d8b32f18f 100644
--- a/Sample/StandardSamples/ResonatorBuilder.h
+++ b/Sample/StandardSamples/ResonatorBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_RESONATORBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_RESONATORBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_RESONATORBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_RESONATORBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -30,4 +30,4 @@ private:
double m_l_ti; // titanium layer thickness
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_RESONATORBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_RESONATORBUILDER_H
diff --git a/Sample/StandardSamples/RipplesBuilder.h b/Sample/StandardSamples/RipplesBuilder.h
index 0759e41f2fd..ef773141271 100644
--- a/Sample/StandardSamples/RipplesBuilder.h
+++ b/Sample/StandardSamples/RipplesBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_RIPPLESBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_RIPPLESBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_RIPPLESBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_RIPPLESBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -45,4 +45,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_RIPPLESBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_RIPPLESBUILDER_H
diff --git a/Sample/StandardSamples/RotatedPyramidsBuilder.h b/Sample/StandardSamples/RotatedPyramidsBuilder.h
index 696e8b4f3d2..f59375c357a 100644
--- a/Sample/StandardSamples/RotatedPyramidsBuilder.h
+++ b/Sample/StandardSamples/RotatedPyramidsBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_ROTATEDPYRAMIDSBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_ROTATEDPYRAMIDSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_ROTATEDPYRAMIDSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_ROTATEDPYRAMIDSBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -26,4 +26,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_ROTATEDPYRAMIDSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_ROTATEDPYRAMIDSBUILDER_H
diff --git a/Sample/StandardSamples/SampleBuilderFactory.h b/Sample/StandardSamples/SampleBuilderFactory.h
index d945aeb226f..8c9159cf30f 100644
--- a/Sample/StandardSamples/SampleBuilderFactory.h
+++ b/Sample/StandardSamples/SampleBuilderFactory.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_SAMPLEBUILDERFACTORY_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_SAMPLEBUILDERFACTORY_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_SAMPLEBUILDERFACTORY_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_SAMPLEBUILDERFACTORY_H
#include "Fit/TestEngine/IFactory.h"
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -30,4 +30,4 @@ public:
MultiLayer* createSampleByName(const std::string& name);
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_SAMPLEBUILDERFACTORY_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_SAMPLEBUILDERFACTORY_H
diff --git a/Sample/StandardSamples/SizeDistributionModelsBuilder.h b/Sample/StandardSamples/SizeDistributionModelsBuilder.h
index 7b66b616c18..61a31dc94eb 100644
--- a/Sample/StandardSamples/SizeDistributionModelsBuilder.h
+++ b/Sample/StandardSamples/SizeDistributionModelsBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_SIZEDISTRIBUTIONMODELSBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_SIZEDISTRIBUTIONMODELSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIZEDISTRIBUTIONMODELSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIZEDISTRIBUTIONMODELSBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -56,4 +56,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_SIZEDISTRIBUTIONMODELSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIZEDISTRIBUTIONMODELSBUILDER_H
diff --git a/Sample/StandardSamples/SlicedCompositionBuilder.h b/Sample/StandardSamples/SlicedCompositionBuilder.h
index ef950255f34..a016e9f0f7b 100644
--- a/Sample/StandardSamples/SlicedCompositionBuilder.h
+++ b/Sample/StandardSamples/SlicedCompositionBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_SLICEDCOMPOSITIONBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_SLICEDCOMPOSITIONBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_SLICEDCOMPOSITIONBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_SLICEDCOMPOSITIONBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -26,4 +26,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_SLICEDCOMPOSITIONBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_SLICEDCOMPOSITIONBUILDER_H
diff --git a/Sample/StandardSamples/SlicedCylindersBuilder.h b/Sample/StandardSamples/SlicedCylindersBuilder.h
index b21572565df..65e5c66c1c8 100644
--- a/Sample/StandardSamples/SlicedCylindersBuilder.h
+++ b/Sample/StandardSamples/SlicedCylindersBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_SLICEDCYLINDERSBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_SLICEDCYLINDERSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_SLICEDCYLINDERSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_SLICEDCYLINDERSBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -47,4 +47,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_SLICEDCYLINDERSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_SLICEDCYLINDERSBUILDER_H
diff --git a/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h b/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h
index 2b4e64ed5c1..dac7b46c609 100644
--- a/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h
+++ b/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_THICKABSORPTIVESAMPLEBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_THICKABSORPTIVESAMPLEBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_THICKABSORPTIVESAMPLEBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_THICKABSORPTIVESAMPLEBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -23,4 +23,4 @@ public:
MultiLayer* buildSample() const override;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_THICKABSORPTIVESAMPLEBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_THICKABSORPTIVESAMPLEBUILDER_H
diff --git a/Sample/StandardSamples/TransformationsBuilder.h b/Sample/StandardSamples/TransformationsBuilder.h
index f68b9463ab8..6609ac332e7 100644
--- a/Sample/StandardSamples/TransformationsBuilder.h
+++ b/Sample/StandardSamples/TransformationsBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_TRANSFORMATIONSBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_TRANSFORMATIONSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_TRANSFORMATIONSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_TRANSFORMATIONSBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -26,4 +26,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_TRANSFORMATIONSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_TRANSFORMATIONSBUILDER_H
diff --git a/Sample/StandardSamples/TwoDimLatticeBuilder.h b/Sample/StandardSamples/TwoDimLatticeBuilder.h
index bbc6bd53aa9..78e08b943ce 100644
--- a/Sample/StandardSamples/TwoDimLatticeBuilder.h
+++ b/Sample/StandardSamples/TwoDimLatticeBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_TWODIMLATTICEBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_TWODIMLATTICEBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_TWODIMLATTICEBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_TWODIMLATTICEBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -73,4 +73,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_TWODIMLATTICEBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_TWODIMLATTICEBUILDER_H
diff --git a/Sample/StandardSamples/TwoLayerRoughnessBuilder.h b/Sample/StandardSamples/TwoLayerRoughnessBuilder.h
index 75bb9d9688b..bdf47b56437 100644
--- a/Sample/StandardSamples/TwoLayerRoughnessBuilder.h
+++ b/Sample/StandardSamples/TwoLayerRoughnessBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_TWOLAYERROUGHNESSBUILDER_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_TWOLAYERROUGHNESSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_TWOLAYERROUGHNESSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_TWOLAYERROUGHNESSBUILDER_H
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -26,4 +26,4 @@ public:
MultiLayer* buildSample() const;
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_TWOLAYERROUGHNESSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_TWOLAYERROUGHNESSBUILDER_H
--
GitLab