Skip to content

Commit 5824796

Browse files
HaarigerHaraldHaarigerHarald
committed
Update CI and datafiles to Geant4 11.3
1 parent 75d9265 commit 5824796

13 files changed

+720
-808
lines changed

‎.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ on:
88
- main
99

1010
env:
11-
GEANT4_GIT_TAG: v11.2.2
11+
GEANT4_GIT_TAG: v11.3.0
1212
GEANT4_SOURCE_DIR: geant4_source
1313
GEANT4_BUILD_DIR: geant4_build
1414
GEANT4_INSTALL_DIR: geant4_install
1515

16-
XERCES_C_GIT_REF: cd34018a9585fb74044f3773d3e3233454808b75
16+
XERCES_C_GIT_REF: 53c0401812bfe5523594c1180f5ac7c758a2eaf7
1717
XERCES_C_SOURCE_DIR: xerces-c_source
1818
XERCES_C_BUILD_DIR: xerces-c_build
1919
XERCES_C_INSTALL_DIR: xerces-c_install

‎.github/workflows/wheels.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ on:
77
- published
88

99
env:
10-
GEANT4_GIT_TAG: v11.2.2
10+
GEANT4_GIT_TAG: v11.3.0
1111
GEANT4_SOURCE_DIR: geant4_source
1212
GEANT4_BUILD_DIR: geant4_build
1313
GEANT4_INSTALL_DIR: geant4_install
1414

15-
XERCES_C_GIT_REF: cd34018a9585fb74044f3773d3e3233454808b75
15+
XERCES_C_GIT_REF: 53c0401812bfe5523594c1180f5ac7c758a2eaf7
1616
XERCES_C_SOURCE_DIR: xerces-c_source
1717
XERCES_C_BUILD_DIR: xerces-c_build
1818
XERCES_C_INSTALL_DIR: xerces-c_install

‎examples/B1/exampleB1.out

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Forcing G4RunManager type...
22

33
**************************************************************
4-
Geant4 version Name: geant4-11-02-patch-02 [MT] (21-June-2024)
4+
Geant4 version Name: geant4-11-03 [MT] (6-December-2024)
55
Copyright : Geant4 Collaboration
66
References : NIM A 506 (2003), 250-303
77
: IEEE-TNS 53 (2006), 270-278
@@ -10,6 +10,8 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
1010
**************************************************************
1111

1212
<<< Reference Physics List QBBC
13+
Accumulable registered as "accumulable_0"
14+
Accumulable registered as "accumulable_1"
1315
Visualization Manager instantiating with verbosity "warnings (3)"...
1416
Visualization Manager initialising...
1517
Registering graphics systems...
@@ -22,12 +24,17 @@ Registered graphics systems are:
2224
RayTracer (RayTracer)
2325
VRML2FILE (VRML2FILE)
2426
gMocrenFile (gMocrenFile)
25-
TOOLSSG_OFFSCREEN (TSG_OFFSCREEN)
2627
TOOLSSG_OFFSCREEN (TSG_OFFSCREEN, TSG_FILE, TSG)
27-
Default graphics system is: TSG_OFFSCREEN (based on batch session).
28-
Default window size hint is: 600x600-0+0 (based on G4VisManager initialisation).
29-
Note: Parameters specified on the command line will override these defaults.
30-
Use "vis/open" without parameters to get these defaults.
28+
You may choose a graphics system (driver) with a parameter of
29+
the command "/vis/open" or "/vis/sceneHandler/create",
30+
or you may omit the driver parameter and choose at run time:
31+
- by argument in the construction of G4VisExecutive;
32+
- by environment variable "G4VIS_DEFAULT_DRIVER";
33+
- by entry in "~/.g4session";
34+
- by build flags.
35+
- Note: This feature is not allowed in batch mode.
36+
For further information see "examples/basic/B1/exampleB1.cc"
37+
and "vis.mac".
3138

3239
Registering model factories...
3340

@@ -88,10 +95,13 @@ Bremsstrahlung energy threshold above which
8895
primary e+- is added to the list of secondary 100 TeV
8996
Bremsstrahlung energy threshold above which primary
9097
muon/hadron is added to the list of secondary 100 TeV
98+
Positron annihilation at rest model SimplePositronium
99+
Enable 3 gamma annihilation on fly 0
91100
Lowest triplet kinetic energy 1 MeV
92101
Enable sampling of gamma linear polarisation 0
93102
5D gamma conversion model type 0
94103
5D gamma conversion model on isolated ion 0
104+
Use Ricardo-Gerardo pair production model 0
95105
Livermore data directory epics_2017
96106
=======================================================================
97107
====== Ionisation Parameters ========
@@ -210,7 +220,7 @@ eBrem: for e+ XStype:4 SubType=3
210220
eBremSB : Emin= 0 eV Emax= 1 GeV ModifiedTsai
211221
eBremLPM : Emin= 1 GeV Emax= 100 TeV ModifiedTsai
212222

213-
annihil: for e+ XStype:2 SubType=5 BuildTable=0
223+
annihil: for e+ XStype:2 SubType=5 AtRestModel:Simple BuildTable=0
214224
===== EM models for the G4Region DefaultRegionForTheWorld ======
215225
eplus2gg : Emin= 0 eV Emax= 100 TeV
216226

@@ -262,7 +272,7 @@ ionIoni: for GenericIon XStype:3 SubType=2
262272
Lambda tables from threshold to 100 TeV, 7 bins/decade, spline: 1
263273
StepFunction=(0.2, 0.1 mm), integ: 3, fluct: 1, linLossLim= 0.02
264274
===== EM models for the G4Region DefaultRegionForTheWorld ======
265-
BraggIon : Emin= 0 eV Emax= 2 MeV
275+
Bragg : Emin= 0 eV Emax= 2 MeV
266276
BetheBloch : Emin= 2 MeV Emax= 100 TeV
267277

268278
msc: for alpha SubType= 10
@@ -537,7 +547,7 @@ CoulombScat: for pi- XStype:1 SubType=1 BuildTable=1
537547
Process: He3Inelastic
538548
Model: Binary Light Ion Cascade: 0 eV /n ---> 6 GeV/n
539549
Model: FTFP: 3 GeV/n ---> 100 TeV/n
540-
Cr_sctns: G4ParticleInelasticXS: 0 eV ---> 25.6 PeV
550+
Cr_sctns: He3ParticleXS: 0 eV ---> 25.6 PeV
541551
-----------------------------------------------------------------------
542552
Hadronic Processes for alpha
543553
Process: hadElastic
@@ -546,7 +556,7 @@ CoulombScat: for pi- XStype:1 SubType=1 BuildTable=1
546556
Process: alphaInelastic
547557
Model: Binary Light Ion Cascade: 0 eV /n ---> 6 GeV/n
548558
Model: FTFP: 3 GeV/n ---> 100 TeV/n
549-
Cr_sctns: G4ParticleInelasticXS: 0 eV ---> 25.6 PeV
559+
Cr_sctns: alphaParticleXS: 0 eV ---> 25.6 PeV
550560
-----------------------------------------------------------------------
551561
Hadronic Processes for anti_He3
552562
Process: hadElastic
@@ -627,7 +637,7 @@ CoulombScat: for pi- XStype:1 SubType=1 BuildTable=1
627637
Process: dInelastic
628638
Model: Binary Light Ion Cascade: 0 eV /n ---> 6 GeV/n
629639
Model: FTFP: 3 GeV/n ---> 100 TeV/n
630-
Cr_sctns: G4ParticleInelasticXS: 0 eV ---> 100 TeV
640+
Cr_sctns: deuteronParticleXS: 0 eV ---> 100 TeV
631641
-----------------------------------------------------------------------
632642
Hadronic Processes for e+
633643
Process: positronNuclear
@@ -727,7 +737,7 @@ CoulombScat: for pi- XStype:1 SubType=1 BuildTable=1
727737
Model: FTFP: 3 GeV ---> 100 TeV
728738
Model: BertiniCascade: 1 GeV ---> 6 GeV
729739
Model: Binary Cascade: 0 eV ---> 1.5 GeV
730-
Cr_sctns: G4ParticleInelasticXS: 0 eV ---> 100 TeV
740+
Cr_sctns: protonParticleXS: 0 eV ---> 100 TeV
731741
-----------------------------------------------------------------------
732742
Hadronic Processes for sigma-
733743
Process: hadElastic
@@ -746,11 +756,11 @@ CoulombScat: for pi- XStype:1 SubType=1 BuildTable=1
746756
Process: tInelastic
747757
Model: Binary Light Ion Cascade: 0 eV /n ---> 6 GeV/n
748758
Model: FTFP: 3 GeV/n ---> 100 TeV/n
749-
Cr_sctns: G4ParticleInelasticXS: 0 eV ---> 25.6 PeV
759+
Cr_sctns: tritonParticleXS: 0 eV ---> 25.6 PeV
750760
=======================================================================
751761
====== Geant4 Native Pre-compound Model Parameters ========
752762
=======================================================================
753-
Type of pre-compound inverse x-section 3
763+
Type of pre-compound inverse x-section 1
754764
Pre-compound model active 1
755765
Pre-compound excitation low energy 100 keV
756766
Pre-compound excitation high energy 30 MeV
@@ -771,16 +781,14 @@ Min energy per nucleon for multifragmentation 200 GeV
771781
Limit excitation energy for Fermi BreakUp 20 MeV
772782
Level density (1/MeV) 0.075
773783
Use simple level density model 1
774-
Use discrete excitation energy of the residual 1
784+
Use discrete excitation energy of the residual 0
775785
Time limit for long lived isomeres 1 ns
776786
Isomer production flag 1
777787
Internal e- conversion flag 1
778-
Store e- internal conversion data 0
788+
Store e- internal conversion data 1
779789
Correlated gamma emission flag 0
780790
Max 2J for sampling of angular correlations 10
781791
=======================================================================
782-
G4VisManager: Using G4TrajectoryDrawByCharge as fallback trajectory model.
783-
See commands in /vis/modeling/trajectories/ for other options.
784792
### Run 0 starts.
785793
--> Event 0 starts.
786794
--> Event 100 starts.
@@ -794,7 +802,7 @@ See commands in /vis/modeling/trajectories/ for other options.
794802
--> Event 900 starts.
795803
--------------------End of Global Run-----------------------
796804
The run consists of 1000 gamma(s) of 6 MeV
797-
Cumulated dose per run, in scoring volume: 42.44133 picoGy rms = 3.88774 picoGy
805+
Cumulated dose per run, in scoring volume: 45.54752 picoGy rms = 3.92567 picoGy
798806
------------------------------------------------------------
799807

800808
### Run 1 starts.
@@ -810,7 +818,7 @@ See commands in /vis/modeling/trajectories/ for other options.
810818
--> Event 900 starts.
811819
--------------------End of Global Run-----------------------
812820
The run consists of 1000 proton(s) of 210 MeV
813-
Cumulated dose per run, in scoring volume: 5.05669 nanoGy rms = 147.00913 picoGy
821+
Cumulated dose per run, in scoring volume: 5.02923 nanoGy rms = 146.04576 picoGy
814822
------------------------------------------------------------
815823

816824
Graphics systems deleted.

0 commit comments

Comments
 (0)