From f396eaffd0bd1c4811b90583140fbb04d5e3ae3b Mon Sep 17 00:00:00 2001 From: Maximilian Reininghaus <maximilian.reininghaus@kit.edu> Date: Tue, 12 Feb 2019 15:42:32 +0100 Subject: [PATCH] ci --- Processes/HadronicElasticModel/HadronicElasticModel.cc | 10 ++++------ Processes/Sibyll/Interaction.cc | 2 +- Processes/Sibyll/NuclearInteraction.cc | 3 +-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Processes/HadronicElasticModel/HadronicElasticModel.cc b/Processes/HadronicElasticModel/HadronicElasticModel.cc index ab349a6be..f68e31410 100644 --- a/Processes/HadronicElasticModel/HadronicElasticModel.cc +++ b/Processes/HadronicElasticModel/HadronicElasticModel.cc @@ -91,12 +91,11 @@ namespace corsika::process::HadronicElasticModel { const auto* currentNode = fEnvironment.GetUniverse()->GetContainingNode(p.GetPosition()); - const auto& mediumComposition = - currentNode->GetModelProperties().GetNuclearComposition(); - const auto& components = mediumComposition.GetComponents(); + const auto& composition = currentNode->GetModelProperties().GetNuclearComposition(); + const auto& components = composition.GetComponents(); std::vector<units::si::CrossSectionType> cross_section_of_components( - mediumComposition.GetComponents().size()); + composition.GetComponents().size()); auto const projectileMomentum = p.GetMomentum(); auto const projectileMomentumSquaredNorm = projectileMomentum.squaredNorm(); @@ -109,8 +108,7 @@ namespace corsika::process::HadronicElasticModel { cross_section_of_components[i] = CrossSection(s); } - const auto targetCode = - currentNode->GetModelProperties().SampleTarget(cross_section_of_components, fRNG); + const auto targetCode = composition.SampleTarget(cross_section_of_components, fRNG); auto const targetMass = particles::GetMass(targetCode); diff --git a/Processes/Sibyll/Interaction.cc b/Processes/Sibyll/Interaction.cc index 893de4f51..5ccc1b743 100644 --- a/Processes/Sibyll/Interaction.cc +++ b/Processes/Sibyll/Interaction.cc @@ -277,7 +277,7 @@ namespace corsika::process::sibyll { sigEla; // to avoid not used warning in array binding } - const auto targetCode = currentNode->GetModelProperties().SampleTarget( + const auto targetCode = mediumComposition.SampleTarget( cross_section_of_components, fRNG); cout << "Interaction: target selected: " << targetCode << endl; /* diff --git a/Processes/Sibyll/NuclearInteraction.cc b/Processes/Sibyll/NuclearInteraction.cc index b3602cb57..6a3736323 100644 --- a/Processes/Sibyll/NuclearInteraction.cc +++ b/Processes/Sibyll/NuclearInteraction.cc @@ -356,8 +356,7 @@ namespace corsika::process::sibyll { [[maybe_unused]] auto sigNucCopy = nNuc; // ONLY TO AVOID COMPILER WARNINGS } - const auto targetCode = - currentNode->GetModelProperties().SampleTarget(cross_section_of_components, fRNG); + const auto targetCode = mediumComposition.SampleTarget(cross_section_of_components, fRNG); cout << "Interaction: target selected: " << targetCode << endl; /* FOR NOW: allow nuclei with A<18 or protons only. -- GitLab