From fb1f785db4c079e17d282ef3763d98e78f7561f3 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Tue, 4 Feb 2020 00:31:08 +0100
Subject: [PATCH] fixed copyright years, removed cross section tuple
---
Processes/QGSJetII/Interaction.cc | 6 +++---
Processes/QGSJetII/Interaction.h | 5 ++---
Processes/QGSJetII/ParticleConversion.cc | 2 +-
Processes/QGSJetII/ParticleConversion.h | 2 +-
Processes/QGSJetII/QGSJetIIFragmentsStack.h | 2 +-
Processes/QGSJetII/QGSJetIIStack.h | 2 +-
Processes/QGSJetII/code_generator.py | 2 +-
Processes/QGSJetII/qgsjet-II-04.cc | 2 +-
Processes/QGSJetII/qgsjet-II-04.h | 2 +-
Processes/QGSJetII/testQGSJetII.cc | 2 +-
10 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/Processes/QGSJetII/Interaction.cc b/Processes/QGSJetII/Interaction.cc
index b3a3ad690..20e91242c 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 8404a4061..c66c35c22 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 a18d56737..266ebc556 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 382626cf7..f6efcc84c 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 958327703..7704c19fc 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 5f7ea3550..b0738a634 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 daa3a7d75..cd4265b34 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 2e716cf62..29dd694a1 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 94dd9ef97..352ce650d 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 e084fc888..8d6ce61cf 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.
*
--
GitLab