Changeset 1315 for trunk/source/processes/electromagnetic/utils/include/G4EmCorrections.hh

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

File:

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

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4EmCorrections.hh,v 1.24 2008/09/12 14:44:48 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4EmCorrections.hh,v 1.25 2010/06/04 09:28:46 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
@@ -56 +56 @@
 
 #include "globals.hh"
-#include "G4AtomicShells.hh"
 #include "G4ionEffectiveCharge.hh"
 #include "G4Material.hh"
@@ -263 +262 @@
   G4int     nbinCorr;
 
-  G4AtomicShells        shells;
   G4ionEffectiveCharge  effCharge;
 
@@ -356 +354 @@
     tmax  = 2.0*electron_mass_c2*bg2 /(1. + 2.0*gamma*ratio + ratio*ratio);
     charge  = p->GetPDGCharge()/eplus;
-    if(charge < 1.5)  {q2 = charge*charge;}
-    else {
-      q2 = effCharge.EffectiveChargeSquareRatio(p,mat,kinEnergy);
-      charge = std::sqrt(q2);
-    }
+    //if(charge < 1.5)  {q2 = charge*charge;}
+    //else {
+    //  q2 = effCharge.EffectiveChargeSquareRatio(p,mat,kinEnergy);
+    //  charge = std::sqrt(q2);
+    //}
+    if(charge > 1.5) { charge = effCharge.EffectiveCharge(p,mat,kinEnergy); }
+    q2 = charge*charge;
   }
   if(mat != material) {