diff --git a/Processes/UrQMD/UrQMD.cc b/Processes/UrQMD/UrQMD.cc index 391986be6d77f8e18bbff6671215926b35465166..9a88c8588b3272d1d7e4cf5bf0511c931d27d563 100644 --- a/Processes/UrQMD/UrQMD.cc +++ b/Processes/UrQMD/UrQMD.cc @@ -176,9 +176,6 @@ corsika::process::EProcessReturn UrQMD::DoInteraction(SetupProjectile& vProjecti std::cout << "UrQMD generated " << sys_.npart << " secondaries!" << std::endl; - if (sys_.npart > 0) // delete only in case of inelastic collision, otherwise keep - vProjectile.Delete(); - return process::EProcessReturn::eOk; } @@ -206,13 +203,15 @@ corsika::particles::Code corsika::process::UrQMD::ConvertFromUrQMD(int vItyp, in std::pair<int, int> corsika::process::UrQMD::ConvertToUrQMD( corsika::particles::Code code) { static const std::map<int, std::pair<int, int>> mapPDGToUrQMD{ - // data from github.com/afedynitch/ParticleDataTool + // data mostly from github.com/afedynitch/ParticleDataTool {22, {100, 0}}, // gamma {111, {101, 0}}, // pi0 {211, {101, 2}}, // pi+ {-211, {101, -2}}, // pi- {321, {106, 1}}, // K+ - {-321, {106, -1}}, // K- + {-321, {-106, -1}}, // K- + {311, {106, -1}}, // K0 + {-311, {-106, 1}}, // K0bar {2212, {1, 1}}, // p {2112, {1, -1}}, // n {221, {102, 0}}, // eta diff --git a/Processes/UrQMD/ityp2pdg.f b/Processes/UrQMD/ityp2pdg.f index 5a48225dceac7fb948026ec4cb80d05ff3946d8d..aa8c2fff2660759cd6602e2527a58ca65729115f 100644 --- a/Processes/UrQMD/ityp2pdg.f +++ b/Processes/UrQMD/ityp2pdg.f @@ -216,7 +216,8 @@ cl check if we found the correct values in IDTAB pdgid = idtab(3,next) endif else - call error ('pdgid','Error in tablelookup',dble(next),3) +! M.R 2019-04-27, error to be handled in CORSIKA instead of here +! call error ('pdgid','Error in tablelookup',dble(next),3) pdgid = 0 endif