From d0b540df6740fcffd9de92b5d2fe0a2bf91a0022 Mon Sep 17 00:00:00 2001
From: Remy Prechelt <prechelt@hawaii.edu>
Date: Tue, 14 Jul 2020 10:30:39 -1000
Subject: [PATCH] Rename UrQMD random number stream (from UrQMD to urqmd).
---
Documentation/Examples/vertical_EAS.cc | 2 +-
Processes/UrQMD/UrQMD.cc | 2 +-
Processes/UrQMD/UrQMD.h | 3 ++-
Processes/UrQMD/testUrQMD.cc | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Documentation/Examples/vertical_EAS.cc b/Documentation/Examples/vertical_EAS.cc
index 7b9e996cf..a1f39a925 100644
--- a/Documentation/Examples/vertical_EAS.cc
+++ b/Documentation/Examples/vertical_EAS.cc
@@ -59,7 +59,7 @@ void registerRandomStreams() {
random::RNGManager::GetInstance().RegisterRandomStream("qgran");
random::RNGManager::GetInstance().RegisterRandomStream("sibyll");
random::RNGManager::GetInstance().RegisterRandomStream("pythia");
- random::RNGManager::GetInstance().RegisterRandomStream("UrQMD");
+ random::RNGManager::GetInstance().RegisterRandomStream("urqmd");
random::RNGManager::GetInstance().SeedAll();
}
diff --git a/Processes/UrQMD/UrQMD.cc b/Processes/UrQMD/UrQMD.cc
index a9ee78c11..cc9e02f61 100644
--- a/Processes/UrQMD/UrQMD.cc
+++ b/Processes/UrQMD/UrQMD.cc
@@ -358,7 +358,7 @@ corsika::process::EProcessReturn UrQMD::DoInteraction(SetupProjectile& projectil
*/
double corsika::process::UrQMD::ranf_(int&) {
static corsika::random::RNG& rng =
- corsika::random::RNGManager::GetInstance().GetRandomStream("UrQMD");
+ corsika::random::RNGManager::GetInstance().GetRandomStream("urqmd");
static std::uniform_real_distribution<double> dist;
return dist(rng);
diff --git a/Processes/UrQMD/UrQMD.h b/Processes/UrQMD/UrQMD.h
index 1852e3d2e..7ef119eb9 100644
--- a/Processes/UrQMD/UrQMD.h
+++ b/Processes/UrQMD/UrQMD.h
@@ -46,10 +46,11 @@ namespace corsika::process::UrQMD {
bool CanInteract(particles::Code) const;
private:
+
void readXSFile(std::string const&);
corsika::random::RNG& rng_ =
- corsika::random::RNGManager::GetInstance().GetRandomStream("UrQMD");
+ corsika::random::RNGManager::GetInstance().GetRandomStream("urqmd");
std::uniform_int_distribution<int> booleanDist_{0, 1};
boost::multi_array<corsika::units::si::CrossSectionType, 3> xs_interp_support_table_;
diff --git a/Processes/UrQMD/testUrQMD.cc b/Processes/UrQMD/testUrQMD.cc
index 5690e0c28..fd947e83f 100644
--- a/Processes/UrQMD/testUrQMD.cc
+++ b/Processes/UrQMD/testUrQMD.cc
@@ -130,7 +130,7 @@ TEST_CASE("UrQMD") {
}
feenableexcept(FE_INVALID);
- corsika::random::RNGManager::GetInstance().RegisterRandomStream("UrQMD");
+ corsika::random::RNGManager::GetInstance().RegisterRandomStream("urqmd");
UrQMD urqmd;
SECTION("interaction length") {
--
GitLab