Changeset 1340 for trunk/source/processes/electromagnetic/standard/src/G4eBremsstrahlungModel.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/G4eBremsstrahlungModel.cc (modified) (13 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4eBremsstrahlungModel.cc,v 1.46 2010/04/28 18:39:40 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4eBremsstrahlungModel.cc,v 1.48 2010/10/26 10:35:22 vnivanch Exp $
+// GEANT4 tag $Name: emstand-V09-03-24 $
 //
 // -------------------------------------------------------------------
@@ -55 +55 @@
 // 15-02-07  correct LPMconstant by a factor 2, thanks to G. Depaola (mma)
 // 09-09-08  MigdalConstant increased in (2pi)^2 times (A.Schaelicke) 
+// 13-10-10  Add angular distributon interface (VI)
 //
 // Class Description:
@@ -75 +76 @@
 #include "G4DataVector.hh"
 #include "G4ParticleChangeForLoss.hh"
+#include "G4ModifiedTsai.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -90 +92 @@
     isInitialised(false)
 {
-  if(p) SetParticle(p);
+  if(p) { SetParticle(p); }
   theGamma = G4Gamma::Gamma();
   minThreshold = 0.1*keV;
+  SetAngularDistribution(new G4ModifiedTsai());
+  highKinEnergy = HighEnergyLimit();
+  lowKinEnergy  = LowEnergyLimit();
 }
 
@@ -129 +134 @@
                                         const G4DataVector& cuts)
 {
-  if(p) SetParticle(p);
+  if(p) { SetParticle(p); }
   highKinEnergy = HighEnergyLimit();
   lowKinEnergy  = LowEnergyLimit();
@@ -172 +177 @@
                                                    G4double cutEnergy)
 {
-  if(!particle) SetParticle(p);
-  if(kineticEnergy < lowKinEnergy) return 0.0;
+  if(!particle) { SetParticle(p); }
+  if(kineticEnergy < lowKinEnergy) { return 0.0; }
 
   const G4double thigh = 100.*GeV;
@@ -272 +277 @@
     dedx += loss;
   }
-  if(dedx < 0.) dedx = 0.;
+  if(dedx < 0.) { dedx = 0.; }
   return dedx;
 }
@@ -413 +418 @@
                                                     G4double maxEnergy)
 {
-  if(!particle) SetParticle(p);
+  if(!particle) { SetParticle(p); }
   G4double cross = 0.0;
   G4double tmax = min(maxEnergy, kineticEnergy);
   G4double cut  = max(cutEnergy, minThreshold);
-  if(cut >= tmax) return cross;
+  if(cut >= tmax) { return cross; }
 
   const G4ElementVector* theElementVector = material->GetElementVector();
@@ -495 +500 @@
 {
   G4double cross = 0.0 ;
-  if ( kineticEnergy < 1*keV || kineticEnergy < cut) return cross;
+  if ( kineticEnergy < 1*keV || kineticEnergy < cut) { return cross; }
 
   static const G4double ksi=2.0, alfa=1.00;
@@ -664 +669 @@
   G4double kineticEnergy = dp->GetKineticEnergy();
   G4double tmax = min(maxEnergy, kineticEnergy);
-  if(tmin >= tmax) return;
+  if(tmin >= tmax) { return; }
 
 //
@@ -709 +714 @@
   G4double xmax     = tmax/kineticEnergy;
   G4double kappa    = 0.0;
-  if(xmax >= 1.) xmax = 1.;
-  else     kappa    = log(xmax)/log(xmin);
+  if(xmax >= 1.) { xmax = 1.; }
+  else   { kappa    = log(xmax)/log(xmin); }
   G4double epsilmin = tmin/totalEnergy;
   G4double epsilmax = tmax/totalEnergy;
@@ -812 +817 @@
       } while( greject < G4UniformRand()*grejmax );
     }
-    /*
-    if(x > 0.999) {
-      G4cout << "### G4eBremsstrahlungModel Warning: e= " << kineticEnergy
-             << " tlow= " << tlow
-             << " x= " << x
-             << " greject= " << greject 
-             << " grejmax= " << grejmax
-             << " migdal= " << migdal
-             << G4endl; 
-      //      if(x >= 1.0) G4Exception("X=1");
-    }
-    */
     gammaEnergy = x*kineticEnergy; 
 
@@ -837 +830 @@
 
   //
-  //  angles of the emitted gamma. ( Z - axis along the parent particle)
+  // angles of the emitted gamma. ( Z - axis along the parent particle)
+  // use general interface
   //
-  //  universal distribution suggested by L. Urban 
-  // (Geant3 manual (1993) Phys211),
-  //  derived from Tsai distribution (Rev Mod Phys 49,421(1977))
-
-  G4double u;
-  const G4double a1 = 0.625 , a2 = 3.*a1 , d = 27. ;
-
-  if (9./(9.+d) > G4UniformRand()) u = - log(G4UniformRand()*G4UniformRand())/a1;
-     else                          u = - log(G4UniformRand()*G4UniformRand())/a2;
-
-  G4double theta = u*electron_mass_c2/totalEnergy;
+  G4double theta = GetAngularDistribution()->PolarAngle(totalEnergy,
+                                                        totalEnergy-gammaEnergy,
+                                                        (G4int)anElement->GetZ());
 
   G4double sint = sin(theta);