From 33239ed9675e5f915353434293dff8d5f7f67ec8 Mon Sep 17 00:00:00 2001 From: ralfulrich <ralf.ulrich@kit.edu> Date: Fri, 3 Apr 2020 09:23:49 +0200 Subject: [PATCH] maybe the enum was not setup correctly --- Processes/QGSJetII/Interaction.cc | 6 +++--- Processes/QGSJetII/ParticleConversion.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Processes/QGSJetII/Interaction.cc b/Processes/QGSJetII/Interaction.cc index 98dd4b194..f440f0034 100644 --- a/Processes/QGSJetII/Interaction.cc +++ b/Processes/QGSJetII/Interaction.cc @@ -71,7 +71,7 @@ namespace corsika::process::qgsjetII { if (process::qgsjetII::CanInteract(beamId)) { - const int iBeam = process::qgsjetII::GetQgsjetIIXSCodeRaw(beamId); + const int xsCode = process::qgsjetII::GetQgsjetIIXSCodeRaw(beamId); int iTarget = 1; if (particles::IsNucleus(targetId)) { iTarget = targetA; @@ -88,9 +88,9 @@ namespace corsika::process::qgsjetII { throw std::runtime_error("QgsjetII target outside range. "); } - cout << "QgsjetII::GetCrossSection Elab=" << Elab << " iBeam=" << iBeam + cout << "QgsjetII::GetCrossSection Elab=" << Elab << " xs-code=" << xsCode << " iProjectile=" << iProjectile << " iTarget=" << iTarget << endl; - sigProd = qgsect_(Elab / 1_GeV, iBeam, iProjectile, iTarget); + sigProd = qgsect_(Elab / 1_GeV, xsCode, iProjectile, iTarget); cout << "QgsjetII::GetCrossSection sigProd=" << sigProd << endl; } diff --git a/Processes/QGSJetII/ParticleConversion.h b/Processes/QGSJetII/ParticleConversion.h index 5828e82f5..9ee005390 100644 --- a/Processes/QGSJetII/ParticleConversion.h +++ b/Processes/QGSJetII/ParticleConversion.h @@ -50,8 +50,8 @@ namespace corsika::process::qgsjetII { Kaon0LType = +5, Kaon0SType = -5, // special codes, not in QGSJetII - NucleusType, - NeutralLightMesonType + NucleusType = 100, + NeutralLightMesonType = 101, }; using QgsjetIIHadronTypeIntType = std::underlying_type<QgsjetIIHadronType>::type; -- GitLab