diff --git a/CMakeLists.txt b/CMakeLists.txt index 0211617c2ec44dd7be1a6867f61c450a29dd385b..524f0ff9c3064967fa5310ad2c10d529eff4fd23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules) include (CorsikaUtilities) # a few cmake function # 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) enable_testing () diff --git a/Documentation/Examples/cascade_example.cc b/Documentation/Examples/cascade_example.cc index c325bbab3b8039dd161ada209e702ae6c74c0141..26a28690d4d69785204a87a2827b54a81e65173b 100644 --- a/Documentation/Examples/cascade_example.cc +++ b/Documentation/Examples/cascade_example.cc @@ -170,12 +170,12 @@ public: // initialize random numbers for sibyll // 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; // auto srng = rmng.GetRandomStream("s_rndm"); @@ -197,6 +197,13 @@ public: private: }; +double s_rndm_(int &) +{ + static corsika::random::RNG& rmng = corsika::random::RNGManager::GetInstance().GetRandomStream("s_rndm");; + return rmng()/(double)rmng.max(); +} + + int main(){ stack_inspector::StackInspector<setup::Stack, setup::Trajectory> p0(true); diff --git a/Framework/Cascade/CMakeLists.txt b/Framework/Cascade/CMakeLists.txt index 43aeb79fcbff9b3dc2df22511731cff96f6fb460..8681fae994b1ff91cb8bb1d69f98f5a23da1e50c 100644 --- a/Framework/Cascade/CMakeLists.txt +++ b/Framework/Cascade/CMakeLists.txt @@ -26,7 +26,7 @@ set ( set ( CORSIKAsibyll_SOURCES sibyll2.3c.f - rndm_dbl.f + gasdev.f ) add_library (CORSIKAsibyll STATIC ${CORSIKAsibyll_SOURCES}) diff --git a/Framework/Cascade/sibyll2.3c.h b/Framework/Cascade/sibyll2.3c.h index 0899d02ee17f37f4d784d7ba4d455d032f5966c4..cd70bf500ab1fbd61fd9afcc6dfd8c99c3a6cb77 100644 --- a/Framework/Cascade/sibyll2.3c.h +++ b/Framework/Cascade/sibyll2.3c.h @@ -73,7 +73,7 @@ extern"C"{ void dec_ini_(); // subroutine to initiate random number generator - void rnd_ini_(); + //void rnd_ini_(); // print event void sib_list_(int&);