diff --git a/Core/Element/SpecularSimulationElement.cpp b/Core/Element/SpecularSimulationElement.cpp
index c3a17b3ff4126578c2535bf62fdb3090b459cf26..9d25627e4a9109b2ca9423f9975cf1ecf3583e75 100644
--- a/Core/Element/SpecularSimulationElement.cpp
+++ b/Core/Element/SpecularSimulationElement.cpp
@@ -35,10 +35,9 @@ SpecularSimulationElement::SpecularSimulationElement(double wavelength, double a
instrument.detector().detectionProperties().analyzerOperator())
, m_intensity(0.0)
, m_computable(computable)
- , m_kz_computation(
- [k = vecOfLambdaAlphaPhi(wavelength, alpha, 0.0)](const SliceStack& slices) {
- return SampleUtils::KzComputation::computeKzFromRefIndices(slices, k);
- })
+ , m_kz_computation([k = vecOfLambdaAlphaPhi(wavelength, alpha, 0.0)](const SliceStack& slices) {
+ return SampleUtils::KzComputation::computeKzFromRefIndices(slices, k);
+ })
{
}
diff --git a/Core/Term/SpecularComputationTerm.cpp b/Core/Term/SpecularComputationTerm.cpp
index 281e58923180866607b1a698b794801d12425f63..893474b8c2bd9503d6f8714f46a8fb238432e9e1 100644
--- a/Core/Term/SpecularComputationTerm.cpp
+++ b/Core/Term/SpecularComputationTerm.cpp
@@ -58,8 +58,7 @@ SpecularScalarTerm::SpecularScalarTerm(const MultiLayer& multilayer)
SpecularScalarTerm::~SpecularScalarTerm() = default;
-void SpecularScalarTerm::eval(SpecularSimulationElement& elem,
- const SliceStack& slices) const
+void SpecularScalarTerm::eval(SpecularSimulationElement& elem, const SliceStack& slices) const
{
const auto coeff =
std::get<complex_t>(m_Strategy->computeTopLayerR(slices, elem.produceKz(slices)));
@@ -92,8 +91,7 @@ SpecularMatrixTerm::SpecularMatrixTerm(const MultiLayer& multilayer)
SpecularMatrixTerm::~SpecularMatrixTerm() = default;
-void SpecularMatrixTerm::eval(SpecularSimulationElement& elem,
- const SliceStack& slices) const
+void SpecularMatrixTerm::eval(SpecularSimulationElement& elem, const SliceStack& slices) const
{
const auto coeff =
std::get<Eigen::Matrix2cd>(m_Strategy->computeTopLayerR(slices, elem.produceKz(slices)));
diff --git a/Sample/Fresnel/IFresnelMap.h b/Sample/Fresnel/IFresnelMap.h
index e8abc7aa61a4aee01255798ddb9beac90499db4f..3194f97ff236c9a3a6a8be3e31a8afeedad1ee4b 100644
--- a/Sample/Fresnel/IFresnelMap.h
+++ b/Sample/Fresnel/IFresnelMap.h
@@ -20,8 +20,8 @@
#ifndef BORNAGAIN_SAMPLE_FRESNEL_IFRESNELMAP_H
#define BORNAGAIN_SAMPLE_FRESNEL_IFRESNELMAP_H
-#include "Sample/Specular/ISpecularStrategy.h"
#include "Sample/Slice/SliceStack.h"
+#include "Sample/Specular/ISpecularStrategy.h"
#include <memory>
class SimulationElement;
diff --git a/Sample/Fresnel/MatrixFresnelMap.cpp b/Sample/Fresnel/MatrixFresnelMap.cpp
index 810494ebe2e688b8c7fa8a02eacc2f9dd6b4da5c..fe4d12ceece108efd9788493192c8378c0194b56 100644
--- a/Sample/Fresnel/MatrixFresnelMap.cpp
+++ b/Sample/Fresnel/MatrixFresnelMap.cpp
@@ -59,8 +59,7 @@ MatrixFresnelMap::getCoefficients(const kvector_t& kvec, size_t layer_index) con
std::unique_ptr<const ILayerRTCoefficients>
MatrixFresnelMap::getCoefficients(const kvector_t& kvec, size_t layer_index,
- const SliceStack& slices,
- CoefficientHash& hash_table) const
+ const SliceStack& slices, CoefficientHash& hash_table) const
{
if (!m_use_cache) {
auto coeffs = m_Strategy->Execute(slices, kvec);
diff --git a/Sample/Processed/MaterialSlicer.cpp b/Sample/Processed/MaterialSlicer.cpp
index d489418763410fc27a6c26fc595ce47b5c6ed42d..b65f40c22ce5ca81301c8f7be3f8e66d5c14fe9b 100644
--- a/Sample/Processed/MaterialSlicer.cpp
+++ b/Sample/Processed/MaterialSlicer.cpp
@@ -93,8 +93,7 @@ bool checkRegions(const std::vector<HomogeneousRegion>& regions)
SliceStack SampleUtils::Preprocessor::averageSlices(
- const SliceStack& slices,
- const std::map<size_t, std::vector<HomogeneousRegion>>& region_map)
+ const SliceStack& slices, const std::map<size_t, std::vector<HomogeneousRegion>>& region_map)
{
SliceStack result = slices;
const auto last_slice_index = slices.size() - 1;
diff --git a/Sample/Processed/MaterialSlicer.h b/Sample/Processed/MaterialSlicer.h
index 7592185620bb5f1d66bb8893942537c1fdf20acd..72e5fb769997005fea6183d068b6c1af140a149e 100644
--- a/Sample/Processed/MaterialSlicer.h
+++ b/Sample/Processed/MaterialSlicer.h
@@ -28,9 +28,8 @@ class SliceStack;
namespace SampleUtils::Preprocessor {
-SliceStack
-averageSlices(const SliceStack& slices,
- const std::map<size_t, std::vector<HomogeneousRegion>>& region_map);
+SliceStack averageSlices(const SliceStack& slices,
+ const std::map<size_t, std::vector<HomogeneousRegion>>& region_map);
} // namespace SampleUtils::Preprocessor
diff --git a/Sample/Processed/ProcessedLayout.cpp b/Sample/Processed/ProcessedLayout.cpp
index 50e098b85c44af7cc7b98780a5ce13b83f5ba84f..4fe232c7e3a90d2da672efca75bbf44223328bc4 100644
--- a/Sample/Processed/ProcessedLayout.cpp
+++ b/Sample/Processed/ProcessedLayout.cpp
@@ -94,8 +94,8 @@ ProcessedLayout::~ProcessedLayout() = default;
//! Returns a contribution to m_formfactors, and modifies m_region_map.
FormFactorCoherentSum ProcessedLayout::processParticle(const IParticle& particle,
- const SliceStack& slices,
- double z_ref, double intensity_factor)
+ const SliceStack& slices, double z_ref,
+ double intensity_factor)
{
const double abundance = particle.abundance();
const SlicedFormFactorList sliced_ffs(particle, slices, z_ref);
diff --git a/Sample/Processed/ProcessedLayout.h b/Sample/Processed/ProcessedLayout.h
index 18a5b066ec71de66faad82dca2f199333c2265c2..acf196008ba11bfccdfc20357b02623cb1df0ddf 100644
--- a/Sample/Processed/ProcessedLayout.h
+++ b/Sample/Processed/ProcessedLayout.h
@@ -55,9 +55,8 @@ public:
const std::map<size_t, std::vector<HomogeneousRegion>>& regionMap() const;
private:
- FormFactorCoherentSum processParticle(const IParticle& particle,
- const SliceStack& slices, double z_ref,
- double intensity_factor);
+ FormFactorCoherentSum processParticle(const IParticle& particle, const SliceStack& slices,
+ double z_ref, double intensity_factor);
const bool m_polarized;
const size_t m_n_slices;
diff --git a/Sample/Processed/ProcessedSample.cpp b/Sample/Processed/ProcessedSample.cpp
index 061faa509798a5de633bfae7626df5a9dff50774..3fa5e133dbcaa219382a07eaf8de3b7b3eafc04c 100644
--- a/Sample/Processed/ProcessedSample.cpp
+++ b/Sample/Processed/ProcessedSample.cpp
@@ -57,8 +57,7 @@ void addNSlices(SliceStack& stack, size_t n, double thickness, const Material& m
addSlice(stack, slice_thickness, material);
}
-std::unique_ptr<IFresnelMap> createFresnelMap(const MultiLayer& sample,
- const SliceStack& slices,
+std::unique_ptr<IFresnelMap> createFresnelMap(const MultiLayer& sample, const SliceStack& slices,
const SimulationOptions& options)
{
std::unique_ptr<IFresnelMap> result;
diff --git a/Sample/Slice/KzComputation.cpp b/Sample/Slice/KzComputation.cpp
index 1f461680cdc1f2c132ccc0c0b75f104fdb7aea71..b9fdccc9b87c7964e294e394aadd29d9857ad564 100644
--- a/Sample/Slice/KzComputation.cpp
+++ b/Sample/Slice/KzComputation.cpp
@@ -38,8 +38,8 @@ complex_t checkForUnderflow(complex_t val)
// namespace KzComputatin
// ************************************************************************************************
-std::vector<complex_t>
-SampleUtils::KzComputation::computeReducedKz(const SliceStack& slices, kvector_t k)
+std::vector<complex_t> SampleUtils::KzComputation::computeReducedKz(const SliceStack& slices,
+ kvector_t k)
{
const size_t N = slices.size();
const double n_ref = slices[0].material().refractiveIndex(2 * M_PI / k.mag()).real();
@@ -56,8 +56,8 @@ SampleUtils::KzComputation::computeReducedKz(const SliceStack& slices, kvector_t
return result;
}
-std::vector<complex_t>
-SampleUtils::KzComputation::computeKzFromSLDs(const SliceStack& slices, double kz)
+std::vector<complex_t> SampleUtils::KzComputation::computeKzFromSLDs(const SliceStack& slices,
+ double kz)
{
const size_t N = slices.size();
const double k_sign = kz > 0.0 ? -1 : 1;
@@ -73,8 +73,8 @@ SampleUtils::KzComputation::computeKzFromSLDs(const SliceStack& slices, double k
return result;
}
-std::vector<complex_t>
-SampleUtils::KzComputation::computeKzFromRefIndices(const SliceStack& slices, kvector_t k)
+std::vector<complex_t> SampleUtils::KzComputation::computeKzFromRefIndices(const SliceStack& slices,
+ kvector_t k)
{
const size_t N = slices.size();
const double kz = k.z();
diff --git a/Sample/Slice/SlicedFormFactorList.cpp b/Sample/Slice/SlicedFormFactorList.cpp
index 1ae2e84a36cdc88b7a310666fa72d872025000be..568533726d9a4733d10181267d3f4146fac32003 100644
--- a/Sample/Slice/SlicedFormFactorList.cpp
+++ b/Sample/Slice/SlicedFormFactorList.cpp
@@ -79,8 +79,8 @@ ZLimits SlicesZLimits(const SliceStack& slices, size_t slice_index)
return ZLimits(-thickness, 0.0);
}
-std::pair<size_t, size_t> SliceIndexSpan(const IParticle& particle,
- const SliceStack& slices, double z_ref)
+std::pair<size_t, size_t> SliceIndexSpan(const IParticle& particle, const SliceStack& slices,
+ double z_ref)
{
const ZLimits bottomTopZ = particle.bottomTopZ();
const double zbottom = bottomTopZ.zBottom();
@@ -110,16 +110,15 @@ void ScaleRegions(std::vector<HomogeneousRegion>& regions, double factor)
// class SlicedFormFactorList
// ************************************************************************************************
-SlicedFormFactorList::SlicedFormFactorList(const IParticle& particle,
- const SliceStack& slices, double z_ref)
+SlicedFormFactorList::SlicedFormFactorList(const IParticle& particle, const SliceStack& slices,
+ double z_ref)
{
const auto particles = particle.decompose();
for (auto* particle : particles)
addParticle(*particle, slices, z_ref);
}
-void SlicedFormFactorList::addParticle(IParticle& particle, const SliceStack& slices,
- double z_ref)
+void SlicedFormFactorList::addParticle(IParticle& particle, const SliceStack& slices, double z_ref)
{
const auto slice_indices = SliceIndexSpan(particle, slices, z_ref);
bool single_layer = (slice_indices.first == slice_indices.second);
diff --git a/Sample/Specular/ISpecularStrategy.h b/Sample/Specular/ISpecularStrategy.h
index 1f4ecf067e75cdf8c630002681e3cb4c0aa4a81c..135c582feaec10d60ee1a04de79fcb08d14d9bdf 100644
--- a/Sample/Specular/ISpecularStrategy.h
+++ b/Sample/Specular/ISpecularStrategy.h
@@ -46,8 +46,7 @@ public:
virtual coeffs_t Execute(const SliceStack& slices, const kvector_t& k) const = 0;
- virtual coeffs_t Execute(const SliceStack& slices,
- const std::vector<complex_t>& kz) const = 0;
+ virtual coeffs_t Execute(const SliceStack& slices, const std::vector<complex_t>& kz) const = 0;
virtual std::variant<complex_t, Eigen::Matrix2cd>
computeTopLayerR(const SliceStack& slices, const std::vector<complex_t>& kz) const = 0;
diff --git a/Sample/Specular/SpecularMagneticStrategy.cpp b/Sample/Specular/SpecularMagneticStrategy.cpp
index 53aac70869e5f969da2fb8f8a95ea51f74975e75..384985562c064a2242c36b882aedbb02b61b9bab 100644
--- a/Sample/Specular/SpecularMagneticStrategy.cpp
+++ b/Sample/Specular/SpecularMagneticStrategy.cpp
@@ -28,8 +28,7 @@ Eigen::Vector2cd checkForUnderflow(const Eigen::Vector2cd& eigenvs);
constexpr double magnetic_prefactor = PhysConsts::m_n * PhysConsts::g_factor_n * PhysConsts::mu_N
/ PhysConsts::h_bar / PhysConsts::h_bar / 4. / M_PI * 1e-18;
const auto eps = std::numeric_limits<double>::epsilon() * 10.;
-const LayerRoughness* GetBottomRoughness(const SliceStack& slices,
- const size_t slice_index);
+const LayerRoughness* GetBottomRoughness(const SliceStack& slices, const size_t slice_index);
} // namespace
ISpecularStrategy::coeffs_t SpecularMagneticStrategy::Execute(const SliceStack& slices,
@@ -39,8 +38,7 @@ ISpecularStrategy::coeffs_t SpecularMagneticStrategy::Execute(const SliceStack&
}
ISpecularStrategy::coeffs_t
-SpecularMagneticStrategy::Execute(const SliceStack& slices,
- const std::vector<complex_t>& kz) const
+SpecularMagneticStrategy::Execute(const SliceStack& slices, const std::vector<complex_t>& kz) const
{
if (slices.size() != kz.size())
throw std::runtime_error("Number of slices does not match the size of the kz-vector");
diff --git a/Sample/Specular/SpecularMagneticStrategy.h b/Sample/Specular/SpecularMagneticStrategy.h
index beba87868b99d0a4c4b1bd9b621722447ad8afcb..0cb54d8f7d206fc7f50d4b96e62e9647360e4c2d 100644
--- a/Sample/Specular/SpecularMagneticStrategy.h
+++ b/Sample/Specular/SpecularMagneticStrategy.h
@@ -57,8 +57,7 @@ public:
//! Computes the Fresnel R coefficient for the top layer only
//! Introduced in order to speed up pure reflectivity computations
virtual std::variant<complex_t, Eigen::Matrix2cd>
- computeTopLayerR(const SliceStack& slices,
- const std::vector<complex_t>& kzs) const override;
+ computeTopLayerR(const SliceStack& slices, const std::vector<complex_t>& kzs) const override;
private:
std::vector<MatrixRTCoefficients> computeTR(const SliceStack& slices,
@@ -68,8 +67,7 @@ private:
computeBackwardsSubmatrices(const MatrixRTCoefficients& coeff_i,
const MatrixRTCoefficients& coeff_i1, double sigma) const = 0;
- void calculateUpwards(std::vector<MatrixRTCoefficients>& coeff,
- const SliceStack& slices) const;
+ void calculateUpwards(std::vector<MatrixRTCoefficients>& coeff, const SliceStack& slices) const;
};
#endif // BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICSTRATEGY_H
diff --git a/Sample/Specular/SpecularScalarStrategy.cpp b/Sample/Specular/SpecularScalarStrategy.cpp
index 7d3fe15eeba2c37ae758862a56c8a6485ef839b5..71bd498a25fbe5713f4caae384e7e8045705b130 100644
--- a/Sample/Specular/SpecularScalarStrategy.cpp
+++ b/Sample/Specular/SpecularScalarStrategy.cpp
@@ -88,8 +88,7 @@ SpecularScalarStrategy::computeTopLayerR(const SliceStack& slices,
}
std::vector<ScalarRTCoefficients>
-SpecularScalarStrategy::computeTR(const SliceStack& slices,
- const std::vector<complex_t>& kz) const
+SpecularScalarStrategy::computeTR(const SliceStack& slices, const std::vector<complex_t>& kz) const
{
const size_t N = slices.size();
std::vector<ScalarRTCoefficients> coeff(N);
diff --git a/Sample/Specular/SpecularScalarStrategy.h b/Sample/Specular/SpecularScalarStrategy.h
index 9dd64e46637a7a03886b10e1c502a9b5700d3165..c2d2f18e196f6a3f85e3e60fbec4b67f5448d467 100644
--- a/Sample/Specular/SpecularScalarStrategy.h
+++ b/Sample/Specular/SpecularScalarStrategy.h
@@ -54,8 +54,7 @@ public:
//! Computes the Fresnel R coefficient for the top layer only
//! Introduced in order to speed up pure reflectivity computations
virtual std::variant<complex_t, Eigen::Matrix2cd>
- computeTopLayerR(const SliceStack& slices,
- const std::vector<complex_t>& kz) const override;
+ computeTopLayerR(const SliceStack& slices, const std::vector<complex_t>& kz) const override;
private:
virtual std::pair<complex_t, complex_t> transition(complex_t kzi, complex_t kzi1,
@@ -64,8 +63,7 @@ private:
std::vector<ScalarRTCoefficients> computeTR(const SliceStack& slices,
const std::vector<complex_t>& kz) const;
- void calculateUpFromLayer(std::vector<ScalarRTCoefficients>& coeff,
- const SliceStack& slices,
+ void calculateUpFromLayer(std::vector<ScalarRTCoefficients>& coeff, const SliceStack& slices,
const std::vector<complex_t>& kz) const;
};