Import Geant4 10.7.0.beta source tree
This commit is contained in:
@@ -14,6 +14,11 @@ track of all tags.
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
07-05-20 A. Ribon (exhadr02-V10-06-00)
|
||||
- HadronPhysicsCRMC_FTFP_BERT , HadronPhysicsHIJING , HadronPhysicsUrQMD :
|
||||
introduced the new class G4HyperonBuilder which is now needed when
|
||||
using G4HyperonFTFPBuilder.
|
||||
|
||||
06-08-19 A. Ribon (exhadr02-V10-05-03)
|
||||
- HadronPhysicsCRMC_FTFP_BERT : use G4HadronicParameters for the energy
|
||||
transition region between FTF and BERT models.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
############################################
|
||||
|
||||
**************************************************************
|
||||
Geant4 version Name: geant4-10-06-patch-02 (29-May-2020)
|
||||
Geant4 version Name: geant4-10-06-ref-06 (26-June-2020)
|
||||
Copyright : Geant4 Collaboration
|
||||
References : NIM A 506 (2003), 250-303
|
||||
: IEEE-TNS 53 (2006), 270-278
|
||||
@@ -21,20 +21,20 @@ Visualization Manager initialising...
|
||||
Registering graphics systems...
|
||||
|
||||
You have successfully registered the following graphics systems.
|
||||
Current available graphics systems are:
|
||||
ASCIITree (ATree)
|
||||
DAWNFILE (DAWNFILE)
|
||||
G4HepRep (HepRepXML)
|
||||
G4HepRepFile (HepRepFile)
|
||||
RayTracer (RayTracer)
|
||||
VRML1FILE (VRML1FILE)
|
||||
VRML2FILE (VRML2FILE)
|
||||
gMocrenFile (gMocrenFile)
|
||||
OpenGLImmediateXm (OGLIXm, OGLI)
|
||||
OpenGLStoredXm (OGLSXm, OGL, OGLS)
|
||||
OpenGLImmediateX (OGLIX, OGLIXm_FALLBACK)
|
||||
OpenGLStoredX (OGLSX, OGLSXm_FALLBACK)
|
||||
RayTracerX (RayTracerX)
|
||||
Registered graphics systems are:
|
||||
ASCIITree (ATree)
|
||||
DAWNFILE (DAWNFILE)
|
||||
G4HepRep (HepRepXML)
|
||||
G4HepRepFile (HepRepFile)
|
||||
RayTracer (RayTracer)
|
||||
VRML1FILE (VRML1FILE)
|
||||
VRML2FILE (VRML2FILE)
|
||||
gMocrenFile (gMocrenFile)
|
||||
OpenGLImmediateXm (OGLIXm, OGLI)
|
||||
OpenGLStoredXm (OGLSXm, OGL, OGLS)
|
||||
OpenGLImmediateX (OGLIX, OGLIXm_FALLBACK)
|
||||
OpenGLStoredX (OGLSX, OGLSXm_FALLBACK)
|
||||
RayTracerX (RayTracerX)
|
||||
|
||||
Registering model factories...
|
||||
|
||||
@@ -47,6 +47,9 @@ Registered model factories:
|
||||
drawByParticleID
|
||||
drawByEncounteredVolume
|
||||
|
||||
Registered models:
|
||||
None
|
||||
|
||||
Registered filter factories:
|
||||
attributeFilter
|
||||
chargeFilter
|
||||
@@ -54,6 +57,9 @@ Registered filter factories:
|
||||
particleFilter
|
||||
encounteredVolumeFilter
|
||||
|
||||
Registered filters:
|
||||
None
|
||||
|
||||
You have successfully registered the following user vis actions.
|
||||
Run Duration User Vis Actions: none
|
||||
End of Event User Vis Actions: none
|
||||
@@ -506,7 +512,7 @@ CoulombScat: for pi-, integral:1 SubType=1 BuildTable=1
|
||||
|
||||
Process: hadElastic
|
||||
Model: hElasticLHEP: 0 eV /n ---> 100 TeV/n
|
||||
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 100 TeV
|
||||
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 25.6 PeV
|
||||
|
||||
Process: He3Inelastic
|
||||
Model: Binary Light Ion Cascade: 0 eV /n ---> 6 GeV/n
|
||||
@@ -518,7 +524,7 @@ CoulombScat: for pi-, integral:1 SubType=1 BuildTable=1
|
||||
|
||||
Process: hadElastic
|
||||
Model: hElasticLHEP: 0 eV /n ---> 100 TeV/n
|
||||
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 100 TeV
|
||||
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 25.6 PeV
|
||||
|
||||
Process: alphaInelastic
|
||||
Model: Binary Light Ion Cascade: 0 eV /n ---> 6 GeV/n
|
||||
@@ -531,11 +537,11 @@ CoulombScat: for pi-, integral:1 SubType=1 BuildTable=1
|
||||
Process: hadElastic
|
||||
Model: hElasticLHEP: 0 eV /n ---> 100.1 MeV/n
|
||||
Model: AntiAElastic: 100 MeV/n ---> 100 TeV/n
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
|
||||
|
||||
Process: anti_He3Inelastic
|
||||
Model: FTFP: 0 eV /n ---> 100 TeV/n
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
|
||||
|
||||
Process: hFritiofCaptureAtRest
|
||||
|
||||
@@ -545,11 +551,11 @@ CoulombScat: for pi-, integral:1 SubType=1 BuildTable=1
|
||||
Process: hadElastic
|
||||
Model: hElasticLHEP: 0 eV /n ---> 100.1 MeV/n
|
||||
Model: AntiAElastic: 100 MeV/n ---> 100 TeV/n
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
|
||||
|
||||
Process: anti_alphaInelastic
|
||||
Model: FTFP: 0 eV /n ---> 100 TeV/n
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
|
||||
|
||||
Process: hFritiofCaptureAtRest
|
||||
|
||||
@@ -559,11 +565,11 @@ CoulombScat: for pi-, integral:1 SubType=1 BuildTable=1
|
||||
Process: hadElastic
|
||||
Model: hElasticLHEP: 0 eV /n ---> 100.1 MeV/n
|
||||
Model: AntiAElastic: 100 MeV/n ---> 100 TeV/n
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
|
||||
|
||||
Process: anti_deuteronInelastic
|
||||
Model: FTFP: 0 eV /n ---> 100 TeV/n
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
|
||||
|
||||
Process: hFritiofCaptureAtRest
|
||||
|
||||
@@ -573,11 +579,11 @@ CoulombScat: for pi-, integral:1 SubType=1 BuildTable=1
|
||||
Process: hadElastic
|
||||
Model: hElasticLHEP: 0 eV ---> 100.1 MeV
|
||||
Model: AntiAElastic: 100 MeV ---> 100 TeV
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
|
||||
|
||||
Process: anti_neutronInelastic
|
||||
Model: FTFP: 0 eV ---> 100 TeV
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
|
||||
|
||||
Process: hFritiofCaptureAtRest
|
||||
|
||||
@@ -587,11 +593,11 @@ CoulombScat: for pi-, integral:1 SubType=1 BuildTable=1
|
||||
Process: hadElastic
|
||||
Model: hElasticLHEP: 0 eV ---> 100.1 MeV
|
||||
Model: AntiAElastic: 100 MeV ---> 100 TeV
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
|
||||
|
||||
Process: anti_protonInelastic
|
||||
Model: FTFP: 0 eV ---> 100 TeV
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
|
||||
|
||||
Process: hFritiofCaptureAtRest
|
||||
|
||||
@@ -601,11 +607,11 @@ CoulombScat: for pi-, integral:1 SubType=1 BuildTable=1
|
||||
Process: hadElastic
|
||||
Model: hElasticLHEP: 0 eV /n ---> 100.1 MeV/n
|
||||
Model: AntiAElastic: 100 MeV/n ---> 100 TeV/n
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
|
||||
|
||||
Process: anti_tritonInelastic
|
||||
Model: FTFP: 0 eV /n ---> 100 TeV/n
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
|
||||
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
|
||||
|
||||
Process: hFritiofCaptureAtRest
|
||||
|
||||
@@ -614,7 +620,7 @@ CoulombScat: for pi-, integral:1 SubType=1 BuildTable=1
|
||||
|
||||
Process: hadElastic
|
||||
Model: hElasticLHEP: 0 eV /n ---> 100 TeV/n
|
||||
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 100 TeV
|
||||
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 25.6 PeV
|
||||
|
||||
Process: dInelastic
|
||||
Model: Binary Light Ion Cascade: 0 eV /n ---> 6 GeV/n
|
||||
@@ -639,7 +645,8 @@ CoulombScat: for pi-, integral:1 SubType=1 BuildTable=1
|
||||
Hadronic Processes for gamma
|
||||
|
||||
Process: photonNuclear
|
||||
Model: BertiniCascade: 0 eV ---> 6 GeV
|
||||
Model: GammaNPreco: 0 eV ---> 200 MeV
|
||||
Model: BertiniCascade: 199 MeV ---> 6 GeV
|
||||
Model: TheoFSGenerator: 3 GeV ---> 100 TeV
|
||||
Cr_sctns: PhotoNuclearXS: 0 eV ---> 100 TeV
|
||||
|
||||
@@ -736,12 +743,26 @@ CoulombScat: for pi-, integral:1 SubType=1 BuildTable=1
|
||||
Model: Binary Cascade: 0 eV ---> 1.5 GeV
|
||||
Cr_sctns: G4ParticleInelasticXS: 0 eV ---> 100 TeV
|
||||
|
||||
---------------------------------------------------
|
||||
Hadronic Processes for sigma-
|
||||
|
||||
Process: hadElastic
|
||||
Model: hElasticLHEP: 0 eV ---> 100 TeV
|
||||
Cr_sctns: Glauber-Gribov: 0 eV ---> 100 TeV
|
||||
|
||||
Process: sigma-Inelastic
|
||||
Model: FTFP: 3 GeV ---> 100 TeV
|
||||
Model: BertiniCascade: 0 eV ---> 6 GeV
|
||||
Cr_sctns: Glauber-Gribov: 0 eV ---> 100 TeV
|
||||
|
||||
Process: hBertiniCaptureAtRest
|
||||
|
||||
---------------------------------------------------
|
||||
Hadronic Processes for triton
|
||||
|
||||
Process: hadElastic
|
||||
Model: hElasticLHEP: 0 eV /n ---> 100 TeV/n
|
||||
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 100 TeV
|
||||
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 25.6 PeV
|
||||
|
||||
Process: tInelastic
|
||||
Model: Binary Light Ion Cascade: 0 eV /n ---> 6 GeV/n
|
||||
@@ -766,15 +787,16 @@ Level density (1/MeV) 0.075
|
||||
Use simple level density model 1
|
||||
Use discrete excitation energy of the residual 0
|
||||
Time limit for long lived isomeres (ns) 1000
|
||||
Isomer production flag 1
|
||||
Internal e- conversion flag 1
|
||||
Store e- internal conversion data 0
|
||||
Electron internal conversion ID 0
|
||||
Electron internal conversion ID 2
|
||||
Correlated gamma emission flag 0
|
||||
Max 2J for sampling of angular correlations 10
|
||||
Upload data before 1st event for Z < 9
|
||||
=======================================================================
|
||||
|
||||
========= Table of registered couples ==============================
|
||||
========= Table of registered couples ============================
|
||||
|
||||
Index : 0 used in the geometry : Yes
|
||||
Material : G4_Galactic
|
||||
@@ -790,7 +812,7 @@ Index : 1 used in the geometry : Yes
|
||||
Region(s) which use this couple :
|
||||
DefaultRegionForTheWorld
|
||||
|
||||
====================================================================
|
||||
==================================================================
|
||||
|
||||
G4VisManager: Using G4TrajectoryDrawByCharge as fallback trajectory model.
|
||||
See commands in /vis/modeling/trajectories/ for other options.
|
||||
@@ -810,28 +832,28 @@ See commands in /vis/modeling/trajectories/ for other options.
|
||||
Run terminated.
|
||||
Run Summary
|
||||
Number of events processed : 100
|
||||
User=0.120000s Real=0.144003s Sys=0.010000s
|
||||
User=0.180000s Real=0.210899s Sys=0.010000s
|
||||
RunAction: End of run action is starting
|
||||
HistoManager: End of run actions are started
|
||||
========================================================
|
||||
Beam particle S32
|
||||
Beam Energy(GeV) 200
|
||||
Number of events 100
|
||||
Average energy deposit (GeV) 6.915 RMS(GeV) 4.023
|
||||
Average number of steps 59.38
|
||||
Average number of gamma 0.78
|
||||
Average energy deposit (GeV) 6.353 RMS(GeV) 4.036
|
||||
Average number of steps 54.7
|
||||
Average number of gamma 0.97
|
||||
Average number of e- 0
|
||||
Average number of e+ 0
|
||||
Average number of neutrons 10.87
|
||||
Average number of protons 11.33
|
||||
Average number of neutrons 11.42
|
||||
Average number of protons 12.73
|
||||
Average number of antiprotons 0
|
||||
Average number of pi+ & pi- 6.57
|
||||
Average number of pi0 3.31
|
||||
Average number of kaons 0.06
|
||||
Average number of pi+ & pi- 8.11
|
||||
Average number of pi0 3.87
|
||||
Average number of kaons 0.12
|
||||
Average number of muons 0
|
||||
Average number of deuterons+tritons 2.91
|
||||
Average number of He3+alpha 1.01
|
||||
Average number of ions 1.1
|
||||
Average number of deuterons+tritons 2.76
|
||||
Average number of He3+alpha 1.17
|
||||
Average number of ions 1.11
|
||||
========================================================
|
||||
|
||||
Graphics systems deleted.
|
||||
@@ -839,6 +861,6 @@ Visualization Manager deleting...
|
||||
G4 kernel has come to Quit state.
|
||||
================== Deleting memory pools ===================
|
||||
Number of memory pools allocated: 12 of which, static: 0
|
||||
Dynamic pools deleted: 12 / Total memory freed: 0.088 MB
|
||||
Dynamic pools deleted: 12 / Total memory freed: 0.087 MB
|
||||
============================================================
|
||||
RunManagerKernel is deleted. Good bye :)
|
||||
|
||||
@@ -54,6 +54,7 @@
|
||||
#include "G4NeutronBuilder.hh"
|
||||
#include "HIJINGNeutronBuilder.hh"
|
||||
|
||||
#include "G4HyperonBuilder.hh"
|
||||
#include "G4HyperonFTFPBuilder.hh"
|
||||
|
||||
#include "G4AntiBarionBuilder.hh"
|
||||
@@ -84,7 +85,8 @@ class HadronPhysicsHIJING : public G4VPhysicsConstructor
|
||||
G4ProtonBuilder * fPro;
|
||||
HIJINGProtonBuilder * fHIJINGPro;
|
||||
|
||||
G4HyperonFTFPBuilder * fHyperon;
|
||||
G4HyperonBuilder * fHyperon;
|
||||
G4HyperonFTFPBuilder * fFTFPHyperon;
|
||||
|
||||
G4AntiBarionBuilder * fAntiBaryon;
|
||||
HIJINGAntiBarionBuilder * fHIJINGAntiBaryon;
|
||||
|
||||
@@ -52,6 +52,7 @@
|
||||
#include "G4NeutronBuilder.hh"
|
||||
#include "UrQMDNeutronBuilder.hh"
|
||||
|
||||
#include "G4HyperonBuilder.hh"
|
||||
#include "G4HyperonFTFPBuilder.hh"
|
||||
|
||||
#include "G4AntiBarionBuilder.hh"
|
||||
@@ -81,7 +82,8 @@ private:
|
||||
G4ProtonBuilder * fPro;
|
||||
UrQMDProtonBuilder * fUrQMDPro;
|
||||
|
||||
G4HyperonFTFPBuilder * fHyperon;
|
||||
G4HyperonBuilder * fHyperon;
|
||||
G4HyperonFTFPBuilder * fFTFPHyperon;
|
||||
|
||||
G4AntiBarionBuilder * fAntiBaryon;
|
||||
UrQMDAntiBarionBuilder * fUrQMDAntiBaryon;
|
||||
|
||||
@@ -58,6 +58,7 @@
|
||||
#include "G4FTFPNeutronBuilder.hh"
|
||||
#include "CRMCNeutronBuilder.hh"
|
||||
#include "G4BertiniNeutronBuilder.hh"
|
||||
#include "G4HyperonBuilder.hh"
|
||||
#include "G4HyperonFTFPBuilder.hh"
|
||||
#include "G4AntiBarionBuilder.hh"
|
||||
#include "G4FTFPAntiBarionBuilder.hh"
|
||||
@@ -218,9 +219,12 @@ void HadronPhysicsCRMC_FTFP_BERT::Kaon() {
|
||||
|
||||
void HadronPhysicsCRMC_FTFP_BERT::Others() {
|
||||
// Hyperons
|
||||
auto hyp = new G4HyperonBuilder;
|
||||
AddBuilder( hyp );
|
||||
auto ftfp_hyp = new G4HyperonFTFPBuilder;
|
||||
AddBuilder( ftfp_hyp );
|
||||
ftfp_hyp->Build();
|
||||
hyp->RegisterMe( ftfp_hyp );
|
||||
hyp->Build();
|
||||
// Anti-baryons
|
||||
auto abar = new G4AntiBarionBuilder;
|
||||
AddBuilder( abar );
|
||||
|
||||
@@ -87,6 +87,7 @@ HadronPhysicsHIJING::HadronPhysicsHIJING(G4int)
|
||||
fPro = 0;
|
||||
fHIJINGPro = 0;
|
||||
fHyperon = 0;
|
||||
fFTFPHyperon = 0;
|
||||
fAntiBaryon = 0;
|
||||
fHIJINGAntiBaryon = 0;
|
||||
fCHIPSInelastic = 0;
|
||||
@@ -143,8 +144,10 @@ void HadronPhysicsHIJING::CreateModels()
|
||||
BertiniPiK->SetMaxEnergy(maxBERT);
|
||||
|
||||
//For Hyperons use FTF model
|
||||
fHyperon=new G4HyperonFTFPBuilder;
|
||||
|
||||
fHyperon=new G4HyperonBuilder;
|
||||
fFTFPHyperon=new G4HyperonFTFPBuilder;
|
||||
fHyperon->RegisterMe( fFTFPHyperon );
|
||||
|
||||
fAntiBaryon=new G4AntiBarionBuilder;
|
||||
//FTFPAntiBaryon=new G4FTFPAntiBarionBuilder(quasiElasFTF);
|
||||
G4FTFPAntiBarionBuilder* FTFPAB = new G4FTFPAntiBarionBuilder(quasiElasFTF);
|
||||
@@ -165,6 +168,7 @@ HadronPhysicsHIJING::~HadronPhysicsHIJING()
|
||||
delete fHIJINGPro;
|
||||
|
||||
delete fHyperon;
|
||||
delete fFTFPHyperon;
|
||||
delete fAntiBaryon;
|
||||
delete fHIJINGAntiBaryon;
|
||||
|
||||
|
||||
@@ -72,6 +72,7 @@ HadronPhysicsUrQMD::HadronPhysicsUrQMD(G4int)
|
||||
fPro = 0;
|
||||
fUrQMDPro = 0;
|
||||
fHyperon = 0;
|
||||
fFTFPHyperon = 0;
|
||||
fAntiBaryon = 0;
|
||||
}
|
||||
|
||||
@@ -92,8 +93,10 @@ void HadronPhysicsUrQMD::CreateModels()
|
||||
fPiK->RegisterMe(fUrQMDPiK);
|
||||
|
||||
//For Hyperons use FTF model
|
||||
fHyperon=new G4HyperonFTFPBuilder;
|
||||
|
||||
fHyperon=new G4HyperonBuilder;
|
||||
fFTFPHyperon=new G4HyperonFTFPBuilder;
|
||||
fHyperon->RegisterMe( fFTFPHyperon );
|
||||
|
||||
fAntiBaryon=new G4AntiBarionBuilder;
|
||||
fUrQMDAntiBaryon=new UrQMDAntiBarionBuilder();
|
||||
fAntiBaryon->RegisterMe( fUrQMDAntiBaryon );
|
||||
@@ -113,6 +116,7 @@ HadronPhysicsUrQMD::~HadronPhysicsUrQMD()
|
||||
delete fUrQMDPro;
|
||||
|
||||
delete fHyperon;
|
||||
delete fFTFPHyperon;
|
||||
delete fAntiBaryon;
|
||||
delete fUrQMDAntiBaryon;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user