Changeset 1055 for trunk/source/processes/electromagnetic/standard/include/G4WentzelVIModel.hh

Timestamp:

May 28, 2009, 4:26:57 PM (15 years ago)

Author:

garnier

Message:

maj sur la beta de geant 4.9.3

File:

• trunk/source/processes/electromagnetic/standard/include/G4WentzelVIModel.hh (modified) (12 diffs)

trunk/source/processes/electromagnetic/standard/include/G4WentzelVIModel.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4WentzelVIModel.hh,v 1.7 2008/08/04 08:49:09 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4WentzelVIModel.hh,v 1.17 2009/05/10 16:09:29 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
 //
 // -------------------------------------------------------------------
@@ -66 +66 @@
 class G4LossTableManager;
 class G4ParticleChangeForMSC;
-class G4SafetyHelper;
 class G4ParticleDefinition;
 
@@ -80 +79 @@
   virtual ~G4WentzelVIModel();
 
-  void Initialise(const G4ParticleDefinition*, const G4DataVector&);
-
-  G4double ComputeCrossSectionPerAtom(const G4ParticleDefinition*,
-                                      G4double KineticEnergy,
-                                      G4double AtomicNumber,
-                                      G4double AtomicWeight=0., 
-                                      G4double cut = DBL_MAX,
-                                      G4double emax= DBL_MAX);
-
-  void SampleScattering(const G4DynamicParticle*, G4double safety);
-
-  void SampleSecondaries(std::vector<G4DynamicParticle*>*, 
-                         const G4MaterialCutsCouple*,
-                         const G4DynamicParticle*,
-                         G4double,
-                         G4double);
-
-  G4double ComputeTruePathLengthLimit(const G4Track& track,
-                                      G4PhysicsTable* theLambdaTable,
-                                      G4double currentMinimalStep);
-
-  G4double ComputeGeomPathLength(G4double truePathLength);
-
-  G4double ComputeTrueStepLength(G4double geomStepLength);
+  virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
+
+  virtual G4double ComputeCrossSectionPerAtom(const G4ParticleDefinition*,
+                                              G4double KineticEnergy,
+                                              G4double AtomicNumber,
+                                              G4double AtomicWeight=0., 
+                                              G4double cut = DBL_MAX,
+                                              G4double emax= DBL_MAX);
+
+  virtual void SampleScattering(const G4DynamicParticle*, G4double safety);
+
+  virtual G4double ComputeTruePathLengthLimit(const G4Track& track,
+                                              G4PhysicsTable* theLambdaTable,
+                                              G4double currentMinimalStep);
+
+  virtual G4double ComputeGeomPathLength(G4double truePathLength);
+
+  virtual G4double ComputeTrueStepLength(G4double geomStepLength);
 
 private:
 
-  G4double ComputeTransportXSectionPerVolume();
+  G4double ComputeTransportXSectionPerAtom();
 
   G4double ComputeXSectionPerVolume();
@@ -133 +126 @@
   G4ParticleChangeForMSC*   fParticleChange;
 
-  G4SafetyHelper*           safetyHelper;
   G4PhysicsTable*           theLambdaTable;
   G4PhysicsTable*           theLambda2Table;
@@ -173 +165 @@
   // single scattering parameters
   G4double coeff;
-  G4double constn;
   G4double cosThetaMin;
   G4double cosThetaMax;
@@ -182 +173 @@
   G4double q2Limit;
   G4double alpha2;
-  G4double a0;
 
   // projectile
@@ -193 +183 @@
   G4double mom2;
   G4double invbeta2;
+  G4double kinFactor;
   G4double etag;
   G4double lowEnergyLimit;
@@ -198 +189 @@
   // target
   G4double targetZ;
+  G4double targetMass;
   G4double screenZ;
   G4double formfactA;
-  G4double FF[100];
+  G4int    iz;
+
+  static G4double ScreenRSquare[100];
+  static G4double FormFactor[100];
 
   // flags
@@ -240 +235 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-inline 
-void G4WentzelVIModel::SetupParticle(const G4ParticleDefinition* p)
+inline void G4WentzelVIModel::SetupParticle(const G4ParticleDefinition* p)
 {
   // Initialise mass and charge
@@ -251 +245 @@
     chargeSquare = q*q;
     tkin = 0.0;
-    lowEnergyLimit = keV*mass/electron_mass_c2;
   }
 }
@@ -264 +257 @@
     invbeta2 = 1.0 +  mass*mass/mom2;
     cosTetMaxNuc = cosThetaMax;
-    if(ekin <= 10.*cut && mass < MeV) {
+    if(mass < MeV && ekin <= 10.*cut) {
       cosTetMaxNuc = ekin*(cosThetaMax + 1.0)/(10.*cut) - 1.0;
     }
@@ -278 +271 @@
     etag    = e; 
     targetZ = Z;
-    G4int iz= G4int(Z);
+    iz = G4int(Z);
     if(iz > 99) iz = 99;
-    G4double x = fNistManager->GetZ13(iz);
-    screenZ = a0*x*x/mom2;
-    if(iz > 1) screenZ *=(1.13 + 3.76*invbeta2*Z*Z*chargeSquare*alpha2);
-    //    screenZ = a0*x*x*(1.13 + 3.76*Z*Z*chargeSquare*alpha2)/mom2;
-    // A.V. Butkevich et al., NIM A 488 (2002) 282
-    formfactA = FF[iz];
-    if(formfactA == 0.0) {
-      x = fNistManager->GetA27(iz); 
-      formfactA = constn*x*x;
-      FF[iz] = formfactA;
+    targetMass = fNistManager->GetAtomicMassAmu(iz)*amu_c2;
+    G4double m12  = mass*mass;
+    G4double x    = 1.0 + mass/targetMass;
+    kinFactor  = coeff*targetZ*chargeSquare*(1.0 +  m12/mom2)/mom2;
+    screenZ = ScreenRSquare[iz]/mom2;
+    if(iz > 1) {
+      screenZ *=(1.13 + 3.76*Z*Z*alpha2);
+      kinFactor /= (x*x);
     }
-    formfactA *= mom2;
+    //if(iz > 1) screenZ *=(1.13 + std::min(0.5,3.76*Z*Z*invbeta2*alpha2));
+    formfactA = FormFactor[iz]*mom2;
     cosTetMaxNuc2 = cosTetMaxNuc;
-    /*
-    G4double ee = 10.*eV*Z;
-    if(1 == iz) ee *= 2.0;
-    G4double z = std::min(cosTetMaxElec, 1.0 - std::max(ecut,ee)*amu_c2
-                          *fNistManager->GetAtomicMassAmu(iz)/mom2);
-    cosTetMaxElec2 = std::max(cosTetMaxNuc2, z);
-    */
     cosTetMaxElec2 = cosTetMaxElec;
   }