From 42e4811f06218057edb8e5d803b7e40f53e75efa Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Thu, 14 Jul 2016 13:44:01 +0200
Subject: [PATCH] ditto in FormFactors; manually moved #include
"IntegratorComplex.h"
---
Core/FormFactors/FormFactorAnisoPyramid.cpp | 2 +-
Core/FormFactors/FormFactorBox.cpp | 2 +-
Core/FormFactors/FormFactorCone.cpp | 3 +--
Core/FormFactors/FormFactorCone.h | 4 ++--
Core/FormFactors/FormFactorCone6.cpp | 2 +-
Core/FormFactors/FormFactorCrystal.h | 2 +-
Core/FormFactors/FormFactorCuboctahedron.cpp | 2 +-
Core/FormFactors/FormFactorCylinder.cpp | 2 +-
Core/FormFactors/FormFactorDWBA.cpp | 2 +-
Core/FormFactors/FormFactorDWBAPol.cpp | 2 +-
Core/FormFactors/FormFactorDecoratorDebyeWaller.cpp | 2 +-
Core/FormFactors/FormFactorDecoratorFactor.h | 2 +-
.../FormFactorDecoratorMultiPositionFactor.cpp | 2 +-
Core/FormFactors/FormFactorDecoratorPositionFactor.h | 2 +-
Core/FormFactors/FormFactorDecoratorRotation.cpp | 2 +-
Core/FormFactors/FormFactorDodecahedron.cpp | 2 +-
Core/FormFactors/FormFactorEllipsoidalCylinder.cpp | 2 +-
Core/FormFactors/FormFactorFullSphere.cpp | 2 +-
Core/FormFactors/FormFactorFullSpheroid.cpp | 3 +--
Core/FormFactors/FormFactorFullSpheroid.h | 6 +-----
Core/FormFactors/FormFactorGauss.cpp | 2 +-
Core/FormFactors/FormFactorHemiEllipsoid.cpp | 4 +---
Core/FormFactors/FormFactorHemiEllipsoid.h | 4 +---
Core/FormFactors/FormFactorIcosahedron.cpp | 2 +-
Core/FormFactors/FormFactorLongBoxGauss.cpp | 2 +-
Core/FormFactors/FormFactorLongBoxLorentz.cpp | 2 +-
Core/FormFactors/FormFactorLongRipple1Gauss.cpp | 6 ++----
Core/FormFactors/FormFactorLongRipple1Gauss.h | 10 +++-------
Core/FormFactors/FormFactorLongRipple1Lorentz.cpp | 4 +---
Core/FormFactors/FormFactorLongRipple1Lorentz.h | 6 +-----
Core/FormFactors/FormFactorLongRipple2Gauss.cpp | 2 +-
Core/FormFactors/FormFactorLongRipple2Lorentz.cpp | 2 +-
Core/FormFactors/FormFactorLorentz.cpp | 2 +-
Core/FormFactors/FormFactorPolyhedron.cpp | 4 ++--
Core/FormFactors/FormFactorPrism3.cpp | 2 +-
Core/FormFactors/FormFactorPrism6.cpp | 2 +-
Core/FormFactors/FormFactorPyramid.cpp | 2 +-
Core/FormFactors/FormFactorRipple2.cpp | 2 +-
Core/FormFactors/FormFactorSphereGaussianRadius.cpp | 2 +-
Core/FormFactors/FormFactorSphereLogNormalRadius.cpp | 2 +-
Core/FormFactors/FormFactorSphereLogNormalRadius.h | 2 +-
Core/FormFactors/FormFactorSphereUniformRadius.cpp | 2 +-
Core/FormFactors/FormFactorTetrahedron.cpp | 4 ++--
Core/FormFactors/FormFactorTools.cpp | 2 +-
Core/FormFactors/FormFactorTriangle.cpp | 2 +-
Core/FormFactors/FormFactorTrivial.cpp | 2 +-
Core/FormFactors/FormFactorTruncatedCube.cpp | 2 +-
Core/FormFactors/FormFactorTruncatedSphere.cpp | 4 +---
Core/FormFactors/FormFactorTruncatedSphere.h | 4 +---
Core/FormFactors/FormFactorTruncatedSpheroid.cpp | 3 +--
Core/FormFactors/FormFactorTruncatedSpheroid.h | 8 +++-----
Core/FormFactors/FormFactorWeighted.cpp | 2 +-
Core/FormFactors/IFormFactor.h | 2 +-
Core/FormFactors/WavevectorInfo.h | 2 +-
54 files changed, 62 insertions(+), 91 deletions(-)
diff --git a/Core/FormFactors/FormFactorAnisoPyramid.cpp b/Core/FormFactors/FormFactorAnisoPyramid.cpp
index 7c3ff67acb5..eaca8168af9 100644
--- a/Core/FormFactors/FormFactorAnisoPyramid.cpp
+++ b/Core/FormFactors/FormFactorAnisoPyramid.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
-#include "FormFactorAnisoPyramid.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
+#include "FormFactorAnisoPyramid.h"
const PolyhedralTopology FormFactorAnisoPyramid::topology = {
{
diff --git a/Core/FormFactors/FormFactorBox.cpp b/Core/FormFactors/FormFactorBox.cpp
index ff31d7ae9a6..5693024d3b1 100644
--- a/Core/FormFactors/FormFactorBox.cpp
+++ b/Core/FormFactors/FormFactorBox.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
-#include "FormFactorBox.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
+#include "FormFactorBox.h"
using namespace BornAgain;
diff --git a/Core/FormFactors/FormFactorCone.cpp b/Core/FormFactors/FormFactorCone.cpp
index 5d04994a26c..b887c51d922 100644
--- a/Core/FormFactors/FormFactorCone.cpp
+++ b/Core/FormFactors/FormFactorCone.cpp
@@ -13,10 +13,9 @@
//
// ************************************************************************** //
-#include "FormFactorCone.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "IntegratorComplex.h"
+#include "FormFactorCone.h"
//! @brief Cone constructor
//! @param radius of Cone's base
diff --git a/Core/FormFactors/FormFactorCone.h b/Core/FormFactors/FormFactorCone.h
index 43185000f3e..d1dfed94781 100644
--- a/Core/FormFactors/FormFactorCone.h
+++ b/Core/FormFactors/FormFactorCone.h
@@ -16,8 +16,8 @@
#ifndef FORMFACTORCONE_H
#define FORMFACTORCONE_H
-#include "FormFactorPolyhedron.h"
-
+#include "IFormFactorBorn.h"
+#include "IntegratorComplex.h"
// Forward declaration to prevent IntegratorComplex.h to be parsed for Python API:
template <class T> class IntegratorComplex;
diff --git a/Core/FormFactors/FormFactorCone6.cpp b/Core/FormFactors/FormFactorCone6.cpp
index ac04b581e53..88551b3d5f1 100644
--- a/Core/FormFactors/FormFactorCone6.cpp
+++ b/Core/FormFactors/FormFactorCone6.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
-#include "FormFactorCone6.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
+#include "FormFactorCone6.h"
const PolyhedralTopology FormFactorCone6::topology = {
{
diff --git a/Core/FormFactors/FormFactorCrystal.h b/Core/FormFactors/FormFactorCrystal.h
index e4a79d2b604..3b421f88b96 100644
--- a/Core/FormFactors/FormFactorCrystal.h
+++ b/Core/FormFactors/FormFactorCrystal.h
@@ -16,8 +16,8 @@
#ifndef FORMFACTORCRYSTAL_H
#define FORMFACTORCRYSTAL_H
-#include "IFormFactorBorn.h"
#include "Crystal.h"
+#include "IFormFactorBorn.h"
//! @class FormFactorCrystal
//! @ingroup formfactors
diff --git a/Core/FormFactors/FormFactorCuboctahedron.cpp b/Core/FormFactors/FormFactorCuboctahedron.cpp
index 5b5a20aeefc..8d922b0d240 100644
--- a/Core/FormFactors/FormFactorCuboctahedron.cpp
+++ b/Core/FormFactors/FormFactorCuboctahedron.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
-#include "FormFactorCuboctahedron.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
+#include "FormFactorCuboctahedron.h"
const PolyhedralTopology FormFactorCuboctahedron::topology = {
{
diff --git a/Core/FormFactors/FormFactorCylinder.cpp b/Core/FormFactors/FormFactorCylinder.cpp
index c9f0bac319b..95c0c030841 100644
--- a/Core/FormFactors/FormFactorCylinder.cpp
+++ b/Core/FormFactors/FormFactorCylinder.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
-#include "FormFactorCylinder.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
+#include "FormFactorCylinder.h"
using namespace BornAgain;
diff --git a/Core/FormFactors/FormFactorDWBA.cpp b/Core/FormFactors/FormFactorDWBA.cpp
index d441a2167dc..c9f4ae20d13 100644
--- a/Core/FormFactors/FormFactorDWBA.cpp
+++ b/Core/FormFactors/FormFactorDWBA.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "FormFactorDWBA.h"
#include "BornAgainNamespace.h"
+#include "FormFactorDWBA.h"
FormFactorDWBA::FormFactorDWBA(const IFormFactor& form_factor)
diff --git a/Core/FormFactors/FormFactorDWBAPol.cpp b/Core/FormFactors/FormFactorDWBAPol.cpp
index 83051a04560..d22ac8adfb2 100644
--- a/Core/FormFactors/FormFactorDWBAPol.cpp
+++ b/Core/FormFactors/FormFactorDWBAPol.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "FormFactorDWBAPol.h"
#include "BornAgainNamespace.h"
+#include "FormFactorDWBAPol.h"
FormFactorDWBAPol::FormFactorDWBAPol(const IFormFactor &form_factor)
: mp_form_factor(form_factor.clone())
diff --git a/Core/FormFactors/FormFactorDecoratorDebyeWaller.cpp b/Core/FormFactors/FormFactorDecoratorDebyeWaller.cpp
index dd47d5c8e14..f305af7d51f 100644
--- a/Core/FormFactors/FormFactorDecoratorDebyeWaller.cpp
+++ b/Core/FormFactors/FormFactorDecoratorDebyeWaller.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "FormFactorDecoratorDebyeWaller.h"
#include "BornAgainNamespace.h"
+#include "FormFactorDecoratorDebyeWaller.h"
using namespace BornAgain;
diff --git a/Core/FormFactors/FormFactorDecoratorFactor.h b/Core/FormFactors/FormFactorDecoratorFactor.h
index b1902fda5ea..4bc96d36bb5 100644
--- a/Core/FormFactors/FormFactorDecoratorFactor.h
+++ b/Core/FormFactors/FormFactorDecoratorFactor.h
@@ -16,8 +16,8 @@
#ifndef FORMFACTORDECORATORFACTOR_H
#define FORMFACTORDECORATORFACTOR_H
-#include "IFormFactorDecorator.h"
#include "BornAgainNamespace.h"
+#include "IFormFactorDecorator.h"
//! @class FormFactorDecoratorFactor
//! @ingroup formfactors_internal
diff --git a/Core/FormFactors/FormFactorDecoratorMultiPositionFactor.cpp b/Core/FormFactors/FormFactorDecoratorMultiPositionFactor.cpp
index a33c00d469d..4cdf5bb7ed8 100644
--- a/Core/FormFactors/FormFactorDecoratorMultiPositionFactor.cpp
+++ b/Core/FormFactors/FormFactorDecoratorMultiPositionFactor.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "FormFactorDecoratorMultiPositionFactor.h"
#include "BornAgainNamespace.h"
+#include "FormFactorDecoratorMultiPositionFactor.h"
FormFactorDecoratorMultiPositionFactor::FormFactorDecoratorMultiPositionFactor(
const IFormFactor &form_factor, std::vector<kvector_t> positions)
diff --git a/Core/FormFactors/FormFactorDecoratorPositionFactor.h b/Core/FormFactors/FormFactorDecoratorPositionFactor.h
index 53de0896806..3f514af3c01 100644
--- a/Core/FormFactors/FormFactorDecoratorPositionFactor.h
+++ b/Core/FormFactors/FormFactorDecoratorPositionFactor.h
@@ -16,8 +16,8 @@
#ifndef FORMFACTORDECORATORPOSITIONFACTOR_H
#define FORMFACTORDECORATORPOSITIONFACTOR_H
-#include "IFormFactorDecorator.h"
#include "BornAgainNamespace.h"
+#include "IFormFactorDecorator.h"
//! @class FormFactorDecoratorPositionFactor
//! @ingroup formfactors_internal
diff --git a/Core/FormFactors/FormFactorDecoratorRotation.cpp b/Core/FormFactors/FormFactorDecoratorRotation.cpp
index 4d0291abe5d..55a87b24ed1 100644
--- a/Core/FormFactors/FormFactorDecoratorRotation.cpp
+++ b/Core/FormFactors/FormFactorDecoratorRotation.cpp
@@ -14,8 +14,8 @@
// ************************************************************************** //
#include <memory>
-#include "FormFactorDecoratorRotation.h"
#include "BornAgainNamespace.h"
+#include "FormFactorDecoratorRotation.h"
FormFactorDecoratorRotation::FormFactorDecoratorRotation(
const IFormFactor& form_factor, const IRotation& transform)
diff --git a/Core/FormFactors/FormFactorDodecahedron.cpp b/Core/FormFactors/FormFactorDodecahedron.cpp
index d0d4d084361..c55abdd78c8 100644
--- a/Core/FormFactors/FormFactorDodecahedron.cpp
+++ b/Core/FormFactors/FormFactorDodecahedron.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "FormFactorDodecahedron.h"
#include "BornAgainNamespace.h"
+#include "FormFactorDodecahedron.h"
const PolyhedralTopology FormFactorDodecahedron::topology = {
{
diff --git a/Core/FormFactors/FormFactorEllipsoidalCylinder.cpp b/Core/FormFactors/FormFactorEllipsoidalCylinder.cpp
index 2c35e14f9c2..a1895bc2a43 100644
--- a/Core/FormFactors/FormFactorEllipsoidalCylinder.cpp
+++ b/Core/FormFactors/FormFactorEllipsoidalCylinder.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
-#include "FormFactorEllipsoidalCylinder.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
+#include "FormFactorEllipsoidalCylinder.h"
using namespace BornAgain;
diff --git a/Core/FormFactors/FormFactorFullSphere.cpp b/Core/FormFactors/FormFactorFullSphere.cpp
index 008ae75aa67..6b6612f8c68 100644
--- a/Core/FormFactors/FormFactorFullSphere.cpp
+++ b/Core/FormFactors/FormFactorFullSphere.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "FormFactorFullSphere.h"
#include "BornAgainNamespace.h"
+#include "FormFactorFullSphere.h"
#ifdef POLYHEDRAL_DIAGNOSTIC
#endif
diff --git a/Core/FormFactors/FormFactorFullSpheroid.cpp b/Core/FormFactors/FormFactorFullSpheroid.cpp
index 4e7b5552aa4..8cc0e586c06 100644
--- a/Core/FormFactors/FormFactorFullSpheroid.cpp
+++ b/Core/FormFactors/FormFactorFullSpheroid.cpp
@@ -13,10 +13,9 @@
//
// ************************************************************************** //
-#include "FormFactorFullSpheroid.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "IntegratorComplex.h"
+#include "FormFactorFullSpheroid.h"
using namespace BornAgain;
diff --git a/Core/FormFactors/FormFactorFullSpheroid.h b/Core/FormFactors/FormFactorFullSpheroid.h
index 0add1a4f33e..733b50592bd 100644
--- a/Core/FormFactors/FormFactorFullSpheroid.h
+++ b/Core/FormFactors/FormFactorFullSpheroid.h
@@ -18,9 +18,7 @@
#include <memory>
#include "IFormFactorBorn.h"
-
-// Forward declaration to prevent IntegratorComplex.h to be parsed for Python API:
-template <class T> class IntegratorComplex;
+#include "IntegratorComplex.h"
//! @class FormFactorFullSpheroid
//! @ingroup formfactors
@@ -75,5 +73,3 @@ inline double FormFactorFullSpheroid::getRadius() const
}
#endif // FORMFACTORFULLSPHEROID_H
-
-
diff --git a/Core/FormFactors/FormFactorGauss.cpp b/Core/FormFactors/FormFactorGauss.cpp
index c0585592e28..8cd3cf54949 100644
--- a/Core/FormFactors/FormFactorGauss.cpp
+++ b/Core/FormFactors/FormFactorGauss.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "FormFactorGauss.h"
#include "BornAgainNamespace.h"
+#include "FormFactorGauss.h"
using namespace BornAgain;
diff --git a/Core/FormFactors/FormFactorHemiEllipsoid.cpp b/Core/FormFactors/FormFactorHemiEllipsoid.cpp
index 47e707aa4e2..363ec97924a 100644
--- a/Core/FormFactors/FormFactorHemiEllipsoid.cpp
+++ b/Core/FormFactors/FormFactorHemiEllipsoid.cpp
@@ -13,11 +13,9 @@
//
// ************************************************************************** //
-#include "FormFactorHemiEllipsoid.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "IntegratorComplex.h"
-
+#include "FormFactorHemiEllipsoid.h"
using namespace BornAgain;
diff --git a/Core/FormFactors/FormFactorHemiEllipsoid.h b/Core/FormFactors/FormFactorHemiEllipsoid.h
index 80d3b4c3984..6dfea43b474 100644
--- a/Core/FormFactors/FormFactorHemiEllipsoid.h
+++ b/Core/FormFactors/FormFactorHemiEllipsoid.h
@@ -18,9 +18,7 @@
#include <memory>
#include "IFormFactorBorn.h"
-
-// Forward declaration to prevent IntegratorComplex.h to be parsed for Python API:
-template <class T> class IntegratorComplex;
+#include "IntegratorComplex.h"
//! @class FormFactorHemiEllipsoid
//! @ingroup formfactors
diff --git a/Core/FormFactors/FormFactorIcosahedron.cpp b/Core/FormFactors/FormFactorIcosahedron.cpp
index 467858544dd..8275ad3520b 100644
--- a/Core/FormFactors/FormFactorIcosahedron.cpp
+++ b/Core/FormFactors/FormFactorIcosahedron.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "FormFactorIcosahedron.h"
#include "BornAgainNamespace.h"
+#include "FormFactorIcosahedron.h"
const PolyhedralTopology FormFactorIcosahedron::topology = {
{
diff --git a/Core/FormFactors/FormFactorLongBoxGauss.cpp b/Core/FormFactors/FormFactorLongBoxGauss.cpp
index 5aaba42ecc8..e213574a813 100644
--- a/Core/FormFactors/FormFactorLongBoxGauss.cpp
+++ b/Core/FormFactors/FormFactorLongBoxGauss.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
-#include "FormFactorLongBoxGauss.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
+#include "FormFactorLongBoxGauss.h"
using namespace BornAgain;
diff --git a/Core/FormFactors/FormFactorLongBoxLorentz.cpp b/Core/FormFactors/FormFactorLongBoxLorentz.cpp
index 6da64b1ca64..9bfdf15aad6 100644
--- a/Core/FormFactors/FormFactorLongBoxLorentz.cpp
+++ b/Core/FormFactors/FormFactorLongBoxLorentz.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
-#include "FormFactorLongBoxLorentz.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
+#include "FormFactorLongBoxLorentz.h"
using namespace BornAgain;
diff --git a/Core/FormFactors/FormFactorLongRipple1Gauss.cpp b/Core/FormFactors/FormFactorLongRipple1Gauss.cpp
index a2f6b915fc8..42d83aaad8c 100644
--- a/Core/FormFactors/FormFactorLongRipple1Gauss.cpp
+++ b/Core/FormFactors/FormFactorLongRipple1Gauss.cpp
@@ -13,11 +13,9 @@
//
// ************************************************************************** //
-#include "FormFactorLongRipple1Gauss.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "IntegratorComplex.h"
-
+#include "FormFactorLongRipple1Gauss.h"
using namespace BornAgain;
@@ -103,5 +101,5 @@ complex_t FormFactorLongRipple1Gauss::evaluate_for_q(const cvector_t q) const
// numerical integration otherwise
complex_t integral = mP_integrator->integrate(0, m_height);
- return factor*integral;
+ return factor * integral;
}
diff --git a/Core/FormFactors/FormFactorLongRipple1Gauss.h b/Core/FormFactors/FormFactorLongRipple1Gauss.h
index d2ea26d2da4..dab77800ea6 100644
--- a/Core/FormFactors/FormFactorLongRipple1Gauss.h
+++ b/Core/FormFactors/FormFactorLongRipple1Gauss.h
@@ -18,9 +18,7 @@
#include <memory>
#include "IFormFactorBorn.h"
-
-// Forward declaration to prevent IntegratorComplex.h to be parsed for Python API:
-template <class T> class IntegratorComplex;
+#include "IntegratorComplex.h"
//! @class FormFactorLongRipple1Gauss
//! @ingroup formfactors
@@ -37,9 +35,9 @@ public:
virtual ~FormFactorLongRipple1Gauss();
- virtual FormFactorLongRipple1Gauss *clone() const;
+ virtual FormFactorLongRipple1Gauss* clone() const;
- virtual void accept(ISampleVisitor *visitor) const;
+ virtual void accept(ISampleVisitor* visitor) const;
virtual double getRadius() const;
@@ -84,5 +82,3 @@ inline double FormFactorLongRipple1Gauss::getLength() const
}
#endif // FORMFACTORLONGRIPPLE1GAUSS_H
-
-
diff --git a/Core/FormFactors/FormFactorLongRipple1Lorentz.cpp b/Core/FormFactors/FormFactorLongRipple1Lorentz.cpp
index 7d4a34c76c2..f6b2ed3185f 100644
--- a/Core/FormFactors/FormFactorLongRipple1Lorentz.cpp
+++ b/Core/FormFactors/FormFactorLongRipple1Lorentz.cpp
@@ -13,11 +13,9 @@
//
// ************************************************************************** //
-#include "FormFactorLongRipple1Lorentz.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "IntegratorComplex.h"
-
+#include "FormFactorLongRipple1Lorentz.h"
using namespace BornAgain;
diff --git a/Core/FormFactors/FormFactorLongRipple1Lorentz.h b/Core/FormFactors/FormFactorLongRipple1Lorentz.h
index 7c9d6d8a0fc..06cf8da7a73 100644
--- a/Core/FormFactors/FormFactorLongRipple1Lorentz.h
+++ b/Core/FormFactors/FormFactorLongRipple1Lorentz.h
@@ -18,9 +18,7 @@
#include <memory>
#include "IFormFactorBorn.h"
-
-// Forward declaration to prevent IntegratorComplex.h to be parsed for Python API:
-template <class T> class IntegratorComplex;
+#include "IntegratorComplex.h"
//! @class FormFactorLongRipple1Lorentz
//! @ingroup formfactors
@@ -84,5 +82,3 @@ inline double FormFactorLongRipple1Lorentz::getLength() const
}
#endif // FORMFACTORLONGRIPPLE1LORENTZ_H
-
-
diff --git a/Core/FormFactors/FormFactorLongRipple2Gauss.cpp b/Core/FormFactors/FormFactorLongRipple2Gauss.cpp
index dfd4cf10f2d..32cc737b28b 100644
--- a/Core/FormFactors/FormFactorLongRipple2Gauss.cpp
+++ b/Core/FormFactors/FormFactorLongRipple2Gauss.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "FormFactorLongRipple2Gauss.h"
#include "BornAgainNamespace.h"
+#include "FormFactorLongRipple2Gauss.h"
using namespace BornAgain;
diff --git a/Core/FormFactors/FormFactorLongRipple2Lorentz.cpp b/Core/FormFactors/FormFactorLongRipple2Lorentz.cpp
index a315032adf1..8364c08c71a 100644
--- a/Core/FormFactors/FormFactorLongRipple2Lorentz.cpp
+++ b/Core/FormFactors/FormFactorLongRipple2Lorentz.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "FormFactorLongRipple2Lorentz.h"
#include "BornAgainNamespace.h"
+#include "FormFactorLongRipple2Lorentz.h"
using namespace BornAgain;
diff --git a/Core/FormFactors/FormFactorLorentz.cpp b/Core/FormFactors/FormFactorLorentz.cpp
index 1ecd0feca91..51eb7079302 100644
--- a/Core/FormFactors/FormFactorLorentz.cpp
+++ b/Core/FormFactors/FormFactorLorentz.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "FormFactorLorentz.h"
#include "BornAgainNamespace.h"
+#include "FormFactorLorentz.h"
using namespace BornAgain;
diff --git a/Core/FormFactors/FormFactorPolyhedron.cpp b/Core/FormFactors/FormFactorPolyhedron.cpp
index 60159f15bed..83d4f2a60f4 100644
--- a/Core/FormFactors/FormFactorPolyhedron.cpp
+++ b/Core/FormFactors/FormFactorPolyhedron.cpp
@@ -18,9 +18,9 @@
//! "Form factor (Fourier shape transform) of polygon and polyhedron."
#include <iomanip>
-#include "Precomputed.h"
-#include "MathFunctions.h"
#include "BornAgainNamespace.h"
+#include "MathFunctions.h"
+#include "Precomputed.h"
#include "FormFactorPolyhedron.h"
static const complex_t I(0.,1.);
diff --git a/Core/FormFactors/FormFactorPrism3.cpp b/Core/FormFactors/FormFactorPrism3.cpp
index 8ba45e73316..eaa776175f0 100644
--- a/Core/FormFactors/FormFactorPrism3.cpp
+++ b/Core/FormFactors/FormFactorPrism3.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "FormFactorPrism3.h"
#include "BornAgainNamespace.h"
+#include "FormFactorPrism3.h"
//! @brief Prism3 constructor
//! @param base_edge of hexagonal base
diff --git a/Core/FormFactors/FormFactorPrism6.cpp b/Core/FormFactors/FormFactorPrism6.cpp
index 1ec3c1aa5df..e40e0620b87 100644
--- a/Core/FormFactors/FormFactorPrism6.cpp
+++ b/Core/FormFactors/FormFactorPrism6.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "FormFactorPrism6.h"
#include "BornAgainNamespace.h"
+#include "FormFactorPrism6.h"
//! @brief Prism6 constructor
//! @param base_edge of hexagonal base
diff --git a/Core/FormFactors/FormFactorPyramid.cpp b/Core/FormFactors/FormFactorPyramid.cpp
index 21942048217..9558c3121dd 100644
--- a/Core/FormFactors/FormFactorPyramid.cpp
+++ b/Core/FormFactors/FormFactorPyramid.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
-#include "FormFactorPyramid.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
+#include "FormFactorPyramid.h"
const PolyhedralTopology FormFactorPyramid::topology = {
{
diff --git a/Core/FormFactors/FormFactorRipple2.cpp b/Core/FormFactors/FormFactorRipple2.cpp
index 76678c7ea8c..76daf77ff62 100644
--- a/Core/FormFactors/FormFactorRipple2.cpp
+++ b/Core/FormFactors/FormFactorRipple2.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
-#include "FormFactorRipple2.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
+#include "FormFactorRipple2.h"
using namespace BornAgain;
diff --git a/Core/FormFactors/FormFactorSphereGaussianRadius.cpp b/Core/FormFactors/FormFactorSphereGaussianRadius.cpp
index 4e815929efa..2e4cd68ebda 100644
--- a/Core/FormFactors/FormFactorSphereGaussianRadius.cpp
+++ b/Core/FormFactors/FormFactorSphereGaussianRadius.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "FormFactorSphereGaussianRadius.h"
#include "BornAgainNamespace.h"
+#include "FormFactorSphereGaussianRadius.h"
using namespace BornAgain;
diff --git a/Core/FormFactors/FormFactorSphereLogNormalRadius.cpp b/Core/FormFactors/FormFactorSphereLogNormalRadius.cpp
index 40027c88c89..240b7bf0775 100644
--- a/Core/FormFactors/FormFactorSphereLogNormalRadius.cpp
+++ b/Core/FormFactors/FormFactorSphereLogNormalRadius.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
-#include "FormFactorSphereLogNormalRadius.h"
#include "BornAgainNamespace.h"
#include "Distributions.h"
+#include "FormFactorSphereLogNormalRadius.h"
using namespace BornAgain;
diff --git a/Core/FormFactors/FormFactorSphereLogNormalRadius.h b/Core/FormFactors/FormFactorSphereLogNormalRadius.h
index 10271a5418c..386eec06e40 100644
--- a/Core/FormFactors/FormFactorSphereLogNormalRadius.h
+++ b/Core/FormFactors/FormFactorSphereLogNormalRadius.h
@@ -15,8 +15,8 @@
#ifndef FORMFACTORSPHERELOGNORMALRADIUS_H
#define FORMFACTORSPHERELOGNORMALRADIUS_H
-#include "SafePointerVector.h"
#include "FormFactorFullSphere.h"
+#include "SafePointerVector.h"
class DistributionLogNormal;
diff --git a/Core/FormFactors/FormFactorSphereUniformRadius.cpp b/Core/FormFactors/FormFactorSphereUniformRadius.cpp
index afdb8e3a5db..c79d7156390 100644
--- a/Core/FormFactors/FormFactorSphereUniformRadius.cpp
+++ b/Core/FormFactors/FormFactorSphereUniformRadius.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "FormFactorSphereUniformRadius.h"
#include "BornAgainNamespace.h"
+#include "FormFactorSphereUniformRadius.h"
using namespace BornAgain;
diff --git a/Core/FormFactors/FormFactorTetrahedron.cpp b/Core/FormFactors/FormFactorTetrahedron.cpp
index 44480173cdb..f1fb788131e 100644
--- a/Core/FormFactors/FormFactorTetrahedron.cpp
+++ b/Core/FormFactors/FormFactorTetrahedron.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
-#include "FormFactorTetrahedron.h"
-#include "MathFunctions.h"
#include "BornAgainNamespace.h"
+#include "MathFunctions.h"
+#include "FormFactorTetrahedron.h"
const PolyhedralTopology FormFactorTetrahedron::topology = {
{
diff --git a/Core/FormFactors/FormFactorTools.cpp b/Core/FormFactors/FormFactorTools.cpp
index 9a1b4257600..bbbac140dbe 100644
--- a/Core/FormFactors/FormFactorTools.cpp
+++ b/Core/FormFactors/FormFactorTools.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
-#include "FormFactorTools.h"
#include "FormFactorDWBA.h"
#include "FormFactorDWBAPol.h"
+#include "FormFactorTools.h"
IFormFactor *FormFactorTools::createDWBAScalarFormFactor(const IFormFactor &form_factor)
{
diff --git a/Core/FormFactors/FormFactorTriangle.cpp b/Core/FormFactors/FormFactorTriangle.cpp
index b8460b7fe1a..1795b5f8b90 100644
--- a/Core/FormFactors/FormFactorTriangle.cpp
+++ b/Core/FormFactors/FormFactorTriangle.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "FormFactorTriangle.h"
#include "BornAgainNamespace.h"
+#include "FormFactorTriangle.h"
FormFactorTriangle::FormFactorTriangle(const double base_edge)
: m_base_edge( base_edge )
diff --git a/Core/FormFactors/FormFactorTrivial.cpp b/Core/FormFactors/FormFactorTrivial.cpp
index 94d5f8bad26..729957e6081 100644
--- a/Core/FormFactors/FormFactorTrivial.cpp
+++ b/Core/FormFactors/FormFactorTrivial.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "FormFactorTrivial.h"
#include "BornAgainNamespace.h"
+#include "FormFactorTrivial.h"
FormFactorTrivial::FormFactorTrivial()
diff --git a/Core/FormFactors/FormFactorTruncatedCube.cpp b/Core/FormFactors/FormFactorTruncatedCube.cpp
index af8ff909d45..cbf216f5858 100644
--- a/Core/FormFactors/FormFactorTruncatedCube.cpp
+++ b/Core/FormFactors/FormFactorTruncatedCube.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "FormFactorTruncatedCube.h"
#include "BornAgainNamespace.h"
+#include "FormFactorTruncatedCube.h"
const PolyhedralTopology FormFactorTruncatedCube::topology = {
{
diff --git a/Core/FormFactors/FormFactorTruncatedSphere.cpp b/Core/FormFactors/FormFactorTruncatedSphere.cpp
index 42b51e96cfe..adccfb1de0c 100644
--- a/Core/FormFactors/FormFactorTruncatedSphere.cpp
+++ b/Core/FormFactors/FormFactorTruncatedSphere.cpp
@@ -13,11 +13,9 @@
//
// ************************************************************************** //
-#include "FormFactorTruncatedSphere.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "IntegratorComplex.h"
-
+#include "FormFactorTruncatedSphere.h"
using namespace BornAgain;
diff --git a/Core/FormFactors/FormFactorTruncatedSphere.h b/Core/FormFactors/FormFactorTruncatedSphere.h
index 2ece31eb081..2577bd59658 100644
--- a/Core/FormFactors/FormFactorTruncatedSphere.h
+++ b/Core/FormFactors/FormFactorTruncatedSphere.h
@@ -18,9 +18,7 @@
#include <memory>
#include "IFormFactorBorn.h"
-
-// Forward declaration to prevent IntegratorComplex.h to be parsed for Python API:
-template <class T> class IntegratorComplex;
+#include "IntegratorComplex.h"
//! @class FormFactorTruncatedSphere
//! @ingroup formfactors
diff --git a/Core/FormFactors/FormFactorTruncatedSpheroid.cpp b/Core/FormFactors/FormFactorTruncatedSpheroid.cpp
index 718723a7030..b05971195ee 100644
--- a/Core/FormFactors/FormFactorTruncatedSpheroid.cpp
+++ b/Core/FormFactors/FormFactorTruncatedSpheroid.cpp
@@ -13,10 +13,9 @@
//
// ************************************************************************** //
-#include "FormFactorTruncatedSpheroid.h"
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
-#include "IntegratorComplex.h"
+#include "FormFactorTruncatedSpheroid.h"
using namespace BornAgain;
diff --git a/Core/FormFactors/FormFactorTruncatedSpheroid.h b/Core/FormFactors/FormFactorTruncatedSpheroid.h
index 691ac031ca4..2bb3e2427dd 100644
--- a/Core/FormFactors/FormFactorTruncatedSpheroid.h
+++ b/Core/FormFactors/FormFactorTruncatedSpheroid.h
@@ -18,9 +18,7 @@
#include <memory>
#include "IFormFactorBorn.h"
-
-// Forward declaration to prevent IntegratorComplex.h to be parsed for Python API:
-template <class T> class IntegratorComplex;
+#include "IntegratorComplex.h"
//! @class FormFactorTruncatedSpheroid
//! @ingroup formfactors
@@ -33,9 +31,9 @@ public:
virtual ~FormFactorTruncatedSpheroid();
- virtual FormFactorTruncatedSpheroid *clone() const;
+ virtual FormFactorTruncatedSpheroid* clone() const;
- virtual void accept(ISampleVisitor *visitor) const;
+ virtual void accept(ISampleVisitor* visitor) const;
double getHeight() const;
diff --git a/Core/FormFactors/FormFactorWeighted.cpp b/Core/FormFactors/FormFactorWeighted.cpp
index b79294f79f6..96f0b3e5279 100644
--- a/Core/FormFactors/FormFactorWeighted.cpp
+++ b/Core/FormFactors/FormFactorWeighted.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include "FormFactorWeighted.h"
#include "BornAgainNamespace.h"
+#include "FormFactorWeighted.h"
FormFactorWeighted::FormFactorWeighted()
diff --git a/Core/FormFactors/IFormFactor.h b/Core/FormFactors/IFormFactor.h
index fc7b16caca1..dee1fb68b07 100644
--- a/Core/FormFactors/IFormFactor.h
+++ b/Core/FormFactors/IFormFactor.h
@@ -17,8 +17,8 @@
#define IFORMFACTOR_H
#include "Complex.h"
-#include "ISample.h"
#include "EigenCore.h"
+#include "ISample.h"
#include "WavevectorInfo.h"
class ILayerRTCoefficients;
diff --git a/Core/FormFactors/WavevectorInfo.h b/Core/FormFactors/WavevectorInfo.h
index 3754354a062..4810b446433 100644
--- a/Core/FormFactors/WavevectorInfo.h
+++ b/Core/FormFactors/WavevectorInfo.h
@@ -16,8 +16,8 @@
#ifndef WAVEVECTORINFO_H
#define WAVEVECTORINFO_H
-#include "Units.h"
#include "Bin.h"
+#include "Units.h"
//! @class WavevectorInfo
--
GitLab