From 36bf3ed25088959a2b6d18bf6e3a69805b8bb528 Mon Sep 17 00:00:00 2001
From: Felix Riehn <friehn@lip.pt>
Date: Fri, 9 Aug 2024 19:30:58 +0200
Subject: [PATCH] clang
---
applications/cross_section.cpp | 4 ++--
.../detail/modules/qgsjetII/InteractionModel.inl | 12 +++++++-----
.../detail/modules/sibyll/InteractionModel.inl | 16 +++++++++-------
corsika/modules/qgsjetII/InteractionModel.hpp | 3 +--
corsika/modules/sibyll/InteractionModel.hpp | 4 ++--
tests/framework/testProcessSequence.cpp | 16 ++++++++--------
6 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/applications/cross_section.cpp b/applications/cross_section.cpp
index 19661f1f9..eb900dd0d 100644
--- a/applications/cross_section.cpp
+++ b/applications/cross_section.cpp
@@ -99,8 +99,8 @@ void calculate_cross_sections(TModel& model, std::string const& model_name,
}
// p-p
- auto const [xs_prod_pp, xs_ela_pp ]=
- model->getCrossSectionInelEla(Code::Proton, Code::Proton, p4protonProj, p4protonTarg);
+ auto const [xs_prod_pp, xs_ela_pp] = model->getCrossSectionInelEla(
+ Code::Proton, Code::Proton, p4protonProj, p4protonTarg);
// p-O
CrossSectionType const xs_prod_pO =
model->getCrossSection(Code::Proton, Code::Oxygen, p4protonProj, p4oxygenTarg);
diff --git a/corsika/detail/modules/qgsjetII/InteractionModel.inl b/corsika/detail/modules/qgsjetII/InteractionModel.inl
index 32e8398b7..1345648c7 100644
--- a/corsika/detail/modules/qgsjetII/InteractionModel.inl
+++ b/corsika/detail/modules/qgsjetII/InteractionModel.inl
@@ -102,11 +102,13 @@ namespace corsika::qgsjetII {
return sigProd * 1_mb;
}
-inline std::tuple<CrossSectionType, CrossSectionType> InteractionModel::getCrossSectionInelEla(
- Code projCode, Code targetCode, FourMomentum const& proj4mom,
- FourMomentum const& target4mom) const {
- return { getCrossSection(projCode, targetCode, proj4mom, target4mom), CrossSectionType::zero()};
- }
+ inline std::tuple<CrossSectionType, CrossSectionType>
+ InteractionModel::getCrossSectionInelEla(Code projCode, Code targetCode,
+ FourMomentum const& proj4mom,
+ FourMomentum const& target4mom) const {
+ return {getCrossSection(projCode, targetCode, proj4mom, target4mom),
+ CrossSectionType::zero()};
+ }
template <typename TSecondaries>
inline void InteractionModel::doInteraction(TSecondaries& view, Code const projectileId,
diff --git a/corsika/detail/modules/sibyll/InteractionModel.inl b/corsika/detail/modules/sibyll/InteractionModel.inl
index 8a3b58f7b..2373e8da0 100644
--- a/corsika/detail/modules/sibyll/InteractionModel.inl
+++ b/corsika/detail/modules/sibyll/InteractionModel.inl
@@ -50,15 +50,17 @@ namespace corsika::sibyll {
target4mom);
}
-inline std::tuple<CrossSectionType, CrossSectionType> InteractionModel::getCrossSectionInelEla(
- Code projCode, Code targetCode, FourMomentum const& proj4mom,
- FourMomentum const& target4mom) const {
+ inline std::tuple<CrossSectionType, CrossSectionType>
+ InteractionModel::getCrossSectionInelEla(Code projCode, Code targetCode,
+ FourMomentum const& proj4mom,
+ FourMomentum const& target4mom) const {
if (is_nucleus(projCode))
- return { getNuclearInteractionModel().getCrossSection(projCode, targetCode, proj4mom,
- target4mom), CrossSectionType::zero()};
+ return {getNuclearInteractionModel().getCrossSection(projCode, targetCode, proj4mom,
+ target4mom),
+ CrossSectionType::zero()};
else
- return getHadronInteractionModel().getCrossSectionInelEla(projCode, targetCode, proj4mom,
- target4mom);
+ return getHadronInteractionModel().getCrossSectionInelEla(projCode, targetCode,
+ proj4mom, target4mom);
}
template <typename TSecondaries>
diff --git a/corsika/modules/qgsjetII/InteractionModel.hpp b/corsika/modules/qgsjetII/InteractionModel.hpp
index bbd3b24e7..f6dcd97e2 100644
--- a/corsika/modules/qgsjetII/InteractionModel.hpp
+++ b/corsika/modules/qgsjetII/InteractionModel.hpp
@@ -55,8 +55,7 @@ namespace corsika::qgsjetII {
FourMomentum const& projectileP4,
FourMomentum const& targetP4) const;
-
-/**
+ /**
* Returns inelastic AND elastic cross sections.
*
* These cross sections must correspond to the process described in doInteraction
diff --git a/corsika/modules/sibyll/InteractionModel.hpp b/corsika/modules/sibyll/InteractionModel.hpp
index 05135bdd6..a89dfa539 100644
--- a/corsika/modules/sibyll/InteractionModel.hpp
+++ b/corsika/modules/sibyll/InteractionModel.hpp
@@ -31,8 +31,8 @@ namespace corsika::sibyll {
CrossSectionType getCrossSection(Code, Code, FourMomentum const&,
FourMomentum const&) const;
- std::tuple<CrossSectionType, CrossSectionType> getCrossSectionInelEla(Code, Code, FourMomentum const&,
- FourMomentum const&) const;
+ std::tuple<CrossSectionType, CrossSectionType> getCrossSectionInelEla(
+ Code, Code, FourMomentum const&, FourMomentum const&) const;
template <typename TSecondaries>
void doInteraction(TSecondaries&, Code, Code, FourMomentum const&,
diff --git a/tests/framework/testProcessSequence.cpp b/tests/framework/testProcessSequence.cpp
index a7f23a329..363254650 100644
--- a/tests/framework/testProcessSequence.cpp
+++ b/tests/framework/testProcessSequence.cpp
@@ -446,20 +446,20 @@ TEST_CASE("ProcessSequence General", "ProcessSequence") {
CHECK(std::is_reference_v<decltype(sequence2.getProcess1())>); // Process1&
CHECK(!std::is_reference_v<decltype(sequence2.getProcess2())>); // ProcessSequence
- CHECK(std::is_reference_v<decltype(
- sequence2.getProcess2().getProcess1())>); // Process2&
- CHECK(std::is_reference_v<decltype(
- sequence2.getProcess2().getProcess2())>); // Process3&
+ CHECK(std::is_reference_v<
+ decltype(sequence2.getProcess2().getProcess1())>); // Process2&
+ CHECK(std::is_reference_v<
+ decltype(sequence2.getProcess2().getProcess2())>); // Process3&
// and now with rvalue initialization
auto sequence2_rv = make_sequence(Process1(0), m2, Process3(0));
CHECK(!std::is_reference_v<decltype(sequence2_rv.getProcess1())>); // Process1
CHECK(!std::is_reference_v<decltype(sequence2_rv.getProcess2())>); // ProcessSequence
- CHECK(std::is_reference_v<decltype(
- sequence2_rv.getProcess2().getProcess1())>); // Process2&
- CHECK(!std::is_reference_v<decltype(
- sequence2_rv.getProcess2().getProcess2())>); // Process3
+ CHECK(std::is_reference_v<
+ decltype(sequence2_rv.getProcess2().getProcess1())>); // Process2&
+ CHECK(!std::is_reference_v<
+ decltype(sequence2_rv.getProcess2().getProcess2())>); // Process3
}
SECTION("lifetime") {
--
GitLab