IAP GITLAB

Commit 69aa3dd5 authored by Felix Riehn's avatar Felix Riehn

fixed merge, do clang

parent 02b5985e
...@@ -327,12 +327,11 @@ namespace corsika::process::sibyll { ...@@ -327,12 +327,11 @@ namespace corsika::process::sibyll {
Ecm_final += psib.GetEnergy(); Ecm_final += psib.GetEnergy();
} }
cout << "conservation (all GeV):" << endl cout << "conservation (all GeV):" << endl
<< "Ecm_initial(per nucleon)=" << Ecm / 1_GeV << "Ecm_initial(per nucleon)=" << Ecm / 1_GeV << " Ecm_final(per nucleon)="
<< " Ecm_final(per nucleon)=" << Ecm_final * 2. / (get_nwounded() + 1) / 1_GeV << endl << Ecm_final * 2. / (get_nwounded() + 1) / 1_GeV << endl
<< "Elab_initial=" << Etot / 1_GeV << "Elab_initial=" << Etot / 1_GeV << " Elab_final=" << Elab_final / 1_GeV
<< " Elab_final=" << Elab_final / 1_GeV
<< " diff (%)=" << (Elab_final / Etot / get_nwounded() - 1) * 100 << " 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 << endl
<< "Plab_initial=" << (pProjectileLab / 1_GeV).GetComponents() << "Plab_initial=" << (pProjectileLab / 1_GeV).GetComponents()
<< ", Plab_final=" << (Plab_final / 1_GeV).GetComponents() << endl; << ", Plab_final=" << (Plab_final / 1_GeV).GetComponents() << endl;
......
...@@ -203,7 +203,7 @@ TEST_CASE("SibyllInterface", "[processes]") { ...@@ -203,7 +203,7 @@ TEST_CASE("SibyllInterface", "[processes]") {
[[maybe_unused]] const GrammageType length = model.GetInteractionLength(particle); [[maybe_unused]] const GrammageType length = model.GetInteractionLength(particle);
} }
SECTION("InteractionInterface - high energy") { SECTION("InteractionInterface - high energy") {
setup::Stack stack; setup::Stack stack;
const HEPEnergyType E0 = 60_EeV; const HEPEnergyType E0 = 60_EeV;
...@@ -221,7 +221,6 @@ TEST_CASE("SibyllInterface", "[processes]") { ...@@ -221,7 +221,6 @@ TEST_CASE("SibyllInterface", "[processes]") {
Interaction model; Interaction model;
model.Init();
[[maybe_unused]] const process::EProcessReturn ret = model.DoInteraction(projectile); [[maybe_unused]] const process::EProcessReturn ret = model.DoInteraction(projectile);
auto const pSum = sumMomentum(view, cs); auto const pSum = sumMomentum(view, cs);
CHECK(pSum.GetComponents(cs).GetX() / P0 == Approx(1).margin(0.05)); CHECK(pSum.GetComponents(cs).GetX() / P0 == Approx(1).margin(0.05));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment