Changeset 991 for trunk/source/processes/electromagnetic/muons/include/G4MuBetheBlochModel.hh

Timestamp:

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

Author:

garnier

Message:

update

File:

• trunk/source/processes/electromagnetic/muons/include/G4MuBetheBlochModel.hh (modified) (4 diffs)

trunk/source/processes/electromagnetic/muons/include/G4MuBetheBlochModel.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4MuBetheBlochModel.hh,v 1.18 2009/02/20 14:48:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4MuBetheBlochModel.hh,v 1.17 2007/05/22 17:35:58 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // -------------------------------------------------------------------
@@ -76 +76 @@
   virtual ~G4MuBetheBlochModel();
 
-  virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
+  void Initialise(const G4ParticleDefinition*, const G4DataVector&);
 
-  virtual G4double MinEnergyCut(const G4ParticleDefinition*,
-                                const G4MaterialCutsCouple*);
+  G4double MinEnergyCut(const G4ParticleDefinition*,
+                        const G4MaterialCutsCouple*);
                         
   virtual G4double ComputeCrossSectionPerElectron(
@@ -113 +113 @@
 protected:
 
-  virtual G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
-                                      G4double kinEnergy);
+  G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
+                                    G4double kinEnergy);
 
 private:
 
-  inline void SetParticle(const G4ParticleDefinition* p);
+  void SetParticle(const G4ParticleDefinition* p);
 
   // hide assignment operator
@@ -141 +141 @@
 };
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 
-inline void G4MuBetheBlochModel::SetParticle(const G4ParticleDefinition* p)
+inline G4double G4MuBetheBlochModel::MaxSecondaryEnergy(
+          const G4ParticleDefinition*,
+                G4double kinEnergy) 
 {
-  if(!particle) {
-    particle = p;
-    mass = particle->GetPDGMass();
-    massSquare = mass*mass;
-    ratio = electron_mass_c2/mass;
-  }
+  G4double tau  = kinEnergy/mass;
+  G4double tmax = 2.0*electron_mass_c2*tau*(tau + 2.) /
+                  (1. + 2.0*(tau + 1.)*ratio + ratio*ratio);
+  return tmax;
 }