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

Timestamp:

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

Author:

garnier

Message:

update processes

File:

• trunk/source/processes/electromagnetic/standard/include/G4BraggModel.hh (modified) (9 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4BraggModel.hh,v 1.10 2007/05/22 17:34:36 vnivanch Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4BraggModel.hh,v 1.13 2009/02/20 12:06:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
@@ -45 +45 @@
 // 11-04-05 Major optimisation of internal interfaces (V.Ivantchenko)
 // 15-02-06 ComputeCrossSectionPerElectron, ComputeCrossSectionPerAtom (mma)
-// 25-04-06 Add stopping data from PSTAR (V.Ivanchenko)
+// 25-04-06 Added stopping data from PSTAR (V.Ivanchenko)
+// 12-08-08 Added methods GetParticleCharge, GetChargeSquareRatio, 
+//          CorrectionsAlongStep needed for ions(V.Ivanchenko)
 
 //
@@ -51 +53 @@
 //
 // Implementation of energy loss and delta-electron production
-// by heavy slow charged particles using eveluated data
+// by heavy slow charged particles using ICRU'49 and NIST evaluated data 
+// for protons
 
 // -------------------------------------------------------------------
@@ -63 +66 @@
 
 class G4ParticleChangeForLoss;
+class G4EmCorrections;
 
 class G4BraggModel : public G4VEmModel
@@ -76 +80 @@
   virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
 
-  G4double MinEnergyCut(const G4ParticleDefinition*,
-                        const G4MaterialCutsCouple*);
+  virtual G4double MinEnergyCut(const G4ParticleDefinition*,
+                                const G4MaterialCutsCouple*);
                         
   virtual G4double ComputeCrossSectionPerElectron(
@@ -109 +113 @@
                                  G4double maxEnergy);
 
+  // Compute ion charge 
+  virtual G4double GetChargeSquareRatio(const G4ParticleDefinition*,
+                                        const G4Material*,
+                                        G4double kineticEnergy);
+
+  virtual G4double GetParticleCharge(const G4ParticleDefinition* p,
+                                     const G4Material* mat,
+                                     G4double kineticEnergy);
+
+  // add correction to energy loss and compute non-ionizing energy loss
+  virtual void CorrectionsAlongStep(const G4MaterialCutsCouple*,
+                                    const G4DynamicParticle*,
+                                    G4double& eloss,
+                                    G4double& niel,
+                                    G4double length);
+
 protected:
 
-  G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
-                              G4double kinEnergy);
+  virtual G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
+                                      G4double kinEnergy);
 
 private:
 
-  void SetParticle(const G4ParticleDefinition* p);
+  inline void SetParticle(const G4ParticleDefinition* p);
 
   G4bool HasMaterial(const G4Material* material);
@@ -139 +159 @@
   G4BraggModel & operator=(const  G4BraggModel &right);
   G4BraggModel(const  G4BraggModel&);
+
+
+  G4EmCorrections*            corr;
 
   const G4ParticleDefinition* particle;
@@ -150 +173 @@
   G4double massRate;
   G4double ratio;
-  G4double highKinEnergy;
-  G4double lowKinEnergy;
   G4double lowestKinEnergy;
   G4double protonMassAMU;
@@ -159 +180 @@
   G4int    iMolecula;          // index in the molecula's table
   G4bool   isIon;
+  G4bool   isInitialised;
 };
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-inline G4double G4BraggModel::MaxSecondaryEnergy(
-                                            const G4ParticleDefinition* pd,
-                                                  G4double kinEnergy)
-{
-  if(pd != particle) 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 tmax;
-}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......