From 66dbe461002e3fd36ab26b3cb4b5daede9d70cc7 Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de> Date: Tue, 6 Oct 2020 13:49:54 +0200 Subject: [PATCH] mv wrapped vector templates to Core/Basics --- Core/{Tools => Basics}/CloneableVector.h | 2 +- Core/{Tools => Basics}/SafePointerVector.h | 2 +- Core/Correlations/ILayout.h | 2 +- Core/Detector/IDetector.h | 2 +- Core/Intensity/OutputData.h | 2 +- Core/Multilayer/Layer.h | 2 +- Core/Multilayer/MultiLayer.h | 2 +- Core/Particle/IParticle.h | 2 +- Core/Particle/ParticleDistribution.h | 2 +- .../FormFactorSphereLogNormalRadius.h | 2 +- auto/Wrap/doxygenCore.i | 76 +++++++++---------- 11 files changed, 48 insertions(+), 48 deletions(-) rename Core/{Tools => Basics}/CloneableVector.h (97%) rename Core/{Tools => Basics}/SafePointerVector.h (98%) diff --git a/Core/Tools/CloneableVector.h b/Core/Basics/CloneableVector.h similarity index 97% rename from Core/Tools/CloneableVector.h rename to Core/Basics/CloneableVector.h index 0bc60c3657b..929a9da01d0 100644 --- a/Core/Tools/CloneableVector.h +++ b/Core/Basics/CloneableVector.h @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit scattering at grazing incidence // -//! @file Core/Tools/CloneableVector.h +//! @file Core/Basics/CloneableVector.h //! @brief Defines and implements templated class CloneableVector. //! //! @homepage http://www.bornagainproject.org diff --git a/Core/Tools/SafePointerVector.h b/Core/Basics/SafePointerVector.h similarity index 98% rename from Core/Tools/SafePointerVector.h rename to Core/Basics/SafePointerVector.h index 481112f5117..22a017e2d8c 100644 --- a/Core/Tools/SafePointerVector.h +++ b/Core/Basics/SafePointerVector.h @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit scattering at grazing incidence // -//! @file Core/Tools/SafePointerVector.h +//! @file Core/Basics/SafePointerVector.h //! @brief Defines and implements template class SafePointerVector. //! //! @homepage http://www.bornagainproject.org diff --git a/Core/Correlations/ILayout.h b/Core/Correlations/ILayout.h index fb7ea917a27..98b9c33c1a2 100644 --- a/Core/Correlations/ILayout.h +++ b/Core/Correlations/ILayout.h @@ -16,7 +16,7 @@ #define BORNAGAIN_CORE_CORRELATIONS_ILAYOUT_H #include "Core/Scattering/ISample.h" -#include "Core/Tools/SafePointerVector.h" +#include "Core/Basics/SafePointerVector.h" class IAbstractParticle; class IInterferenceFunction; diff --git a/Core/Detector/IDetector.h b/Core/Detector/IDetector.h index eb98997a22e..e35e12f73f1 100644 --- a/Core/Detector/IDetector.h +++ b/Core/Detector/IDetector.h @@ -20,7 +20,7 @@ #include "Core/Detector/SimulationAreaIterator.h" #include "Core/Intensity/IUnitConverter.h" #include "Core/Parametrization/INode.h" -#include "Core/Tools/CloneableVector.h" +#include "Core/Basics/CloneableVector.h" class Beam; class DetectorMask; diff --git a/Core/Intensity/OutputData.h b/Core/Intensity/OutputData.h index fa44a34af0e..1fcd3a98709 100644 --- a/Core/Intensity/OutputData.h +++ b/Core/Intensity/OutputData.h @@ -21,7 +21,7 @@ #include "Core/Intensity/OutputDataIterator.h" #include "Core/Parametrization/ThreadInfo.h" #include "Core/Tools/PyObject.h" -#include "Core/Tools/SafePointerVector.h" +#include "Core/Basics/SafePointerVector.h" #include <sstream> using std::size_t; diff --git a/Core/Multilayer/Layer.h b/Core/Multilayer/Layer.h index 55bb6a323b5..3d607130e12 100644 --- a/Core/Multilayer/Layer.h +++ b/Core/Multilayer/Layer.h @@ -17,7 +17,7 @@ #include "Core/Material/Material.h" #include "Core/Scattering/ISample.h" -#include "Core/Tools/SafePointerVector.h" +#include "Core/Basics/SafePointerVector.h" class ILayout; diff --git a/Core/Multilayer/MultiLayer.h b/Core/Multilayer/MultiLayer.h index a2a41902dcc..06df45024c4 100644 --- a/Core/Multilayer/MultiLayer.h +++ b/Core/Multilayer/MultiLayer.h @@ -18,7 +18,7 @@ #include "Core/Multilayer/RoughnessModels.h" #include "Core/Scattering/ISample.h" #include "Core/Scattering/ZLimits.h" -#include "Core/Tools/SafePointerVector.h" +#include "Core/Basics/SafePointerVector.h" #include "Core/Vector/Vectors3D.h" #include <functional> diff --git a/Core/Particle/IParticle.h b/Core/Particle/IParticle.h index 45e0b808d98..e45f50f1977 100644 --- a/Core/Particle/IParticle.h +++ b/Core/Particle/IParticle.h @@ -19,7 +19,7 @@ #include "Core/Particle/SlicedParticle.h" #include "Core/Scattering/Rotations.h" #include "Core/Scattering/ZLimits.h" -#include "Core/Tools/SafePointerVector.h" +#include "Core/Basics/SafePointerVector.h" #include "Core/Vector/Vectors3D.h" #include <memory> diff --git a/Core/Particle/ParticleDistribution.h b/Core/Particle/ParticleDistribution.h index 4f481bdaf07..9e4562bdaab 100644 --- a/Core/Particle/ParticleDistribution.h +++ b/Core/Particle/ParticleDistribution.h @@ -17,7 +17,7 @@ #include "Core/Parametrization/ParameterDistribution.h" #include "Core/Particle/IAbstractParticle.h" -#include "Core/Tools/SafePointerVector.h" +#include "Core/Basics/SafePointerVector.h" class IParticle; diff --git a/Core/SoftParticle/FormFactorSphereLogNormalRadius.h b/Core/SoftParticle/FormFactorSphereLogNormalRadius.h index eb4112a7add..f510c950c05 100644 --- a/Core/SoftParticle/FormFactorSphereLogNormalRadius.h +++ b/Core/SoftParticle/FormFactorSphereLogNormalRadius.h @@ -16,7 +16,7 @@ #define BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORSPHERELOGNORMALRADIUS_H #include "Core/Scattering/IFormFactorBorn.h" -#include "Core/Tools/SafePointerVector.h" +#include "Core/Basics/SafePointerVector.h" #include <memory> //! A sphere with log normal radius distribution. diff --git a/auto/Wrap/doxygenCore.i b/auto/Wrap/doxygenCore.i index d3ddeb5642f..6e1c722d9c4 100644 --- a/auto/Wrap/doxygenCore.i +++ b/auto/Wrap/doxygenCore.i @@ -16556,70 +16556,70 @@ C++ includes: ZLimits.h "; -// File: namespace_0d110.xml +// File: namespace_0d100.xml -// File: namespace_0d116.xml +// File: namespace_0d112.xml -// File: namespace_0d120.xml +// File: namespace_0d118.xml -// File: namespace_0d151.xml +// File: namespace_0d122.xml -// File: namespace_0d16.xml +// File: namespace_0d153.xml -// File: namespace_0d163.xml +// File: namespace_0d16.xml -// File: namespace_0d171.xml +// File: namespace_0d165.xml -// File: namespace_0d176.xml +// File: namespace_0d173.xml -// File: namespace_0d185.xml +// File: namespace_0d178.xml // File: namespace_0d187.xml -// File: namespace_0d191.xml +// File: namespace_0d189.xml -// File: namespace_0d2.xml +// File: namespace_0d193.xml -// File: namespace_0d25.xml +// File: namespace_0d2.xml -// File: namespace_0d254.xml +// File: namespace_0d25.xml -// File: namespace_0d257.xml +// File: namespace_0d256.xml -// File: namespace_0d264.xml +// File: namespace_0d259.xml -// File: namespace_0d268.xml +// File: namespace_0d266.xml -// File: namespace_0d272.xml +// File: namespace_0d270.xml -// File: namespace_0d278.xml +// File: namespace_0d274.xml -// File: namespace_0d282.xml +// File: namespace_0d280.xml -// File: namespace_0d296.xml +// File: namespace_0d284.xml -// File: namespace_0d327.xml +// File: namespace_0d298.xml // File: namespace_0d329.xml @@ -16628,25 +16628,28 @@ C++ includes: ZLimits.h // File: namespace_0d331.xml -// File: namespace_0d351.xml +// File: namespace_0d333.xml -// File: namespace_0d355.xml +// File: namespace_0d353.xml -// File: namespace_0d359.xml +// File: namespace_0d357.xml -// File: namespace_0d373.xml +// File: namespace_0d361.xml -// File: namespace_0d382.xml +// File: namespace_0d375.xml -// File: namespace_0d386.xml +// File: namespace_0d384.xml -// File: namespace_0d396.xml +// File: namespace_0d388.xml + + +// File: namespace_0d398.xml // File: namespace_0d4.xml @@ -16739,16 +16742,13 @@ C++ includes: ZLimits.h // File: namespace_0d633.xml -// File: namespace_0d90.xml - - // File: namespace_0d92.xml // File: namespace_0d94.xml -// File: namespace_0d98.xml +// File: namespace_0d96.xml // File: namespacealgo.xml @@ -17997,6 +17997,12 @@ global helper function for comparison of axes // File: PointwiseAxis_8h.xml +// File: PolarizationHandler_8cpp.xml + + +// File: PolarizationHandler_8h.xml + + // File: SimulationElement_8cpp.xml @@ -19122,12 +19128,6 @@ magnetization (in A/m) // File: MultiLayerUtils_8h.xml -// File: PolarizationHandler_8cpp.xml - - -// File: PolarizationHandler_8h.xml - - // File: RoughnessModels_8cpp.xml -- GitLab