Changeset 1340 for trunk/source/processes/electromagnetic/utils/include/G4ElectronIonPair.hh

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/electromagnetic/utils/include/G4ElectronIonPair.hh (modified) (7 diffs)

trunk/source/processes/electromagnetic/utils/include/G4ElectronIonPair.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4ElectronIonPair.hh,v 1.2 2008/10/17 14:46:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4ElectronIonPair.hh,v 1.5 2010/10/25 17:23:01 vnivanch Exp $
+// GEANT4 tag $Name: emutils-V09-03-23 $
 //
 //
@@ -62 +62 @@
 #include "G4ParticleDefinition.hh"
 #include "G4ThreeVector.hh"
-#include "G4TrackVector.hh"
 #include "G4VProcess.hh"
 #include <vector>
@@ -86 +85 @@
   inline G4double MeanNumberOfIonsAlongStep(const G4Step*); 
 
+  inline G4int SampleNumberOfIonsAlongStep(const G4Step*); 
+
   // returns pointer to the new vector of positions of
   // ionisation points in the World coordinate system 
-  std::vector<G4ThreeVector>* 
-  SampleIonsAlongStep(const G4ThreeVector& prePosition,
-                      const G4ThreeVector& postPosition,
-                      G4double numberOfIonisations);
-
   std::vector<G4ThreeVector>* SampleIonsAlongStep(const G4Step*);
 
@@ -115 +111 @@
 private:
 
+  void Initialise();
+
+  G4double FindMeanEnergyPerIonPair(const G4Material*);
+
   // hide assignment operator
   G4ElectronIonPair & operator=(const G4ElectronIonPair &right);
   G4ElectronIonPair(const G4ElectronIonPair&);
 
-  G4double FindMeanEnergyPerIonPair(const G4Material*);
+  // cash
+  const G4Material*  curMaterial;
+  G4double           curMeanEnergy;
 
-  void Initialise();
-
-  const G4ParticleDefinition* gamma;
-
-  // cash
-  const G4Material*           curMaterial;
-  G4double                    curMeanEnergy;
-
+  G4double FanoFactor;
+  
   G4int    verbose;             
   G4int    nMaterials;
 
   // list of G4 NIST materials with mean energy per ion defined 
-  std::vector<G4double>       g4MatData;
-  std::vector<G4String>       g4MatNames;
-
+  std::vector<G4double>  g4MatData;
+  std::vector<G4String>  g4MatNames;
 };
 
@@ -141 +136 @@
 G4ElectronIonPair::MeanNumberOfIonsAlongStep(const G4Step* step)
 {
-  return MeanNumberOfIonsAlongStep(step->GetTrack()->GetDefinition(),
+  return MeanNumberOfIonsAlongStep(step->GetTrack()->GetParticleDefinition(),
                                    step->GetPreStepPoint()->GetMaterial(),
                                    step->GetTotalEnergyDeposit(),
@@ -147 +142 @@
 }
 
-inline std::vector<G4ThreeVector>* 
-G4ElectronIonPair::SampleIonsAlongStep(const G4Step* step)
+inline 
+G4int G4ElectronIonPair::SampleNumberOfIonsAlongStep(const G4Step* step)
 {
-  return SampleIonsAlongStep(step->GetPreStepPoint()->GetPosition(),
-                             step->GetPostStepPoint()->GetPosition(),
-                             MeanNumberOfIonsAlongStep(step));
-}
+  G4double meanion = MeanNumberOfIonsAlongStep(step);
+  G4double sig = FanoFactor*std::sqrt(meanion);
+  G4int nion = G4int(G4RandGauss::shoot(meanion,sig) + 0.5);
+  return nion;
+} 
 
 inline 
@@ -160 +156 @@
   G4int subtype = -1;
   const G4VProcess* proc = step->GetPostStepPoint()->GetProcessDefinedStep();
-  if(proc) subtype = proc->GetProcessSubType();
-  return ResidualeChargePostStep(step->GetTrack()->GetDefinition(),
+  if(proc) { subtype = proc->GetProcessSubType(); }
+  return ResidualeChargePostStep(step->GetTrack()->GetParticleDefinition(),
                                  step->GetSecondary(),
                                  subtype);