From 80ee91a100e990fd549c1a25784317dac3c8591e Mon Sep 17 00:00:00 2001 From: Remy Prechelt <prechelt@hawaii.edu> Date: Thu, 9 Jul 2020 20:49:19 -1000 Subject: [PATCH] Rename sibyll random stream. --- Documentation/Examples/boundary_example.cc | 2 +- Documentation/Examples/cascade_example.cc | 2 +- Documentation/Examples/cascade_proton_example.cc | 2 +- Documentation/Examples/vertical_EAS.cc | 2 +- Processes/Sibyll/Interaction.h | 2 +- Processes/Sibyll/NuclearInteraction.h | 2 +- Processes/Sibyll/sibyll2.3d.cc | 2 +- Processes/Sibyll/testSibyll.cc | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/Examples/boundary_example.cc b/Documentation/Examples/boundary_example.cc index a2f0d1001..caaa087a4 100644 --- a/Documentation/Examples/boundary_example.cc +++ b/Documentation/Examples/boundary_example.cc @@ -114,7 +114,7 @@ int main() { // setup processes, decays and interactions tracking_line::TrackingLine tracking; - random::RNGManager::GetInstance().RegisterRandomStream("s_rndm"); + random::RNGManager::GetInstance().RegisterRandomStream("sibyll"); process::sibyll::Interaction sibyll; process::sibyll::Decay decay; diff --git a/Documentation/Examples/cascade_example.cc b/Documentation/Examples/cascade_example.cc index fb94eaa5b..93902e146 100644 --- a/Documentation/Examples/cascade_example.cc +++ b/Documentation/Examples/cascade_example.cc @@ -133,7 +133,7 @@ int main() { tracking_line::TrackingLine tracking; stack_inspector::StackInspector<setup::Stack> stackInspect(1, true, E0); - random::RNGManager::GetInstance().RegisterRandomStream("s_rndm"); + random::RNGManager::GetInstance().RegisterRandomStream("sibyll"); random::RNGManager::GetInstance().RegisterRandomStream("pythia"); process::sibyll::Interaction sibyll; process::sibyll::NuclearInteraction sibyllNuc(sibyll, env); diff --git a/Documentation/Examples/cascade_proton_example.cc b/Documentation/Examples/cascade_proton_example.cc index 5125902df..996d67eb9 100644 --- a/Documentation/Examples/cascade_proton_example.cc +++ b/Documentation/Examples/cascade_proton_example.cc @@ -116,7 +116,7 @@ int main() { tracking_line::TrackingLine tracking; stack_inspector::StackInspector<setup::Stack> stackInspect(1, true, E0); - random::RNGManager::GetInstance().RegisterRandomStream("s_rndm"); + random::RNGManager::GetInstance().RegisterRandomStream("sibyll"); random::RNGManager::GetInstance().RegisterRandomStream("pythia"); // process::sibyll::Interaction sibyll(env); process::pythia::Interaction pythia; diff --git a/Documentation/Examples/vertical_EAS.cc b/Documentation/Examples/vertical_EAS.cc index 3e1af668f..7b9e996cf 100644 --- a/Documentation/Examples/vertical_EAS.cc +++ b/Documentation/Examples/vertical_EAS.cc @@ -57,7 +57,7 @@ using namespace corsika::units::si; void registerRandomStreams() { random::RNGManager::GetInstance().RegisterRandomStream("cascade"); random::RNGManager::GetInstance().RegisterRandomStream("qgran"); - random::RNGManager::GetInstance().RegisterRandomStream("s_rndm"); + random::RNGManager::GetInstance().RegisterRandomStream("sibyll"); random::RNGManager::GetInstance().RegisterRandomStream("pythia"); random::RNGManager::GetInstance().RegisterRandomStream("UrQMD"); diff --git a/Processes/Sibyll/Interaction.h b/Processes/Sibyll/Interaction.h index bcc9b632e..fcb3b94e5 100644 --- a/Processes/Sibyll/Interaction.h +++ b/Processes/Sibyll/Interaction.h @@ -57,7 +57,7 @@ namespace corsika::process::sibyll { private: corsika::random::RNG& RNG_ = - corsika::random::RNGManager::GetInstance().GetRandomStream("s_rndm"); + corsika::random::RNGManager::GetInstance().GetRandomStream("sibyll"); const corsika::units::si::HEPEnergyType minEnergyCoM_ = 10. * 1e9 * corsika::units::si::electronvolt; diff --git a/Processes/Sibyll/NuclearInteraction.h b/Processes/Sibyll/NuclearInteraction.h index 8897d199d..ba9c710bb 100644 --- a/Processes/Sibyll/NuclearInteraction.h +++ b/Processes/Sibyll/NuclearInteraction.h @@ -60,7 +60,7 @@ namespace corsika::process::sibyll { corsika::process::sibyll::Interaction& hadronicInteraction_; std::map<corsika::particles::Code, int> targetComponentsIndex_; corsika::random::RNG& RNG_ = - corsika::random::RNGManager::GetInstance().GetRandomStream("s_rndm"); + corsika::random::RNGManager::GetInstance().GetRandomStream("sibyll"); static constexpr int gNSample_ = 500; // number of samples in MC estimation of cross section static constexpr int gMaxNucleusAProjectile_ = 56; diff --git a/Processes/Sibyll/sibyll2.3d.cc b/Processes/Sibyll/sibyll2.3d.cc index 7257e97a8..16db131f7 100644 --- a/Processes/Sibyll/sibyll2.3d.cc +++ b/Processes/Sibyll/sibyll2.3d.cc @@ -16,7 +16,7 @@ double get_sibyll_mass2(int& id) { return s_mass1_.am2[abs(id) - 1]; } double s_rndm_(int&) { static corsika::random::RNG& rng = - corsika::random::RNGManager::GetInstance().GetRandomStream("s_rndm"); + corsika::random::RNGManager::GetInstance().GetRandomStream("sibyll"); std::uniform_real_distribution<double> dist; return dist(rng); diff --git a/Processes/Sibyll/testSibyll.cc b/Processes/Sibyll/testSibyll.cc index 2aab98c2a..308e8ea18 100644 --- a/Processes/Sibyll/testSibyll.cc +++ b/Processes/Sibyll/testSibyll.cc @@ -115,7 +115,7 @@ TEST_CASE("SibyllInterface", "[processes]") { const geometry::CoordinateSystem& cs = env.GetCoordinateSystem(); - random::RNGManager::GetInstance().RegisterRandomStream("s_rndm"); + random::RNGManager::GetInstance().RegisterRandomStream("sibyll"); SECTION("InteractionInterface") { -- GitLab