IAP GITLAB

Skip to content
Snippets Groups Projects
Commit b4929d1a authored by Felix Riehn's avatar Felix Riehn Committed by ralfulrich
Browse files

switch from sibyll random numbers to RNG

parent c6a35928
No related branches found
No related tags found
No related merge requests found
...@@ -15,7 +15,7 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules) ...@@ -15,7 +15,7 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules)
include (CorsikaUtilities) # a few cmake function include (CorsikaUtilities) # a few cmake function
# enable warnings and disallow non-standard language # enable warnings and disallow non-standard language
add_definitions(-Wall -pedantic -Wextra) add_definitions(-Wall -pedantic -Wextra -Wno-ignored-qualifiers)
set (CMAKE_CXX_STANDARD 17) set (CMAKE_CXX_STANDARD 17)
enable_testing () enable_testing ()
......
...@@ -172,12 +172,12 @@ public: ...@@ -172,12 +172,12 @@ public:
// initialize random numbers for sibyll // initialize random numbers for sibyll
// FOR NOW USE SIBYLL INTERNAL !!! // FOR NOW USE SIBYLL INTERNAL !!!
rnd_ini_(); // rnd_ini_();
corsika::random::RNGManager & rmng = corsika::random::RNGManager::GetInstance();;
const std::string str_name = "s_rndm";
rmng.RegisterRandomStream(str_name);
// corsika::random::RNGManager rmng;
// const std::string str_name = "s_rndm";
// rmng.RegisterRandomStream(str_name);
// // corsika::random::RNG srng; // // corsika::random::RNG srng;
// auto srng = rmng.GetRandomStream("s_rndm"); // auto srng = rmng.GetRandomStream("s_rndm");
...@@ -216,6 +216,13 @@ public: ...@@ -216,6 +216,13 @@ public:
private: private:
}; };
double s_rndm_(int &)
{
static corsika::random::RNG& rmng = corsika::random::RNGManager::GetInstance().GetRandomStream("s_rndm");;
return rmng()/(double)rmng.max();
}
int main(){ int main(){
stack_inspector::StackInspector<setup::Stack, setup::Trajectory> p0(true); stack_inspector::StackInspector<setup::Stack, setup::Trajectory> p0(true);
......
...@@ -26,7 +26,7 @@ set ( ...@@ -26,7 +26,7 @@ set (
set ( set (
CORSIKAsibyll_SOURCES CORSIKAsibyll_SOURCES
sibyll2.3c.f sibyll2.3c.f
rndm_dbl.f gasdev.f
) )
add_library (CORSIKAsibyll STATIC ${CORSIKAsibyll_SOURCES}) add_library (CORSIKAsibyll STATIC ${CORSIKAsibyll_SOURCES})
......
...@@ -73,7 +73,7 @@ extern"C"{ ...@@ -73,7 +73,7 @@ extern"C"{
void dec_ini_(); void dec_ini_();
// subroutine to initiate random number generator // subroutine to initiate random number generator
void rnd_ini_(); //void rnd_ini_();
// print event // print event
void sib_list_(int&); void sib_list_(int&);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment