From 4037fd932175b9797cb5add8fa92ba6bb82aeefb Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Thu, 1 Feb 2018 17:15:14 +0100
Subject: [PATCH] Gauginos: Comply with ATLAS naming conventions.
Private data members should start with m_ or s_.
---
.../Gauginos/src/GMSBGravitino.cxx | 12 +++----
.../Gauginos/src/GMSBGravitino.hh | 2 +-
.../Gauginos/src/GMSBNeutralino.cxx | 12 +++----
.../Gauginos/src/GMSBNeutralino.hh | 2 +-
.../Gauginos/src/GauginosPhysicsTool.cxx | 34 +++++++++----------
.../Gauginos/src/GauginosPhysicsTool.h | 8 ++---
6 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/Simulation/G4Extensions/Gauginos/src/GMSBGravitino.cxx b/Simulation/G4Extensions/Gauginos/src/GMSBGravitino.cxx
index e2031be49aa..ee3511896f1 100755
--- a/Simulation/G4Extensions/Gauginos/src/GMSBGravitino.cxx
+++ b/Simulation/G4Extensions/Gauginos/src/GMSBGravitino.cxx
@@ -7,13 +7,13 @@
// ### Gravitino ###
// ######################################################################
-GMSBGravitino* GMSBGravitino::theInstance = NULL;
+GMSBGravitino* GMSBGravitino::s_theInstance = NULL;
GMSBGravitino* GMSBGravitino::Definition(G4double mass, G4double width, G4double charge, G4double PDG, G4bool stable, G4double lifetime, G4bool shortlived)
{
- if (theInstance !=0 && (mass>=0. || width>=0. || lifetime>=0.) )
+ if (s_theInstance !=0 && (mass>=0. || width>=0. || lifetime>=0.) )
{
G4ExceptionDescription description;
description << "Trying to redefine the GMSB Gravitino properties after it has been constructed is not allowed";
@@ -21,9 +21,9 @@ GMSBGravitino* GMSBGravitino::Definition(G4double mass, G4double width, G4double
abort();
}
- if (theInstance != 0)
+ if (s_theInstance != 0)
{
- return theInstance;
+ return s_theInstance;
}
// Arguments for constructor are as follows
@@ -43,8 +43,8 @@ GMSBGravitino* GMSBGravitino::Definition(G4double mass, G4double width, G4double
stable, lifetime, NULL,
shortlived, "Gravitino");
- theInstance = reinterpret_cast<GMSBGravitino*>(anInstance);
- return theInstance;
+ s_theInstance = reinterpret_cast<GMSBGravitino*>(anInstance);
+ return s_theInstance;
}
else
{
diff --git a/Simulation/G4Extensions/Gauginos/src/GMSBGravitino.hh b/Simulation/G4Extensions/Gauginos/src/GMSBGravitino.hh
index 0570d92fb6d..f0646a526dc 100644
--- a/Simulation/G4Extensions/Gauginos/src/GMSBGravitino.hh
+++ b/Simulation/G4Extensions/Gauginos/src/GMSBGravitino.hh
@@ -13,7 +13,7 @@ class GMSBGravitino: public G4ParticleDefinition
{
private:
- static GMSBGravitino* theInstance;
+ static GMSBGravitino* s_theInstance;
GMSBGravitino(){}
~GMSBGravitino(){}
diff --git a/Simulation/G4Extensions/Gauginos/src/GMSBNeutralino.cxx b/Simulation/G4Extensions/Gauginos/src/GMSBNeutralino.cxx
index c35ed2ddac5..8ba863237f3 100755
--- a/Simulation/G4Extensions/Gauginos/src/GMSBNeutralino.cxx
+++ b/Simulation/G4Extensions/Gauginos/src/GMSBNeutralino.cxx
@@ -7,12 +7,12 @@
// ### Neutralino ###
// ######################################################################
-GMSBNeutralino* GMSBNeutralino::theInstance = NULL;
+GMSBNeutralino* GMSBNeutralino::s_theInstance = NULL;
GMSBNeutralino* GMSBNeutralino::Definition(G4double mass, G4double width, G4double charge, G4double PDG, G4bool stable, G4double lifetime, G4bool shortlived)
{
- if (theInstance !=0 && (mass>=0. || width>=0. || lifetime>=0.) )
+ if (s_theInstance !=0 && (mass>=0. || width>=0. || lifetime>=0.) )
{
G4ExceptionDescription description;
description << "Trying to redefine the GMSB Neutralino properties after it has been constructed is not allowed";
@@ -20,9 +20,9 @@ GMSBNeutralino* GMSBNeutralino::Definition(G4double mass, G4double width, G4doub
abort();
}
- if (theInstance != 0)
+ if (s_theInstance != 0)
{
- return theInstance;
+ return s_theInstance;
}
// Arguments for constructor are as follows
@@ -42,8 +42,8 @@ GMSBNeutralino* GMSBNeutralino::Definition(G4double mass, G4double width, G4doub
stable, lifetime, NULL,
shortlived, "Neutralino");
- theInstance = reinterpret_cast<GMSBNeutralino*>(anInstance);
- return theInstance;
+ s_theInstance = reinterpret_cast<GMSBNeutralino*>(anInstance);
+ return s_theInstance;
}
else
{
diff --git a/Simulation/G4Extensions/Gauginos/src/GMSBNeutralino.hh b/Simulation/G4Extensions/Gauginos/src/GMSBNeutralino.hh
index 18645589438..d44e664754a 100644
--- a/Simulation/G4Extensions/Gauginos/src/GMSBNeutralino.hh
+++ b/Simulation/G4Extensions/Gauginos/src/GMSBNeutralino.hh
@@ -13,7 +13,7 @@ class GMSBNeutralino: public G4ParticleDefinition
{
private:
- static GMSBNeutralino* theInstance;
+ static GMSBNeutralino* s_theInstance;
GMSBNeutralino(){}
~GMSBNeutralino(){}
diff --git a/Simulation/G4Extensions/Gauginos/src/GauginosPhysicsTool.cxx b/Simulation/G4Extensions/Gauginos/src/GauginosPhysicsTool.cxx
index 86b1535348d..d622923d16d 100644
--- a/Simulation/G4Extensions/Gauginos/src/GauginosPhysicsTool.cxx
+++ b/Simulation/G4Extensions/Gauginos/src/GauginosPhysicsTool.cxx
@@ -31,21 +31,21 @@ GauginosPhysicsTool::GauginosPhysicsTool( const std::string& type,
const std::string& nam,const IInterface* parent )
: base_class ( type, nam , parent )
{
- declareProperty("GravitinoMass",GravitinoMass=0.108E-04*CLHEP::GeV,"Gravitino Mass");
- declareProperty("GravitinoWidth",GravitinoWidth=0.*CLHEP::GeV,"Gravitino Width");
- declareProperty("GravitinoCharge",GravitinoCharge=0,"Gravitino charge");
- declareProperty("GravitinoPDGCode",GravitinoPDGCode=1000039,"Gravitino PDG CODE");
- declareProperty("GravitinoLifetime",GravitinoLifetime=-1 ,"Gravitino Lifetime");
- declareProperty("GravitinoStable",GravitinoStable=true ,"Gravitino Stable");
- declareProperty("GravitinoShortlived",GravitinoShortlived=false ,"Gravitino Shortlived");
-
- declareProperty("NeutralinoMass",NeutralinoMass=118.848*CLHEP::GeV,"Neutralino Mass");
- declareProperty("NeutralinoWidth",NeutralinoWidth=0.*CLHEP::GeV,"Neutralino Width");
- declareProperty("NeutralinoCharge",NeutralinoCharge=0,"Neutralino charge");
- declareProperty("NeutralinoPDGCode",NeutralinoPDGCode=1000022,"Neutralino PDG CODE");
- declareProperty("NeutralinoStable",NeutralinoStable=true,"Neutralino Stable");
- declareProperty("NeutralinoLifetime",NeutralinoLifetime=-1,"Neutralino Lifetime");
- declareProperty("NeutralinoShortlived",NeutralinoShortlived=false,"Neutralino Shortlived");
+ declareProperty("GravitinoMass",m_GravitinoMass=0.108E-04*CLHEP::GeV,"Gravitino Mass");
+ declareProperty("GravitinoWidth",m_GravitinoWidth=0.*CLHEP::GeV,"Gravitino Width");
+ declareProperty("GravitinoCharge",m_GravitinoCharge=0,"Gravitino charge");
+ declareProperty("GravitinoPDGCode",m_GravitinoPDGCode=1000039,"Gravitino PDG CODE");
+ declareProperty("GravitinoLifetime",m_GravitinoLifetime=-1 ,"Gravitino Lifetime");
+ declareProperty("GravitinoStable",m_GravitinoStable=true ,"Gravitino Stable");
+ declareProperty("GravitinoShortlived",m_GravitinoShortlived=false ,"Gravitino Shortlived");
+
+ declareProperty("NeutralinoMass",m_NeutralinoMass=118.848*CLHEP::GeV,"Neutralino Mass");
+ declareProperty("NeutralinoWidth",m_NeutralinoWidth=0.*CLHEP::GeV,"Neutralino Width");
+ declareProperty("NeutralinoCharge",m_NeutralinoCharge=0,"Neutralino charge");
+ declareProperty("NeutralinoPDGCode",m_NeutralinoPDGCode=1000022,"Neutralino PDG CODE");
+ declareProperty("NeutralinoStable",m_NeutralinoStable=true,"Neutralino Stable");
+ declareProperty("NeutralinoLifetime",m_NeutralinoLifetime=-1,"Neutralino Lifetime");
+ declareProperty("NeutralinoShortlived",m_NeutralinoShortlived=false,"Neutralino Shortlived");
}
@@ -78,9 +78,9 @@ void GauginosPhysicsTool::ConstructParticle()
{
ATH_MSG_DEBUG("Create particle of Gauginos" );
- GMSBNeutralino::Definition(NeutralinoMass, NeutralinoWidth, NeutralinoCharge, NeutralinoPDGCode, NeutralinoStable, NeutralinoLifetime, NeutralinoShortlived );
+ GMSBNeutralino::Definition(m_NeutralinoMass, m_NeutralinoWidth, m_NeutralinoCharge, m_NeutralinoPDGCode, m_NeutralinoStable, m_NeutralinoLifetime, m_NeutralinoShortlived );
- GMSBGravitino::Definition(GravitinoMass, GravitinoWidth, GravitinoCharge, GravitinoPDGCode, GravitinoStable, GravitinoLifetime, NeutralinoShortlived);
+ GMSBGravitino::Definition(m_GravitinoMass, m_GravitinoWidth, m_GravitinoCharge, m_GravitinoPDGCode, m_GravitinoStable, m_GravitinoLifetime, m_NeutralinoShortlived);
}
diff --git a/Simulation/G4Extensions/Gauginos/src/GauginosPhysicsTool.h b/Simulation/G4Extensions/Gauginos/src/GauginosPhysicsTool.h
index cce703b61af..98225a15e7a 100644
--- a/Simulation/G4Extensions/Gauginos/src/GauginosPhysicsTool.h
+++ b/Simulation/G4Extensions/Gauginos/src/GauginosPhysicsTool.h
@@ -41,11 +41,11 @@ protected:
static GauginosPhysicsTool* m_physList;
- G4double GravitinoMass, GravitinoWidth, GravitinoLifetime, GravitinoCharge, NeutralinoPDGCode;
- G4double NeutralinoMass, NeutralinoWidth, NeutralinoLifetime, NeutralinoCharge, GravitinoPDGCode;
+ G4double m_GravitinoMass, m_GravitinoWidth, m_GravitinoLifetime, m_GravitinoCharge, m_NeutralinoPDGCode;
+ G4double m_NeutralinoMass, m_NeutralinoWidth, m_NeutralinoLifetime, m_NeutralinoCharge, m_GravitinoPDGCode;
- G4bool NeutralinoStable, NeutralinoShortlived;
- G4bool GravitinoStable, GravitinoShortlived;
+ G4bool m_NeutralinoStable, m_NeutralinoShortlived;
+ G4bool m_GravitinoStable, m_GravitinoShortlived;
};
--
GitLab