Import Geant4 4.1.0 source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
$Id: History,v 1.38 2001/11/08 15:56:51 maire Exp $
|
||||
$Id: History,v 1.52 2002/06/11 12:57:55 maire Exp $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -16,7 +16,47 @@ committal in the CVS repository !
|
||||
----------------------------------------------------------
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
11 jun 02: Laszlo (utils-V04-00-08)
|
||||
- important bug fixed in G4MultipleScattering.cc
|
||||
ComputeTransportCrossSection. The bug affected the scattering
|
||||
for all the low energy ( <~ few hundred MeV) heavy particles.
|
||||
|
||||
24 may 02: Laszlo (utils-V04-00-07)
|
||||
- G4MultipleScattering.hh,.cc: mods in angle distribution and
|
||||
in boundary algorithm
|
||||
|
||||
06 may 02: Laszlo (utils-V04-00-06)
|
||||
- G4MultipleScattering.cc :bug fixed in GetContinuousStepLimit
|
||||
|
||||
24 apr 02: Laszlo (utils-V04-00-05)
|
||||
- G4MultipleScattering.hh,.cc have been committed:
|
||||
some minor changes in boundary algorithm to improve the backscattering.
|
||||
|
||||
22 apr 02: Laszlo (utils-V04-00-04)
|
||||
- G4MultipleScattering.hh,.cc have been committed:
|
||||
boundary algorithm has been modified resulting improvement ~10%
|
||||
in the performance (with the same physics).
|
||||
|
||||
17 apr 02: Laszlo (utils-V04-00-03)
|
||||
- G4MultipleScattering.hh,.cc have been committed:
|
||||
new parametrisation for angle distribution.
|
||||
boundary algorithm has been modified + some other (minor) changes.
|
||||
|
||||
26 feb 02: mma (utils-V04-00-02)
|
||||
- initial value of data member of G4VEnergyLoss finalRange = 1 mm
|
||||
(actual value of this data member is computed in
|
||||
G4VeEnergyLoss,G4VhEnergyLoss and G4VMuEnergyLoss.)
|
||||
|
||||
14 feb 02: L.Urban (utils-V04-00-01)
|
||||
- initial value of data member of G4VEnergyLoss finalRange
|
||||
has been changed
|
||||
(actual value of this data member is computed in
|
||||
G4VeEnergyLoss,G4VhEnergyLoss and G4VMuEnergyLoss..)
|
||||
|
||||
11 feb 02: mma (utils-V04-00-00)
|
||||
- subSecFlag = false --> No sucutoff generation
|
||||
|
||||
08 nov 01: mma (utils-V03-02-11)
|
||||
- G4VEnergyLoss: some data members and functions are no more static
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4EnergyLossMessenger.hh,v 1.4 2001/07/11 10:03:40 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
// GEANT4 tag $Name: geant4-04-01 $
|
||||
//
|
||||
//
|
||||
// Class Description:
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4EnergyLossTables.hh,v 1.12 2001/10/29 09:40:51 maire Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
// GEANT4 tag $Name: geant4-04-01 $
|
||||
//
|
||||
// $Id:
|
||||
//
|
||||
|
||||
@@ -20,22 +20,26 @@
|
||||
// * statement, and all its terms. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4MultipleScattering.hh,v 1.9 2002/05/24 06:11:24 urban Exp $
|
||||
// GEANT4 tag $Name: geant4-04-01 $
|
||||
//
|
||||
// $Id: G4MultipleScattering.hh,v 1.5 2001/09/19 13:16:06 maire Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
//
|
||||
//------------- G4MultipleScattering physics process --------------------------
|
||||
// by Laszlo Urban, March 2001
|
||||
// by Laszlo Urban, March 2001
|
||||
//
|
||||
// 07-08-01 new methods Store/Retrieve PhysicsTable
|
||||
// 07-08-01 new methods Store/Retrieve PhysicsTable
|
||||
// 23-08-01 new angle and z distribution,energy dependence reduced,
|
||||
// Store,Retrieve methods commented out temporarily, L.Urban
|
||||
// 11-09-01 G4MultipleScatteringx put as default: G4MultipleScattering
|
||||
// Store,Retrieve methods reactived (mma)
|
||||
// 13-09-01 Unused TrueToGeomTransformation method deleted,
|
||||
// class description (L.Urban)
|
||||
// 19-09-01 come back to previous process name msc
|
||||
//
|
||||
// 19-09-01 come back to previous process name msc
|
||||
// 17-04-02 NEW angle distribution + boundary algorithm modified, L.Urban
|
||||
// 22-04-02 boundary algorithm modified -> important improvement in timing !!!!
|
||||
// (L.Urban)
|
||||
// 24-04-02 some minor changes in boundary algorithm, L.Urban
|
||||
// 24-05-02 changes in data members, L.Urban
|
||||
//
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
// class description
|
||||
@@ -54,6 +58,7 @@
|
||||
#include "G4EnergyLossTables.hh"
|
||||
#include "G4GPILSelection.hh"
|
||||
#include "G4PhysicsLogVector.hh"
|
||||
#include "G4VPhysicalVolume.hh"
|
||||
#include "G4ParticleChangeForMSC.hh"
|
||||
#include "G4UnitsTable.hh"
|
||||
|
||||
@@ -138,27 +143,25 @@ class G4MultipleScattering : public G4VContinuousDiscreteProcess
|
||||
// This function overloads a virtual function of the base class.
|
||||
// It is invoked by the ProcessManager of the Particle.
|
||||
|
||||
// Set functions for the different model parameters:
|
||||
void Setpalfa(G4double value) {palfa = value;};
|
||||
void Setpbeta(G4double value) {pbeta = value;};
|
||||
void Setpgamma(G4double value) {pgamma = value;};
|
||||
void Setpq0(G4double value) {pq0 = value;};
|
||||
void Setpq1(G4double value) {pq1 = value;};
|
||||
void Setpc0(G4double value) {pc0 = value;};
|
||||
// angle distribution parameters
|
||||
|
||||
void Setpcz(G4double value) {pcz = value;};
|
||||
// geom. step length distribution
|
||||
|
||||
void Setdtrl(G4double value) {dtrl = value;};
|
||||
// to reduce the energy/step dependence
|
||||
|
||||
void SetBoundary(G4bool value) {boundary = value;};
|
||||
void SetFactlim(G4double val) {factlim=val;};
|
||||
void SetBoundary(G4bool value) {boundary = value;};
|
||||
void SetFacrange(G4double val) {facrange=val;
|
||||
nsmallstep = G4int(1./facrange) ;
|
||||
G4cout << " f=" << facrange
|
||||
<< " n=" << nsmallstep << G4endl ;};
|
||||
// Steplimit after boundary crossing = facrange*range
|
||||
// estimated nb of steps at boundary nsmallstep = 1/facrange
|
||||
|
||||
// parameters needed near to boundary
|
||||
|
||||
void SetTuning(G4double value) {tuning = value;};
|
||||
void SetCparm (G4double value) {cparm = value;};
|
||||
void SetTlim (G4double value) {Tlim = value;};
|
||||
// tuning of the transport mean free path
|
||||
|
||||
void SetLateralDisplacementFlag(G4bool flag) {fLatDisplFlag = flag;};
|
||||
@@ -188,16 +191,14 @@ class G4MultipleScattering : public G4VContinuousDiscreteProcess
|
||||
|
||||
G4PhysicsTable* theTransportMeanFreePathTable;
|
||||
|
||||
G4double fTransportMeanFreePath;
|
||||
G4double fTransportMeanFreePath,kappa;
|
||||
|
||||
G4double biglambda,taubig,tausmall,taulim;
|
||||
G4double taubig,tausmall,taulim;
|
||||
|
||||
G4double LowestKineticEnergy;
|
||||
G4double HighestKineticEnergy;
|
||||
G4int TotBin;
|
||||
|
||||
G4Material* lastMaterial;
|
||||
G4double lastKineticEnergy;
|
||||
G4int materialIndex;
|
||||
|
||||
G4double tLast;
|
||||
@@ -205,20 +206,19 @@ class G4MultipleScattering : public G4VContinuousDiscreteProcess
|
||||
|
||||
// model parameters
|
||||
G4bool boundary; // spec. handling near boundaries
|
||||
G4double factlim;
|
||||
G4double facrange,tlimit;
|
||||
G4int stepno,stepnolastmsc,nsmallstep ;
|
||||
G4GPILSelection valueGPILSelectionMSC;
|
||||
|
||||
G4double pcz,zmean; // z(geom.step length)
|
||||
// distribution
|
||||
|
||||
G4double palfa,pbeta,pgamma,pq0,pq1,pc0; // parameters of angle
|
||||
// disrtibution
|
||||
|
||||
G4double range,T1,lambda1,cth1,z1,t1,dtrl; // used to reduce the energy
|
||||
// (or step length) dependence
|
||||
|
||||
G4double tuning; // param. for lambda tuning
|
||||
G4double cparm; // "
|
||||
G4double Tlim ; // "
|
||||
|
||||
// with/without lateral displacement
|
||||
G4bool fLatDisplFlag;
|
||||
|
||||
@@ -20,16 +20,15 @@
|
||||
// * statement, and all its terms. *
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4MultipleScattering.icc,v 1.6 2001/09/13 11:00:19 urban Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
// $Id: G4MultipleScattering.icc,v 1.7 2002/05/24 06:11:24 urban Exp $
|
||||
// GEANT4 tag $Name: geant4-04-01 $
|
||||
//
|
||||
//------------ G4MultipleScattering physics process ---------------------------
|
||||
// by Laszlo Urban, March 2001
|
||||
//
|
||||
// Modified:
|
||||
//
|
||||
// 18-05-01 V.Ivanchenko Clean up against Linux ANSI compilation
|
||||
// 18-05-01 V.Ivanchenko Clean up against Linux ANSI compilation
|
||||
// 23-08-01 new angle and z distribution,energy dependence reduced,
|
||||
// Store,Retrieve methods commented out temporarily, L.Urban
|
||||
// 27-08-01 bugfix in AlongStepDoIt, L.Urban
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4VEnergyLoss.hh,v 1.13 2001/11/08 08:09:57 urban Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
// GEANT4 tag $Name: geant4-04-01 $
|
||||
//
|
||||
//
|
||||
// ------------------------------------------------------------
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4EnergyLossMessenger.cc,v 1.4 2001/07/11 10:03:41 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
// GEANT4 tag $Name: geant4-04-01 $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4EnergyLossTables.cc,v 1.17 2001/10/29 09:40:52 maire Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
// GEANT4 tag $Name: geant4-04-01 $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
// first version created by P.Urban , 06/04/1998
|
||||
|
||||
@@ -20,14 +20,13 @@
|
||||
// * statement, and all its terms. *
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4MultipleScattering.cc,v 1.16 2001/10/31 07:27:25 urban Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
// $Id: G4MultipleScattering.cc,v 1.22 2002/06/11 08:06:47 urban Exp $
|
||||
// GEANT4 tag $Name: geant4-04-01 $
|
||||
//
|
||||
// -----------------------------------------------------------------------------
|
||||
// 16/05/01 value of cparm changed , L.Urban
|
||||
// 18/05/01 V.Ivanchenko Clean up against Linux ANSI compilation
|
||||
// 07/08/01 new methods Store/Retrieve PhysicsTable (mma)
|
||||
// 07/08/01 new methods Store/Retrieve PhysicsTable (mma)
|
||||
// 23-08-01 new angle and z distribution,energy dependence reduced,
|
||||
// Store,Retrieve methods commented out temporarily, L.Urban
|
||||
// 27-08-01 in BuildPhysicsTable:aParticleType.GetParticleName()=="mu+" (mma)
|
||||
@@ -41,12 +40,21 @@
|
||||
// 17-09-01 migration of Materials to pure STL (mma)
|
||||
// 27-09-01 value of data member factlim changed, L.Urban
|
||||
// 31-10-01 big fixed in PostStepDoIt,L.Urban
|
||||
// 17-04-02 NEW angle distribution + boundary algorithm modified, L.Urban
|
||||
// 22-04-02 boundary algorithm modified -> important improvement in timing !!!!
|
||||
// (L.Urban)
|
||||
// 24-04-02 some minor changes in boundary algorithm, L.Urban
|
||||
// 06-05-02 bug fixed in GetContinuousStepLimit, L.Urban
|
||||
// 24-05-02 changes in angle distribution and boundary algorithm, L.Urban
|
||||
// 11-06-06 bug fixed in ComputeTransportCrossSection, L.Urban
|
||||
//
|
||||
// -----------------------------------------------------------------------------
|
||||
//
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
#include "G4MultipleScattering.hh"
|
||||
#include "G4StepStatus.hh"
|
||||
#include "G4Navigator.hh"
|
||||
#include "G4TransportationManager.hh"
|
||||
#include "Randomize.hh"
|
||||
@@ -56,25 +64,23 @@
|
||||
G4MultipleScattering::G4MultipleScattering(const G4String& processName)
|
||||
: G4VContinuousDiscreteProcess(processName),
|
||||
theTransportMeanFreePathTable(0),
|
||||
fTransportMeanFreePath (1.e12),
|
||||
biglambda(1.e10),taubig(10.),tausmall(1.e-12),taulim(1.e-6),
|
||||
fTransportMeanFreePath (1.e12),kappa(2.5),
|
||||
taubig(10.),tausmall(1.e-12),taulim(1.e-6),
|
||||
LowestKineticEnergy(0.1*keV),
|
||||
HighestKineticEnergy(100.*TeV),
|
||||
TotBin(100),
|
||||
lastMaterial(0),
|
||||
lastKineticEnergy(0.),
|
||||
materialIndex(0),
|
||||
tLast (0.0),
|
||||
zLast (0.0),
|
||||
boundary(true),
|
||||
factlim(1.00),
|
||||
facrange(0.199),tlimit(1.e10),
|
||||
stepno(0),stepnolastmsc(-1000000),nsmallstep(5),
|
||||
valueGPILSelectionMSC(NotCandidateForSelection),
|
||||
pcz(0.17),zmean(0.),
|
||||
palfa(0.9698),pbeta(0.4138),pgamma(2.0001),
|
||||
pq0(0.272),pq1(50.14),pc0(4.024),
|
||||
range(1.0),T1(1.0),lambda1(-1.),cth1(1.),z1(1.e10),dtrl(0.15),
|
||||
tuning (1.00),
|
||||
cparm (1.5),
|
||||
cparm (0.0),
|
||||
Tlim(1.e6*MeV),
|
||||
fLatDisplFlag(true),
|
||||
NuclCorrPar (0.0615),
|
||||
FactPar(0.40)
|
||||
@@ -174,108 +180,108 @@ G4double G4MultipleScattering::ComputeTransportCrossSection(
|
||||
const G4double Zdat[15] = { 4., 6.,13.,20.,26.,29.,32.,38.,47.,
|
||||
50.,56.,64.,74.,79.,82. };
|
||||
|
||||
const G4double Tdat[22] = {0.0001*MeV,0.0002*MeV,0.0004*MeV,0.0007*MeV,
|
||||
const G4double Tdat[23] = {0.0001*MeV,0.0002*MeV,0.0004*MeV,0.0007*MeV,
|
||||
0.001*MeV,0.002*MeV,0.004*MeV,0.007*MeV,
|
||||
0.01*MeV,0.02*MeV,0.04*MeV,0.07*MeV,
|
||||
0.1*MeV,0.2*MeV,0.4*MeV,0.7*MeV,
|
||||
1.*MeV,2.*MeV,4.*MeV,7.*MeV,10.*MeV,20.*MeV};
|
||||
0.01*MeV,0.02*MeV,0.04*MeV,0.07*MeV,
|
||||
0.1*MeV,0.2*MeV,0.4*MeV,0.7*MeV,
|
||||
1.*MeV,2.*MeV,4.*MeV,7.*MeV,10.*MeV,20.*MeV,
|
||||
10000.0*MeV};
|
||||
|
||||
// corr. factors for e-/e+ lambda
|
||||
|
||||
const G4double celectron[15][22] =
|
||||
G4double celectron[15][23] =
|
||||
{{1.125,1.072,1.051,1.047,1.047,1.050,1.052,1.054,
|
||||
1.054,1.057,1.062,1.069,1.075,1.090,1.105,1.111,
|
||||
1.112,1.108,1.100,1.093,1.089,1.087 },
|
||||
1.112,1.108,1.100,1.093,1.089,1.087,0.7235 },
|
||||
{1.408,1.246,1.143,1.096,1.077,1.059,1.053,1.051,
|
||||
1.052,1.053,1.058,1.065,1.072,1.087,1.101,1.108,
|
||||
1.109,1.105,1.097,1.090,1.086,1.082 },
|
||||
1.109,1.105,1.097,1.090,1.086,1.082,0.7925 },
|
||||
{2.833,2.268,1.861,1.612,1.486,1.309,1.204,1.156,
|
||||
1.136,1.114,1.106,1.106,1.109,1.119,1.129,1.132,
|
||||
1.131,1.124,1.113,1.104,1.099,1.098 },
|
||||
1.131,1.124,1.113,1.104,1.099,1.098,0.9147 },
|
||||
{3.879,3.016,2.380,2.007,1.818,1.535,1.340,1.236,
|
||||
1.190,1.133,1.107,1.099,1.098,1.103,1.110,1.113,
|
||||
1.112,1.105,1.096,1.089,1.085,1.098 },
|
||||
1.112,1.105,1.096,1.089,1.085,1.098,0.9700 },
|
||||
{6.937,4.330,2.886,2.256,1.987,1.628,1.395,1.265,
|
||||
1.203,1.122,1.080,1.065,1.061,1.063,1.070,1.073,
|
||||
1.073,1.070,1.064,1.059,1.056,1.056 },
|
||||
1.073,1.070,1.064,1.059,1.056,1.056,1.0022 },
|
||||
{9.616,5.708,3.424,2.551,2.204,1.762,1.485,1.330,
|
||||
1.256,1.155,1.099,1.077,1.070,1.068,1.072,1.074,
|
||||
1.074,1.070,1.063,1.059,1.056,1.052 },
|
||||
1.074,1.070,1.063,1.059,1.056,1.052,1.0158 },
|
||||
{11.72,6.364,3.811,2.806,2.401,1.884,1.564,1.386,
|
||||
1.300,1.180,1.112,1.082,1.073,1.066,1.068,1.069,
|
||||
1.068,1.064,1.059,1.054,1.051,1.050 },
|
||||
1.068,1.064,1.059,1.054,1.051,1.050,1.0284 },
|
||||
{18.08,8.601,4.569,3.183,2.662,2.025,1.646,1.439,
|
||||
1.339,1.195,1.108,1.068,1.053,1.040,1.039,1.039,
|
||||
1.039,1.037,1.034,1.031,1.030,1.036 },
|
||||
1.039,1.037,1.034,1.031,1.030,1.036,1.0515 },
|
||||
{18.22,10.48,5.333,3.713,3.115,2.367,1.898,1.631,
|
||||
1.498,1.301,1.171,1.105,1.077,1.048,1.036,1.033,
|
||||
1.031,1.028,1.024,1.022,1.021,1.024 },
|
||||
1.031,1.028,1.024,1.022,1.021,1.024,1.0834 },
|
||||
{14.14,10.65,5.710,3.929,3.266,2.453,1.951,1.669,
|
||||
1.528,1.319,1.178,1.106,1.075,1.040,1.027,1.022,
|
||||
1.020,1.017,1.015,1.013,1.013,1.020 },
|
||||
1.020,1.017,1.015,1.013,1.013,1.020,1.0937 },
|
||||
{14.11,11.73,6.312,4.240,3.478,2.566,2.022,1.720,
|
||||
1.569,1.342,1.186,1.102,1.065,1.022,1.003,0.997,
|
||||
0.995,0.993,0.993,0.993,0.993,1.011 },
|
||||
0.995,0.993,0.993,0.993,0.993,1.011,1.1140 },
|
||||
{22.76,20.01,8.835,5.287,4.144,2.901,2.219,1.855,
|
||||
1.677,1.410,1.224,1.121,1.073,1.014,0.986,0.976,
|
||||
0.974,0.972,0.973,0.974,0.975,0.987 },
|
||||
0.974,0.972,0.973,0.974,0.975,0.987,1.1410 },
|
||||
{50.77,40.85,14.13,7.184,5.284,3.435,2.520,2.059,
|
||||
1.837,1.512,1.283,1.153,1.091,1.010,0.969,0.954,
|
||||
0.950,0.947,0.949,0.952,0.954,0.963 },
|
||||
0.950,0.947,0.949,0.952,0.954,0.963,1.1750 },
|
||||
{65.87,59.06,15.87,7.570,5.567,3.650,2.682,2.182,
|
||||
1.939,1.579,1.325,1.178,1.108,1.014,0.965,0.947,
|
||||
0.941,0.938,0.940,0.944,0.946,0.954 },
|
||||
0.941,0.938,0.940,0.944,0.946,0.954,1.1922 },
|
||||
// {45.60,47.34,15.92,7.810,5.755,3.767,2.760,2.239, // paper.....
|
||||
{55.60,47.34,15.92,7.810,5.755,3.767,2.760,2.239,
|
||||
{55.60,47.34,15.92,7.810,5.755,3.767,2.760,2.239,
|
||||
1.985,1.609,1.343,1.188,1.113,1.013,0.960,0.939,
|
||||
0.933,0.930,0.933,0.936,0.939,0.949 }};
|
||||
|
||||
const G4double cpositron[15][22] = {
|
||||
0.933,0.930,0.933,0.936,0.939,0.949,1.2026 }};
|
||||
G4double cpositron[15][23] = {
|
||||
{2.589,2.044,1.658,1.446,1.347,1.217,1.144,1.110,
|
||||
1.097,1.083,1.080,1.086,1.092,1.108,1.123,1.131,
|
||||
1.131,1.126,1.117,1.108,1.103,1.100 },
|
||||
1.131,1.126,1.117,1.108,1.103,1.100,0.7235 },
|
||||
{3.904,2.794,2.079,1.710,1.543,1.325,1.202,1.145,
|
||||
1.122,1.096,1.089,1.092,1.098,1.114,1.130,1.137,
|
||||
1.138,1.132,1.122,1.113,1.108,1.102 },
|
||||
1.138,1.132,1.122,1.113,1.108,1.102,0.7925 },
|
||||
{7.970,6.080,4.442,3.398,2.872,2.127,1.672,1.451,
|
||||
1.357,1.246,1.194,1.179,1.178,1.188,1.201,1.205,
|
||||
1.203,1.190,1.173,1.159,1.151,1.145 },
|
||||
1.203,1.190,1.173,1.159,1.151,1.145,0.9147 },
|
||||
{9.714,7.607,5.747,4.493,3.815,2.777,2.079,1.715,
|
||||
1.553,1.353,1.253,1.219,1.211,1.214,1.225,1.228,
|
||||
1.225,1.210,1.191,1.175,1.166,1.174 },
|
||||
1.225,1.210,1.191,1.175,1.166,1.174,0.9700 },
|
||||
{17.97,12.95,8.628,6.065,4.849,3.222,2.275,1.820,
|
||||
1.624,1.382,1.259,1.214,1.202,1.202,1.214,1.219,
|
||||
1.217,1.203,1.184,1.169,1.160,1.151 },
|
||||
1.217,1.203,1.184,1.169,1.160,1.151,1.0022 },
|
||||
{24.83,17.06,10.84,7.355,5.767,3.707,2.546,1.996,
|
||||
1.759,1.465,1.311,1.252,1.234,1.228,1.238,1.241,
|
||||
1.237,1.222,1.201,1.184,1.174,1.159 },
|
||||
1.237,1.222,1.201,1.184,1.174,1.159,1.0158 },
|
||||
{23.26,17.15,11.52,8.049,6.375,4.114,2.792,2.155,
|
||||
1.880,1.535,1.353,1.281,1.258,1.247,1.254,1.256,
|
||||
1.252,1.234,1.212,1.194,1.183,1.170 },
|
||||
1.252,1.234,1.212,1.194,1.183,1.170,1.0284 },
|
||||
{22.33,18.01,12.86,9.212,7.336,4.702,3.117,2.348,
|
||||
2.015,1.602,1.385,1.297,1.268,1.251,1.256,1.258,
|
||||
1.254,1.237,1.214,1.195,1.185,1.179 },
|
||||
1.254,1.237,1.214,1.195,1.185,1.179,1.0515 },
|
||||
{33.91,24.13,15.71,10.80,8.507,5.467,3.692,2.808,
|
||||
2.407,1.873,1.564,1.425,1.374,1.330,1.324,1.320,
|
||||
1.312,1.288,1.258,1.235,1.221,1.205 },
|
||||
1.312,1.288,1.258,1.235,1.221,1.205,1.0834 },
|
||||
{32.14,24.11,16.30,11.40,9.015,5.782,3.868,2.917,
|
||||
2.490,1.925,1.596,1.447,1.391,1.342,1.332,1.327,
|
||||
1.320,1.294,1.264,1.240,1.226,1.214 },
|
||||
1.320,1.294,1.264,1.240,1.226,1.214,1.0937 },
|
||||
{29.51,24.07,17.19,12.28,9.766,6.238,4.112,3.066,
|
||||
2.602,1.995,1.641,1.477,1.414,1.356,1.342,1.336,
|
||||
1.328,1.302,1.270,1.245,1.231,1.233 },
|
||||
1.328,1.302,1.270,1.245,1.231,1.233,1.1140 },
|
||||
{38.19,30.85,21.76,15.35,12.07,7.521,4.812,3.498,
|
||||
2.926,2.188,1.763,1.563,1.484,1.405,1.382,1.371,
|
||||
1.361,1.330,1.294,1.267,1.251,1.239 },
|
||||
1.361,1.330,1.294,1.267,1.251,1.239,1.1410 },
|
||||
{49.71,39.80,27.96,19.63,15.36,9.407,5.863,4.155,
|
||||
3.417,2.478,1.944,1.692,1.589,1.480,1.441,1.423,
|
||||
1.409,1.372,1.330,1.298,1.280,1.258 },
|
||||
1.409,1.372,1.330,1.298,1.280,1.258,1.1750 },
|
||||
{59.25,45.08,30.36,20.83,16.15,9.834,6.166,4.407,
|
||||
3.641,2.648,2.064,1.779,1.661,1.531,1.482,1.459,
|
||||
1.442,1.400,1.354,1.319,1.299,1.272 },
|
||||
1.442,1.400,1.354,1.319,1.299,1.272,1.1922 },
|
||||
{56.38,44.29,30.50,21.18,16.51,10.11,6.354,4.542,
|
||||
3.752,2.724,2.116,1.817,1.692,1.554,1.499,1.474,
|
||||
1.456,1.412,1.364,1.328,1.307,1.282 }};
|
||||
1.456,1.412,1.364,1.328,1.307,1.282,1.2026 }};
|
||||
|
||||
G4double sigma;
|
||||
|
||||
@@ -323,7 +329,10 @@ G4double G4MultipleScattering::ComputeTransportCrossSection(
|
||||
}
|
||||
|
||||
// correct this value using the corrections computed for e+/e-
|
||||
KineticEnergy *= electron_mass_c2/ParticleMass;
|
||||
// scaling: mass*beta*gamma does not depend on the kind of particle !
|
||||
G4double tau=KineticEnergy/electron_mass_c2 ;
|
||||
KineticEnergy = sqrt(ParticleMass*ParticleMass+tau*(tau+2.)*
|
||||
electron_mass_c2*electron_mass_c2)-ParticleMass ;
|
||||
|
||||
// interpolate in AtomicNumber and beta2
|
||||
// get bin number in Z
|
||||
@@ -337,9 +346,9 @@ G4double G4MultipleScattering::ComputeTransportCrossSection(
|
||||
G4double ratZ = (AtomicNumber-Z1)/(Z2-Z1);
|
||||
|
||||
// get bin number in T (beta2)
|
||||
G4int iT = 21;
|
||||
G4int iT = 22;
|
||||
while ((iT>=0)&&(Tdat[iT]>=KineticEnergy)) iT -= 1;
|
||||
if(iT==21) iT = 20;
|
||||
if(iT==22) iT = 21;
|
||||
if(iT==-1) iT = 0 ;
|
||||
|
||||
// calculate betasquare values
|
||||
@@ -348,8 +357,14 @@ G4double G4MultipleScattering::ComputeTransportCrossSection(
|
||||
T = Tdat[iT+1]; E = T + electron_mass_c2;
|
||||
G4double b2big = T*(E+electron_mass_c2)/(E*E);
|
||||
G4double ratb2 = (beta2-b2small)/(b2big-b2small);
|
||||
G4double beta2lim = Tlim*(Tlim+2.*electron_mass_c2)/
|
||||
((Tlim+electron_mass_c2)*(Tlim+electron_mass_c2));
|
||||
|
||||
G4double corrfactor = tuning*(1.+cparm)/(1.+cparm*beta2);
|
||||
G4double corrfactor ;
|
||||
if(T < Tlim)
|
||||
corrfactor = tuning*(1.+cparm*beta2lim)/(1.+cparm*beta2);
|
||||
else
|
||||
corrfactor = tuning ;
|
||||
|
||||
G4double c1,c2,cc1,cc2,corr;
|
||||
if (Charge < 0.)
|
||||
@@ -416,44 +431,60 @@ G4double G4MultipleScattering::GetContinuousStepLimit(
|
||||
aParticle = track.GetDynamicParticle();
|
||||
KineticEnergy = aParticle->GetKineticEnergy();
|
||||
|
||||
if ((lastMaterial != aMaterial) || (lastKineticEnergy != KineticEnergy))
|
||||
{
|
||||
lastKineticEnergy = KineticEnergy ;
|
||||
materialIndex = aMaterial->GetIndex() ;
|
||||
fTransportMeanFreePath = (*theTransportMeanFreePathTable)
|
||||
(materialIndex)->GetValue(KineticEnergy,isOut);
|
||||
|
||||
fTransportMeanFreePath = (*theTransportMeanFreePathTable)
|
||||
(materialIndex)->GetValue(KineticEnergy,isOut);
|
||||
|
||||
lastMaterial = aMaterial;
|
||||
}
|
||||
range = G4EnergyLossTables::GetRange(aParticle->GetDefinition(),
|
||||
KineticEnergy,aMaterial);
|
||||
|
||||
// special treatment near boundaries ?
|
||||
if (boundary)
|
||||
{
|
||||
// step limitation at boundary ?
|
||||
if (track.GetCurrentStepNumber() > 1)
|
||||
stepno = track.GetCurrentStepNumber() ;
|
||||
if(stepno == 1)
|
||||
{
|
||||
if((track.GetStep()->GetPreStepPoint()->GetSafety()<fTransportMeanFreePath)
|
||||
&& (tPathLength > fTransportMeanFreePath))
|
||||
{
|
||||
tPathLength = factlim*fTransportMeanFreePath ;
|
||||
valueGPILSelectionMSC = CandidateForSelection;
|
||||
}
|
||||
}
|
||||
}
|
||||
stepnolastmsc = -1000000 ;
|
||||
tlimit = 1.e10 ;
|
||||
}
|
||||
|
||||
if(stepno > 1)
|
||||
{
|
||||
if(track.GetStep()->GetPreStepPoint()->GetStepStatus() == fGeomBoundary)
|
||||
{
|
||||
stepnolastmsc = stepno ;
|
||||
tlimit = facrange*range ;
|
||||
if(tPathLength > tlimit)
|
||||
{
|
||||
tPathLength = tlimit ;
|
||||
valueGPILSelectionMSC = CandidateForSelection;
|
||||
}
|
||||
}
|
||||
else if(stepno >= stepnolastmsc)
|
||||
{
|
||||
if((stepno - stepnolastmsc) < nsmallstep)
|
||||
{
|
||||
if(tPathLength > tlimit)
|
||||
{
|
||||
tPathLength = tlimit ;
|
||||
valueGPILSelectionMSC = CandidateForSelection;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// do the true -> geom transformation
|
||||
lambda1 = -1.;
|
||||
z1 = 1.e10;
|
||||
z1 = 1.e10 ;
|
||||
|
||||
tau = tPathLength/fTransportMeanFreePath ;
|
||||
|
||||
if(tau < tausmall) zPathLength = tPathLength;
|
||||
|
||||
if (fTransportMeanFreePath > biglambda) zPathLength = tPathLength;
|
||||
else
|
||||
{
|
||||
range = G4EnergyLossTables::GetRange(aParticle->GetDefinition(),
|
||||
KineticEnergy,aMaterial);
|
||||
tau = tPathLength/fTransportMeanFreePath ;
|
||||
|
||||
if (tPathLength/range < dtrl) zmean = fTransportMeanFreePath*(1.-exp(-tau));
|
||||
if(tPathLength/range < dtrl) zmean = fTransportMeanFreePath*(1.-exp(-tau));
|
||||
else
|
||||
{
|
||||
T1 = G4EnergyLossTables::GetPreciseEnergyFromRange(
|
||||
@@ -469,14 +500,16 @@ G4double G4MultipleScattering::GetContinuousStepLimit(
|
||||
if ((pcz > 0.) && (2.*zmean > tPathLength))
|
||||
{
|
||||
z0 = zmean+pcz*(tPathLength-zmean);
|
||||
kz = (2.*zmean-tPathLength)/(z0-zmean);
|
||||
|
||||
kz = (2.*zmean-tPathLength)/(z0-zmean)+1.;
|
||||
if (G4UniformRand() < z0/tPathLength)
|
||||
zPathLength = z0*exp(log(G4UniformRand())/(kz+1.));
|
||||
zPathLength = z0*exp(log(G4UniformRand())/kz);
|
||||
else zPathLength = tPathLength-(tPathLength-z0)
|
||||
*exp(log(1.-G4UniformRand())/(kz+1.));
|
||||
*exp(log(1.-G4UniformRand())/kz);
|
||||
}
|
||||
else
|
||||
{
|
||||
zPathLength = zmean;
|
||||
}
|
||||
else zPathLength = zmean;
|
||||
}
|
||||
|
||||
tLast = tPathLength;
|
||||
@@ -495,9 +528,11 @@ G4VParticleChange* G4MultipleScattering::AlongStepDoIt(
|
||||
fParticleChange.Initialize(track);
|
||||
|
||||
G4double geomPathLength = track.GetStepLength();
|
||||
|
||||
G4double truePathLength;
|
||||
|
||||
if (fTransportMeanFreePath > biglambda) truePathLength = geomPathLength;
|
||||
if (geomPathLength/fTransportMeanFreePath < tausmall)
|
||||
truePathLength = geomPathLength;
|
||||
else if(geomPathLength == zLast) truePathLength = tLast;
|
||||
else
|
||||
{
|
||||
@@ -531,12 +566,11 @@ G4VParticleChange* G4MultipleScattering::PostStepDoIt(
|
||||
const G4Track& trackData,
|
||||
const G4Step& stepData)
|
||||
{
|
||||
const G4double kappa = 2.5, kappapl1 = kappa+1., kappami1 = kappa-1. ;
|
||||
|
||||
// angle distribution parameters
|
||||
const G4double kappapl1 = kappa+1., kappami1 = kappa-1. ;
|
||||
G4bool isOut;
|
||||
|
||||
fParticleChange.Initialize(trackData);
|
||||
|
||||
G4double truestep = stepData.GetStepLength();
|
||||
|
||||
const G4DynamicParticle* aParticle = trackData.GetDynamicParticle();
|
||||
@@ -546,41 +580,87 @@ G4VParticleChange* G4MultipleScattering::PostStepDoIt(
|
||||
(materialIndex)->GetValue(KineticEnergy,isOut);
|
||||
|
||||
// change direction first ( scattering )
|
||||
G4double tau = truestep/fTransportMeanFreePath;
|
||||
G4double cth;
|
||||
G4double cth,tau;
|
||||
tau = truestep/fTransportMeanFreePath;
|
||||
|
||||
if (tau < tausmall) cth = 1.;
|
||||
else if(tau > taubig) cth = -1.+2.*G4UniformRand();
|
||||
if(KineticEnergy <= 0.)
|
||||
cth = -1.+2.*G4UniformRand() ;
|
||||
else
|
||||
{
|
||||
if (tau < tausmall) cth = 1.;
|
||||
else if(tau > taubig) cth = -1.+2.*G4UniformRand();
|
||||
else
|
||||
{
|
||||
if(lambda1 > 0.) tau = 0.5*tLast/lambda1
|
||||
+(truestep-0.5*tLast)/fTransportMeanFreePath;
|
||||
if(tau > taubig) cth = -1.+2.*G4UniformRand();
|
||||
else
|
||||
{
|
||||
if(lambda1 > 0.) tau = 0.5*tLast/lambda1
|
||||
+(truestep-0.5*tLast)/fTransportMeanFreePath;
|
||||
if(tau > taubig) cth = -1.+2.*G4UniformRand();
|
||||
else
|
||||
{
|
||||
G4double e=exp(-tau);
|
||||
if (palfa < 0.) cth = e;
|
||||
else
|
||||
{
|
||||
G4double a = exp( palfa*tau), ap1=a+1., am1=a-1., aw1 = 1./a;
|
||||
G4double w = exp(-pbeta*tau), b = 2.*w/(1.-w), bw1=w;
|
||||
G4double c = 1.+pc0*tau, cp1=c+1., cm1=c-1.;
|
||||
G4double gamma1 = pgamma-1.;
|
||||
G4double w1 = exp(log(cp1)*gamma1), w2=exp(log(cm1)*gamma1);
|
||||
G4double cw1 = c-gamma1*(w1*cm1-w2*cp1)/((gamma1-1.)*(w1-w2));
|
||||
G4double q = 1.-exp(-pq0-pq1*tau);
|
||||
G4double prob = (e-cw1)/(q*aw1+(1.-q)*bw1-cw1);
|
||||
if (G4UniformRand() <= prob)
|
||||
{
|
||||
if (G4UniformRand() <= q)
|
||||
cth = a-am1*ap1/sqrt(am1*am1+4.*a*G4UniformRand());
|
||||
else cth = -1.+2.*exp(log(G4UniformRand())/(b+1.));
|
||||
}
|
||||
else cth = c-cp1*cm1/exp(log(w2+(w1-w2)*G4UniformRand())/gamma1);
|
||||
}
|
||||
}
|
||||
}
|
||||
const G4double alfa = 0.385 ;
|
||||
const G4double beta = 0.0626 ;
|
||||
const G4double c = 2.500 ;
|
||||
const G4double x2mean3 = 1./3. ;
|
||||
|
||||
G4double a,b,c1,bp1,bm1,bbp1,bbm1,
|
||||
xmean1,x2mean1,xmean2,x2mean2,
|
||||
x2mean,xmeanth,x2meanth,pp,qq ;
|
||||
|
||||
a = 2.*exp(-alfa*tau)/(1.-exp(-alfa*tau)) ;
|
||||
|
||||
xmean1 = a/(a+2.) ;
|
||||
x2mean1= (a*a+a+2.)/((a+2.)*(a+3.)) ;
|
||||
|
||||
b = exp((1.+beta)*tau) ;
|
||||
|
||||
c1 = 1.-c ;
|
||||
bp1=b+1. ;
|
||||
bm1=b-1. ;
|
||||
bbp1=exp(log(bp1)*c1) ;
|
||||
bbm1=exp(log(bm1)*c1) ;
|
||||
|
||||
xmean2 = -(bbp1+bbm1)/(bbp1-bbm1)+(bp1*bbp1-bm1*bbm1)/
|
||||
((2.-c)*(bbp1-bbm1)) ;
|
||||
x2mean2= 1.-2.*(bp1*bbp1+bm1*bbm1)/((2.-c)*(bbp1-bbm1))+
|
||||
2.*(bp1*bp1*bbp1-bm1*bm1*bbm1)/((2.-c)*(3.-c)*(bbp1-bbm1)) ;
|
||||
|
||||
xmeanth = exp(-tau) ;
|
||||
x2meanth = (1.+2.*exp(-kappa*tau))/3. ;
|
||||
|
||||
pp = (xmeanth-xmean2)/(xmean1-xmean2) ;
|
||||
x2mean = pp*x2mean1+(1.-pp)*x2mean2 ;
|
||||
if(x2mean >= x2meanth)
|
||||
{
|
||||
qq = 1. ;
|
||||
}
|
||||
else
|
||||
{
|
||||
pp = (x2meanth*xmean1-x2mean1*xmeanth+x2mean3*xmeanth
|
||||
+x2mean1*xmean2-x2mean3*xmean2-x2mean2*xmean1)/
|
||||
(xmean2*x2mean1-xmean2*x2mean3-xmean1*x2mean2+xmean1*x2mean3) ;
|
||||
|
||||
qq = (xmeanth-(1.-pp)*xmean2)/(pp*xmean1) ;
|
||||
}
|
||||
|
||||
if(G4UniformRand() < pp)
|
||||
{
|
||||
if(G4UniformRand() < qq)
|
||||
{
|
||||
cth = -1.+2.*exp(log(G4UniformRand())/(1.+a)) ;
|
||||
}
|
||||
else
|
||||
{
|
||||
cth = -1.+2.*G4UniformRand() ;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
cth = b- exp(log(bbp1-G4UniformRand()*(bbp1-bbm1))/c1) ;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
G4double sth = sqrt(1.-cth*cth);
|
||||
G4double phi = twopi*G4UniformRand();
|
||||
G4double dirx = sth*cos(phi), diry = sth*sin(phi), dirz = cth;
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VEnergyLoss.cc,v 1.28 2001/11/08 15:56:52 maire Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
// $Id: G4VEnergyLoss.cc,v 1.32 2002/02/26 12:21:51 maire Exp $
|
||||
// GEANT4 tag $Name: geant4-04-01 $
|
||||
//
|
||||
|
||||
// --------------------------------------------------------------
|
||||
@@ -36,6 +36,9 @@
|
||||
// 17-09-01 migration of Materials to pure STL (mma)
|
||||
// 26-10-01 static inline functions moved from .hh file (mma)
|
||||
// 08.11.01 some static methods,data members are not static L.Urban
|
||||
// 11.02.02 subSecFlag = false --> No sucutoff generation (mma)
|
||||
// 14.02.02 initial value of data member finalRange has been changed L.Urban
|
||||
// 26.02.02 initial value of data member finalRange = 1 mm (mma)
|
||||
//
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
@@ -48,19 +51,19 @@
|
||||
G4bool G4VEnergyLoss::rndmStepFlag = false;
|
||||
G4bool G4VEnergyLoss::EnlossFlucFlag = true;
|
||||
|
||||
G4bool G4VEnergyLoss::subSecFlag = true;
|
||||
G4double G4VEnergyLoss::MinDeltaCutInRange = 0.100*mm ;
|
||||
G4double* G4VEnergyLoss::MinDeltaEnergy = NULL ;
|
||||
G4bool* G4VEnergyLoss::LowerLimitForced = NULL ;
|
||||
G4bool G4VEnergyLoss::setMinDeltaCutInRange = false ;
|
||||
G4bool G4VEnergyLoss::subSecFlag = false;
|
||||
G4double G4VEnergyLoss::MinDeltaCutInRange = 0.100*mm;
|
||||
G4double* G4VEnergyLoss::MinDeltaEnergy = 0;
|
||||
G4bool* G4VEnergyLoss::LowerLimitForced = 0;
|
||||
G4bool G4VEnergyLoss::setMinDeltaCutInRange = false;
|
||||
|
||||
G4double G4VEnergyLoss::dRoverRange = 20*perCent;
|
||||
G4double G4VEnergyLoss::finalRange = 200*micrometer;
|
||||
G4double G4VEnergyLoss::c1lim = dRoverRange ;
|
||||
G4double G4VEnergyLoss::c2lim = 2.*(1.-dRoverRange)*finalRange ;
|
||||
G4double G4VEnergyLoss::finalRange = 1*mm;
|
||||
G4double G4VEnergyLoss::c1lim = dRoverRange;
|
||||
G4double G4VEnergyLoss::c2lim = 2.*(1.-dRoverRange)*finalRange;
|
||||
G4double G4VEnergyLoss::c3lim = -(1.-dRoverRange)*finalRange*finalRange;
|
||||
|
||||
G4EnergyLossMessenger* G4VEnergyLoss::ELossMessenger = NULL;
|
||||
G4EnergyLossMessenger* G4VEnergyLoss::ELossMessenger = 0;
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
|
||||
Reference in New Issue
Block a user