From cfb1fb9a2f9a16fbda61d2b0e0fe31058c459cd9 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Mon, 2 Nov 2020 20:18:29 +0100
Subject: [PATCH] clang-format
---
Core/Computation/ParticleLayoutComputation.cpp | 3 +--
Sample/Interference/FormFactorPrecompute.cpp | 4 ++--
Sample/Interference/FormFactorPrecompute.h | 10 ++++------
Sample/Interference/SSCAHelper.cpp | 7 +++----
Sample/Interference/SSCAHelper.h | 2 +-
5 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/Core/Computation/ParticleLayoutComputation.cpp b/Core/Computation/ParticleLayoutComputation.cpp
index 806f378fa92..5e689de97fe 100644
--- a/Core/Computation/ParticleLayoutComputation.cpp
+++ b/Core/Computation/ParticleLayoutComputation.cpp
@@ -70,8 +70,7 @@ void ParticleLayoutComputation::compute(SimulationElement& elem) const
if (n_layers > 1 && alpha_f < 0)
return; // zero for transmission with multilayers (n>1) # TODO: support transmission GISAS
- elem.addIntensity(m_interference_function_strategy->evaluate(elem)
- * m_layout.surfaceDensity());
+ elem.addIntensity(m_interference_function_strategy->evaluate(elem) * m_layout.surfaceDensity());
}
void ParticleLayoutComputation::mergeRegionMap(
diff --git a/Sample/Interference/FormFactorPrecompute.cpp b/Sample/Interference/FormFactorPrecompute.cpp
index 90e6149b6d9..dbe2a0f6e77 100644
--- a/Sample/Interference/FormFactorPrecompute.cpp
+++ b/Sample/Interference/FormFactorPrecompute.cpp
@@ -17,7 +17,7 @@
std::vector<complex_t>
FormFactorPrecompute::scalar(const SimulationElement& sim_element,
- const std::vector<FormFactorCoherentSum>& ff_wrappers)
+ const std::vector<FormFactorCoherentSum>& ff_wrappers)
{
std::vector<complex_t> result;
for (auto& ffw : ff_wrappers) {
@@ -28,7 +28,7 @@ FormFactorPrecompute::scalar(const SimulationElement& sim_element,
FormFactorPrecompute::matrixFFVector_t
FormFactorPrecompute::polarized(const SimulationElement& sim_element,
- const std::vector<FormFactorCoherentSum>& ff_wrappers)
+ const std::vector<FormFactorCoherentSum>& ff_wrappers)
{
FormFactorPrecompute::matrixFFVector_t result;
for (auto& ffw : ff_wrappers) {
diff --git a/Sample/Interference/FormFactorPrecompute.h b/Sample/Interference/FormFactorPrecompute.h
index 6632f8ce369..f8ef50be637 100644
--- a/Sample/Interference/FormFactorPrecompute.h
+++ b/Sample/Interference/FormFactorPrecompute.h
@@ -26,12 +26,10 @@ namespace FormFactorPrecompute
{
using matrixFFVector_t = std::vector<Eigen::Matrix2cd, Eigen::aligned_allocator<Eigen::Matrix2cd>>;
-std::vector<complex_t>
-scalar(const SimulationElement& sim_element,
- const std::vector<FormFactorCoherentSum>& ff_wrappers);
-matrixFFVector_t
-polarized(const SimulationElement& sim_element,
- const std::vector<FormFactorCoherentSum>& ff_wrappers);
+std::vector<complex_t> scalar(const SimulationElement& sim_element,
+ const std::vector<FormFactorCoherentSum>& ff_wrappers);
+matrixFFVector_t polarized(const SimulationElement& sim_element,
+ const std::vector<FormFactorCoherentSum>& ff_wrappers);
} // namespace FormFactorPrecompute
diff --git a/Sample/Interference/SSCAHelper.cpp b/Sample/Interference/SSCAHelper.cpp
index f26921e9ee9..4961df4e696 100644
--- a/Sample/Interference/SSCAHelper.cpp
+++ b/Sample/Interference/SSCAHelper.cpp
@@ -68,10 +68,9 @@ SSCAHelper::getMeanFormfactorNorm(double qp, const std::vector<complex_t>& preco
return ff_orig * ff_conj;
}
-void SSCAHelper::getMeanFormfactors(
- double qp, Eigen::Matrix2cd& ff_orig, Eigen::Matrix2cd& ff_conj,
- const FormFactorPrecompute::matrixFFVector_t& precomputed_ff,
- const std::vector<FormFactorCoherentSum>& ff_wrappers) const
+void SSCAHelper::getMeanFormfactors(double qp, Eigen::Matrix2cd& ff_orig, Eigen::Matrix2cd& ff_conj,
+ const FormFactorPrecompute::matrixFFVector_t& precomputed_ff,
+ const std::vector<FormFactorCoherentSum>& ff_wrappers) const
{
ff_orig = Eigen::Matrix2cd::Zero();
ff_conj = Eigen::Matrix2cd::Zero();
diff --git a/Sample/Interference/SSCAHelper.h b/Sample/Interference/SSCAHelper.h
index fcf75c4ca03..eaff366a9db 100644
--- a/Sample/Interference/SSCAHelper.h
+++ b/Sample/Interference/SSCAHelper.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_SAMPLE_INTERFERENCE_SSCAHELPER_H
#define BORNAGAIN_SAMPLE_INTERFERENCE_SSCAHELPER_H
-#include "Sample/Interference/IInterferenceFunctionStrategy.h"
#include "Sample/Interference/FormFactorPrecompute.h"
+#include "Sample/Interference/IInterferenceFunctionStrategy.h"
#include <Eigen/StdVector>
class FormFactorCoherentSum;
--
GitLab