Changeset 1340 for trunk/source/processes/electromagnetic/standard/src/G4BetheBlochModel.cc

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/electromagnetic/standard/src/G4BetheBlochModel.cc (modified) (6 diffs)

trunk/source/processes/electromagnetic/standard/src/G4BetheBlochModel.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4BetheBlochModel.cc,v 1.37 2010/05/27 10:25:59 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4BetheBlochModel.cc,v 1.40 2010/11/04 17:30:31 vnivanch Exp $
+// GEANT4 tag $Name: emstand-V09-03-25 $
 //
 // -------------------------------------------------------------------
@@ -82 +82 @@
 {
   fParticleChange = 0;
+  theElectron = G4Electron::Electron();
   if(p) {
     SetGenericIon(p);
     SetParticle(p);
-  }
-  theElectron = G4Electron::Electron();
+  } else {
+    SetParticle(theElectron);
+  }
   corr = G4LossTableManager::Instance()->EmCorrections();  
   nist = G4NistManager::Instance();
@@ -117 +119 @@
   //     << G4endl;
 
-  corrFactor = chargeSquare;
   // always false before the run
   SetDeexcitationFlag(false);
@@ -157 +158 @@
   G4double q = particle->GetPDGCharge()/eplus;
   chargeSquare = q*q;
+  corrFactor = chargeSquare;
   ratio = electron_mass_c2/mass;
   G4double magmom = 
@@ -275 +277 @@
 
   // shell correction
-  dedx -= 2.0*corr->ShellCorrection(p,material,kineticEnergy);
+  //dedx -= 2.0*corr->ShellCorrection(p,material,kineticEnergy);
+  dedx -= corr->ShellCorrection(p,material,kineticEnergy);
 
   // now compute the total ionization loss
-
-  if (dedx < 0.0) dedx = 0.0 ;
-
   dedx *= twopi_mc2_rcl2*chargeSquare*eDensity/beta2;
 
@@ -289 +289 @@
     dedx += corr->HighOrderCorrections(p,material,kineticEnergy,cutEnergy);
   }
+
+  if (dedx < 0.0) { dedx = 0.0; }
   return dedx;
 }