From 6270d9b1293a49094d5f763fc80f8967085720fe Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Sat, 3 Oct 2020 07:12:42 +0200
Subject: [PATCH] rm includeIncludes/FOrmFactors.h
---
.../LayersWithAbsorptionBySLDBuilder.cpp | 7 +++++-
.../ParticleInVacuumBuilder.cpp | 7 +++++-
Core/includeIncludes/FormFactors.h | 25 -------------------
GUI/coregui/Models/FormFactorItems.cpp | 7 +++++-
GUI/coregui/Models/GUIDomainSampleVisitor.cpp | 7 +++++-
.../Core/Sample/ParticleDistributionTest.cpp | 7 +++++-
Tests/UnitTests/GUI/TestFormFactorItems.cpp | 7 +++++-
.../GUI/TestGUICoreObjectCorrespondence.cpp | 7 +++++-
.../GUI/TestParticleDistributionItem.cpp | 7 +++++-
9 files changed, 48 insertions(+), 33 deletions(-)
delete mode 100644 Core/includeIncludes/FormFactors.h
diff --git a/Core/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp b/Core/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp
index b5800890a83..7dd0608e184 100644
--- a/Core/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp
+++ b/Core/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp
@@ -19,7 +19,12 @@
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Particle/Particle.h"
-#include "Core/includeIncludes/FormFactors.h"
+#include "Core/Particle/FormFactorWeighted.h"
+#include "Core/Scattering/FormFactorDecoratorMaterial.h"
+#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
+#include "Core/Scattering/FormFactorDecoratorRotation.h"
+#include "Core/HardParticle/HardParticles.h"
+#include "Core/SoftParticle/SoftParticles.h"
const double middle_layer_thickness(60.0 * Units::nanometer);
diff --git a/Core/StandardSamples/ParticleInVacuumBuilder.cpp b/Core/StandardSamples/ParticleInVacuumBuilder.cpp
index 7acfdb4a0b6..d005787775b 100644
--- a/Core/StandardSamples/ParticleInVacuumBuilder.cpp
+++ b/Core/StandardSamples/ParticleInVacuumBuilder.cpp
@@ -21,7 +21,12 @@
#include "Core/Particle/Particle.h"
#include "Core/SampleBuilderEngine/SampleComponents.h"
#include "Core/StandardSamples/ReferenceMaterials.h"
-#include "Core/includeIncludes/FormFactors.h"
+#include "Core/Particle/FormFactorWeighted.h"
+#include "Core/Scattering/FormFactorDecoratorMaterial.h"
+#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
+#include "Core/Scattering/FormFactorDecoratorRotation.h"
+#include "Core/HardParticle/HardParticles.h"
+#include "Core/SoftParticle/SoftParticles.h"
namespace
{
diff --git a/Core/includeIncludes/FormFactors.h b/Core/includeIncludes/FormFactors.h
deleted file mode 100644
index 94f003ff347..00000000000
--- a/Core/includeIncludes/FormFactors.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// ************************************************************************** //
-//
-// BornAgain: simulate and fit scattering at grazing incidence
-//
-//! @file Core/includeIncludes/FormFactors.h
-//! @brief Includes form-factor related include files.
-//!
-//! @homepage http://www.bornagainproject.org
-//! @license GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2018
-//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
-//
-// ************************************************************************** //
-
-#ifndef BORNAGAIN_CORE_INCLUDEINCLUDES_FORMFACTORS_H
-#define BORNAGAIN_CORE_INCLUDEINCLUDES_FORMFACTORS_H
-
-#include "Core/Particle/FormFactorWeighted.h"
-#include "Core/Scattering/FormFactorDecoratorMaterial.h"
-#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
-#include "Core/Scattering/FormFactorDecoratorRotation.h"
-#include "Core/HardParticle/HardParticles.h"
-#include "Core/SoftParticle/SoftParticles.h"
-
-#endif // BORNAGAIN_CORE_INCLUDEINCLUDES_FORMFACTORS_H
diff --git a/GUI/coregui/Models/FormFactorItems.cpp b/GUI/coregui/Models/FormFactorItems.cpp
index b458f23d44c..a972c816960 100644
--- a/GUI/coregui/Models/FormFactorItems.cpp
+++ b/GUI/coregui/Models/FormFactorItems.cpp
@@ -14,7 +14,12 @@
#include "GUI/coregui/Models/FormFactorItems.h"
#include "Core/Basics/Units.h"
-#include "Core/includeIncludes/FormFactors.h"
+#include "Core/Particle/FormFactorWeighted.h"
+#include "Core/Scattering/FormFactorDecoratorMaterial.h"
+#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
+#include "Core/Scattering/FormFactorDecoratorRotation.h"
+#include "Core/HardParticle/HardParticles.h"
+#include "Core/SoftParticle/SoftParticles.h"
/* ------------------------------------------------ */
diff --git a/GUI/coregui/Models/GUIDomainSampleVisitor.cpp b/GUI/coregui/Models/GUIDomainSampleVisitor.cpp
index 348b65fd5bb..0d8c745849b 100644
--- a/GUI/coregui/Models/GUIDomainSampleVisitor.cpp
+++ b/GUI/coregui/Models/GUIDomainSampleVisitor.cpp
@@ -25,7 +25,12 @@
#include "Core/Particle/ParticleComposition.h"
#include "Core/Particle/ParticleCoreShell.h"
#include "Core/Particle/ParticleDistribution.h"
-#include "Core/includeIncludes/FormFactors.h"
+#include "Core/Particle/FormFactorWeighted.h"
+#include "Core/Scattering/FormFactorDecoratorMaterial.h"
+#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
+#include "Core/Scattering/FormFactorDecoratorRotation.h"
+#include "Core/HardParticle/HardParticles.h"
+#include "Core/SoftParticle/SoftParticles.h"
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/FormFactorItems.h"
#include "GUI/coregui/Models/LayerItem.h"
diff --git a/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp b/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp
index 9b92e0fa43e..88ef4e07436 100644
--- a/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp
+++ b/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp
@@ -3,7 +3,12 @@
#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Parametrization/Distributions.h"
#include "Core/Particle/Particle.h"
-#include "Core/includeIncludes/FormFactors.h"
+#include "Core/Particle/FormFactorWeighted.h"
+#include "Core/Scattering/FormFactorDecoratorMaterial.h"
+#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
+#include "Core/Scattering/FormFactorDecoratorRotation.h"
+#include "Core/HardParticle/HardParticles.h"
+#include "Core/SoftParticle/SoftParticles.h"
#include "Tests/GTestWrapper/google_test.h"
class ParticleDistributionTest : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestFormFactorItems.cpp b/Tests/UnitTests/GUI/TestFormFactorItems.cpp
index 37f6b569338..5a9e568103c 100644
--- a/Tests/UnitTests/GUI/TestFormFactorItems.cpp
+++ b/Tests/UnitTests/GUI/TestFormFactorItems.cpp
@@ -1,5 +1,10 @@
#include "Core/Basics/Units.h"
-#include "Core/includeIncludes/FormFactors.h"
+#include "Core/Particle/FormFactorWeighted.h"
+#include "Core/Scattering/FormFactorDecoratorMaterial.h"
+#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
+#include "Core/Scattering/FormFactorDecoratorRotation.h"
+#include "Core/HardParticle/HardParticles.h"
+#include "Core/SoftParticle/SoftParticles.h"
#include "Fit/TestEngine/Numeric.h"
#include "GUI/coregui/Models/FormFactorItems.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp b/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp
index 9b3066b5151..c7d82c477b2 100644
--- a/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp
+++ b/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp
@@ -1,6 +1,11 @@
#include "Core/Basics/Units.h"
#include "Core/Parametrization/ParameterPool.h"
-#include "Core/includeIncludes/FormFactors.h"
+#include "Core/Particle/FormFactorWeighted.h"
+#include "Core/Scattering/FormFactorDecoratorMaterial.h"
+#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
+#include "Core/Scattering/FormFactorDecoratorRotation.h"
+#include "Core/HardParticle/HardParticles.h"
+#include "Core/SoftParticle/SoftParticles.h"
#include "Core/Aggregate/InterferenceFunctions.h"
#include "GUI/coregui/Models/FormFactorItems.h"
#include "GUI/coregui/Models/InterferenceFunctionItems.h"
diff --git a/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp b/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp
index 52bf817015b..b1348785eac 100644
--- a/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp
+++ b/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp
@@ -2,7 +2,12 @@
#include "Core/Parametrization/Distributions.h"
#include "Core/Particle/Particle.h"
#include "Core/Particle/ParticleDistribution.h"
-#include "Core/includeIncludes/FormFactors.h"
+#include "Core/Particle/FormFactorWeighted.h"
+#include "Core/Scattering/FormFactorDecoratorMaterial.h"
+#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
+#include "Core/Scattering/FormFactorDecoratorRotation.h"
+#include "Core/HardParticle/HardParticles.h"
+#include "Core/SoftParticle/SoftParticles.h"
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/DistributionItems.h"
#include "GUI/coregui/Models/MaterialModel.h"
--
GitLab