Changeset 991 for trunk/source/processes/electromagnetic/utils/src/G4VEmModel.cc

Timestamp:

Apr 17, 2009, 12:17:14 PM (15 years ago)

Author:

garnier

Message:

update

File:

• trunk/source/processes/electromagnetic/utils/src/G4VEmModel.cc (modified) (5 diffs)

trunk/source/processes/electromagnetic/utils/src/G4VEmModel.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VEmModel.cc,v 1.25 2009/02/19 09:57:36 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4VEmModel.cc,v 1.20 2008/11/13 23:13:18 schaelic Exp $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // -------------------------------------------------------------------
@@ -41 +41 @@
 // 25.10.2005 Set default highLimit=100.TeV (V.Ivanchenko)
 // 06.02.2006 add method ComputeMeanFreePath() (mma)
-// 16.02.2009 Move implementations of virtual methods to source (VI)
 //
 //
@@ -61 +60 @@
   fluc(0), name(nam), lowLimit(0.1*keV), highLimit(100.0*TeV), 
   polarAngleLimit(0.0),secondaryThreshold(DBL_MAX),theLPMflag(false),
-  pParticleChange(0),nuclearStopping(false),
-  currentCouple(0),currentElement(0),
-  nsec(5),flagDeexcitation(false) 
+  pParticleChange(0),nuclearStopping(false),nsec(5) 
 {
   xsec.resize(nsec);
@@ -85 +82 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
+G4double G4VEmModel::CrossSectionPerVolume(const G4Material* material,
+                                           const G4ParticleDefinition* p,
+                                           G4double ekin,
+                                           G4double emin,
+                                           G4double emax)
+{
+  SetupForMaterial(p, material, ekin);
+  G4double cross = 0.0;
+  const G4ElementVector* theElementVector = material->GetElementVector();
+  const G4double* theAtomNumDensityVector = material->GetVecNbOfAtomsPerVolume();
+  G4int nelm = material->GetNumberOfElements(); 
+  if(nelm > nsec) {
+    xsec.resize(nelm);
+    nsec = nelm;
+  }
+  for (G4int i=0; i<nelm; i++) {
+    cross += theAtomNumDensityVector[i]*
+      ComputeCrossSectionPerAtom(p,(*theElementVector)[i],ekin,emin,emax);
+    xsec[i] = cross;
+  }
+  return cross;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
+G4double G4VEmModel::ComputeMeanFreePath(const G4ParticleDefinition* p,
+                                         G4double ekin,
+                                         const G4Material* material,     
+                                         G4double emin,
+                                         G4double emax)
+{
+  G4double mfp = DBL_MAX;
+  G4double cross = CrossSectionPerVolume(material,p,ekin,emin,emax);
+  if (cross > DBL_MIN) mfp = 1./cross;
+  return mfp;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
 void G4VEmModel::InitialiseElementSelectors(const G4ParticleDefinition* p, 
                                             const G4DataVector& cuts)
 {
-  // initialise before run
-  flagDeexcitation = false;
-
   G4int nbins = G4int(std::log10(highLimit/lowLimit) + 0.5);
   if(nbins < 3) nbins = 3;
@@ -129 +162 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-G4double G4VEmModel::ComputeDEDXPerVolume(const G4Material*,
-                                          const G4ParticleDefinition*,
-                                          G4double,G4double)
-{
-  return 0.0;
-}
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-G4double G4VEmModel::CrossSectionPerVolume(const G4Material* material,
-                                           const G4ParticleDefinition* p,
-                                           G4double ekin,
-                                           G4double emin,
-                                           G4double emax)
-{
-  SetupForMaterial(p, material, ekin);
-  G4double cross = 0.0;
-  const G4ElementVector* theElementVector = material->GetElementVector();
-  const G4double* theAtomNumDensityVector = material->GetVecNbOfAtomsPerVolume();
-  G4int nelm = material->GetNumberOfElements(); 
-  if(nelm > nsec) {
-    xsec.resize(nelm);
-    nsec = nelm;
-  }
-  for (G4int i=0; i<nelm; i++) {
-    cross += theAtomNumDensityVector[i]*
-      ComputeCrossSectionPerAtom(p,(*theElementVector)[i],ekin,emin,emax);
-    xsec[i] = cross;
-  }
-  return cross;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-G4double G4VEmModel::ComputeCrossSectionPerAtom(const G4ParticleDefinition*,
-                                                G4double, G4double, G4double,
-                                                G4double, G4double)
-{
-  return 0.0;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-G4double G4VEmModel::MinEnergyCut(const G4ParticleDefinition*,
-                                  const G4MaterialCutsCouple*)
-{
-  return 0.0;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-G4double G4VEmModel::GetChargeSquareRatio(const G4ParticleDefinition* p,
-                                          const G4Material*, G4double)
-{
-  G4double q = p->GetPDGCharge()/CLHEP::eplus;
-  return q*q;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-G4double G4VEmModel::GetParticleCharge(const G4ParticleDefinition* p,
-                                       const G4Material*, G4double)
-{
-  return p->GetPDGCharge();
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-void G4VEmModel::CorrectionsAlongStep(const G4MaterialCutsCouple*,
-                                      const G4DynamicParticle*,
-                                      G4double&,G4double&,G4double)
-{}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-void G4VEmModel::SampleDeexcitationAlongStep(const G4Material*,
-                                             const G4Track&,
-                                             G4double& )
-{}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-G4double G4VEmModel::MaxSecondaryEnergy(const G4ParticleDefinition*,
-                                        G4double kineticEnergy)
-{
-  return kineticEnergy;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-void G4VEmModel::SampleScattering(const G4DynamicParticle*, G4double)
-{}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-G4double G4VEmModel::ComputeTruePathLengthLimit(const G4Track&, 
-                                                G4PhysicsTable*, 
-                                                G4double)
-{
-  return DBL_MAX;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-G4double G4VEmModel::ComputeGeomPathLength(G4double truePathLength)
-{
-  return truePathLength;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-G4double G4VEmModel::ComputeTrueStepLength(G4double geomPathLength)
-{
-  return geomPathLength;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-void G4VEmModel::DefineForRegion(const G4Region*) 
-{}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-void G4VEmModel::SetupForMaterial(const G4ParticleDefinition*,
-                                  const G4Material*, G4double)
-{}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......