Changeset 961 for trunk/source/processes/electromagnetic/standard/include/G4BetheBlochModel.hh

Timestamp:

Apr 6, 2009, 12:21:12 PM (15 years ago)

Author:

garnier

Message:

update processes

File:

• trunk/source/processes/electromagnetic/standard/include/G4BetheBlochModel.hh (modified) (7 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4BetheBlochModel.hh,v 1.9 2007/05/22 17:34:36 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4BetheBlochModel.hh,v 1.17 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
@@ -45 +45 @@
 // 12-11-03 Fix for GenericIons (V.Ivanchenko)
 // 24-03-05 Add G4EmCorrections (V.Ivanchenko)
-// 11-04-05 Major optimisation of internal interfaces (V.Ivantchenko)
+// 11-04-05 Major optimisation of internal interfaces (V.Ivanchenko)
 // 11-04-04 Move MaxSecondaryEnergy to models (V.Ivanchenko)
 // 11-02-06 ComputeCrossSectionPerElectron, ComputeCrossSectionPerAtom (mma)
+// 12-08-08 Added methods GetParticleCharge, GetChargeSquareRatio, 
+//          CorrectionsAlongStep needed for ions(V.Ivanchenko)
 
 //
@@ -65 +67 @@
 class G4EmCorrections;
 class G4ParticleChangeForLoss;
+class G4NistManager;
+
 
 class G4BetheBlochModel : public G4VEmModel
@@ -78 +82 @@
   virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
 
-  G4double MinEnergyCut(const G4ParticleDefinition*,
-                        const G4MaterialCutsCouple*);
+  virtual G4double MinEnergyCut(const G4ParticleDefinition*,
+                                const G4MaterialCutsCouple*);
                         
   virtual G4double ComputeCrossSectionPerElectron(
@@ -105 +109 @@
                                         G4double cutEnergy);
 
+  virtual G4double GetChargeSquareRatio(const G4ParticleDefinition* p,
+                                        const G4Material* mat,
+                                        G4double kineticEnergy);
+
+  virtual G4double GetParticleCharge(const G4ParticleDefinition* p,
+                                     const G4Material* mat,
+                                     G4double kineticEnergy);
+
+  virtual void CorrectionsAlongStep(const G4MaterialCutsCouple*,
+                                    const G4DynamicParticle*,
+                                    G4double& eloss,
+                                    G4double& niel,
+                                    G4double length);
+
   virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
                                  const G4MaterialCutsCouple*,
@@ -113 +131 @@
 protected:
 
-  G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
-                              G4double kinEnergy);
+  virtual G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
+                                      G4double kinEnergy);
 
 private:
@@ -125 +143 @@
 
   const G4ParticleDefinition* particle;
+  const G4Material*           currentMaterial;
   G4ParticleDefinition*       theElectron;
   G4EmCorrections*            corr;
   G4ParticleChangeForLoss*    fParticleChange;
+  G4NistManager*              nist;
 
   G4double mass;
   G4double tlimit;
   G4double spin;
+  G4double magMoment2;
   G4double chargeSquare;
   G4double ratio;
+  G4double formfact;
   G4double twoln10;
   G4double bg2lim;
   G4double taulim;
+  G4double corrFactor;
   G4bool   isIon;
+  G4bool   isInitialised;
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-inline G4double G4BetheBlochModel::MaxSecondaryEnergy(
-          const G4ParticleDefinition* pd,
-                G4double kinEnergy) 
-{
-  if(isIon) SetParticle(pd);
-  G4double tau  = kinEnergy/mass;
-  G4double tmax = 2.0*electron_mass_c2*tau*(tau + 2.) /
-                  (1. + 2.0*(tau + 1.)*ratio + ratio*ratio);
-  return std::min(tmax,tlimit);
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-inline void G4BetheBlochModel::SetParticle(const G4ParticleDefinition* p)
-{
-  if(particle != p) {
-    particle = p;
-    mass = particle->GetPDGMass();
-    spin = particle->GetPDGSpin();
-    G4double q = particle->GetPDGCharge()/eplus;
-    chargeSquare = q*q;
-    ratio = electron_mass_c2/mass;
-    if(mass > 120.*MeV) tlimit = 51.2*GeV*std::pow(proton_mass_c2/mass,0.66667);
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
 #endif