From 69aa3dd5bb2e49565689403547bc9791fb5f8bcb Mon Sep 17 00:00:00 2001
From: Felix Riehn <felix@matilda>
Date: Sat, 1 Aug 2020 14:26:38 +0100
Subject: [PATCH] fixed merge, do clang
---
Processes/Sibyll/Interaction.cc | 9 ++++-----
Processes/Sibyll/testSibyll.cc | 3 +--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/Processes/Sibyll/Interaction.cc b/Processes/Sibyll/Interaction.cc
index bb4e93d80..d738dc81c 100644
--- a/Processes/Sibyll/Interaction.cc
+++ b/Processes/Sibyll/Interaction.cc
@@ -327,12 +327,11 @@ namespace corsika::process::sibyll {
Ecm_final += psib.GetEnergy();
}
cout << "conservation (all GeV):" << endl
- << "Ecm_initial(per nucleon)=" << Ecm / 1_GeV
- << " Ecm_final(per nucleon)=" << Ecm_final * 2. / (get_nwounded() + 1) / 1_GeV << endl
- << "Elab_initial=" << Etot / 1_GeV
- << " Elab_final=" << Elab_final / 1_GeV
+ << "Ecm_initial(per nucleon)=" << Ecm / 1_GeV << " Ecm_final(per nucleon)="
+ << Ecm_final * 2. / (get_nwounded() + 1) / 1_GeV << endl
+ << "Elab_initial=" << Etot / 1_GeV << " Elab_final=" << Elab_final / 1_GeV
<< " diff (%)=" << (Elab_final / Etot / get_nwounded() - 1) * 100
- << " E in nucleons=" << constants::nucleonMass * get_nwounded() / 1_GeV
+ << " E in nucleons=" << constants::nucleonMass * get_nwounded() / 1_GeV
<< endl
<< "Plab_initial=" << (pProjectileLab / 1_GeV).GetComponents()
<< ", Plab_final=" << (Plab_final / 1_GeV).GetComponents() << endl;
diff --git a/Processes/Sibyll/testSibyll.cc b/Processes/Sibyll/testSibyll.cc
index 62aea2774..18c0b94c5 100644
--- a/Processes/Sibyll/testSibyll.cc
+++ b/Processes/Sibyll/testSibyll.cc
@@ -203,7 +203,7 @@ TEST_CASE("SibyllInterface", "[processes]") {
[[maybe_unused]] const GrammageType length = model.GetInteractionLength(particle);
}
- SECTION("InteractionInterface - high energy") {
+ SECTION("InteractionInterface - high energy") {
setup::Stack stack;
const HEPEnergyType E0 = 60_EeV;
@@ -221,7 +221,6 @@ TEST_CASE("SibyllInterface", "[processes]") {
Interaction model;
- model.Init();
[[maybe_unused]] const process::EProcessReturn ret = model.DoInteraction(projectile);
auto const pSum = sumMomentum(view, cs);
CHECK(pSum.GetComponents(cs).GetX() / P0 == Approx(1).margin(0.05));
--
GitLab