diff --git a/Core/Computation/SpecularComputation.cpp b/Core/Computation/SpecularComputation.cpp index 56ddae690ccc204ee78b9ad5339773ed54e7f159..f12a70e1ea3e7d8f79f3d1d490fda6659ebbb670 100644 --- a/Core/Computation/SpecularComputation.cpp +++ b/Core/Computation/SpecularComputation.cpp @@ -16,7 +16,7 @@ #include "Core/Computation/ProcessedSample.h" #include "Core/Computation/ProgressHandler.h" #include "Core/Computation/SpecularStrategyBuilder.h" -#include "Sample/Specular/SpecularSimulationElement.h" +#include "Sample/Slice/SpecularSimulationElement.h" static_assert(std::is_copy_constructible<SpecularComputation>::value == false, "SpecularComputation should not be copy constructible"); diff --git a/Core/Computation/SpecularComputationTerm.cpp b/Core/Computation/SpecularComputationTerm.cpp index 89f90510fcf1267d3579036eb86b91c22d93cb8b..0ba8dddb332254d408a75b47750c4520686c5cc9 100644 --- a/Core/Computation/SpecularComputationTerm.cpp +++ b/Core/Computation/SpecularComputationTerm.cpp @@ -16,7 +16,7 @@ #include "Core/Computation/DelayedProgressCounter.h" #include "Sample/RT/ILayerRTCoefficients.h" #include "Sample/Specular/ISpecularStrategy.h" -#include "Sample/Specular/SpecularSimulationElement.h" +#include "Sample/Slice/SpecularSimulationElement.h" SpecularComputationTerm::SpecularComputationTerm(std::unique_ptr<ISpecularStrategy> strategy) : m_Strategy(std::move(strategy)){}; diff --git a/Core/Simulation/SpecularSimulation.cpp b/Core/Simulation/SpecularSimulation.cpp index 06e01ecb5c8e898e0372e314b0c2968e2403e750..ef2ea82a9de6680e580773d0d71edcd909458c84 100644 --- a/Core/Simulation/SpecularSimulation.cpp +++ b/Core/Simulation/SpecularSimulation.cpp @@ -28,7 +28,7 @@ #include "Sample/Material/MaterialUtils.h" #include "Sample/Multilayer/MultiLayer.h" #include "Sample/SampleBuilderEngine/ISampleBuilder.h" -#include "Sample/Specular/SpecularSimulationElement.h" +#include "Sample/Slice/SpecularSimulationElement.h" namespace { diff --git a/Device/Scan/AngularSpecScan.cpp b/Device/Scan/AngularSpecScan.cpp index 519bab4386bd847f1c1b207ba5f9c74116e56c50..8db0eae38ee29bc5780b64e3012515d870296e8e 100644 --- a/Device/Scan/AngularSpecScan.cpp +++ b/Device/Scan/AngularSpecScan.cpp @@ -19,7 +19,7 @@ #include "Device/Beam/IFootprintFactor.h" #include "Device/Resolution/ScanResolution.h" #include "Param/Distrib/RangedDistributions.h" -#include "Sample/Specular/SpecularSimulationElement.h" +#include "Sample/Slice/SpecularSimulationElement.h" namespace { diff --git a/Device/Scan/QSpecScan.cpp b/Device/Scan/QSpecScan.cpp index 28563ae4737be312466a61ac5142cf1cb0c5451a..f1a1d5e4a23b39a09d6eafc57ab3fb4ad5e8b44b 100644 --- a/Device/Scan/QSpecScan.cpp +++ b/Device/Scan/QSpecScan.cpp @@ -18,7 +18,7 @@ #include "Base/Utils/PyFmt.h" #include "Device/Resolution/ScanResolution.h" #include "Param/Distrib/RangedDistributions.h" -#include "Sample/Specular/SpecularSimulationElement.h" +#include "Sample/Slice/SpecularSimulationElement.h" namespace { diff --git a/Sample/Specular/SpecularSimulationElement.cpp b/Sample/Slice/SpecularSimulationElement.cpp similarity index 95% rename from Sample/Specular/SpecularSimulationElement.cpp rename to Sample/Slice/SpecularSimulationElement.cpp index cedbb0584f7856423d25bf0968446c452577cad4..9ae1b1b8c9887d7f3657966a8a335dc632beb3ce 100644 --- a/Sample/Specular/SpecularSimulationElement.cpp +++ b/Sample/Slice/SpecularSimulationElement.cpp @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit scattering at grazing incidence // -//! @file Sample/Specular/SpecularSimulationElement.cpp +//! @file Sample/Slice/SpecularSimulationElement.cpp //! @brief Implements the class SpecularSimulationElement. //! //! @homepage http://www.bornagainproject.org @@ -12,7 +12,7 @@ // // ************************************************************************** // -#include "Sample/Specular/SpecularSimulationElement.h" +#include "Sample/Slice/SpecularSimulationElement.h" #include "Sample/Slice/KzComputation.h" SpecularSimulationElement::SpecularSimulationElement(double kz) diff --git a/Sample/Specular/SpecularSimulationElement.h b/Sample/Slice/SpecularSimulationElement.h similarity index 97% rename from Sample/Specular/SpecularSimulationElement.h rename to Sample/Slice/SpecularSimulationElement.h index 2c05eb8c77402bb3dec9e78628a1b2c857233770..41896cb4826a7c5e3e6b857c0f170cfeb3a887cb 100644 --- a/Sample/Specular/SpecularSimulationElement.h +++ b/Sample/Slice/SpecularSimulationElement.h @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit scattering at grazing incidence // -//! @file Sample/Specular/SpecularSimulationElement.h +//! @file Sample/Slice/SpecularSimulationElement.h //! @brief Declares the class SpecularSimulationElement. //! //! @homepage http://www.bornagainproject.org diff --git a/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp b/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp index 50f90ad8e86eba6b9f9aedc988ee85910734f56e..c21d01f83c3d14a2618b7a0f1f2c4690747d3e78 100644 --- a/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp +++ b/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp @@ -5,7 +5,7 @@ #include "Device/Scan/AngularSpecScan.h" #include "Device/Scan/QSpecScan.h" #include "Param/Distrib/RangedDistributions.h" -#include "Sample/Specular/SpecularSimulationElement.h" +#include "Sample/Slice/SpecularSimulationElement.h" #include "Tests/GTestWrapper/google_test.h" class SpecularScanTest : public ::testing::Test diff --git a/auto/Wrap/doxygenSample.i b/auto/Wrap/doxygenSample.i index 56bb1521090e04cb0edde30a50edc66309180351..310477d6dbbd6449874ac2619da46ed8bcdb4257 100644 --- a/auto/Wrap/doxygenSample.i +++ b/auto/Wrap/doxygenSample.i @@ -7876,9 +7876,6 @@ C++ includes: ZLimits.h // File: namespace_0D262.xml -// File: namespace_0D272.xml - - // File: namespace_0D274.xml @@ -7891,12 +7888,15 @@ C++ includes: ZLimits.h // File: namespace_0D280.xml -// File: namespace_0D284.xml +// File: namespace_0D282.xml // File: namespace_0D286.xml +// File: namespace_0D288.xml + + // File: namespace_0D290.xml @@ -9006,6 +9006,12 @@ Generate vertices of centered ellipse with given semi-axes at height z. // File: SlicedFormFactorList_8h.xml +// File: SpecularSimulationElement_8cpp.xml + + +// File: SpecularSimulationElement_8h.xml + + // File: FormFactorGauss_8cpp.xml @@ -9078,12 +9084,6 @@ Generate vertices of centered ellipse with given semi-axes at height z. // File: SpecularScalarTanhStrategy_8h.xml -// File: SpecularSimulationElement_8cpp.xml - - -// File: SpecularSimulationElement_8h.xml - - // File: BoxCompositionBuilder_8cpp.xml