diff --git a/Core/HardParticle/FormFactorBar.cpp b/Core/HardParticle/FormFactorBar.cpp
index 2366ae9e2eccd7fa8b3482045e6599913e43f468..5c37df741f4f450899a14e26218d694096be1f5a 100644
--- a/Core/HardParticle/FormFactorBar.cpp
+++ b/Core/HardParticle/FormFactorBar.cpp
@@ -20,14 +20,14 @@
// ************************************************************************** //
FormFactorBarGauss::FormFactorBarGauss(const std::vector<double> P)
- : ProfileRectangularRipple({"BarGauss", "class_tooltip", {}}, P)
+ : ProfileRectangularRipple({"BarGauss", "class_tooltip", {}}, P)
{
}
FormFactorBarGauss::FormFactorBarGauss(double length, double width, double height)
- : FormFactorBarGauss(std::vector<double>{length, width, height})
-{}
-
+ : FormFactorBarGauss(std::vector<double>{length, width, height})
+{
+}
FormFactorBarGauss* FormFactorBarGauss::clone() const
{
@@ -49,14 +49,14 @@ complex_t FormFactorBarGauss::factor_x(complex_t qx) const
// ************************************************************************** //
FormFactorBarLorentz::FormFactorBarLorentz(const std::vector<double> P)
- : ProfileRectangularRipple({"BarLorentz", "class_tooltip", {}}, P)
+ : ProfileRectangularRipple({"BarLorentz", "class_tooltip", {}}, P)
{
}
FormFactorBarLorentz::FormFactorBarLorentz(double length, double width, double height)
- : FormFactorBarLorentz(std::vector<double>{length, width, height})
-{}
-
+ : FormFactorBarLorentz(std::vector<double>{length, width, height})
+{
+}
FormFactorBarLorentz* FormFactorBarLorentz::clone() const
{
diff --git a/Core/HardParticle/FormFactorRipple1.cpp b/Core/HardParticle/FormFactorRipple1.cpp
index c807489b64feb7d65c960e5a6f05b113e61974f7..aa1c749e19e7c947f10dd8e6ba3cf1bdf272380b 100644
--- a/Core/HardParticle/FormFactorRipple1.cpp
+++ b/Core/HardParticle/FormFactorRipple1.cpp
@@ -20,14 +20,14 @@
// ************************************************************************** //
FormFactorRipple1Box::FormFactorRipple1Box(const std::vector<double> P)
- : ProfileRipple1({"Ripple1Box", "class_tooltip", {}}, P)
+ : ProfileRipple1({"Ripple1Box", "class_tooltip", {}}, P)
{
}
FormFactorRipple1Box::FormFactorRipple1Box(double length, double width, double height)
- : FormFactorRipple1Box(std::vector<double>{length, width, height})
-{}
-
+ : FormFactorRipple1Box(std::vector<double>{length, width, height})
+{
+}
FormFactorRipple1Box* FormFactorRipple1Box::clone() const
{
@@ -49,14 +49,14 @@ complex_t FormFactorRipple1Box::factor_x(complex_t qx) const
// ************************************************************************** //
FormFactorRipple1Gauss::FormFactorRipple1Gauss(const std::vector<double> P)
- : ProfileRipple1({"Ripple1Gauss", "class_tooltip", {}}, P)
+ : ProfileRipple1({"Ripple1Gauss", "class_tooltip", {}}, P)
{
}
FormFactorRipple1Gauss::FormFactorRipple1Gauss(double length, double width, double height)
- : FormFactorRipple1Gauss(std::vector<double>{length, width, height})
-{}
-
+ : FormFactorRipple1Gauss(std::vector<double>{length, width, height})
+{
+}
FormFactorRipple1Gauss* FormFactorRipple1Gauss::clone() const
{
@@ -78,14 +78,14 @@ complex_t FormFactorRipple1Gauss::factor_x(complex_t qx) const
// ************************************************************************** //
FormFactorRipple1Lorentz::FormFactorRipple1Lorentz(const std::vector<double> P)
- : ProfileRipple1({"Ripple1Lorentz", "class_tooltip", {}}, P)
+ : ProfileRipple1({"Ripple1Lorentz", "class_tooltip", {}}, P)
{
}
FormFactorRipple1Lorentz::FormFactorRipple1Lorentz(double length, double width, double height)
- : FormFactorRipple1Lorentz(std::vector<double>{length, width, height})
-{}
-
+ : FormFactorRipple1Lorentz(std::vector<double>{length, width, height})
+{
+}
FormFactorRipple1Lorentz* FormFactorRipple1Lorentz::clone() const
{
diff --git a/Core/HardParticle/FormFactorRipple2.cpp b/Core/HardParticle/FormFactorRipple2.cpp
index 6d5f7e01435cb3ab0d5d542ef295f0b442ed8b37..c1a53a4f3d3847983ec60c64e904f4518d71a08a 100644
--- a/Core/HardParticle/FormFactorRipple2.cpp
+++ b/Core/HardParticle/FormFactorRipple2.cpp
@@ -20,15 +20,15 @@
// ************************************************************************** //
FormFactorRipple2Box::FormFactorRipple2Box(const std::vector<double> P)
- : ProfileRipple2({"Ripple2Box", "class_tooltip", {}}, P)
+ : ProfileRipple2({"Ripple2Box", "class_tooltip", {}}, P)
{
}
FormFactorRipple2Box::FormFactorRipple2Box(double length, double width, double height,
double asymmetry)
- : FormFactorRipple2Box(std::vector<double>{length, width, height, asymmetry})
-{}
-
+ : FormFactorRipple2Box(std::vector<double>{length, width, height, asymmetry})
+{
+}
FormFactorRipple2Box* FormFactorRipple2Box::clone() const
{
@@ -50,15 +50,15 @@ complex_t FormFactorRipple2Box::factor_x(complex_t qx) const
// ************************************************************************** //
FormFactorRipple2Gauss::FormFactorRipple2Gauss(const std::vector<double> P)
- : ProfileRipple2({"Ripple2Gauss", "class_tooltip", {}}, P)
+ : ProfileRipple2({"Ripple2Gauss", "class_tooltip", {}}, P)
{
}
FormFactorRipple2Gauss::FormFactorRipple2Gauss(double length, double width, double height,
double asymmetry)
- : FormFactorRipple2Gauss(std::vector<double>{length, width, height, asymmetry})
-{}
-
+ : FormFactorRipple2Gauss(std::vector<double>{length, width, height, asymmetry})
+{
+}
FormFactorRipple2Gauss* FormFactorRipple2Gauss::clone() const
{
@@ -80,15 +80,15 @@ complex_t FormFactorRipple2Gauss::factor_x(complex_t qx) const
// ************************************************************************** //
FormFactorRipple2Lorentz::FormFactorRipple2Lorentz(const std::vector<double> P)
- : ProfileRipple2({"Ripple2Lorentz", "class_tooltip", {}}, P)
+ : ProfileRipple2({"Ripple2Lorentz", "class_tooltip", {}}, P)
{
}
FormFactorRipple2Lorentz::FormFactorRipple2Lorentz(double length, double width, double height,
double asymmetry)
- : FormFactorRipple2Lorentz(std::vector<double>{length, width, height, asymmetry})
-{}
-
+ : FormFactorRipple2Lorentz(std::vector<double>{length, width, height, asymmetry})
+{
+}
FormFactorRipple2Lorentz* FormFactorRipple2Lorentz::clone() const
{
diff --git a/Core/HardParticle/IProfileRipple.cpp b/Core/HardParticle/IProfileRipple.cpp
index e0950f4ae6a79c979b708e724cd3960a4187cbbd..7879c9a70171d418b47933a0ef09a53f46e99e6c 100644
--- a/Core/HardParticle/IProfileRipple.cpp
+++ b/Core/HardParticle/IProfileRipple.cpp
@@ -24,10 +24,10 @@
IProfileRipple::IProfileRipple(const NodeMeta& meta, const std::vector<double>& PValues)
: IFormFactorBorn(nodeMetaUnion({{"Length", "nm", "Characteristic length", 0, INF, 1.},
- {"Width", "nm", "Width", 0, INF, 1.},
- {"Height", "nm", "Height", 0, INF, 1.}},
- meta),
- PValues),
+ {"Width", "nm", "Width", 0, INF, 1.},
+ {"Height", "nm", "Height", 0, INF, 1.}},
+ meta),
+ PValues),
m_length(m_P[0]), m_width(m_P[1]), m_height(m_P[2])
{
}
@@ -46,7 +46,8 @@ complex_t IProfileRipple::evaluate_for_q(cvector_t q) const
// interface ProfileRectangularRipple
// ************************************************************************** //
-ProfileRectangularRipple::ProfileRectangularRipple(const NodeMeta& meta, const std::vector<double>& PValues)
+ProfileRectangularRipple::ProfileRectangularRipple(const NodeMeta& meta,
+ const std::vector<double>& PValues)
: IProfileRipple(meta, PValues)
{
onChange();
@@ -89,9 +90,9 @@ void ProfileRipple1::onChange()
// ************************************************************************** //
ProfileRipple2::ProfileRipple2(const NodeMeta& meta, const std::vector<double>& PValues)
- : IProfileRipple(nodeMetaUnion({{"AsymmetryLength", "nm", "Asymmetry of width", -INF, INF, 0.}},
- meta),
- PValues),
+ : IProfileRipple(
+ nodeMetaUnion({{"AsymmetryLength", "nm", "Asymmetry of width", -INF, INF, 0.}}, meta),
+ PValues),
m_asymmetry(m_P[3])
{
onChange();
diff --git a/Core/HardParticle/Ripples.cpp b/Core/HardParticle/Ripples.cpp
index 0226bee403d7655efb70b3b98d5f907a29a555b4..f4b677e2c50abb5e1090c44a140b31a5c169e46f 100644
--- a/Core/HardParticle/Ripples.cpp
+++ b/Core/HardParticle/Ripples.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Core/HardParticle/Ripples.h"
-#include "Core/Tools/Integrator.h"
#include "Core/Basics/MathConstants.h"
+#include "Core/Tools/Integrator.h"
#include "Core/Tools/MathFunctions.h"
complex_t ripples::factor_x_box(complex_t q, double r)
diff --git a/Core/HardParticle/Ripples.h b/Core/HardParticle/Ripples.h
index a92e6590e355e137be24446a06accb7395f2bb3e..b654f3c8390f23f82c25a40a5f0553c6c8c24bef 100644
--- a/Core/HardParticle/Ripples.h
+++ b/Core/HardParticle/Ripples.h
@@ -28,7 +28,7 @@ complex_t factor_x_Lorentz(complex_t q, double l);
complex_t profile_yz_bar(complex_t qy, complex_t qz, double width, double height);
complex_t profile_yz_cosine(complex_t qy, complex_t qz, double width, double height);
complex_t profile_yz_triangular(complex_t qy, complex_t qz, double width, double height,
- double asymmetry);
+ double asymmetry);
} // namespace ripples