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

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4BetheHeitlerModel.cc,v 1.13 2009/04/09 18:41:18 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4BetheHeitlerModel.cc,v 1.15 2010/10/25 19:02:32 vnivanch Exp $
+// GEANT4 tag $Name: emstand-V09-03-24 $
 //
 // -------------------------------------------------------------------
@@ -43 +43 @@
 // 16-11-05 replace shootBit() by G4UniformRand()  mma
 // 04-12-05 SetProposedKineticEnergy(0.) for the killed photon (mma)
-// 20-02-20 SelectRandomElement is called for any initial gamma energy 
+// 20-02-07 SelectRandomElement is called for any initial gamma energy 
 //          in order to have selected element for polarized model (VI)
+// 25-10-10 Removed unused table, added element selector (VI) 
 //
 // Class Description:
@@ -58 +59 @@
 #include "G4Gamma.hh"
 #include "Randomize.hh"
-#include "G4DataVector.hh"
-#include "G4PhysicsLogVector.hh"
 #include "G4ParticleChangeForGamma.hh"
-#include "G4LossTableManager.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -69 +67 @@
 G4BetheHeitlerModel::G4BetheHeitlerModel(const G4ParticleDefinition*,
                                          const G4String& nam)
-  : G4VEmModel(nam),
-    theCrossSectionTable(0),
-    nbins(10)
+  : G4VEmModel(nam)
 {
   fParticleChange = 0;
@@ -82 +78 @@
 
 G4BetheHeitlerModel::~G4BetheHeitlerModel()
-{
-  if(theCrossSectionTable) {
-    theCrossSectionTable->clearAndDestroy();
-    delete theCrossSectionTable;
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void G4BetheHeitlerModel::Initialise(const G4ParticleDefinition*,
-                                     const G4DataVector&)
-{
-  if(!fParticleChange) fParticleChange = GetParticleChangeForGamma();
-
-  if(theCrossSectionTable) {
-    theCrossSectionTable->clearAndDestroy();
-    delete theCrossSectionTable;
-  }
-
-  const G4ElementTable* theElementTable = G4Element::GetElementTable();
-  size_t nvect = G4Element::GetNumberOfElements();
-  theCrossSectionTable = new G4PhysicsTable(nvect);
-  G4PhysicsLogVector* ptrVector;
-  G4double emin = LowEnergyLimit();
-  G4double emax = HighEnergyLimit();
-  G4int n = nbins*G4int(log10(emax/emin));
-  G4bool spline = G4LossTableManager::Instance()->SplineFlag(); 
-  G4double e, value;
-
-  for(size_t j=0; j<nvect ; j++) { 
-
-    ptrVector  = new G4PhysicsLogVector(emin, emax, n);
-    ptrVector->SetSpline(spline);
-    G4double Z = (*theElementTable)[j]->GetZ();
-    G4int   iz = G4int(Z);
-    indexZ[iz] = j;
- 
-    for(G4int i=0; i<nbins; i++) {
-      e = ptrVector->GetLowEdgeEnergy( i ) ;
-      value = ComputeCrossSectionPerAtom(theGamma, e, Z);  
-      ptrVector->PutValue( i, value );
-    }
-
-    theCrossSectionTable->insert(ptrVector);
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-G4double G4BetheHeitlerModel::ComputeCrossSectionPerAtom(
-                                                   const G4ParticleDefinition*,
-                                              G4double GammaEnergy, G4double Z,
-                                              G4double, G4double, G4double)
+{}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void G4BetheHeitlerModel::Initialise(const G4ParticleDefinition* p,
+                                     const G4DataVector& cuts)
+{
+  if(!fParticleChange) { fParticleChange = GetParticleChangeForGamma(); }
+  InitialiseElementSelectors(p, cuts);
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+G4double 
+G4BetheHeitlerModel::ComputeCrossSectionPerAtom(const G4ParticleDefinition*,
+                                                G4double GammaEnergy, G4double Z,
+                                                G4double, G4double, G4double)
 // Calculates the microscopic cross section in GEANT4 internal units.
 // A parametrized formula from L. Urban is used to estimate
@@ -144 +104 @@
   static const G4double GammaEnergyLimit = 1.5*MeV;
   G4double CrossSection = 0.0 ;
-  if ( Z < 1. ) return CrossSection;
-  if ( GammaEnergy <= 2.0*electron_mass_c2 ) return CrossSection;
+  if ( Z < 0.9 || GammaEnergy <= 2.0*electron_mass_c2 ) { return CrossSection; }
 
   static const G4double
@@ -160 +119 @@
 
   G4double GammaEnergySave = GammaEnergy;
-  if (GammaEnergy < GammaEnergyLimit) GammaEnergy = GammaEnergyLimit ;
+  if (GammaEnergy < GammaEnergyLimit) { GammaEnergy = GammaEnergyLimit; }
 
   G4double X=log(GammaEnergy/electron_mass_c2), X2=X*X, X3=X2*X, X4=X3*X, X5=X4*X;
@@ -177 +136 @@
   }
 
-  if (CrossSection < 0.) CrossSection = 0.;
+  if (CrossSection < 0.) { CrossSection = 0.; }
   return CrossSection;
 }
@@ -208 +167 @@
   G4double epsil ;
   G4double epsil0 = electron_mass_c2/GammaEnergy ;
-  if(epsil0 > 1.0) return;
+  if(epsil0 > 1.0) { return; }
 
   // do it fast if GammaEnergy < 2. MeV
@@ -225 +184 @@
     // Extract Coulomb factor for this Element
     G4double FZ = 8.*(anElement->GetIonisation()->GetlogZ3());
-    if (GammaEnergy > 50.*MeV) FZ += 8.*(anElement->GetfCoulomb());
+    if (GammaEnergy > 50.*MeV) { FZ += 8.*(anElement->GetfCoulomb()); }
 
     // limits of the screening variable
@@ -334 +293 @@
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-