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

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/standard/src/G4BetheBlochModel.cc (modified) (7 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4BetheBlochModel.cc,v 1.36 2009/12/03 17:26:40 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4BetheBlochModel.cc,v 1.37 2010/05/27 10:25:59 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
@@ -145 +145 @@
                                               G4double kineticEnergy)
 {
-  // this method is called only for ions
+  // this method is called only for ions, so no check if it is an ion
   return corr->GetParticleCharge(p,mat,kineticEnergy);
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void G4BetheBlochModel::SetupParameters()
+{
+  mass = particle->GetPDGMass();
+  spin = particle->GetPDGSpin();
+  G4double q = particle->GetPDGCharge()/eplus;
+  chargeSquare = q*q;
+  ratio = electron_mass_c2/mass;
+  G4double magmom = 
+    particle->GetPDGMagneticMoment()*mass/(0.5*eplus*hbar_Planck*c_squared);
+  magMoment2 = magmom*magmom - 1.0;
+  formfact = 0.0;
+  if(particle->GetLeptonNumber() == 0) {
+    G4double x = 0.8426*GeV;
+    if(spin == 0.0 && mass < GeV) {x = 0.736*GeV;}
+    else if(mass > GeV) {
+      x /= nist->GetZ13(mass/proton_mass_c2);
+      //        tlimit = 51.2*GeV*A13[iz]*A13[iz];
+    }
+    formfact = 2.0*electron_mass_c2/(x*x);
+    tlimit   = 2.0/formfact;
+  }
 }
 
@@ -170 +195 @@
 
     // +term for spin=1/2 particle
-    if( 0.5 == spin ) cross += 0.5*(maxEnergy - cutEnergy)/energy2;
+    if( 0.5 == spin ) { cross += 0.5*(maxEnergy - cutEnergy)/energy2; }
 
     // High order correction different for hadrons and ions
@@ -225 +250 @@
 {
   G4double tmax      = MaxSecondaryEnergy(p, kineticEnergy);
-  G4double cutEnergy = min(cut,tmax);
+  G4double cutEnergy = std::min(cut,tmax);
 
   G4double tau   = kineticEnergy/mass;
@@ -234 +259 @@
   G4double eexc  = material->GetIonisation()->GetMeanExcitationEnergy();
   G4double eexc2 = eexc*eexc;
-  //G4double cden  = material->GetIonisation()->GetCdensity();
-  //G4double mden  = material->GetIonisation()->GetMdensity();
-  //G4double aden  = material->GetIonisation()->GetAdensity();
-  //G4double x0den = material->GetIonisation()->GetX0density();
-  //G4double x1den = material->GetIonisation()->GetX1density();
 
   G4double eDensity = material->GetElectronDensity();
@@ -252 +272 @@
   // density correction
   G4double x = log(bg2)/twoln10;
-  //if ( x >= x0den ) {
-  //  dedx -= twoln10*x - cden ;
-  //  if ( x < x1den ) dedx -= aden*pow((x1den-x),mden) ;
-  //}
   dedx -= material->GetIonisation()->DensityCorrection(x);
 
@@ -277 +293 @@
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-/*
-void G4BetheBlochModel::CorrectionsAlongStep(const G4MaterialCutsCouple*,
-                                             const G4DynamicParticle*,
-                                             G4double&,
-                                             G4double&,
-                                             G4double)
-{}
-*/
 
 void G4BetheBlochModel::CorrectionsAlongStep(const G4MaterialCutsCouple* couple,