From f7403d9b729ff694e3ddc258fa86144d9f3d64ee Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Tue, 30 Jan 2018 15:58:52 +0100
Subject: [PATCH] EvtGen_i: Comply with ATLAS naming conventions.
Private data members should start with m_.
---
.../EvtGenExternal/EvtExternalGenFactory.hh | 4 ++--
.../EvtGen_i/EvtGenExternal/EvtPHOTOS.hh | 2 +-
.../EvtGen_i/EvtGenExternal/EvtPythia.hh | 4 ++--
.../EvtGen_i/EvtGenExternal/EvtTauola.hh | 2 +-
.../EvtGen_i/src/EvtExternalGenFactory.cxx | 16 ++++++++--------
Generators/EvtGen_i/src/EvtPHOTOS.cxx | 10 +++++-----
Generators/EvtGen_i/src/EvtPythia.cxx | 14 +++++++-------
Generators/EvtGen_i/src/EvtTauola.cxx | 10 +++++-----
8 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtExternalGenFactory.hh b/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtExternalGenFactory.hh
index 1078a973301..68a990566b0 100644
--- a/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtExternalGenFactory.hh
+++ b/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtExternalGenFactory.hh
@@ -58,8 +58,8 @@ private:
EvtExternalGenFactory(const EvtExternalGenFactory&) {};
- ExtGenMap _extGenMap;
- ExtGenCommandMap _extGenCommandMap;
+ ExtGenMap m_extGenMap;
+ ExtGenCommandMap m_extGenCommandMap;
};
diff --git a/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtPHOTOS.hh b/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtPHOTOS.hh
index 2f1a7a9171d..0577f0485a1 100644
--- a/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtPHOTOS.hh
+++ b/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtPHOTOS.hh
@@ -40,7 +40,7 @@ public:
private:
- EvtAbsExternalGen* _photosEngine;
+ EvtAbsExternalGen* m_photosEngine;
};
diff --git a/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtPythia.hh b/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtPythia.hh
index f849dcfe766..67dca878301 100644
--- a/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtPythia.hh
+++ b/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtPythia.hh
@@ -56,12 +56,12 @@ public:
protected:
- EvtAbsExternalGen* _pythiaEngine;
+ EvtAbsExternalGen* m_pythiaEngine;
private:
void fixPolarisations(EvtParticle *p);
- std::vector<std::string> _commandList;
+ std::vector<std::string> m_commandList;
};
diff --git a/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtTauola.hh b/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtTauola.hh
index c6aff285594..e3096101612 100644
--- a/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtTauola.hh
+++ b/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtTauola.hh
@@ -43,7 +43,7 @@ public:
protected:
- EvtAbsExternalGen* _tauolaEngine;
+ EvtAbsExternalGen* m_tauolaEngine;
private:
diff --git a/Generators/EvtGen_i/src/EvtExternalGenFactory.cxx b/Generators/EvtGen_i/src/EvtExternalGenFactory.cxx
index 219534a699b..1c1668d4a74 100644
--- a/Generators/EvtGen_i/src/EvtExternalGenFactory.cxx
+++ b/Generators/EvtGen_i/src/EvtExternalGenFactory.cxx
@@ -40,21 +40,21 @@ using std::endl;
EvtExternalGenFactory::EvtExternalGenFactory() {
- _extGenMap.clear();
+ m_extGenMap.clear();
}
EvtExternalGenFactory::~EvtExternalGenFactory() {
ExtGenMap::iterator iter;
- for (iter = _extGenMap.begin(); iter != _extGenMap.end(); ++iter) {
+ for (iter = m_extGenMap.begin(); iter != m_extGenMap.end(); ++iter) {
EvtAbsExternalGen* theGenerator = iter->second;
delete theGenerator;
}
- _extGenMap.clear();
+ m_extGenMap.clear();
}
@@ -93,7 +93,7 @@ void EvtExternalGenFactory::definePythiaGenerator(std::string xmlDir,
}
EvtAbsExternalGen* pythiaGenerator = new EvtPythiaEngine(xmlDir, convertPhysCodes, useEvtGenRandom);
- _extGenMap[genId] = pythiaGenerator;
+ m_extGenMap[genId] = pythiaGenerator;
}
#else
void EvtExternalGenFactory::definePythiaGenerator(std::string ,
@@ -110,7 +110,7 @@ void EvtExternalGenFactory::definePhotosGenerator(std::string photonType, bool u
int genId = EvtExternalGenFactory::PhotosGenId;
EvtGenReport(EVTGEN_INFO,"EvtGen")<<"Defining EvtPhotosEngine using photonType = "<<photonType<<endl;
EvtAbsExternalGen* photosGenerator = new EvtPhotosEngine(photonType, useEvtGenRandom);
- _extGenMap[genId] = photosGenerator;
+ m_extGenMap[genId] = photosGenerator;
}
#else
void EvtExternalGenFactory::definePhotosGenerator(std::string, bool)
@@ -124,7 +124,7 @@ void EvtExternalGenFactory::defineTauolaGenerator(bool useEvtGenRandom) {
int genId = EvtExternalGenFactory::TauolaGenId;
EvtGenReport(EVTGEN_INFO,"EvtGen")<<"Defining EvtTauolaEngine."<<endl;
EvtAbsExternalGen* tauolaGenerator = new EvtTauolaEngine(useEvtGenRandom);
- _extGenMap[genId] = tauolaGenerator;
+ m_extGenMap[genId] = tauolaGenerator;
}
#else
void EvtExternalGenFactory::defineTauolaGenerator(bool) {}
@@ -137,7 +137,7 @@ EvtAbsExternalGen* EvtExternalGenFactory::getGenerator(int genId) {
ExtGenMap::iterator iter;
- if ((iter = _extGenMap.find(genId)) != _extGenMap.end()) {
+ if ((iter = m_extGenMap.find(genId)) != m_extGenMap.end()) {
// Retrieve the external generator engine
theGenerator = iter->second;
@@ -151,7 +151,7 @@ EvtAbsExternalGen* EvtExternalGenFactory::getGenerator(int genId) {
void EvtExternalGenFactory::initialiseAllGenerators() {
ExtGenMap::iterator iter;
- for (iter = _extGenMap.begin(); iter != _extGenMap.end(); ++iter) {
+ for (iter = m_extGenMap.begin(); iter != m_extGenMap.end(); ++iter) {
EvtAbsExternalGen* theGenerator = iter->second;
if (theGenerator != 0) {
diff --git a/Generators/EvtGen_i/src/EvtPHOTOS.cxx b/Generators/EvtGen_i/src/EvtPHOTOS.cxx
index b934e16264f..7c9d3c84ae2 100644
--- a/Generators/EvtGen_i/src/EvtPHOTOS.cxx
+++ b/Generators/EvtGen_i/src/EvtPHOTOS.cxx
@@ -28,7 +28,7 @@
EvtPHOTOS::EvtPHOTOS() {
- _photosEngine = 0;
+ m_photosEngine = 0;
}
@@ -38,12 +38,12 @@ EvtPHOTOS::~EvtPHOTOS() {
void EvtPHOTOS::doRadCorr(EvtParticle *p) {
- if (_photosEngine == 0) {
- _photosEngine = EvtExternalGenFactory::getInstance()->getGenerator(EvtExternalGenFactory::PhotosGenId);
+ if (m_photosEngine == 0) {
+ m_photosEngine = EvtExternalGenFactory::getInstance()->getGenerator(EvtExternalGenFactory::PhotosGenId);
}
- if (_photosEngine != 0) {
- _photosEngine->doDecay(p);
+ if (m_photosEngine != 0) {
+ m_photosEngine->doDecay(p);
}
}
diff --git a/Generators/EvtGen_i/src/EvtPythia.cxx b/Generators/EvtGen_i/src/EvtPythia.cxx
index 8a078f4d093..4190a240efb 100644
--- a/Generators/EvtGen_i/src/EvtPythia.cxx
+++ b/Generators/EvtGen_i/src/EvtPythia.cxx
@@ -40,12 +40,12 @@ EvtPythia::EvtPythia() {
// Set the Pythia engine to a null pointer at first.
// When we do the decay, we retrieve the pointer to the Pythia engine
// and use that for all decays. All clones will use the same Pythia engine.
- _pythiaEngine = 0;
+ m_pythiaEngine = 0;
}
EvtPythia::~EvtPythia() {
- _commandList.clear();
+ m_commandList.clear();
}
std::string EvtPythia::getName(){
@@ -83,12 +83,12 @@ void EvtPythia::decay( EvtParticle *p ){
// We check to see if the engine has been created before doing the decay.
// This should only create the full Pythia engine once, and all clones will point to the same engine.
- if (_pythiaEngine == 0) {
- _pythiaEngine = EvtExternalGenFactory::getInstance()->getGenerator(EvtExternalGenFactory::PythiaGenId);
+ if (m_pythiaEngine == 0) {
+ m_pythiaEngine = EvtExternalGenFactory::getInstance()->getGenerator(EvtExternalGenFactory::PythiaGenId);
}
- if (_pythiaEngine != 0) {
- _pythiaEngine->doDecay(p);
+ if (m_pythiaEngine != 0) {
+ m_pythiaEngine->doDecay(p);
}
this->fixPolarisations(p);
@@ -156,6 +156,6 @@ std::string EvtPythia::commandName() {
void EvtPythia::command(std::string cmd) {
// Locally store commands in a vector
- _commandList.push_back(cmd);
+ m_commandList.push_back(cmd);
}
diff --git a/Generators/EvtGen_i/src/EvtTauola.cxx b/Generators/EvtGen_i/src/EvtTauola.cxx
index bb8020c9cff..75d30de8fbc 100644
--- a/Generators/EvtGen_i/src/EvtTauola.cxx
+++ b/Generators/EvtGen_i/src/EvtTauola.cxx
@@ -35,7 +35,7 @@ EvtTauola::EvtTauola() {
// Set the Tauola engine to a null pointer at first.
// When we do the decay, we retrieve the pointer to the Tauola engine
// and use that for all decays. All clones will use the same Tauola engine.
- _tauolaEngine = 0;
+ m_tauolaEngine = 0;
}
@@ -71,12 +71,12 @@ void EvtTauola::decay( EvtParticle *p ){
// This should only create the full Tauola engine once, and all clones will
// point to the same engine.
- if (_tauolaEngine == 0) {
- _tauolaEngine = EvtExternalGenFactory::getInstance()->getGenerator(EvtExternalGenFactory::TauolaGenId);
+ if (m_tauolaEngine == 0) {
+ m_tauolaEngine = EvtExternalGenFactory::getInstance()->getGenerator(EvtExternalGenFactory::TauolaGenId);
}
- if (_tauolaEngine != 0) {
- _tauolaEngine->doDecay(p);
+ if (m_tauolaEngine != 0) {
+ m_tauolaEngine->doDecay(p);
}
}
--
GitLab