From 46d2e5c94658db8575ae3473215169276a3c7b05 Mon Sep 17 00:00:00 2001 From: ralfulrich <ralf.ulrich@kit.edu> Date: Thu, 7 Jan 2021 12:32:16 +0100 Subject: [PATCH] style --- corsika/detail/modules/pythia8/Interaction.inl | 8 ++++---- corsika/detail/modules/qgsjetII/Interaction.inl | 14 ++++++-------- corsika/framework/core/Logging.hpp | 3 ++- corsika/setup/SetupLogger.hpp | 2 +- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/corsika/detail/modules/pythia8/Interaction.inl b/corsika/detail/modules/pythia8/Interaction.inl index 95758a4e5..61bee857c 100644 --- a/corsika/detail/modules/pythia8/Interaction.inl +++ b/corsika/detail/modules/pythia8/Interaction.inl @@ -338,10 +338,10 @@ namespace corsika::pythia8 { // link to pythia stack Pythia8::Event& event = pythia_.event; - if (print_listing_) { - // print final state - event.list(); - } + if (print_listing_) { + // print final state + event.list(); + } MomentumVector Plab_final(labCS, {0.0_GeV, 0.0_GeV, 0.0_GeV}); HEPEnergyType Elab_final = 0_GeV; diff --git a/corsika/detail/modules/qgsjetII/Interaction.inl b/corsika/detail/modules/qgsjetII/Interaction.inl index 2cb34dbf9..afdafc99f 100644 --- a/corsika/detail/modules/qgsjetII/Interaction.inl +++ b/corsika/detail/modules/qgsjetII/Interaction.inl @@ -223,7 +223,7 @@ namespace corsika::qgsjetII { mediumComposition.sampleTarget(cross_section_of_components, rng_); std::cout << "Interaction: target selected: " << targetCode << std::endl; - int targetMassNumber = 1; // proton + int targetMassNumber = 1; // proton if (is_nucleus(targetCode)) { // nucleus targetMassNumber = get_nucleus_A(targetCode); if (targetMassNumber > maxMassNumber_) @@ -232,7 +232,8 @@ namespace corsika::qgsjetII { if (targetCode != Proton::code) throw std::runtime_error("QgsjetII Taget not possible."); } - std::cout << "Interaction: target qgsjetII code/A: " << targetMassNumber << std::endl; + std::cout << "Interaction: target qgsjetII code/A: " << targetMassNumber + << std::endl; int projectileMassNumber = 1; // "1" means "hadron" QgsjetIIHadronType qgsjet_hadron_type = @@ -322,8 +323,7 @@ namespace corsika::qgsjetII { std::cout << "secondary fragment> id=" << idFragm << " p=" << momentum.getComponents() << std::endl; auto pnew = view.addSecondary( - std::make_tuple(idFragm, energy, momentum, - pOrig, tOrig)); + std::make_tuple(idFragm, energy, momentum, pOrig, tOrig)); Plab_final += pnew.getMomentum(); Elab_final += pnew.getEnergy(); } break; @@ -343,8 +343,7 @@ namespace corsika::qgsjetII { } if (idFragm == Code::Nucleus) { // thus: not p or n - const HEPMassType nucleusMass = - Proton::mass * Z + Neutron::mass * (A - Z); + const HEPMassType nucleusMass = Proton::mass * Z + Neutron::mass * (A - Z); auto momentum = Vector( zAxisFrame, QuantityVector<hepmomentum_d>{ 0.0_GeV, 0.0_GeV, @@ -357,8 +356,7 @@ namespace corsika::qgsjetII { << " p=" << momentum.getComponents() << " A=" << A << " Z=" << Z << std::endl; auto pnew = view.addSecondary( - std::make_tuple( - idFragm, energy, momentum, pOrig, tOrig, A, Z)); + std::make_tuple(idFragm, energy, momentum, pOrig, tOrig, A, Z)); Plab_final += pnew.getMomentum(); Elab_final += pnew.getEnergy(); } diff --git a/corsika/framework/core/Logging.hpp b/corsika/framework/core/Logging.hpp index 999235555..4d4c43a7b 100644 --- a/corsika/framework/core/Logging.hpp +++ b/corsika/framework/core/Logging.hpp @@ -88,7 +88,8 @@ namespace corsika { /** * The default "corsika" logger. */ - static inline std::shared_ptr<spdlog::logger> corsika_logger = get_logger("corsika", true); + static inline std::shared_ptr<spdlog::logger> corsika_logger = + get_logger("corsika", true); // corsika_logger->set_pattern("[%n:%^%-8l%$] custom pattern: %v"); // many of these free functions are special to the logging diff --git a/corsika/setup/SetupLogger.hpp b/corsika/setup/SetupLogger.hpp index 6d46e9836..562f93c92 100644 --- a/corsika/setup/SetupLogger.hpp +++ b/corsika/setup/SetupLogger.hpp @@ -16,4 +16,4 @@ namespace corsika::setup { static std::shared_ptr<spdlog::logger> corsika_logger = get_logger("corsika", true); // corsika_logger->set_pattern("[%n:%^%-8l%$] custom pattern: %v"); -} +} // namespace corsika::setup -- GitLab