Changeset 961 for trunk/source/processes/electromagnetic/highenergy/include/G4eeToHadronsMultiModel.hh

Timestamp:

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

Author:

garnier

Message:

update processes

File:

• trunk/source/processes/electromagnetic/highenergy/include/G4eeToHadronsMultiModel.hh (modified) (6 diffs)

trunk/source/processes/electromagnetic/highenergy/include/G4eeToHadronsMultiModel.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4eeToHadronsMultiModel.hh,v 1.5 2007/05/23 08:50:41 vnivanch Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4eeToHadronsMultiModel.hh,v 1.7 2009/02/20 16:38:33 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
@@ -59 +59 @@
 
 class G4eeCrossSections;
+class G4Vee2hadrons;
 
 class G4eeToHadronsMultiModel : public G4VEmModel
@@ -84 +85 @@
                                          G4double maxEnergy = DBL_MAX);
 
-  virtual G4double ComputeCrossSectionPerElectron(
-                                         const G4ParticleDefinition*,
-                                         G4double kineticEnergy,
-                                         G4double cutEnergy = 0.0,
-                                         G4double maxEnergy = DBL_MAX);
-
   virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
                                  const G4MaterialCutsCouple*,
@@ -96 +91 @@
                                  G4double maxEnergy = DBL_MAX);
 
-  void PrintInfo();
+  virtual void PrintInfo();
 
   // Set the factor to artificially increase the crossSection (default 1)
   void SetCrossSecFactor(G4double fac);
 
+  inline G4double ComputeCrossSectionPerElectron(
+                                         const G4ParticleDefinition*,
+                                         G4double kineticEnergy,
+                                         G4double cutEnergy = 0.0,
+                                         G4double maxEnergy = DBL_MAX);
+
 private:
+
+  void AddEEModel(G4Vee2hadrons*);
 
   // hide assignment operator
@@ -128 +131 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-inline G4double G4eeToHadronsMultiModel::CrossSectionPerVolume(
-                                      const G4Material* mat,
-                                      const G4ParticleDefinition* p,
-                                      G4double kineticEnergy,
-                                      G4double, G4double)
-{
-  return mat->GetElectronDensity()*
-    ComputeCrossSectionPerElectron(p, kineticEnergy);
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-inline G4double G4eeToHadronsMultiModel::ComputeCrossSectionPerAtom(
-                                      const G4ParticleDefinition* p,
-                                      G4double kineticEnergy,
-                                      G4double Z, G4double,
-                                      G4double, G4double)
-{
-  return Z*ComputeCrossSectionPerElectron(p, kineticEnergy);
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
 inline G4double G4eeToHadronsMultiModel::ComputeCrossSectionPerElectron(
                                       const G4ParticleDefinition*,
@@ -169 +149 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-inline 
-void G4eeToHadronsMultiModel::SampleSecondaries(std::vector<G4DynamicParticle*>* newp,
-                                                const G4MaterialCutsCouple* couple,
-                                                const G4DynamicParticle* dp,
-                                                G4double, G4double)
-{
-  G4double kinEnergy = dp->GetKineticEnergy();
-  if (kinEnergy > thKineticEnergy) {
-    G4double q = cumSum[nModels-1]*G4UniformRand();
-    for(G4int i=0; i<nModels; i++) {
-      if(q <= cumSum[i]) {
-        (models[i])->SampleSecondaries(newp, couple,dp);
-        if(newp->size() > 0) fParticleChange->ProposeTrackStatus(fStopAndKill);
-        break;
-      }
-    }
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
 #endif