Changeset 961 for trunk/source/processes/electromagnetic/highenergy/src/G4eeToHadronsModel.cc

Timestamp:

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

Author:

garnier

Message:

update processes

File:

• trunk/source/processes/electromagnetic/highenergy/src/G4eeToHadronsModel.cc (modified) (4 diffs)

trunk/source/processes/electromagnetic/highenergy/src/G4eeToHadronsModel.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4eeToHadronsModel.cc,v 1.8 2007/05/22 17:37:30 vnivanch Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4eeToHadronsModel.cc,v 1.9 2008/07/10 18:06:39 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------
@@ -65 +65 @@
 using namespace std;
 
-G4eeToHadronsModel::G4eeToHadronsModel(const G4Vee2hadrons* m,
-                                             G4int ver,
+G4eeToHadronsModel::G4eeToHadronsModel(G4Vee2hadrons* m, G4int ver,
                                        const G4String& nam)
   : G4VEmModel(nam),
-  model(m),
-  crossPerElectron(0),
-  crossBornPerElectron(0),
-  isInitialised(false),
-  nbins(100),
-  verbose(ver)
-{
-  theGamma      = G4Gamma::Gamma();
+    model(m),
+    crossPerElectron(0),
+    crossBornPerElectron(0),
+    isInitialised(false),
+    nbins(100),
+    verbose(ver)
+{
+  theGamma = G4Gamma::Gamma();
 }
 
@@ -96 +95 @@
   isInitialised  = true;
 
+  // Lab system
   highKinEnergy = HighEnergyLimit();
   lowKinEnergy  = LowEnergyLimit();
 
-  emin  = model->ThresholdEnergy();
-  emax = 2.0*electron_mass_c2*sqrt(1.0 + 0.5*highKinEnergy/electron_mass_c2);
-  if(emin > emax) emin = emax;
-
-  lowKinEnergy  = 0.5*emin*emin/electron_mass_c2 - 2.0*electron_mass_c2;
-
-  epeak = min(model->PeakEnergy(), emax);
+  // CM system
+  emin  = model->LowEnergy();
+  emax  = model->HighEnergy();
+
+  G4double emin0 = 
+    2.0*electron_mass_c2*sqrt(1.0 + 0.5*lowKinEnergy/electron_mass_c2);
+  G4double emax0 = 
+    2.0*electron_mass_c2*sqrt(1.0 + 0.5*highKinEnergy/electron_mass_c2);
+
+  // recompute low energy
+  if(emin0 > emax) {
+    emin0 = emax;
+    model->SetLowEnergy(emin0);
+  }
+  if(emin > emin0) {
+    emin0 = emin;
+    lowKinEnergy  = 0.5*emin*emin/electron_mass_c2 - 2.0*electron_mass_c2;
+    SetLowEnergyLimit(lowKinEnergy);
+  }
+
+  // recompute high energy
+  if(emax < emax0) {
+    emax0 = emax;
+    highKinEnergy = 0.5*emax*emax/electron_mass_c2 - 2.0*electron_mass_c2;
+    SetHighEnergyLimit(highKinEnergy);
+  }
+
+  // peak energy
+  epeak = std::min(model->PeakEnergy(), emax);
   peakKinEnergy  = 0.5*epeak*epeak/electron_mass_c2 - 2.0*electron_mass_c2;
 
@@ -148 +170 @@
     }
   }
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+G4double G4eeToHadronsModel::CrossSectionPerVolume(
+                                      const G4Material* mat,
+                                      const G4ParticleDefinition* p,
+                                      G4double kineticEnergy,
+                                      G4double, G4double)
+{
+  return mat->GetElectronDensity()*
+    ComputeCrossSectionPerElectron(p, kineticEnergy);
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+G4double G4eeToHadronsModel::ComputeCrossSectionPerAtom(
+                                      const G4ParticleDefinition* p,
+                                      G4double kineticEnergy,
+                                      G4double Z, G4double,
+                                      G4double, G4double)
+{
+  return Z*ComputeCrossSectionPerElectron(p, kineticEnergy);
 }