Import Geant4 10.4.1 source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
$Id: History 107365 2017-11-09 10:54:29Z gcosmo $
|
||||
$Id: History 108504 2018-02-15 15:46:37Z gcosmo $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -18,6 +18,11 @@ committal in the CVS repository !
|
||||
|
||||
----------------------------------------------------------
|
||||
|
||||
09 December 17: V.Ivanchenko (emstand-V10-03-52)
|
||||
- G4PairProductionRelModel - fixed misuse of G4Pow (A13(..) should
|
||||
be used instead of Z13(..)), add initialisation of an element
|
||||
cache before sampling of final state (partly fix problem #2017)
|
||||
|
||||
08 November 17: D.Sawkey (emstand-V10-03-51)
|
||||
- G4CoulombScattering, G4eMultipleScattering, G4hMultipleScattering
|
||||
modify ProcessDescription text
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PairProductionRelModel.cc 106628 2017-10-17 06:25:38Z gcosmo $
|
||||
// $Id: G4PairProductionRelModel.cc 108504 2018-02-15 15:46:37Z gcosmo $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
@@ -350,6 +350,7 @@ G4PairProductionRelModel::SampleSecondaries(std::vector<G4DynamicParticle*>* fve
|
||||
// select randomly one element constituing the material
|
||||
const G4Element* anElement =
|
||||
SelectRandomAtom(aMaterial, theGamma, GammaEnergy);
|
||||
SetCurrentElement(anElement->GetZasInt());
|
||||
|
||||
CLHEP::HepRandomEngine* rndmEngine = G4Random::getTheEngine();
|
||||
|
||||
@@ -388,7 +389,7 @@ G4PairProductionRelModel::SampleSecondaries(std::vector<G4DynamicParticle*>* fve
|
||||
|
||||
do {
|
||||
if ( NormF1/(NormF1+NormF2) > rndmEngine->flat() ) {
|
||||
epsil = 0.5 - epsilrange*g4calc->Z13(rndmEngine->flat());
|
||||
epsil = 0.5 - epsilrange*g4calc->A13(rndmEngine->flat());
|
||||
screenvar = screenfac/(epsil*(1-epsil));
|
||||
if (fLPMflag && GammaEnergy > Eghigh) {
|
||||
CalcLPMFunctions(GammaEnergy,GammaEnergy*epsil);
|
||||
|
||||
Reference in New Issue
Block a user