From 5192d2e7ab4800aba8cecae2496ec2639d98e231 Mon Sep 17 00:00:00 2001
From: Fabian Klimpel <fklimpel@cern.ch>
Date: Wed, 18 Mar 2020 13:21:59 +0100
Subject: [PATCH] Format fixed
---
.../Acts/Propagator/DefaultExtension.hpp | 5 ++--
.../Propagator/DenseEnvironmentExtension.hpp | 7 +++--
Core/include/Acts/Propagator/EigenStepper.hpp | 4 +--
Core/include/Acts/Propagator/EigenStepper.ipp | 14 +++++----
.../Acts/Propagator/StepperExtensionList.hpp | 29 ++++++++++---------
5 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/Core/include/Acts/Propagator/DefaultExtension.hpp b/Core/include/Acts/Propagator/DefaultExtension.hpp
index 9c8fda4e5..66a4f8f2e 100644
--- a/Core/include/Acts/Propagator/DefaultExtension.hpp
+++ b/Core/include/Acts/Propagator/DefaultExtension.hpp
@@ -44,8 +44,9 @@ struct DefaultExtension {
/// @return Boolean flag if the calculation is valid
template <typename propagator_state_t, typename stepper_t>
bool k(const propagator_state_t& state, const stepper_t& stepper,
- Vector3D& knew, const Vector3D& bField, std::array<double, 4>& kQoP, const int i = 0,
- const double h = 0., const Vector3D& kprev = Vector3D()) {
+ Vector3D& knew, const Vector3D& bField, std::array<double, 4>& kQoP,
+ const int i = 0, const double h = 0.,
+ const Vector3D& kprev = Vector3D()) {
auto qop =
stepper.charge(state.stepping) / stepper.momentum(state.stepping);
// First step does not rely on previous data
diff --git a/Core/include/Acts/Propagator/DenseEnvironmentExtension.hpp b/Core/include/Acts/Propagator/DenseEnvironmentExtension.hpp
index 350a8f4df..8ace96145 100644
--- a/Core/include/Acts/Propagator/DenseEnvironmentExtension.hpp
+++ b/Core/include/Acts/Propagator/DenseEnvironmentExtension.hpp
@@ -86,8 +86,9 @@ struct DenseEnvironmentExtension {
/// @return Boolean flag if the calculation is valid
template <typename propagator_state_t, typename stepper_t>
bool k(const propagator_state_t& state, const stepper_t& stepper,
- Vector3D& knew, const Vector3D& bField, std::array<double, 4>& kQoP, const int i = 0,
- const double h = 0., const Vector3D& kprev = Vector3D()) {
+ Vector3D& knew, const Vector3D& bField, std::array<double, 4>& kQoP,
+ const int i = 0, const double h = 0.,
+ const Vector3D& kprev = Vector3D()) {
// i = 0 is used for setup and evaluation of k
if (i == 0) {
// Set up container for energy loss
@@ -475,4 +476,4 @@ struct DenseStepperPropagatorOptions
}
};
-} // namespace Acts
+} // namespace Acts
\ No newline at end of file
diff --git a/Core/include/Acts/Propagator/EigenStepper.hpp b/Core/include/Acts/Propagator/EigenStepper.hpp
index 8355cf021..164836289 100644
--- a/Core/include/Acts/Propagator/EigenStepper.hpp
+++ b/Core/include/Acts/Propagator/EigenStepper.hpp
@@ -165,7 +165,7 @@ class EigenStepper {
/// k_i of the RKN4 algorithm
Vector3D k1, k2, k3, k4;
/// k_i elements of the momenta
- std::array<double, 4> kQoP;
+ std::array<double, 4> kQoP;
} stepData;
};
@@ -368,4 +368,4 @@ class EigenStepper {
};
} // namespace Acts
-#include "Acts/Propagator/EigenStepper.ipp"
+#include "Acts/Propagator/EigenStepper.ipp"
\ No newline at end of file
diff --git a/Core/include/Acts/Propagator/EigenStepper.ipp b/Core/include/Acts/Propagator/EigenStepper.ipp
index 9ef674b6e..97329488c 100644
--- a/Core/include/Acts/Propagator/EigenStepper.ipp
+++ b/Core/include/Acts/Propagator/EigenStepper.ipp
@@ -233,14 +233,14 @@ Acts::Result<double> Acts::EigenStepper<B, E, A>::step(
const Vector3D pos1 =
state.stepping.pos + half_h * state.stepping.dir + h2 * 0.125 * sd.k1;
sd.B_middle = getField(state.stepping, pos1);
- if (!state.stepping.extension.k2(state, *this, sd.k2, sd.B_middle, sd.kQoP, half_h,
- sd.k1)) {
+ if (!state.stepping.extension.k2(state, *this, sd.k2, sd.B_middle, sd.kQoP,
+ half_h, sd.k1)) {
return false;
}
// Third Runge-Kutta point
- if (!state.stepping.extension.k3(state, *this, sd.k3, sd.B_middle, sd.kQoP, half_h,
- sd.k2)) {
+ if (!state.stepping.extension.k3(state, *this, sd.k3, sd.B_middle, sd.kQoP,
+ half_h, sd.k2)) {
return false;
}
@@ -255,7 +255,9 @@ Acts::Result<double> Acts::EigenStepper<B, E, A>::step(
// Compute and check the local integration error estimate
error_estimate = std::max(
- h2 * ((sd.k1 - sd.k2 - sd.k3 + sd.k4).template lpNorm<1>() + std::abs(sd.kQoP[0] - sd.kQoP[1] - sd.kQoP[2] + sd.kQoP[3])), 1e-20);
+ h2 * ((sd.k1 - sd.k2 - sd.k3 + sd.k4).template lpNorm<1>() +
+ std::abs(sd.kQoP[0] - sd.kQoP[1] - sd.kQoP[2] + sd.kQoP[3])),
+ 1e-20);
return (error_estimate <= state.options.tolerance);
};
@@ -321,4 +323,4 @@ Acts::Result<double> Acts::EigenStepper<B, E, A>::step(
}
state.stepping.pathAccumulated += h;
return h;
-}
+}
\ No newline at end of file
diff --git a/Core/include/Acts/Propagator/StepperExtensionList.hpp b/Core/include/Acts/Propagator/StepperExtensionList.hpp
index 8ba023a02..cbbc133cb 100644
--- a/Core/include/Acts/Propagator/StepperExtensionList.hpp
+++ b/Core/include/Acts/Propagator/StepperExtensionList.hpp
@@ -80,7 +80,8 @@ struct StepperExtensionList : private detail::Extendable<extensions...> {
template <typename propagator_state_t, typename stepper_t>
bool k1(const propagator_state_t& state, const stepper_t& stepper,
Vector3D& knew, const Vector3D& bField, std::array<double, 4>& kQoP) {
- return impl::k(tuple(), state, stepper, knew, bField, kQoP, validExtensions);
+ return impl::k(tuple(), state, stepper, knew, bField, kQoP,
+ validExtensions);
}
/// @brief This functions broadcasts the call for evaluating k2. It collects
@@ -88,10 +89,10 @@ struct StepperExtensionList : private detail::Extendable<extensions...> {
/// returns a boolean as indicator if the evaluation is valid.
template <typename propagator_state_t, typename stepper_t>
bool k2(const propagator_state_t& state, const stepper_t& stepper,
- Vector3D& knew, const Vector3D& bField, std::array<double, 4>& kQoP, const double h,
- const Vector3D& kprev) {
- return impl::k(tuple(), state, stepper, knew, bField, kQoP, validExtensions, 1, h,
- kprev);
+ Vector3D& knew, const Vector3D& bField, std::array<double, 4>& kQoP,
+ const double h, const Vector3D& kprev) {
+ return impl::k(tuple(), state, stepper, knew, bField, kQoP, validExtensions,
+ 1, h, kprev);
}
/// @brief This functions broadcasts the call for evaluating k3. It collects
@@ -99,10 +100,10 @@ struct StepperExtensionList : private detail::Extendable<extensions...> {
/// returns a boolean as indicator if the evaluation is valid.
template <typename propagator_state_t, typename stepper_t>
bool k3(const propagator_state_t& state, const stepper_t& stepper,
- Vector3D& knew, const Vector3D& bField, std::array<double, 4>& kQoP, const double h,
- const Vector3D& kprev) {
- return impl::k(tuple(), state, stepper, knew, bField, kQoP, validExtensions, 2, h,
- kprev);
+ Vector3D& knew, const Vector3D& bField, std::array<double, 4>& kQoP,
+ const double h, const Vector3D& kprev) {
+ return impl::k(tuple(), state, stepper, knew, bField, kQoP, validExtensions,
+ 2, h, kprev);
}
/// @brief This functions broadcasts the call for evaluating k4. It collects
@@ -110,10 +111,10 @@ struct StepperExtensionList : private detail::Extendable<extensions...> {
/// returns a boolean as indicator if the evaluation is valid.
template <typename propagator_state_t, typename stepper_t>
bool k4(const propagator_state_t& state, const stepper_t& stepper,
- Vector3D& knew, const Vector3D& bField, std::array<double, 4>& kQoP, const double h,
- const Vector3D& kprev) {
- return impl::k(tuple(), state, stepper, knew, bField, kQoP, validExtensions, 3, h,
- kprev);
+ Vector3D& knew, const Vector3D& bField, std::array<double, 4>& kQoP,
+ const double h, const Vector3D& kprev) {
+ return impl::k(tuple(), state, stepper, knew, bField, kQoP, validExtensions,
+ 3, h, kprev);
}
/// @brief This functions broadcasts the call of the method finalize(). It
@@ -135,4 +136,4 @@ struct StepperExtensionList : private detail::Extendable<extensions...> {
}
};
-} // namespace Acts
+} // namespace Acts
\ No newline at end of file
--
GitLab