Changeset 961 for trunk/source/processes/electromagnetic/utils/include/G4ionEffectiveCharge.hh

Timestamp:

Apr 6, 2009, 12:21:12 PM (15 years ago)

Author:

garnier

Message:

update processes

File:

• trunk/source/processes/electromagnetic/utils/include/G4ionEffectiveCharge.hh (modified) (4 diffs)

trunk/source/processes/electromagnetic/utils/include/G4ionEffectiveCharge.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4ionEffectiveCharge.hh,v 1.8 2006/08/15 16:21:39 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4ionEffectiveCharge.hh,v 1.12 2008/09/20 19:39:34 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
@@ -56 +56 @@
 
 #include "globals.hh"
+#include "G4ParticleDefinition.hh"
 
 class G4Material;
-class G4ParticleDefinition;
+class G4NistManager;
 
 class G4ionEffectiveCharge 
@@ -84 +85 @@
   G4ionEffectiveCharge(const G4ionEffectiveCharge&);
 
+  G4NistManager*              nist;
+
+  const G4ParticleDefinition* lastPart;
+  const G4Material*           lastMat;
+  G4double                    lastKinEnergy;
+
   G4double                    chargeCorrection;
+  G4double                    effCharge;
+
   G4double                    energyHighLimit;
   G4double                    energyLowLimit;
@@ -100 +109 @@
                                  G4double kineticEnergy)
 {
-  G4double charge = EffectiveCharge(p,material,kineticEnergy)/eplus;
-  charge *= chargeCorrection;
+  G4double charge = effCharge;
+  if( kineticEnergy != lastKinEnergy || material != lastMat || p != lastPart) {
+    charge = EffectiveCharge(p,material,kineticEnergy);
+  }
+  charge *= chargeCorrection/CLHEP::eplus;
 
   return charge*charge;