From e7646f50f0fb5eaf772e9a64bb4c87cb4881c460 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 14 Aug 2020 13:43:16 +0200
Subject: [PATCH] clang-format
---
Core/HardParticle/FormFactorBar.cpp | 16 ++++++++--------
Core/HardParticle/FormFactorRipple1.cpp | 24 ++++++++++++------------
Core/HardParticle/FormFactorRipple2.cpp | 24 ++++++++++++------------
Core/HardParticle/IProfileRipple.cpp | 17 +++++++++--------
Core/HardParticle/Ripples.cpp | 2 +-
Core/HardParticle/Ripples.h | 2 +-
6 files changed, 43 insertions(+), 42 deletions(-)
diff --git a/Core/HardParticle/FormFactorBar.cpp b/Core/HardParticle/FormFactorBar.cpp
index 2366ae9e2ec..5c37df741f4 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 c807489b64f..aa1c749e19e 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 6d5f7e01435..c1a53a4f3d3 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 e0950f4ae6a..7879c9a7017 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 0226bee403d..f4b677e2c50 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 a92e6590e35..b654f3c8390 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
--
GitLab