diff --git a/Processes/QGSJetII/Interaction.cc b/Processes/QGSJetII/Interaction.cc index b3a3ad690042e9b4609923d33496334860a35bf2..20e91242c1790cbf3fc6dd02e4caec5c5a9b6c9a 100644 --- a/Processes/QGSJetII/Interaction.cc +++ b/Processes/QGSJetII/Interaction.cc @@ -1,5 +1,5 @@ /* - * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu + * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu * * See file AUTHORS for a list of contributors. * @@ -64,7 +64,7 @@ namespace corsika::process::qgsjetII { } } - tuple<units::si::CrossSectionType, units::si::CrossSectionType> + units::si::CrossSectionType Interaction::GetCrossSection(const particles::Code BeamId, const particles::Code TargetId, const units::si::HEPEnergyType CoMenergy, @@ -106,7 +106,7 @@ namespace corsika::process::qgsjetII { sigProd = qgsect_(dEcm, iBeam, iProjectile, iTarget); } - return std::make_tuple(sigProd * 1_mb, 0_mb); + return sigProd * 1_mb; } template <> diff --git a/Processes/QGSJetII/Interaction.h b/Processes/QGSJetII/Interaction.h index 8404a406135b65e819999e32c67779bd4d546e89..c66c35c221798babd3a825830b6473cb7e7e8f69 100644 --- a/Processes/QGSJetII/Interaction.h +++ b/Processes/QGSJetII/Interaction.h @@ -1,5 +1,5 @@ /* - * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu + * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu * * See file AUTHORS for a list of contributors. * @@ -17,7 +17,6 @@ #include <corsika/units/PhysicalUnits.h> #include <string> -#include <tuple> namespace corsika::process::qgsjetII { @@ -45,7 +44,7 @@ namespace corsika::process::qgsjetII { corsika::particles::IsNucleus(TargetId); } - std::tuple<corsika::units::si::CrossSectionType, corsika::units::si::CrossSectionType> + corsika::units::si::CrossSectionType GetCrossSection(const corsika::particles::Code, const corsika::particles::Code, const corsika::units::si::HEPEnergyType, const unsigned int Abeam = 0, const unsigned int Atarget = 0) const; diff --git a/Processes/QGSJetII/ParticleConversion.cc b/Processes/QGSJetII/ParticleConversion.cc index a18d5673723e573034048c929abbb75e9a08a1ac..266ebc5567671acc0616a7a84f83f2201ddbb15f 100644 --- a/Processes/QGSJetII/ParticleConversion.cc +++ b/Processes/QGSJetII/ParticleConversion.cc @@ -1,5 +1,5 @@ /* - * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu + * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu * * See file AUTHORS for a list of contributors. * diff --git a/Processes/QGSJetII/ParticleConversion.h b/Processes/QGSJetII/ParticleConversion.h index 382626cf7146111073c2cbefb8b3f9673ed36c73..f6efcc84c2c0925dd519b61166ae0db8f752b734 100644 --- a/Processes/QGSJetII/ParticleConversion.h +++ b/Processes/QGSJetII/ParticleConversion.h @@ -1,5 +1,5 @@ /* - * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu + * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu * * See file AUTHORS for a list of contributors. * diff --git a/Processes/QGSJetII/QGSJetIIFragmentsStack.h b/Processes/QGSJetII/QGSJetIIFragmentsStack.h index 958327703958324645c209b938a8a1c67b46c001..7704c19fc058ea82198b7a0462467624b5de1c3a 100644 --- a/Processes/QGSJetII/QGSJetIIFragmentsStack.h +++ b/Processes/QGSJetII/QGSJetIIFragmentsStack.h @@ -1,5 +1,5 @@ /* - * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu + * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu * * See file AUTHORS for a list of contributors. * diff --git a/Processes/QGSJetII/QGSJetIIStack.h b/Processes/QGSJetII/QGSJetIIStack.h index 5f7ea3550e9f1e4dae03f78d2133b446b1c19327..b0738a634ffab28408ebe97bd4af327ef38ce425 100644 --- a/Processes/QGSJetII/QGSJetIIStack.h +++ b/Processes/QGSJetII/QGSJetIIStack.h @@ -1,5 +1,5 @@ /* - * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu + * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu * * See file AUTHORS for a list of contributors. * diff --git a/Processes/QGSJetII/code_generator.py b/Processes/QGSJetII/code_generator.py index daa3a7d7520464fd763b35e2dba2e111f2b261a5..cd4265b3427e16123c64f1a3bc211afbd08afc38 100755 --- a/Processes/QGSJetII/code_generator.py +++ b/Processes/QGSJetII/code_generator.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# (c) Copyright 2018-2019 CORSIKA Project, corsika-project@lists.kit.edu +# (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu # # See file AUTHORS for a list of contributors. # diff --git a/Processes/QGSJetII/qgsjet-II-04.cc b/Processes/QGSJetII/qgsjet-II-04.cc index 2e716cf6231a5dfd710006fdf39dece200069be4..29dd694a12576b9b45743281eebc0ae093f0bede 100644 --- a/Processes/QGSJetII/qgsjet-II-04.cc +++ b/Processes/QGSJetII/qgsjet-II-04.cc @@ -1,5 +1,5 @@ /* - * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu + * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu * * See file AUTHORS for a list of contributors. * diff --git a/Processes/QGSJetII/qgsjet-II-04.h b/Processes/QGSJetII/qgsjet-II-04.h index 94dd9ef971ac53d199dbee49f2011ee04d38ba08..352ce650dc845e3c2f30dba35eadc7d637e65eaa 100644 --- a/Processes/QGSJetII/qgsjet-II-04.h +++ b/Processes/QGSJetII/qgsjet-II-04.h @@ -1,5 +1,5 @@ /* - * (c) Copyright 2019 CORSIKA Project, corsika-project@lists.kit.edu + * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu * * See file AUTHORS for a list of contributors. * diff --git a/Processes/QGSJetII/testQGSJetII.cc b/Processes/QGSJetII/testQGSJetII.cc index e084fc88852428e8d6a9baaf6ee214bf4ee89e15..8d6ce61cf98338c38e3cf8e9d968ce96c57d74fe 100644 --- a/Processes/QGSJetII/testQGSJetII.cc +++ b/Processes/QGSJetII/testQGSJetII.cc @@ -1,5 +1,5 @@ /* - * (c) Copyright 2019 CORSIKA Project, corsika-project@lists.kit.edu + * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu * * See file AUTHORS for a list of contributors. *