From a379328612ee7f595db70f5eca3cfe5769aa8bed Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de>
Date: Fri, 16 Oct 2020 23:00:07 +0200
Subject: [PATCH] clang-format
---
Core/Computation/RoughMultiLayerComputation.cpp | 2 +-
Core/Export/SampleToPython.cpp | 2 +-
Device/Scan/AngularSpecScan.cpp | 13 +++++++------
Device/Scan/QSpecScan.cpp | 4 ++--
GUI/coregui/Models/TransformFromDomain.cpp | 2 +-
Sample/Multilayer/MultiLayer.cpp | 2 +-
Sample/Multilayer/MultiLayerUtils.cpp | 4 ++--
Sample/Particle/Crystal.cpp | 4 ++--
Sample/Specular/SpecularMagneticOldStrategy.cpp | 2 +-
Sample/Specular/SpecularScalarStrategy.cpp | 2 +-
Sample/StandardSamples/CylindersBuilder.cpp | 2 +-
.../StandardSamples/LayersWithAbsorptionBuilder.cpp | 2 +-
Sample/StandardSamples/MagneticParticlesBuilder.cpp | 2 +-
.../UnitTests/Core/Fresnel/SpecularMagneticTest.cpp | 4 ++--
Tests/UnitTests/Core/Sample/MultiLayerTest.cpp | 2 +-
Tests/UnitTests/Core/Sample/RTTest.cpp | 2 +-
16 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/Core/Computation/RoughMultiLayerComputation.cpp b/Core/Computation/RoughMultiLayerComputation.cpp
index d411862980a..1be44ca381e 100644
--- a/Core/Computation/RoughMultiLayerComputation.cpp
+++ b/Core/Computation/RoughMultiLayerComputation.cpp
@@ -18,9 +18,9 @@
#include "Core/Computation/ProcessedSample.h"
#include "Sample/Fresnel/IFresnelMap.h"
#include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/LayerInterface.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/RT/ILayerRTCoefficients.h"
+#include "Sample/Slice/LayerInterface.h"
#include "Sample/Slice/LayerRoughness.h"
#include <cerf>
diff --git a/Core/Export/SampleToPython.cpp b/Core/Export/SampleToPython.cpp
index 32cd4fa48be..4426a7dcaf9 100644
--- a/Core/Export/SampleToPython.cpp
+++ b/Core/Export/SampleToPython.cpp
@@ -21,7 +21,6 @@
#include "Sample/Aggregate/InterferenceFunctions.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/LayerInterface.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Crystal.h"
#include "Sample/Particle/MesoCrystal.h"
@@ -29,6 +28,7 @@
#include "Sample/Particle/ParticleComposition.h"
#include "Sample/Particle/ParticleCoreShell.h"
#include "Sample/Particle/ParticleDistribution.h"
+#include "Sample/Slice/LayerInterface.h"
#include "Sample/Slice/LayerRoughness.h"
#include <iomanip>
#include <map>
diff --git a/Device/Scan/AngularSpecScan.cpp b/Device/Scan/AngularSpecScan.cpp
index b5ede1ccd4c..2bd24fd8d0a 100644
--- a/Device/Scan/AngularSpecScan.cpp
+++ b/Device/Scan/AngularSpecScan.cpp
@@ -91,7 +91,7 @@ std::vector<SpecularSimulationElement> AngularSpecScan::generateSimulationElemen
const double wl = paired_values[i].first;
const double inc = paired_values[i].second;
result.emplace_back(wl, -inc);
- if (wl<0 || inc<0 || inc>M_PI_2)
+ if (wl < 0 || inc < 0 || inc > M_PI_2)
result.back().setCalculationFlag(false); // false = exclude from calculations
}
@@ -204,7 +204,8 @@ std::vector<double> AngularSpecScan::footprint(size_t start, size_t n_elements)
for (size_t k = pos_inc; k < n_inc_samples && left > 0; ++k) {
pos_inc = 0;
double angle = sample_values[i][k];
- double footprint = (angle>=0 && angle<=M_PI_2) ? m_footprint->calculate(angle) : 1.0;
+ double footprint =
+ (angle >= 0 && angle <= M_PI_2) ? m_footprint->calculate(angle) : 1.0;
for (size_t j = pos_wl; j < n_wl_samples && left > 0; ++j) {
pos_wl = 0;
result[pos_res] = footprint;
@@ -226,10 +227,10 @@ AngularSpecScan::createIntensities(const std::vector<SpecularSimulationElement>&
const size_t axis_size = m_inc_angle->size();
std::vector<double> result(axis_size, 0.0);
- const auto wl_weights = extractValues(applyWlResolution(),
- [](const ParameterSample& sample) { return sample.weight; });
- const auto inc_weights = extractValues(applyIncResolution(),
- [](const ParameterSample& sample) { return sample.weight; });
+ const auto wl_weights = extractValues(
+ applyWlResolution(), [](const ParameterSample& sample) { return sample.weight; });
+ const auto inc_weights = extractValues(
+ applyIncResolution(), [](const ParameterSample& sample) { return sample.weight; });
size_t elem_pos = 0;
for (size_t i = 0; i < axis_size; ++i) {
diff --git a/Device/Scan/QSpecScan.cpp b/Device/Scan/QSpecScan.cpp
index b7de4e5ebea..d3c8376f81f 100644
--- a/Device/Scan/QSpecScan.cpp
+++ b/Device/Scan/QSpecScan.cpp
@@ -61,7 +61,7 @@ std::vector<SpecularSimulationElement> QSpecScan::generateSimulationElements() c
result.reserve(qz.size());
for (size_t i = 0, size = qz.size(); i < size; ++i) {
result.emplace_back(-qz[i] / 2.0);
- if (qz[i]<0)
+ if (qz[i] < 0)
result.back().setCalculationFlag(false); // false = exclude from calculations
}
@@ -160,7 +160,7 @@ void QSpecScan::checkInitialization()
throw std::runtime_error("Error in QSpecScan::checkInitialization: q-vector values shall "
"be sorted in ascending order.");
- if (axis_values.front()<0)
+ if (axis_values.front() < 0)
throw std::runtime_error("Error in QSpecScan::checkInitialization: q-vector values are out "
"of acceptable range.");
}
diff --git a/GUI/coregui/Models/TransformFromDomain.cpp b/GUI/coregui/Models/TransformFromDomain.cpp
index 9005bd33225..8eec681802d 100644
--- a/GUI/coregui/Models/TransformFromDomain.cpp
+++ b/GUI/coregui/Models/TransformFromDomain.cpp
@@ -59,8 +59,8 @@
#include "Param/Varia/ParameterPattern.h"
#include "Sample/Aggregate/InterferenceFunctions.h"
#include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/LayerInterface.h"
#include "Sample/Particle/Particle.h"
+#include "Sample/Slice/LayerInterface.h"
#include "Sample/Slice/LayerRoughness.h"
using namespace INodeUtils;
diff --git a/Sample/Multilayer/MultiLayer.cpp b/Sample/Multilayer/MultiLayer.cpp
index 9d1ea591e3d..1a9228ab7bc 100644
--- a/Sample/Multilayer/MultiLayer.cpp
+++ b/Sample/Multilayer/MultiLayer.cpp
@@ -19,9 +19,9 @@
#include "Sample/Correlations/ILayout.h"
#include "Sample/Material/MaterialUtils.h"
#include "Sample/Multilayer/Layer.h"
+#include "Sample/Multilayer/MultiLayerUtils.h"
#include "Sample/Scattering/LayerFillLimits.h"
#include "Sample/Slice/LayerInterface.h"
-#include "Sample/Multilayer/MultiLayerUtils.h"
#include "Sample/Slice/LayerRoughness.h"
MultiLayer::MultiLayer() : m_crossCorrLength(0)
diff --git a/Sample/Multilayer/MultiLayerUtils.cpp b/Sample/Multilayer/MultiLayerUtils.cpp
index 19a8aa423bf..befbd7a17c2 100644
--- a/Sample/Multilayer/MultiLayerUtils.cpp
+++ b/Sample/Multilayer/MultiLayerUtils.cpp
@@ -16,10 +16,10 @@
#include "Sample/Correlations/ILayout.h"
#include "Sample/Material/MaterialUtils.h"
#include "Sample/Multilayer/Layer.h"
-#include "Sample/Scattering/LayerFillLimits.h"
-#include "Sample/Slice/LayerInterface.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/IParticle.h"
+#include "Sample/Scattering/LayerFillLimits.h"
+#include "Sample/Slice/LayerInterface.h"
namespace
{
diff --git a/Sample/Particle/Crystal.cpp b/Sample/Particle/Crystal.cpp
index 0cf67b78afa..f601fd2038e 100644
--- a/Sample/Particle/Crystal.cpp
+++ b/Sample/Particle/Crystal.cpp
@@ -47,8 +47,8 @@ IFormFactor* Crystal::createTotalFormFactor(const IFormFactor& meso_crystal_form
P_basis_clone->rotate(*p_rotation);
P_basis_clone->translate(translation);
const std::unique_ptr<IFormFactor> P_basis_ff(P_basis_clone->createFormFactor());
- return new FormFactorCrystal(
- transformed_lattice, *P_basis_ff, meso_crystal_form_factor, m_position_variance);
+ return new FormFactorCrystal(transformed_lattice, *P_basis_ff, meso_crystal_form_factor,
+ m_position_variance);
}
std::vector<HomogeneousRegion> Crystal::homogeneousRegions() const
diff --git a/Sample/Specular/SpecularMagneticOldStrategy.cpp b/Sample/Specular/SpecularMagneticOldStrategy.cpp
index 2d3d8b1d8ce..b58f980c501 100644
--- a/Sample/Specular/SpecularMagneticOldStrategy.cpp
+++ b/Sample/Specular/SpecularMagneticOldStrategy.cpp
@@ -15,8 +15,8 @@
#include "Sample/Specular/SpecularMagneticOldStrategy.h"
#include "Sample/Material/WavevectorInfo.h"
#include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/LayerInterface.h"
#include "Sample/Multilayer/MultiLayer.h"
+#include "Sample/Slice/LayerInterface.h"
#include "Sample/Slice/Slice.h"
#include <Eigen/LU>
diff --git a/Sample/Specular/SpecularScalarStrategy.cpp b/Sample/Specular/SpecularScalarStrategy.cpp
index 2012ab735bf..e3419273761 100644
--- a/Sample/Specular/SpecularScalarStrategy.cpp
+++ b/Sample/Specular/SpecularScalarStrategy.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Sample/Specular/SpecularScalarStrategy.h"
-#include "Sample/Slice/KzComputation.h"
#include "Sample/Multilayer/Layer.h"
+#include "Sample/Slice/KzComputation.h"
#include "Sample/Slice/LayerRoughness.h"
#include "Sample/Slice/Slice.h"
#include <Eigen/Dense>
diff --git a/Sample/StandardSamples/CylindersBuilder.cpp b/Sample/StandardSamples/CylindersBuilder.cpp
index 896f10d228b..034d9654588 100644
--- a/Sample/StandardSamples/CylindersBuilder.cpp
+++ b/Sample/StandardSamples/CylindersBuilder.cpp
@@ -17,9 +17,9 @@
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/FormFactorCylinder.h"
#include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/LayerInterface.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Particle.h"
+#include "Sample/Slice/LayerInterface.h"
#include "Sample/StandardSamples/ReferenceMaterials.h"
// -----------------------------------------------------------------------------
diff --git a/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp b/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
index ba42d4eb4fb..cce776fcf14 100644
--- a/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
+++ b/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
@@ -17,10 +17,10 @@
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/FormFactorFullSphere.h"
#include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/LayerInterface.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Particle.h"
#include "Sample/SampleBuilderEngine/SampleComponents.h"
+#include "Sample/Slice/LayerInterface.h"
#include "Sample/StandardSamples/ReferenceMaterials.h"
namespace
diff --git a/Sample/StandardSamples/MagneticParticlesBuilder.cpp b/Sample/StandardSamples/MagneticParticlesBuilder.cpp
index 9f3a9e2977c..8d2387fb7ff 100644
--- a/Sample/StandardSamples/MagneticParticlesBuilder.cpp
+++ b/Sample/StandardSamples/MagneticParticlesBuilder.cpp
@@ -19,9 +19,9 @@
#include "Sample/HardParticle/FormFactorFullSphere.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
#include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/LayerInterface.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Particle.h"
+#include "Sample/Slice/LayerInterface.h"
#include "Sample/Slice/LayerRoughness.h"
// ----------------------------------------------------------------------------
diff --git a/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp b/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp
index 4fb93d55443..76c4ebfe840 100644
--- a/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp
@@ -1,10 +1,10 @@
#include "Base/Const/Units.h"
#include "Core/Computation/ProcessedSample.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
-#include "Sample/Slice/KzComputation.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/RT/SimulationOptions.h"
+#include "Sample/Slice/KzComputation.h"
#include "Sample/Specular/SpecularMagneticNewTanhStrategy.h"
#include "Sample/Specular/SpecularMagneticStrategy.h"
#include "Sample/Specular/SpecularScalarTanhStrategy.h"
@@ -52,7 +52,7 @@ template <> void SpecularMagneticTest::test_degenerate<SpecularMagneticNewTanhSt
}
}
- //! Compares results with scalar case
+//! Compares results with scalar case
template <typename Strategy>
void SpecularMagneticTest::testZeroField(const kvector_t& k, const ProcessedSample& sample)
{
diff --git a/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp b/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp
index fd1818a6d09..3834589e019 100644
--- a/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp
+++ b/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp
@@ -4,8 +4,8 @@
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
#include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/LayerInterface.h"
#include "Sample/Multilayer/MultiLayerUtils.h"
+#include "Sample/Slice/LayerInterface.h"
#include "Sample/Slice/LayerRoughness.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/Core/Sample/RTTest.cpp b/Tests/UnitTests/Core/Sample/RTTest.cpp
index 55445a64b6e..cd6fce27abd 100644
--- a/Tests/UnitTests/Core/Sample/RTTest.cpp
+++ b/Tests/UnitTests/Core/Sample/RTTest.cpp
@@ -3,9 +3,9 @@
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
#include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/LayerInterface.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/RT/SimulationOptions.h"
+#include "Sample/Slice/LayerInterface.h"
#include "Sample/Slice/LayerRoughness.h"
#include "Sample/Specular/SpecularScalarTanhStrategy.h"
#include "Tests/GTestWrapper/google_test.h"
--
GitLab