IAP GITLAB

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

Merge branch '233-pythia8-required-to-build-2' into 'master'

Resolve "pythia8 required to build"

Closes #233

See merge request AirShowerPhysics/corsika!179
parents 9cc574c0 fce3c77b
No related branches found
No related tags found
No related merge requests found
...@@ -90,7 +90,7 @@ target_link_libraries (vertical_EAS ...@@ -90,7 +90,7 @@ target_link_libraries (vertical_EAS
CORSIKAlogging CORSIKAlogging
CORSIKArandom CORSIKArandom
ProcessSibyll ProcessSibyll
ProcessPythia # ProcessPythia
ProcessUrQMD ProcessUrQMD
ProcessSwitch ProcessSwitch
CORSIKAcascade CORSIKAcascade
......
...@@ -28,12 +28,10 @@ ...@@ -28,12 +28,10 @@
#include <corsika/geometry/Plane.h> #include <corsika/geometry/Plane.h>
#include <corsika/geometry/Sphere.h> #include <corsika/geometry/Sphere.h>
//~ #include <corsika/process/sibyll/Decay.h> #include <corsika/process/sibyll/Decay.h>
#include <corsika/process/sibyll/Interaction.h> #include <corsika/process/sibyll/Interaction.h>
#include <corsika/process/sibyll/NuclearInteraction.h> #include <corsika/process/sibyll/NuclearInteraction.h>
#include <corsika/process/pythia/Decay.h>
#include <corsika/process/urqmd/UrQMD.h> #include <corsika/process/urqmd/UrQMD.h>
#include <corsika/process/particle_cut/ParticleCut.h> #include <corsika/process/particle_cut/ParticleCut.h>
...@@ -65,7 +63,7 @@ using namespace corsika::units::si; ...@@ -65,7 +63,7 @@ using namespace corsika::units::si;
void registerRandomStreams() { void registerRandomStreams() {
random::RNGManager::GetInstance().RegisterRandomStream("cascade"); random::RNGManager::GetInstance().RegisterRandomStream("cascade");
random::RNGManager::GetInstance().RegisterRandomStream("s_rndm"); random::RNGManager::GetInstance().RegisterRandomStream("s_rndm");
random::RNGManager::GetInstance().RegisterRandomStream("pythia"); //random::RNGManager::GetInstance().RegisterRandomStream("pythia");
random::RNGManager::GetInstance().RegisterRandomStream("UrQMD"); random::RNGManager::GetInstance().RegisterRandomStream("UrQMD");
random::RNGManager::GetInstance().SeedAll(); random::RNGManager::GetInstance().SeedAll();
...@@ -139,15 +137,10 @@ int main() { ...@@ -139,15 +137,10 @@ int main() {
// setup processes, decays and interactions // setup processes, decays and interactions
const std::vector<particles::Code> trackedHadrons = {
particles::Code::PiPlus, particles::Code::PiMinus, particles::Code::KPlus,
particles::Code::KMinus, particles::Code::K0Long, particles::Code::K0Short};
process::sibyll::Interaction sibyll; process::sibyll::Interaction sibyll;
process::sibyll::NuclearInteraction sibyllNuc(sibyll, env); process::sibyll::NuclearInteraction sibyllNuc(sibyll, env);
//~ process::sibyll::Decay decay(trackedHadrons); process::sibyll::Decay decay;
process::pythia::Decay decay(trackedHadrons);
process::particle_cut::ParticleCut cut(5_GeV); process::particle_cut::ParticleCut cut(5_GeV);
process::track_writer::TrackWriter trackWriter("tracks.dat"); process::track_writer::TrackWriter trackWriter("tracks.dat");
......
...@@ -60,6 +60,10 @@ CORSIKA 8 is tested regularly at least on gcc7.3.0 and clang-6.0.0. ...@@ -60,6 +60,10 @@ CORSIKA 8 is tested regularly at least on gcc7.3.0 and clang-6.0.0.
Additional software prerequisites: eigen3, boost, cmake, g++, git. Additional software prerequisites: eigen3, boost, cmake, g++, git.
However, eigen3 is shipped in ThirdParty directory, so any installation However, eigen3 is shipped in ThirdParty directory, so any installation
on the system is optional. on the system is optional.
In case one wants to use Pythia 8 for particle decays or to simulate showers
in a proton environment, Pythia has to be installed on your system and
switched ON in CMakeLists.txt. We test with Pythia version 8.235.
On a bare Ubuntu 18.04, just add: On a bare Ubuntu 18.04, just add:
``` ```
sudo apt install cmake g++ git sudo apt install cmake g++ git
......
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