Changeset 1196 for trunk/source/processes/electromagnetic/muons/src/G4MuPairProductionModel.cc

Timestamp:

Nov 25, 2009, 5:13:58 PM (15 years ago)

Author:

garnier

Message:

update CVS release candidate geant4.9.3.01

File:

• trunk/source/processes/electromagnetic/muons/src/G4MuPairProductionModel.cc (modified) (5 diffs)

trunk/source/processes/electromagnetic/muons/src/G4MuPairProductionModel.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4MuPairProductionModel.cc,v 1.41 2009/04/12 17:19:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// $Id: G4MuPairProductionModel.cc,v 1.44 2009/08/11 16:50:07 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // -------------------------------------------------------------------
@@ -389 +389 @@
 
   SetCurrentElement(Z);
-  G4double tmax = std::min(maxEnergy, kineticEnergy);
-  G4double cut  = std::min(cutEnergy, kineticEnergy);
-  if(cut < minPairEnergy) cut = minPairEnergy;
+
+  G4double maxPairEnergy = MaxSecondaryEnergy(particle,kineticEnergy);
+  G4double tmax = std::min(maxEnergy, maxPairEnergy);
+  G4double cut  = std::max(cutEnergy, minPairEnergy);
   if (cut >= tmax) return cross;
 
@@ -457 +458 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-void G4MuPairProductionModel::SampleSecondaries(std::vector<G4DynamicParticle*>* vdp, 
-                                                const G4MaterialCutsCouple* couple,
-                                                const G4DynamicParticle* aDynamicParticle,
-                                                G4double tmin,
-                                                G4double tmax)
+void 
+G4MuPairProductionModel::SampleSecondaries(std::vector<G4DynamicParticle*>* vdp, 
+                                           const G4MaterialCutsCouple* couple,
+                                           const G4DynamicParticle* aDynamicParticle,
+                                           G4double tmin,
+                                           G4double tmax)
 {
   G4double kineticEnergy = aDynamicParticle->GetKineticEnergy();
@@ -611 +613 @@
 
   G4double sum = 0.0;
+  G4double dl;
 
   size_t i;
@@ -618 +621 @@
     G4double maxPairEnergy = MaxSecondaryEnergy(particle,kinEnergy);
     G4double minEnergy     = std::max(tmin, minPairEnergy);
-
-    G4int iz;
-    for(iz=1; iz<nzdat; iz++) {if(Z <= zdat[iz]) break;}
-    if(iz == nzdat) iz--;
-    G4double dz = log(Z/zdat[iz-1])/log(zdat[iz]/zdat[iz-1]);
-
-    G4double sigcut;
-    if(minEnergy <= minPairEnergy)
-      sigcut = 0.;
-    else
-    {
-      G4double xc = log(minEnergy/minPairEnergy)/log(maxPairEnergy/minPairEnergy);
-      G4int iy = (G4int)((log(xc) - ymin)/dy);
-      if(iy < 0) iy = 0;
-      if(iy >= nbiny) iy = nbiny-1;
-      sigcut = InterpolatedIntegralCrossSection(dt,dz,iz,it,iy,   Z);
+    dl = 0.0;
+    if(minEnergy < maxPairEnergy) {
+
+      G4int iz;
+      for(iz=1; iz<nzdat; iz++) {if(Z <= zdat[iz]) break;}
+      if(iz == nzdat) iz--;
+      G4double dz = log(Z/zdat[iz-1])/log(zdat[iz]/zdat[iz-1]);
+
+      G4double sigcut;
+      if(minEnergy <= minPairEnergy)
+        sigcut = 0.;
+      else
+        {
+          G4double xc = log(minEnergy/minPairEnergy)/log(maxPairEnergy/minPairEnergy);
+          G4int iy = (G4int)((log(xc) - ymin)/dy);
+          if(iy < 0) iy = 0;
+          if(iy >= nbiny) iy = nbiny-1;
+          sigcut = InterpolatedIntegralCrossSection(dt,dz,iz,it,iy,   Z);
+        }
+
+      G4double sigtot = InterpolatedIntegralCrossSection(dt,dz,iz,it,nbiny,Z);
+      dl = (sigtot - sigcut)*theAtomNumDensityVector[i];
     }
-
-    G4double sigtot = InterpolatedIntegralCrossSection(dt,dz,iz,it,nbiny,Z);
-    G4double dl = (sigtot - sigcut)*theAtomNumDensityVector[i];
-
     // protection
     if(dl < 0.0) dl = 0.0;