From 77a408009c1d56f0fffe22d37195429d0943d150 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Sun, 6 Jun 2021 11:29:30 +0200
Subject: [PATCH] new random interface
---
corsika/detail/modules/proposal/ProposalProcessBase.inl | 7 +++----
corsika/modules/proposal/ProposalProcessBase.hpp | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/corsika/detail/modules/proposal/ProposalProcessBase.inl b/corsika/detail/modules/proposal/ProposalProcessBase.inl
index e423bd626..b5e211225 100644
--- a/corsika/detail/modules/proposal/ProposalProcessBase.inl
+++ b/corsika/detail/modules/proposal/ProposalProcessBase.inl
@@ -27,8 +27,7 @@ namespace corsika::proposal {
}
template <typename TEnvironment>
- inline ProposalProcessBase::ProposalProcessBase(TEnvironment const& _env)
- : RNG_(RNGManager::getInstance().getRandomStream("proposal")) {
+ inline ProposalProcessBase::ProposalProcessBase(TEnvironment const& _env) {
_env.getUniverse()->walk([&](auto& vtn) {
if (vtn.hasModelProperties()) {
const auto& prop = vtn.getModelProperties();
@@ -64,8 +63,8 @@ namespace corsika::proposal {
}
}
- inline size_t ProposalProcessBase::hash::operator()(const calc_key_t& p) const
- noexcept {
+ inline size_t ProposalProcessBase::hash::operator()(
+ const calc_key_t& p) const noexcept {
return p.first ^ std::hash<Code>{}(p.second);
}
diff --git a/corsika/modules/proposal/ProposalProcessBase.hpp b/corsika/modules/proposal/ProposalProcessBase.hpp
index d1231a5db..2ad7c4739 100644
--- a/corsika/modules/proposal/ProposalProcessBase.hpp
+++ b/corsika/modules/proposal/ProposalProcessBase.hpp
@@ -71,7 +71,7 @@ namespace corsika::proposal {
//!
class ProposalProcessBase {
protected:
- RNGManager::prng_type RNG_; //!< random number generator used by proposal
+ default_prng_type& RNG_ = RNGManager<>::getInstance().getRandomStream("proposal");
std::unordered_map<std::size_t, PROPOSAL::Medium>
media; //!< maps nuclear composition from univers to media to produce
--
GitLab