From 62fdaa663ed2f4e293bca94b16477ef6a24d504c Mon Sep 17 00:00:00 2001
From: Remy Prechelt <prechelt@hawaii.edu>
Date: Fri, 10 Jul 2020 08:54:52 -1000
Subject: [PATCH] Remove Init() from QGSJetII.
---
Framework/ProcessSequence/testProcessSequence.cc | 4 ++--
Processes/QGSJetII/Interaction.cc | 6 ++----
Processes/QGSJetII/Interaction.h | 2 --
Processes/QGSJetII/QGSJetIIFragmentsStack.h | 1 -
Processes/QGSJetII/QGSJetIIStack.h | 1 -
Processes/QGSJetII/testQGSJetII.cc | 2 +-
6 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/Framework/ProcessSequence/testProcessSequence.cc b/Framework/ProcessSequence/testProcessSequence.cc
index 64f1266c7..4b71e89c0 100644
--- a/Framework/ProcessSequence/testProcessSequence.cc
+++ b/Framework/ProcessSequence/testProcessSequence.cc
@@ -25,9 +25,9 @@ static const int nData = 10;
int globalCount = 0;
class ContinuousProcess1 : public ContinuousProcess<ContinuousProcess1> {
-public:
int fV = 0;
+public:
ContinuousProcess1(const int v)
: fV(v) {
@@ -45,9 +45,9 @@ public:
};
class ContinuousProcess2 : public ContinuousProcess<ContinuousProcess2> {
-public:
int fV = 0;
+public:
ContinuousProcess2(const int v)
: fV(v) {
cout << "globalCount: " << globalCount << ", fV: " << fV << std::endl;
diff --git a/Processes/QGSJetII/Interaction.cc b/Processes/QGSJetII/Interaction.cc
index b5afcb9a6..d1b84e5c1 100644
--- a/Processes/QGSJetII/Interaction.cc
+++ b/Processes/QGSJetII/Interaction.cc
@@ -46,11 +46,7 @@ namespace corsika::process::qgsjetII {
cout << "Searching for QGSJetII data tables in " << data_path_ << endl;
}
}
- }
-
- Interaction::~Interaction() { cout << "QgsjetII::Interaction n=" << count_ << endl; }
- void Interaction::Init() {
// initialize QgsjetII
if (!initialized_) {
qgset_();
@@ -60,6 +56,8 @@ namespace corsika::process::qgsjetII {
}
}
+ Interaction::~Interaction() { cout << "QgsjetII::Interaction n=" << count_ << endl; }
+
units::si::CrossSectionType Interaction::GetCrossSection(
const particles::Code beamId, const particles::Code targetId,
const units::si::HEPEnergyType Elab, const unsigned int Abeam,
diff --git a/Processes/QGSJetII/Interaction.h b/Processes/QGSJetII/Interaction.h
index aeed49ec7..f72cbdcc7 100644
--- a/Processes/QGSJetII/Interaction.h
+++ b/Processes/QGSJetII/Interaction.h
@@ -30,8 +30,6 @@ namespace corsika::process::qgsjetII {
Interaction(const std::string& dataPath = "");
~Interaction();
- void Init();
-
bool WasInitialized() { return initialized_; }
int GetMaxTargetMassNumber() const { return maxMassNumber_; }
bool IsValidTarget(corsika::particles::Code TargetId) const {
diff --git a/Processes/QGSJetII/QGSJetIIFragmentsStack.h b/Processes/QGSJetII/QGSJetIIFragmentsStack.h
index 9adb85713..5da94661c 100644
--- a/Processes/QGSJetII/QGSJetIIFragmentsStack.h
+++ b/Processes/QGSJetII/QGSJetIIFragmentsStack.h
@@ -20,7 +20,6 @@ namespace corsika::process::qgsjetII {
class QGSJetIIFragmentsStackData {
public:
- void Init();
void Dump() const {}
void Clear() {
diff --git a/Processes/QGSJetII/QGSJetIIStack.h b/Processes/QGSJetII/QGSJetIIStack.h
index 60ce7350e..8e3c87ddc 100644
--- a/Processes/QGSJetII/QGSJetIIStack.h
+++ b/Processes/QGSJetII/QGSJetIIStack.h
@@ -22,7 +22,6 @@ namespace corsika::process::qgsjetII {
class QGSJetIIStackData {
public:
- void Init();
void Dump() const {}
void Clear() {
diff --git a/Processes/QGSJetII/testQGSJetII.cc b/Processes/QGSJetII/testQGSJetII.cc
index bc1a56ba8..edfaad83b 100644
--- a/Processes/QGSJetII/testQGSJetII.cc
+++ b/Processes/QGSJetII/testQGSJetII.cc
@@ -139,7 +139,7 @@ TEST_CASE("QgsjetIIInterface", "[processes]") {
auto const projectileMomentum = projectile.GetMomentum();
Interaction model;
- model.Init();
+
[[maybe_unused]] const process::EProcessReturn ret = model.DoInteraction(projectile);
[[maybe_unused]] const GrammageType length = model.GetInteractionLength(particle);
--
GitLab