diff --git a/Simulation/G4Extensions/Sleptons/src/SleptonsPhysicsTool.cxx b/Simulation/G4Extensions/Sleptons/src/SleptonsPhysicsTool.cxx
index e5cdfac4a177f59e47f6d58aa5710cdcbbc6f67a..ecde41a61c0b3734c68a3647e93102a1ed847e67 100644
--- a/Simulation/G4Extensions/Sleptons/src/SleptonsPhysicsTool.cxx
+++ b/Simulation/G4Extensions/Sleptons/src/SleptonsPhysicsTool.cxx
@@ -37,59 +37,65 @@
// Standard constructor, initializes variables
//=============================================================================
SleptonsPhysicsTool::SleptonsPhysicsTool( const std::string& type,
- const std::string& nam,const IInterface* parent )
- : AthAlgTool ( type, nam , parent )
+ const std::string& name,const IInterface* parent )
+ : AthAlgTool ( type, name , parent )
+ , m_theSElectronMinus(nullptr)
+ , m_theSElectronPlus(nullptr)
+ , m_theSMuonMinus(nullptr)
+ , m_theSMuonPlus(nullptr)
+ , m_theSTauMinus(nullptr)
+ , m_theSTauPlus(nullptr)
{
- ATH_MSG_DEBUG("SleptonsPhysicsTool "<<type<<" "<<nam);
+ ATH_MSG_DEBUG("SleptonsPhysicsTool "<<type<<" "<<name);
declareInterface< IPhysicsOptionTool >( this ) ;
- declareProperty("G4SElectronMinusMass",G4SElectronMinusMass=100.00*CLHEP::GeV,"G4SElectronMinus Mass");
- declareProperty("G4SElectronMinusWidth",G4SElectronMinusWidth=0.0*CLHEP::MeV,"G4SElectronMinus Width");
- declareProperty("G4SElectronMinusCharge",G4SElectronMinusCharge=-1.*CLHEP::eplus,"G4SElectronMinus charge");
- declareProperty("G4SElectronMinusPDGCode",G4SElectronMinusPDGCode=2000011,"G4SElectronMinus PDG CODE");
- declareProperty("G4SElectronMinusStable",G4SElectronMinusStable=true,"G4SElectronMinus Stable");
- declareProperty("G4SElectronMinusLifetime",G4SElectronMinusLifetime=-1,"G4SElectronMinus Lifetime");
- declareProperty("G4SElectronMinusShortlived",G4SElectronMinusShortlived=false,"G4SElectronMinus Shortlived");
-
- declareProperty("G4SElectronPlusMass",G4SElectronPlusMass= 100.0*CLHEP::GeV,"G4SElectronPlus Mass");
- declareProperty("G4SElectronPlusWidth",G4SElectronPlusWidth=0.0*CLHEP::MeV,"G4SElectronPlus Width");
- declareProperty("G4SElectronPlusCharge",G4SElectronPlusCharge=+1.*CLHEP::eplus,"G4SElectronPlus charge");
- declareProperty("G4SElectronPlusPDGCode",G4SElectronPlusPDGCode=-2000011,"G4SElectronPlus PDG CODE");
- declareProperty("G4SElectronPlusStable",G4SElectronPlusStable=true,"G4SElectronPlus Stable");
- declareProperty("G4SElectronPlusLifetime",G4SElectronPlusLifetime=-1,"G4SElectronPlus Lifetime");
- declareProperty("G4SElectronPlusShortlived",G4SElectronPlusShortlived=false,"G4SElectronPlus Shortlived");
-
- declareProperty("G4SMuonMinusMass",G4SMuonMinusMass= 100.0*CLHEP::GeV,"G4SMuonMinus Mass");
- declareProperty("G4SMuonMinusWidth",G4SMuonMinusWidth=0.0*CLHEP::MeV,"G4SMuonMinus Width");
- declareProperty("G4SMuonMinusCharge",G4SMuonMinusCharge=-1.*CLHEP::eplus,"G4SMuonMinus charge");
- declareProperty("G4SMuonMinusPDGCode",G4SMuonMinusPDGCode=2000013,"G4SMuonMinus PDG CODE");
- declareProperty("G4SMuonMinusStable",G4SMuonMinusStable=true,"G4SMuonMinus Stable");
- declareProperty("G4SMuonMinusLifetime",G4SMuonMinusLifetime=-1,"G4SMuonMinus Lifetime");
- declareProperty("G4SMuonMinusShortlived",G4SMuonMinusShortlived=false,"G4SMuonMinus Shortlived");
-
- declareProperty("G4SMuonPlusMass",G4SMuonPlusMass= 100.0*CLHEP::GeV,"G4SMuonPlus Mass");
- declareProperty("G4SMuonPlusWidth",G4SMuonPlusWidth=0.0*CLHEP::MeV,"G4SMuonPlus Width");
- declareProperty("G4SMuonPlusCharge",G4SMuonPlusCharge=1.*CLHEP::eplus,"G4SMuonPlus charge");
- declareProperty("G4SMuonPlusPDGCode",G4SMuonPlusPDGCode=-2000013,"G4SMuonPlus PDG CODE");
- declareProperty("G4SMuonPlusStable",G4SMuonPlusStable=true,"G4SMuonPlus Stable");
- declareProperty("G4SMuonPlusLifetime",G4SMuonPlusLifetime=-1,"G4SMuonPlus Lifetime");
- declareProperty("G4SMuonPlusShortlived",G4SMuonPlusShortlived=false,"G4SMuonPlus Shortlived");
-
- declareProperty("G4STauMinusMass",G4STauMinusMass= 100.0*CLHEP::GeV,"G4STauMinus Mass");
- declareProperty("G4STauMinusWidth",G4STauMinusWidth=0.0*CLHEP::MeV,"G4STauMinus Width");
- declareProperty("G4STauMinusCharge",G4STauMinusCharge=-1.*CLHEP::eplus,"G4STauMinus charge");
- declareProperty("G4STauMinusPDGCode",G4STauMinusPDGCode= 1000015,"G4STauMinus PDG CODE");
- declareProperty("G4STauMinusStable",G4STauMinusStable=true,"G4STauMinus Stable");
- declareProperty("G4STauMinusLifetime",G4STauMinusLifetime=-1,"G4STauMinus Lifetime");
- declareProperty("G4STauMinusShortlived",G4STauMinusShortlived=false,"G4STauMinus Shortlived");
-
- declareProperty("G4STauPlusMass",G4STauPlusMass= 100.0*CLHEP::GeV,"G4STauPlus Mass");
- declareProperty("G4STauPlusWidth",G4STauPlusWidth=0.0*CLHEP::MeV,"G4STauPlus Width");
- declareProperty("G4STauPlusCharge",G4STauPlusCharge=+1.*CLHEP::eplus,"G4STauPlus charge");
- declareProperty("G4STauPlusPDGCode",G4STauPlusPDGCode=-1000015,"G4STauPlus PDG CODE");
- declareProperty("G4STauPlusStable",G4STauPlusStable=true,"G4STauPlus Stable");
- declareProperty("G4STauPlusLifetime",G4STauPlusLifetime=-1,"G4STauPlus Lifetime");
- declareProperty("G4STauPlusShortlived",G4STauPlusShortlived=false,"G4STauPlus Shortlived");
+ declareProperty("G4SElectronMinusMass",m_G4SElectronMinusMass=100.00*CLHEP::GeV,"G4SElectronMinus Mass");
+ declareProperty("G4SElectronMinusWidth",m_G4SElectronMinusWidth=0.0*CLHEP::MeV,"G4SElectronMinus Width");
+ declareProperty("G4SElectronMinusCharge",m_G4SElectronMinusCharge=-1.*CLHEP::eplus,"G4SElectronMinus charge");
+ declareProperty("G4SElectronMinusPDGCode",m_G4SElectronMinusPDGCode=2000011,"G4SElectronMinus PDG CODE");
+ declareProperty("G4SElectronMinusStable",m_G4SElectronMinusStable=true,"G4SElectronMinus Stable");
+ declareProperty("G4SElectronMinusLifetime",m_G4SElectronMinusLifetime=-1,"G4SElectronMinus Lifetime");
+ declareProperty("G4SElectronMinusShortlived",m_G4SElectronMinusShortlived=false,"G4SElectronMinus Shortlived");
+
+ declareProperty("G4SElectronPlusMass",m_G4SElectronPlusMass= 100.0*CLHEP::GeV,"G4SElectronPlus Mass");
+ declareProperty("G4SElectronPlusWidth",m_G4SElectronPlusWidth=0.0*CLHEP::MeV,"G4SElectronPlus Width");
+ declareProperty("G4SElectronPlusCharge",m_G4SElectronPlusCharge=+1.*CLHEP::eplus,"G4SElectronPlus charge");
+ declareProperty("G4SElectronPlusPDGCode",m_G4SElectronPlusPDGCode=-2000011,"G4SElectronPlus PDG CODE");
+ declareProperty("G4SElectronPlusStable",m_G4SElectronPlusStable=true,"G4SElectronPlus Stable");
+ declareProperty("G4SElectronPlusLifetime",m_G4SElectronPlusLifetime=-1,"G4SElectronPlus Lifetime");
+ declareProperty("G4SElectronPlusShortlived",m_G4SElectronPlusShortlived=false,"G4SElectronPlus Shortlived");
+
+ declareProperty("G4SMuonMinusMass",m_G4SMuonMinusMass= 100.0*CLHEP::GeV,"G4SMuonMinus Mass");
+ declareProperty("G4SMuonMinusWidth",m_G4SMuonMinusWidth=0.0*CLHEP::MeV,"G4SMuonMinus Width");
+ declareProperty("G4SMuonMinusCharge",m_G4SMuonMinusCharge=-1.*CLHEP::eplus,"G4SMuonMinus charge");
+ declareProperty("G4SMuonMinusPDGCode",m_G4SMuonMinusPDGCode=2000013,"G4SMuonMinus PDG CODE");
+ declareProperty("G4SMuonMinusStable",m_G4SMuonMinusStable=true,"G4SMuonMinus Stable");
+ declareProperty("G4SMuonMinusLifetime",m_G4SMuonMinusLifetime=-1,"G4SMuonMinus Lifetime");
+ declareProperty("G4SMuonMinusShortlived",m_G4SMuonMinusShortlived=false,"G4SMuonMinus Shortlived");
+
+ declareProperty("G4SMuonPlusMass",m_G4SMuonPlusMass= 100.0*CLHEP::GeV,"G4SMuonPlus Mass");
+ declareProperty("G4SMuonPlusWidth",m_G4SMuonPlusWidth=0.0*CLHEP::MeV,"G4SMuonPlus Width");
+ declareProperty("G4SMuonPlusCharge",m_G4SMuonPlusCharge=1.*CLHEP::eplus,"G4SMuonPlus charge");
+ declareProperty("G4SMuonPlusPDGCode",m_G4SMuonPlusPDGCode=-2000013,"G4SMuonPlus PDG CODE");
+ declareProperty("G4SMuonPlusStable",m_G4SMuonPlusStable=true,"G4SMuonPlus Stable");
+ declareProperty("G4SMuonPlusLifetime",m_G4SMuonPlusLifetime=-1,"G4SMuonPlus Lifetime");
+ declareProperty("G4SMuonPlusShortlived",m_G4SMuonPlusShortlived=false,"G4SMuonPlus Shortlived");
+
+ declareProperty("G4STauMinusMass",m_G4STauMinusMass= 100.0*CLHEP::GeV,"G4STauMinus Mass");
+ declareProperty("G4STauMinusWidth",m_G4STauMinusWidth=0.0*CLHEP::MeV,"G4STauMinus Width");
+ declareProperty("G4STauMinusCharge",m_G4STauMinusCharge=-1.*CLHEP::eplus,"G4STauMinus charge");
+ declareProperty("G4STauMinusPDGCode",m_G4STauMinusPDGCode= 1000015,"G4STauMinus PDG CODE");
+ declareProperty("G4STauMinusStable",m_G4STauMinusStable=true,"G4STauMinus Stable");
+ declareProperty("G4STauMinusLifetime",m_G4STauMinusLifetime=-1,"G4STauMinus Lifetime");
+ declareProperty("G4STauMinusShortlived",m_G4STauMinusShortlived=false,"G4STauMinus Shortlived");
+
+ declareProperty("G4STauPlusMass",m_G4STauPlusMass= 100.0*CLHEP::GeV,"G4STauPlus Mass");
+ declareProperty("G4STauPlusWidth",m_G4STauPlusWidth=0.0*CLHEP::MeV,"G4STauPlus Width");
+ declareProperty("G4STauPlusCharge",m_G4STauPlusCharge=+1.*CLHEP::eplus,"G4STauPlus charge");
+ declareProperty("G4STauPlusPDGCode",m_G4STauPlusPDGCode=-1000015,"G4STauPlus PDG CODE");
+ declareProperty("G4STauPlusStable",m_G4STauPlusStable=true,"G4STauPlus Stable");
+ declareProperty("G4STauPlusLifetime",m_G4STauPlusLifetime=-1,"G4STauPlus Lifetime");
+ declareProperty("G4STauPlusShortlived",m_G4STauPlusShortlived=false,"G4STauPlus Shortlived");
@@ -110,7 +116,7 @@ SleptonsPhysicsTool::~SleptonsPhysicsTool()
StatusCode SleptonsPhysicsTool::initialize( )
{
ATH_MSG_DEBUG("SleptonsPhysicsTool initialize( )");
- this->SetPhysicsName(name());
+ this->SetPhysicsName(this->name());
return StatusCode::SUCCESS;
}
@@ -125,17 +131,17 @@ void SleptonsPhysicsTool::ConstructParticle()
ATH_MSG_DEBUG("ConstructParticle for the Sleptons being run");
- theSElectronMinus = G4SElectronMinus::Definition(G4SElectronMinusMass, G4SElectronMinusWidth, G4SElectronMinusCharge, G4SElectronMinusPDGCode, G4SElectronMinusStable, G4SElectronMinusLifetime, G4SElectronMinusShortlived );
+ m_theSElectronMinus = G4SElectronMinus::Definition(m_G4SElectronMinusMass, m_G4SElectronMinusWidth, m_G4SElectronMinusCharge, m_G4SElectronMinusPDGCode, m_G4SElectronMinusStable, m_G4SElectronMinusLifetime, m_G4SElectronMinusShortlived );
- theSElectronPlus = G4SElectronPlus::Definition(G4SElectronPlusMass, G4SElectronPlusWidth, G4SElectronPlusCharge, G4SElectronPlusPDGCode, G4SElectronPlusStable, G4SElectronPlusLifetime, G4SElectronPlusShortlived );
+ m_theSElectronPlus = G4SElectronPlus::Definition(m_G4SElectronPlusMass, m_G4SElectronPlusWidth, m_G4SElectronPlusCharge, m_G4SElectronPlusPDGCode, m_G4SElectronPlusStable, m_G4SElectronPlusLifetime, m_G4SElectronPlusShortlived );
- theSMuonMinus = G4SMuonMinus::Definition(G4SMuonMinusMass, G4SMuonMinusWidth, G4SMuonMinusCharge, G4SMuonMinusPDGCode, G4SMuonMinusStable, G4SMuonMinusLifetime, G4SMuonMinusShortlived );
+ m_theSMuonMinus = G4SMuonMinus::Definition(m_G4SMuonMinusMass, m_G4SMuonMinusWidth, m_G4SMuonMinusCharge, m_G4SMuonMinusPDGCode, m_G4SMuonMinusStable, m_G4SMuonMinusLifetime, m_G4SMuonMinusShortlived );
- theSMuonPlus = G4SMuonPlus::Definition(G4SMuonPlusMass, G4SMuonPlusWidth, G4SMuonPlusCharge, G4SMuonPlusPDGCode, G4SMuonPlusStable, G4SMuonPlusLifetime, G4SMuonPlusShortlived );
+ m_theSMuonPlus = G4SMuonPlus::Definition(m_G4SMuonPlusMass, m_G4SMuonPlusWidth, m_G4SMuonPlusCharge, m_G4SMuonPlusPDGCode, m_G4SMuonPlusStable, m_G4SMuonPlusLifetime, m_G4SMuonPlusShortlived );
- theSTauMinus=G4STauMinus::Definition(G4STauMinusMass, G4STauMinusWidth, G4STauMinusCharge, G4STauMinusPDGCode, G4STauMinusStable, G4STauMinusLifetime, G4STauMinusShortlived );
+ m_theSTauMinus=G4STauMinus::Definition(m_G4STauMinusMass, m_G4STauMinusWidth, m_G4STauMinusCharge, m_G4STauMinusPDGCode, m_G4STauMinusStable, m_G4STauMinusLifetime, m_G4STauMinusShortlived );
- theSTauPlus=G4STauPlus::Definition(G4STauPlusMass, G4STauPlusWidth, G4STauPlusCharge, G4STauPlusPDGCode, G4STauPlusStable, G4STauPlusLifetime, G4STauPlusShortlived );
+ m_theSTauPlus=G4STauPlus::Definition(m_G4STauPlusMass, m_G4STauPlusWidth, m_G4STauPlusCharge, m_G4STauPlusPDGCode, m_G4STauPlusStable, m_G4STauPlusLifetime, m_G4STauPlusShortlived );
}
diff --git a/Simulation/G4Extensions/Sleptons/src/SleptonsPhysicsTool.h b/Simulation/G4Extensions/Sleptons/src/SleptonsPhysicsTool.h
index 1600a4d7a38571b4af880b7551c62b6341c0cbad..948f2f908cdd6c670f5f03960be9d5e49f1011b5 100644
--- a/Simulation/G4Extensions/Sleptons/src/SleptonsPhysicsTool.h
+++ b/Simulation/G4Extensions/Sleptons/src/SleptonsPhysicsTool.h
@@ -42,31 +42,31 @@ public:
protected:
- G4double G4SElectronMinusMass, G4SElectronMinusWidth, G4SElectronMinusCharge, G4SElectronMinusPDGCode, G4SElectronMinusLifetime;
- G4bool G4SElectronMinusShortlived, G4SElectronMinusStable;
+ G4double m_G4SElectronMinusMass, m_G4SElectronMinusWidth, m_G4SElectronMinusCharge, m_G4SElectronMinusPDGCode, m_G4SElectronMinusLifetime;
+ G4bool m_G4SElectronMinusShortlived, m_G4SElectronMinusStable;
- G4double G4SElectronPlusMass, G4SElectronPlusWidth, G4SElectronPlusCharge, G4SElectronPlusPDGCode, G4SElectronPlusLifetime;
- G4bool G4SElectronPlusShortlived, G4SElectronPlusStable;
+ G4double m_G4SElectronPlusMass, m_G4SElectronPlusWidth, m_G4SElectronPlusCharge, m_G4SElectronPlusPDGCode, m_G4SElectronPlusLifetime;
+ G4bool m_G4SElectronPlusShortlived, m_G4SElectronPlusStable;
- G4double G4SMuonMinusMass, G4SMuonMinusWidth, G4SMuonMinusCharge, G4SMuonMinusPDGCode, G4SMuonMinusLifetime;
- G4bool G4SMuonMinusShortlived, G4SMuonMinusStable;
+ G4double m_G4SMuonMinusMass, m_G4SMuonMinusWidth, m_G4SMuonMinusCharge, m_G4SMuonMinusPDGCode, m_G4SMuonMinusLifetime;
+ G4bool m_G4SMuonMinusShortlived, m_G4SMuonMinusStable;
- G4double G4SMuonPlusMass, G4SMuonPlusWidth, G4SMuonPlusCharge, G4SMuonPlusPDGCode, G4SMuonPlusLifetime;
- G4bool G4SMuonPlusShortlived, G4SMuonPlusStable;
+ G4double m_G4SMuonPlusMass, m_G4SMuonPlusWidth, m_G4SMuonPlusCharge, m_G4SMuonPlusPDGCode, m_G4SMuonPlusLifetime;
+ G4bool m_G4SMuonPlusShortlived, m_G4SMuonPlusStable;
- G4double G4STauMinusMass, G4STauMinusWidth, G4STauMinusCharge, G4STauMinusPDGCode, G4STauMinusLifetime;
- G4bool G4STauMinusShortlived, G4STauMinusStable;
+ G4double m_G4STauMinusMass, m_G4STauMinusWidth, m_G4STauMinusCharge, m_G4STauMinusPDGCode, m_G4STauMinusLifetime;
+ G4bool m_G4STauMinusShortlived, m_G4STauMinusStable;
- G4double G4STauPlusMass, G4STauPlusWidth, G4STauPlusCharge, G4STauPlusPDGCode, G4STauPlusLifetime;
- G4bool G4STauPlusShortlived, G4STauPlusStable;
+ G4double m_G4STauPlusMass, m_G4STauPlusWidth, m_G4STauPlusCharge, m_G4STauPlusPDGCode, m_G4STauPlusLifetime;
+ G4bool m_G4STauPlusShortlived, m_G4STauPlusStable;
- G4ParticleDefinition *theSElectronMinus;
- G4ParticleDefinition *theSElectronPlus;
- G4ParticleDefinition *theSMuonMinus;
- G4ParticleDefinition *theSMuonPlus;
- G4ParticleDefinition *theSTauMinus;
- G4ParticleDefinition *theSTauPlus;
+ G4ParticleDefinition *m_theSElectronMinus;
+ G4ParticleDefinition *m_theSElectronPlus;
+ G4ParticleDefinition *m_theSMuonMinus;
+ G4ParticleDefinition *m_theSMuonPlus;
+ G4ParticleDefinition *m_theSTauMinus;
+ G4ParticleDefinition *m_theSTauPlus;
};