Charginos: Comply with ATLAS naming conventions.

Private static data members should start with s_.

Simulation/G4Extensions/Charginos/src/AMSBCharginoMinus.cxx

@@ -9,12 +9,12 @@
 // ######################################################################
 
 
-AMSBCharginoMinus* AMSBCharginoMinus::theInstance = NULL;
+AMSBCharginoMinus* AMSBCharginoMinus::s_theInstance = NULL;
 
 AMSBCharginoMinus* AMSBCharginoMinus::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 AMSB Chargino Minus properties after it has been constructed is not allowed";
@@ -22,9 +22,9 @@ AMSBCharginoMinus* AMSBCharginoMinus::Definition(G4double mass, G4double width,
       abort();
     }
 
-  if (theInstance != 0)
+  if (s_theInstance != 0)
     {
-      return theInstance;
+      return s_theInstance;
     }
 
   //    Arguments for constructor are as follows
@@ -44,8 +44,8 @@ AMSBCharginoMinus* AMSBCharginoMinus::Definition(G4double mass, G4double width,
                                  "supersymmetric",   0,               0,          PDG,
                                  stable,               lifetime,            NULL,
                                  shortlived,              "CharginoMinus");
-      theInstance = reinterpret_cast<AMSBCharginoMinus*>(anInstance);
-      return theInstance;
+      s_theInstance = reinterpret_cast<AMSBCharginoMinus*>(anInstance);
+      return s_theInstance;
     }
   else
     {

Simulation/G4Extensions/Charginos/src/AMSBCharginoMinus.hh

@@ -13,7 +13,7 @@ class AMSBCharginoMinus: public G4ParticleDefinition
 {
 private:
 
-  static AMSBCharginoMinus* theInstance;
+  static AMSBCharginoMinus* s_theInstance;
   AMSBCharginoMinus(){}
   ~AMSBCharginoMinus(){}
 

Simulation/G4Extensions/Charginos/src/AMSBCharginoPlus.cxx

@@ -8,12 +8,12 @@
 // ###                      CharginoPlus                              ###
 // ######################################################################
 
-AMSBCharginoPlus* AMSBCharginoPlus::theInstance = NULL;
+AMSBCharginoPlus* AMSBCharginoPlus::s_theInstance = NULL;
 
 AMSBCharginoPlus* AMSBCharginoPlus::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 AMSB Chargino Plus properties after it has been constructed is not allowed";
@@ -21,9 +21,9 @@ AMSBCharginoPlus* AMSBCharginoPlus::Definition(G4double mass, G4double width, G4
       abort();
     }
 
-  if (theInstance != 0)
+  if (s_theInstance != 0)
     {
-      return theInstance;
+      return s_theInstance;
     }
 
   //    Arguments for constructor are as follows
@@ -43,8 +43,8 @@ AMSBCharginoPlus* AMSBCharginoPlus::Definition(G4double mass, G4double width, G4
                                  stable,               lifetime,            NULL,
                                  shortlived,              "CharginoPlus");
 
-      theInstance = reinterpret_cast<AMSBCharginoPlus*>(anInstance);
-      return theInstance;
+      s_theInstance = reinterpret_cast<AMSBCharginoPlus*>(anInstance);
+      return s_theInstance;
     }
   else
     {

Simulation/G4Extensions/Charginos/src/AMSBCharginoPlus.hh

@@ -13,7 +13,7 @@ class AMSBCharginoPlus: public G4ParticleDefinition
 {
 private:
 
-  static AMSBCharginoPlus* theInstance;
+  static AMSBCharginoPlus* s_theInstance;
   AMSBCharginoPlus(){}
   ~AMSBCharginoPlus(){}
 

Simulation/G4Extensions/Charginos/src/AMSBNeutralino.cxx

@@ -10,12 +10,12 @@
 // ######################################################################
 
 
-AMSBNeutralino* AMSBNeutralino::theInstance = NULL;
+AMSBNeutralino* AMSBNeutralino::s_theInstance = NULL;
 
 AMSBNeutralino* AMSBNeutralino::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 AMSB Neutralino properties after it has been constructed is not allowed";
@@ -23,9 +23,9 @@ AMSBNeutralino* AMSBNeutralino::Definition(G4double mass, G4double width, G4doub
       abort();
     }
 
-  if (theInstance != 0)
+  if (s_theInstance != 0)
     {
-      return theInstance;
+      return s_theInstance;
     }
 
 
@@ -48,8 +48,8 @@ AMSBNeutralino* AMSBNeutralino::Definition(G4double mass, G4double width, G4doub
                                  stable,               lifetime,            NULL,
                                  shortlived,              "Neutralino");
 
-      theInstance = reinterpret_cast<AMSBNeutralino*>(anInstance);
-      return theInstance;
+      s_theInstance = reinterpret_cast<AMSBNeutralino*>(anInstance);
+      return s_theInstance;
     }
   else
     {

Simulation/G4Extensions/Charginos/src/AMSBNeutralino.hh

@@ -13,7 +13,7 @@ class AMSBNeutralino: public G4ParticleDefinition
 {
 private:
 
-  static AMSBNeutralino* theInstance;
+  static AMSBNeutralino* s_theInstance;
   AMSBNeutralino(){}
   ~AMSBNeutralino(){}