From 24bc10e47b84c96cd364c912e60a542b63b19e43 Mon Sep 17 00:00:00 2001
From: Felix Riehn <felix@matilda>
Date: Sat, 16 Feb 2019 18:52:25 +0000
Subject: [PATCH] read target components from environment
---
Documentation/Examples/cascade_example.cc | 6 +++--
Processes/Sibyll/NuclearInteraction.cc | 31 ++++++++++++++++++-----
2 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/Documentation/Examples/cascade_example.cc b/Documentation/Examples/cascade_example.cc
index 1598f7e4f..17f5e23f9 100644
--- a/Documentation/Examples/cascade_example.cc
+++ b/Documentation/Examples/cascade_example.cc
@@ -252,8 +252,10 @@ int main() {
if (auto const mp = vtn.GetModelPropertiesPtr();
mp != nullptr) { // do not query Universe it self, it has no ModelProperties
auto const& comp = mp->GetNuclearComposition().GetComponents();
- std::for_each(comp.cbegin(), comp.cend(),
- [&](particles::Code c) { allElementsInUniverse.insert(c); });
+ for (auto const c : comp)
+ allElementsInUniverse.insert(c);
+ // std::for_each(comp.cbegin(), comp.cend(),
+ // [&](particles::Code c) { allElementsInUniverse.insert(c); });
}
};
universe.walk(collectElements);
diff --git a/Processes/Sibyll/NuclearInteraction.cc b/Processes/Sibyll/NuclearInteraction.cc
index cf10583cc..0e65121d4 100644
--- a/Processes/Sibyll/NuclearInteraction.cc
+++ b/Processes/Sibyll/NuclearInteraction.cc
@@ -22,6 +22,8 @@
#include <corsika/setup/SetupStack.h>
#include <corsika/setup/SetupTrajectory.h>
+#include <set>
+
using std::cout;
using std::endl;
using std::tuple;
@@ -69,15 +71,31 @@ namespace corsika::process::sibyll {
{
using namespace corsika::particles;
using namespace units::si;
- // TODO: get composition of target volumes from environment
- // now: hard coded list for air
- constexpr Code target_nuclei[] = { Code::Oxygen, Code::Nitrogen };
+ auto& universe = *(fEnvironment.GetUniverse());
+
+ auto const allElementsInUniverse = std::invoke([&]() {
+ std::set<particles::Code> allElementsInUniverse;
+ auto collectElements = [&](auto& vtn) {
+ if (auto const mp = vtn.GetModelPropertiesPtr();
+ mp != nullptr) { // do not query Universe it self, it has no ModelProperties
+ auto const& comp = mp->GetNuclearComposition().GetComponents();
+ for (auto const c : comp)
+ allElementsInUniverse.insert(c);
+ // std::for_each(comp.cbegin(), comp.cend(),
+ // [&](particles::Code c) { allElementsInUniverse.insert(c); });
+ }
+ };
+ universe.walk(collectElements);
+ return allElementsInUniverse;
+ });
+
+
cout << "NuclearInteraction: initializing nuclear cross sections..." << endl;
// loop over target components, at most 4!!
int k =-1;
- for(auto &ptarg: target_nuclei){
+ for(auto &ptarg: allElementsInUniverse){
++k;
cout << "NuclearInteraction: init target component: " << ptarg << endl;
const int ib = GetNucleusA( ptarg );
@@ -109,7 +127,7 @@ namespace corsika::process::sibyll {
}
}
cout << "NuclearInteraction: cross sections for " << fTargetComponentsIndex.size() << " components initialized!" << endl;
- for(auto &ptarg: target_nuclei){
+ for(auto &ptarg: allElementsInUniverse){
cout << "cross section table: " << ptarg << endl;
PrintCrossSectionTable( ptarg );
}
@@ -120,7 +138,8 @@ namespace corsika::process::sibyll {
{
using namespace corsika::particles;
const int k = fTargetComponentsIndex.at( pCode );
- Code pNuclei [] = {Code::Helium, Code::Lithium7, Code::Oxygen, Code::Neon, Code::Argon, Code::Iron};
+ Code pNuclei [] = {Code::Helium, Code::Lithium7, Code::Oxygen,
+ Code::Neon, Code::Argon, Code::Iron};
cout << "en/A ";
for(auto &j: pNuclei)
cout << std::setw(9) << j;
--
GitLab