From f9fbf3791e7347c0b3ae8087c3bedb7db8ff334b Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Sun, 4 Jul 2021 09:06:37 +0200
Subject: [PATCH] new dir Sample/Interface

---
 Core/Computation/RoughMultiLayerComputation.cpp           | 4 ++--
 Core/Export/SampleToPython.cpp                            | 4 ++--
 GUI/Models/TransformFromDomain.cpp                        | 4 ++--
 GUI/Models/TransformToDomain.h                            | 2 +-
 Sample/{Slice => Interface}/LayerInterface.cpp            | 6 +++---
 Sample/{Slice => Interface}/LayerInterface.h              | 8 ++++----
 Sample/{Slice => Interface}/LayerRoughness.cpp            | 4 ++--
 Sample/{Slice => Interface}/LayerRoughness.h              | 8 ++++----
 Sample/Multilayer/MultiLayer.cpp                          | 4 ++--
 Sample/Multilayer/MultilayerUtils.cpp                     | 2 +-
 Sample/Processed/ProcessedSample.cpp                      | 2 +-
 Sample/Processed/ProfileHelper.cpp                        | 2 +-
 Sample/Slice/Slice.cpp                                    | 2 +-
 Sample/Specular/SpecularMagneticStrategy.cpp              | 2 +-
 Sample/Specular/SpecularScalarStrategy.cpp                | 2 +-
 Sample/StandardSamples/CylindersBuilder.cpp               | 2 +-
 Sample/StandardSamples/FeNiBilayerBuilder.cpp             | 2 +-
 Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp    | 2 +-
 Sample/StandardSamples/MagneticLayersBuilder.cpp          | 2 +-
 Sample/StandardSamples/MagneticParticlesBuilder.cpp       | 4 ++--
 .../StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp  | 2 +-
 Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp | 2 +-
 Sample/StandardSamples/ResonatorBuilder.cpp               | 2 +-
 Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp   | 2 +-
 Sample/StandardSamples/TwoLayerRoughnessBuilder.cpp       | 2 +-
 Tests/Performance/Core/Mesocrystal.cpp                    | 2 +-
 Tests/UnitTests/Core/Core/PythonFormattingTest.cpp        | 2 +-
 Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp        | 4 ++--
 Tests/UnitTests/Core/Sample/LayerRoughnessTest.cpp        | 2 +-
 Tests/UnitTests/Core/Sample/MultiLayerTest.cpp            | 4 ++--
 Tests/UnitTests/Core/Sample/RTTest.cpp                    | 4 ++--
 Wrap/Swig/libBornAgainSample.i                            | 6 +++---
 gui2/quicksimeditor/profilehelper.cpp                     | 2 +-
 gui2/quicksimeditor/quicksimutils.cpp                     | 2 +-
 34 files changed, 53 insertions(+), 53 deletions(-)
 rename Sample/{Slice => Interface}/LayerInterface.cpp (94%)
 rename Sample/{Slice => Interface}/LayerInterface.h (92%)
 rename Sample/{Slice => Interface}/LayerRoughness.cpp (96%)
 rename Sample/{Slice => Interface}/LayerRoughness.h (92%)

diff --git a/Core/Computation/RoughMultiLayerComputation.cpp b/Core/Computation/RoughMultiLayerComputation.cpp
index 2776b56cad6..30470d4f1b3 100644
--- a/Core/Computation/RoughMultiLayerComputation.cpp
+++ b/Core/Computation/RoughMultiLayerComputation.cpp
@@ -20,8 +20,8 @@
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Processed/ProcessedSample.h"
 #include "Sample/RT/ILayerRTCoefficients.h"
-#include "Sample/Slice/LayerInterface.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Slice/Slice.h"
 #include "Sample/Slice/SliceStack.h"
 
diff --git a/Core/Export/SampleToPython.cpp b/Core/Export/SampleToPython.cpp
index 2894d72b52e..1cc492c3f10 100644
--- a/Core/Export/SampleToPython.cpp
+++ b/Core/Export/SampleToPython.cpp
@@ -30,8 +30,8 @@
 #include "Sample/Particle/ParticleComposition.h"
 #include "Sample/Particle/ParticleCoreShell.h"
 #include "Sample/Scattering/IFormFactor.h"
-#include "Sample/Slice/LayerInterface.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include <iomanip>
 #include <map>
 #include <set>
diff --git a/GUI/Models/TransformFromDomain.cpp b/GUI/Models/TransformFromDomain.cpp
index 5d150906815..1de625ebcd8 100644
--- a/GUI/Models/TransformFromDomain.cpp
+++ b/GUI/Models/TransformFromDomain.cpp
@@ -52,8 +52,8 @@
 #include "Param/Distrib/RangedDistributions.h"
 #include "Sample/Aggregate/InterferenceFunctions.h"
 #include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/LayerInterface.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 
 using namespace node_progeny;
 
diff --git a/GUI/Models/TransformToDomain.h b/GUI/Models/TransformToDomain.h
index b03d50f0eeb..6e9e2ee6608 100644
--- a/GUI/Models/TransformToDomain.h
+++ b/GUI/Models/TransformToDomain.h
@@ -23,7 +23,7 @@
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/IParticle.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include <memory>
 
 class AngularSpecScan;
diff --git a/Sample/Slice/LayerInterface.cpp b/Sample/Interface/LayerInterface.cpp
similarity index 94%
rename from Sample/Slice/LayerInterface.cpp
rename to Sample/Interface/LayerInterface.cpp
index 40dfb228f60..d39e80a3b72 100644
--- a/Sample/Slice/LayerInterface.cpp
+++ b/Sample/Interface/LayerInterface.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Slice/LayerInterface.cpp
+//! @file      Sample/Interface/LayerInterface.cpp
 //! @brief     Implements class LayerInterface.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Slice/LayerInterface.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 
 LayerInterface::LayerInterface() : m_topLayer(nullptr), m_bottomLayer(nullptr)
 {
diff --git a/Sample/Slice/LayerInterface.h b/Sample/Interface/LayerInterface.h
similarity index 92%
rename from Sample/Slice/LayerInterface.h
rename to Sample/Interface/LayerInterface.h
index c4d5962ba81..d55ef945c16 100644
--- a/Sample/Slice/LayerInterface.h
+++ b/Sample/Interface/LayerInterface.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Slice/LayerInterface.h
+//! @file      Sample/Interface/LayerInterface.h
 //! @brief     Defines class LayerInterface.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,8 +17,8 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_SLICE_LAYERINTERFACE_H
-#define BORNAGAIN_SAMPLE_SLICE_LAYERINTERFACE_H
+#ifndef BORNAGAIN_SAMPLE_INTERFACE_LAYERINTERFACE_H
+#define BORNAGAIN_SAMPLE_INTERFACE_LAYERINTERFACE_H
 
 #include "Sample/Scattering/ISampleNode.h"
 #include <memory>
@@ -79,5 +79,5 @@ inline const Layer* LayerInterface::bottomLayer() const
     return m_bottomLayer;
 }
 
-#endif // BORNAGAIN_SAMPLE_SLICE_LAYERINTERFACE_H
+#endif // BORNAGAIN_SAMPLE_INTERFACE_LAYERINTERFACE_H
 #endif // USER_API
diff --git a/Sample/Slice/LayerRoughness.cpp b/Sample/Interface/LayerRoughness.cpp
similarity index 96%
rename from Sample/Slice/LayerRoughness.cpp
rename to Sample/Interface/LayerRoughness.cpp
index 1c0ef2cae77..5875ada9e1e 100644
--- a/Sample/Slice/LayerRoughness.cpp
+++ b/Sample/Interface/LayerRoughness.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Slice/LayerRoughness.cpp
+//! @file      Sample/Interface/LayerRoughness.cpp
 //! @brief     Implements class LayerRoughness.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Base/Math/Constants.h"
 #include "Base/Py/PyFmt.h"
 #include "Fit/Param/RealLimits.h"
diff --git a/Sample/Slice/LayerRoughness.h b/Sample/Interface/LayerRoughness.h
similarity index 92%
rename from Sample/Slice/LayerRoughness.h
rename to Sample/Interface/LayerRoughness.h
index f4b6b6730dd..998d44bfcec 100644
--- a/Sample/Slice/LayerRoughness.h
+++ b/Sample/Interface/LayerRoughness.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Slice/LayerRoughness.h
+//! @file      Sample/Interface/LayerRoughness.h
 //! @brief     Defines class LayerRoughness.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_SAMPLE_SLICE_LAYERROUGHNESS_H
-#define BORNAGAIN_SAMPLE_SLICE_LAYERROUGHNESS_H
+#ifndef BORNAGAIN_SAMPLE_INTERFACE_LAYERROUGHNESS_H
+#define BORNAGAIN_SAMPLE_INTERFACE_LAYERROUGHNESS_H
 
 #include "Sample/Scattering/ISampleNode.h"
 
@@ -70,4 +70,4 @@ private:
     double m_lateralCorrLength; //!< lateral correlation length of the roughness
 };
 
-#endif // BORNAGAIN_SAMPLE_SLICE_LAYERROUGHNESS_H
+#endif // BORNAGAIN_SAMPLE_INTERFACE_LAYERROUGHNESS_H
diff --git a/Sample/Multilayer/MultiLayer.cpp b/Sample/Multilayer/MultiLayer.cpp
index 59d8ff68958..ad35513db32 100644
--- a/Sample/Multilayer/MultiLayer.cpp
+++ b/Sample/Multilayer/MultiLayer.cpp
@@ -19,8 +19,8 @@
 #include "Sample/Material/MaterialUtils.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultilayerUtils.h"
-#include "Sample/Slice/LayerInterface.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 
 MultiLayer::MultiLayer() : m_crossCorrLength(0)
 {
diff --git a/Sample/Multilayer/MultilayerUtils.cpp b/Sample/Multilayer/MultilayerUtils.cpp
index f2c34d03116..7832959fe95 100644
--- a/Sample/Multilayer/MultilayerUtils.cpp
+++ b/Sample/Multilayer/MultilayerUtils.cpp
@@ -16,7 +16,7 @@
 #include "Sample/Material/MaterialUtils.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Slice/LayerInterface.h"
+#include "Sample/Interface/LayerInterface.h"
 
 const LayerRoughness* SampleUtils::Multilayer::LayerTopRoughness(const MultiLayer& multilayer,
                                                                  size_t i)
diff --git a/Sample/Processed/ProcessedSample.cpp b/Sample/Processed/ProcessedSample.cpp
index 5ab59e13947..02b100ccd19 100644
--- a/Sample/Processed/ProcessedSample.cpp
+++ b/Sample/Processed/ProcessedSample.cpp
@@ -25,7 +25,7 @@
 #include "Sample/Processed/ProcessedLayout.h"
 #include "Sample/RT/SimulationOptions.h"
 #include "Sample/Scattering/ZLimits.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Slice/Slice.h"
 #include "Sample/Slice/SliceStack.h"
 #include "Sample/Specular/SpecularStrategyBuilder.h"
diff --git a/Sample/Processed/ProfileHelper.cpp b/Sample/Processed/ProfileHelper.cpp
index c0986fd6f9c..6b30ae7a9a2 100644
--- a/Sample/Processed/ProfileHelper.cpp
+++ b/Sample/Processed/ProfileHelper.cpp
@@ -14,7 +14,7 @@
 
 #include "Sample/Processed/ProfileHelper.h"
 #include "Sample/Processed/ProcessedSample.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Slice/Slice.h"
 #include "Sample/Slice/SliceStack.h"
 
diff --git a/Sample/Slice/Slice.cpp b/Sample/Slice/Slice.cpp
index 3ced4b00556..57ad513fac4 100644
--- a/Sample/Slice/Slice.cpp
+++ b/Sample/Slice/Slice.cpp
@@ -14,7 +14,7 @@
 
 #include "Sample/Slice/Slice.h"
 #include "Sample/Material/MaterialUtils.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Slice/SliceStack.h"
 
 Slice::Slice(const ZLimits& zRange, const Material& material, const kvector_t& B_field,
diff --git a/Sample/Specular/SpecularMagneticStrategy.cpp b/Sample/Specular/SpecularMagneticStrategy.cpp
index fb95fdf2bad..ccc900c35e8 100644
--- a/Sample/Specular/SpecularMagneticStrategy.cpp
+++ b/Sample/Specular/SpecularMagneticStrategy.cpp
@@ -15,7 +15,7 @@
 #include "Sample/Specular/SpecularMagneticStrategy.h"
 #include "Base/Const/PhysicalConstants.h"
 #include "Sample/Slice/KzComputation.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Slice/Slice.h"
 #include "Sample/Slice/SliceStack.h"
 
diff --git a/Sample/Specular/SpecularScalarStrategy.cpp b/Sample/Specular/SpecularScalarStrategy.cpp
index 8220c094bab..3d00c676eb3 100644
--- a/Sample/Specular/SpecularScalarStrategy.cpp
+++ b/Sample/Specular/SpecularScalarStrategy.cpp
@@ -15,7 +15,7 @@
 #include "Sample/Specular/SpecularScalarStrategy.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Slice/KzComputation.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Slice/Slice.h"
 #include "Sample/Slice/SliceStack.h"
 #include <Eigen/Dense>
diff --git a/Sample/StandardSamples/CylindersBuilder.cpp b/Sample/StandardSamples/CylindersBuilder.cpp
index 98bdd4ba6ee..d83885177e9 100644
--- a/Sample/StandardSamples/CylindersBuilder.cpp
+++ b/Sample/StandardSamples/CylindersBuilder.cpp
@@ -20,7 +20,7 @@
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/Slice/LayerInterface.h"
+#include "Sample/Interface/LayerInterface.h"
 #include "Sample/StandardSamples/ReferenceMaterials.h"
 
 // -----------------------------------------------------------------------------
diff --git a/Sample/StandardSamples/FeNiBilayerBuilder.cpp b/Sample/StandardSamples/FeNiBilayerBuilder.cpp
index af7e9d54c6b..89e47280775 100644
--- a/Sample/StandardSamples/FeNiBilayerBuilder.cpp
+++ b/Sample/StandardSamples/FeNiBilayerBuilder.cpp
@@ -19,7 +19,7 @@
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 
 namespace {
 auto constexpr rhoMconst = -PhysConsts::m_n * PhysConsts::g_factor_n * PhysConsts::mu_N
diff --git a/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp b/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
index e944abec59f..74f6619c7b7 100644
--- a/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
+++ b/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
@@ -20,7 +20,7 @@
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
 #include "Sample/SampleBuilderEngine/FormFactorComponents.h"
-#include "Sample/Slice/LayerInterface.h"
+#include "Sample/Interface/LayerInterface.h"
 #include "Sample/StandardSamples/ReferenceMaterials.h"
 
 namespace {
diff --git a/Sample/StandardSamples/MagneticLayersBuilder.cpp b/Sample/StandardSamples/MagneticLayersBuilder.cpp
index 815faaa8a0e..eccbf86d9ce 100644
--- a/Sample/StandardSamples/MagneticLayersBuilder.cpp
+++ b/Sample/StandardSamples/MagneticLayersBuilder.cpp
@@ -21,7 +21,7 @@
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 
 namespace {
 
diff --git a/Sample/StandardSamples/MagneticParticlesBuilder.cpp b/Sample/StandardSamples/MagneticParticlesBuilder.cpp
index 6c41b350a5d..32ce8ea21d3 100644
--- a/Sample/StandardSamples/MagneticParticlesBuilder.cpp
+++ b/Sample/StandardSamples/MagneticParticlesBuilder.cpp
@@ -21,8 +21,8 @@
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/Slice/LayerInterface.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 
 // ----------------------------------------------------------------------------
 // Magnetic cylinders and zero magnetic field
diff --git a/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp b/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp
index 175bc42ca9e..5326271dcc4 100644
--- a/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp
+++ b/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp
@@ -14,7 +14,7 @@
 
 #include "Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 
 MultiLayer* MultiLayerWithNCRoughnessBuilder::buildSample() const
 {
diff --git a/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp b/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
index e32ae748af6..7c6da53f4ab 100644
--- a/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
+++ b/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
@@ -17,7 +17,7 @@
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 
 MultiLayer* MultiLayerWithRoughnessBuilder::buildSample() const
 {
diff --git a/Sample/StandardSamples/ResonatorBuilder.cpp b/Sample/StandardSamples/ResonatorBuilder.cpp
index 99a4e64154b..418ed423e80 100644
--- a/Sample/StandardSamples/ResonatorBuilder.cpp
+++ b/Sample/StandardSamples/ResonatorBuilder.cpp
@@ -18,7 +18,7 @@
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include <memory>
 
 ResonatorBuilder::ResonatorBuilder(double ti_thickness)
diff --git a/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp b/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp
index 3e8aec2f96e..87955b58941 100644
--- a/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp
+++ b/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp
@@ -17,7 +17,7 @@
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 
 MultiLayer* ThickAbsorptiveSampleBuilder::buildSample() const
 {
diff --git a/Sample/StandardSamples/TwoLayerRoughnessBuilder.cpp b/Sample/StandardSamples/TwoLayerRoughnessBuilder.cpp
index a46c8f65cbd..26205e48be9 100644
--- a/Sample/StandardSamples/TwoLayerRoughnessBuilder.cpp
+++ b/Sample/StandardSamples/TwoLayerRoughnessBuilder.cpp
@@ -16,7 +16,7 @@
 #include "Base/Const/Units.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/StandardSamples/ReferenceMaterials.h"
 
 MultiLayer* TwoLayerRoughnessBuilder::buildSample() const
diff --git a/Tests/Performance/Core/Mesocrystal.cpp b/Tests/Performance/Core/Mesocrystal.cpp
index f20413831ff..1bf3c6c738a 100644
--- a/Tests/Performance/Core/Mesocrystal.cpp
+++ b/Tests/Performance/Core/Mesocrystal.cpp
@@ -27,7 +27,7 @@
 #include "Sample/Particle/Particle.h"
 #include "Sample/Particle/ParticleComposition.h"
 #include "Sample/SampleBuilderEngine/ISampleBuilder.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/SoftParticle/FormFactorSphereLogNormalRadius.h"
 #include <iostream>
 
diff --git a/Tests/UnitTests/Core/Core/PythonFormattingTest.cpp b/Tests/UnitTests/Core/Core/PythonFormattingTest.cpp
index 8cb152a704c..3e604c89f76 100644
--- a/Tests/UnitTests/Core/Core/PythonFormattingTest.cpp
+++ b/Tests/UnitTests/Core/Core/PythonFormattingTest.cpp
@@ -34,7 +34,7 @@
 #include "Sample/HardParticle/FormFactorTruncatedCube.h"
 #include "Sample/HardParticle/FormFactorTruncatedSphere.h"
 #include "Sample/HardParticle/FormFactorTruncatedSpheroid.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/SoftParticle/FormFactorGauss.h"
 #include "Sample/SoftParticle/FormFactorSphereGaussianRadius.h"
 #include "Sample/SoftParticle/FormFactorSphereLogNormalRadius.h"
diff --git a/Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp b/Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp
index b1388454d67..4ba98f4fe63 100644
--- a/Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp
+++ b/Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp
@@ -1,7 +1,7 @@
-#include "Sample/Slice/LayerInterface.h"
+#include "Sample/Interface/LayerInterface.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <memory>
 
diff --git a/Tests/UnitTests/Core/Sample/LayerRoughnessTest.cpp b/Tests/UnitTests/Core/Sample/LayerRoughnessTest.cpp
index a6a0665e86b..3f66042d63d 100644
--- a/Tests/UnitTests/Core/Sample/LayerRoughnessTest.cpp
+++ b/Tests/UnitTests/Core/Sample/LayerRoughnessTest.cpp
@@ -1,4 +1,4 @@
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Tests/GTestWrapper/google_test.h"
 
 class LayerRoughnessTest : public ::testing::Test {
diff --git a/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp b/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp
index 727ca2f6e33..b34e08af35f 100644
--- a/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp
+++ b/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp
@@ -5,8 +5,8 @@
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultilayerUtils.h"
-#include "Sample/Slice/LayerInterface.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Tests/GTestWrapper/google_test.h"
 
 class MultiLayerTest : public ::testing::Test {
diff --git a/Tests/UnitTests/Core/Sample/RTTest.cpp b/Tests/UnitTests/Core/Sample/RTTest.cpp
index 7edd8f0ff1f..ff93dc23e34 100644
--- a/Tests/UnitTests/Core/Sample/RTTest.cpp
+++ b/Tests/UnitTests/Core/Sample/RTTest.cpp
@@ -5,8 +5,8 @@
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Processed/ProcessedSample.h"
 #include "Sample/RT/SimulationOptions.h"
-#include "Sample/Slice/LayerInterface.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Specular/SpecularScalarTanhStrategy.h"
 #include "Tests/GTestWrapper/google_test.h"
 
diff --git a/Wrap/Swig/libBornAgainSample.i b/Wrap/Swig/libBornAgainSample.i
index ea9b47602e2..fcff62cdd6d 100644
--- a/Wrap/Swig/libBornAgainSample.i
+++ b/Wrap/Swig/libBornAgainSample.i
@@ -96,8 +96,8 @@
 #include "Sample/RT/SimulationOptions.h"
 #include "Sample/SampleBuilderEngine/ISampleBuilder.h"
 #include "Sample/Scattering/IFormFactorDecorator.h"
-#include "Sample/Slice/LayerInterface.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/SoftParticle/FormFactorGauss.h"
 #include "Sample/SoftParticle/FormFactorSphereGaussianRadius.h"
 #include "Sample/SoftParticle/FormFactorSphereLogNormalRadius.h"
@@ -175,7 +175,7 @@
 %include "Sample/Aggregate/InterferenceFunctionTwin.h"
 %include "Sample/Aggregate/ParticleLayout.h"
 
-%include "Sample/Slice/LayerRoughness.h"
+%include "Sample/Interface/LayerRoughness.h"
 %include "Sample/Processed/MultiLayerFuncs.h"
 
 %include "Sample/Multilayer/Layer.h"
diff --git a/gui2/quicksimeditor/profilehelper.cpp b/gui2/quicksimeditor/profilehelper.cpp
index 88435ee4768..3de31018981 100644
--- a/gui2/quicksimeditor/profilehelper.cpp
+++ b/gui2/quicksimeditor/profilehelper.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "gui2/quicksimeditor/profilehelper.h"
-#include <Sample/Slice/LayerRoughness.h>
+#include <Sample/Interface/LayerRoughness.h>
 #include <Sample/Slice/Slice.h>
 
 namespace {
diff --git a/gui2/quicksimeditor/quicksimutils.cpp b/gui2/quicksimeditor/quicksimutils.cpp
index 623bb35416a..86e0c6af60b 100644
--- a/gui2/quicksimeditor/quicksimutils.cpp
+++ b/gui2/quicksimeditor/quicksimutils.cpp
@@ -19,7 +19,7 @@
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/sessionmodel.h"
 #include <Sample/Material/MaterialFactoryFuncs.h>
-#include <Sample/Slice/LayerRoughness.h>
+#include <Sample/Interface/LayerRoughness.h>
 #include <Sample/Slice/Slice.h>
 #include <stdexcept>
 
-- 
GitLab