Changeset 890 for trunk/source/particles/management/src/G4IonTable.cc

Timestamp:

Nov 25, 2008, 5:27:50 PM (16 years ago)

Author:

garnier

Message:

update to pre-tag revision

File:

• trunk/source/particles/management/src/G4IonTable.cc (modified) (2 diffs)

trunk/source/particles/management/src/G4IonTable.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4IonTable.cc,v 1.51 2008/06/08 12:55:45 kurasige Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4IonTable.cc,v 1.53 2008/10/15 02:41:37 kurasige Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -615 +615 @@
 {
   // returns pointer to pre-defined ions 
+  static G4bool isInitialized = false;
+  static G4ParticleDefinition* p_proton=0;
+  static G4ParticleDefinition* p_neutron=0;
+  static G4ParticleDefinition* p_deuteron=0;
+  static G4ParticleDefinition* p_triton=0;
+  static G4ParticleDefinition* p_alpha=0;
+  static G4ParticleDefinition* p_He3=0;
+  
+  if (!isInitialized) {
+    p_proton   = G4ParticleTable::GetParticleTable()->FindParticle("proton"); // proton 
+    p_neutron  = G4ParticleTable::GetParticleTable()->FindParticle("neutron"); // neutron 
+    p_deuteron = G4ParticleTable::GetParticleTable()->FindParticle("deuteron"); // deuteron 
+    p_triton   = G4ParticleTable::GetParticleTable()->FindParticle("triton"); // tritoon 
+    p_alpha    = G4ParticleTable::GetParticleTable()->FindParticle("alpha"); // alpha 
+    p_He3      = G4ParticleTable::GetParticleTable()->FindParticle("He3"); // He3 
+    isInitialized = true;
+  }
 
   G4ParticleDefinition* ion=0;
   if ( (Z<=2) ) {
     if ( (Z==1)&&(A==1) ) {
-      ion = G4ParticleTable::GetParticleTable()->FindParticle("proton"); // proton 
-
+      ion = p_proton;
     } else if ( (Z==0)&&(A==1) ) {
-      ion = G4ParticleTable::GetParticleTable()->FindParticle("neutron"); // neutron 
+      ion = p_neutron;
     } else if ( (Z==1)&&(A==2) ) {
-      ion = G4ParticleTable::GetParticleTable()->FindParticle("deuteron"); // deuteron 
+      ion = p_deuteron;
     } else if ( (Z==1)&&(A==3) ) {
-      ion = G4ParticleTable::GetParticleTable()->FindParticle("triton"); // tritoon 
+      ion = p_triton;
     } else if ( (Z==2)&&(A==4) ) {
-      ion = G4ParticleTable::GetParticleTable()->FindParticle("alpha"); // alpha 
-
+      ion = p_alpha;
     } else if ( (Z==2)&&(A==3) ) {
-      ion = G4ParticleTable::GetParticleTable()->FindParticle("He3"); // He3 
+      ion = p_He3;
     }
   }