Skip to content

Commit 744cc45

Browse files
gcosmogcosmo
committed
Import Geant4 10.6.3 source tree
1 parent 2d174b7 commit 744cc45

File tree

213 files changed

+4428
-2480
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

213 files changed

+4428
-2480
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX
3232
project(Geant4)
3333
set(${PROJECT_NAME}_VERSION_MAJOR 10)
3434
set(${PROJECT_NAME}_VERSION_MINOR 6)
35-
set(${PROJECT_NAME}_VERSION_PATCH 2)
35+
set(${PROJECT_NAME}_VERSION_PATCH 3)
3636
set(${PROJECT_NAME}_VERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}")
3737

3838
# - Prepend our own CMake Modules to the search path

‎ReleaseNotes/Patch4.10.6-3.txt

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
2+
Geant4 10.6 - patch-03 Release Notes
3+
------------------------------------
4+
5+
6 November 2020
6+
7+
List of fixes included in this public patch since the public release 10.6.p02:
8+
9+
o Analysis:
10+
--------
11+
+ Fixed definition of UI commands in G4AnalysisMessenger (for 2D and
12+
3D histograms).
13+
+ Updated to g4tools 5.0.6:
14+
o Changed usage of Google style fonts.
15+
o Fixed compilation warnings on clang-10.
16+
17+
o Event:
18+
-----
19+
+ Fixed misleading error message in G4SPSPosDistribution.
20+
Addressing problem report #2275.
21+
22+
o Global:
23+
------
24+
+ Re-instate static pointer for 'masterG4coutDestination' in
25+
G4coutDestination with proper symbol exporting on Windows
26+
(necessary for MT builds). Restores trapping of G4cout from
27+
workers in Qt GUI.
28+
+ Updated date and version for 10.6.p03.
29+
30+
o Intercoms:
31+
---------
32+
+ Added StoL() method in G4UImessenger for parsing string to long int.
33+
Addressing problem report #2276.
34+
35+
o Interfaces:
36+
----------
37+
+ Added fix in G4Qt to properly set GL on Windows (see Forum topic #3144).
38+
39+
o Persistency - gdml:
40+
------------------
41+
+ Fixed treatment of loops. Addressing problem report #2273.
42+
43+
o Processes - Hadronic:
44+
--------------------
45+
+ cross_sections:
46+
o G4CrossSectionElastic, G4CrossSectionInelastic: fix for ions and
47+
anti-ions, where the max energy of applicability of the (elastic and
48+
inelastic) cross-sections must scale with the absolute baryonic number;
49+
however, the cross-sections objects are often shared between the
50+
different types of ions (d, t, He3, alpha, and genericIon), therefore
51+
we scale by a large value (256, safely larger than the number of
52+
nucleons of the heaviest nuclides).
53+
+ models/de_excitation:
54+
o G4NuclearLevelData: more safe initialisation of data in MT mode, use
55+
mutex locks only within each method, whithout calls to other methods.
56+
o G4ExcitationHandler: call to G4NuclearLevelData to initialise data for
57+
levels for all elements possibly involved in the geometry.
58+
o G4FermiFragmentsPoolVI: use old interface to nuclear levels.
59+
+ models/particle_hp:
60+
o G4ParticleHPInelastic, G4ParticleHPInelasticData: improved error
61+
message in the case that both G4PARTICLEHPDATA and the related
62+
particle-specific environmental variable (e.g. G4PROTONHPDATA) are
63+
not defined. The recommendation is to define only G4PARTICLEHPDATA.
64+
+ models/parton_string/diffraction:
65+
o G4FTFModel: quasi-elastic is not applied any longer when the target
66+
nucleus has one nucleon and the projectile hadron is not an ion. This
67+
avoids to double count elastic scattering (as reported by NA61/SHINE
68+
in 158 GeV/c proton interactions on liquid hydrogen).
69+
Addressing problem report #2274.
70+
+ models/parton_string/hadronization:
71+
o G4VLongitudinalStringDecay: fix in ProduceOneHadron() method, to remove
72+
an inconsistency in the treatment of low-mass strings with respect to
73+
the method G4QGSMFragmentation::FragmentString(). As consequence of
74+
this inconsistency, interactions with fewer intra-nuclear collisions
75+
were favored, therefore producing fewer secondary hadrons.
76+
o G4QGSMFragmentation : proper exit in the method FragmentString()
77+
when the string mass is below the threshold.
78+
+ models/parton_string/qgsm:
79+
o G4BaryonSplitter: removed inexisting in Geant4 excited hyperon states
80+
(Sigma* and Xi*).
81+
82+
o Run:
83+
---
84+
+ Fix for rndmSaveThisEvent() not properly working in multi-threaded mode.
85+
Addressing problem report #2278.
86+
+ Allow setting of seeds with 'long' values for '/random/setSeeds'
87+
UI command. Addresses problem report #2276.
88+
89+
o Visualization:
90+
-------------
91+
+ Fixed compilation warnings on clang-10 in gMocren and gl2ps.
92+
93+
o Examples:
94+
--------
95+
+ advanced/brachytherapy
96+
o Added missing call to "/run/initialize" in VisualisationMacro.mac.
97+
+ advanced/purging_magnet
98+
+ advanced/STCyclotron
99+
o Fixed README.
100+
101+
----------------------------------------------------------------------------
102+
103+
Technical Notes
104+
---------------
105+
106+
o This patch should be applied on top of release 10.6 or 10.6.p01/p02.
107+
o Technical notes distributed for release 10.6 are also applicable and
108+
valid for this patch.
109+
110+
The code and rebuilt binary libraries for release 10.6.p03 are available
111+
through the Geant4 "Download" Web page.
112+
113+
Please refer to the Geant4 User Documentation for further information about
114+
using Geant4.

‎examples/advanced/ChargeExchangeMC/ChargeExchangeMC.out

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
############################################
55

66
**************************************************************
7-
Geant4 version Name: geant4-10-06-patch-02 (29-May-2020)
7+
Geant4 version Name: geant4-10-06-patch-03 (6-November-2020)
88
Copyright : Geant4 Collaboration
99
References : NIM A 506 (2003), 250-303
1010
: IEEE-TNS 53 (2006), 270-278
@@ -510,43 +510,43 @@ CoulombScat: for pi-, integral:1 SubType=1 BuildTable=1
510510
Process: ionInelastic
511511
Model: Binary Light Ion Cascade: 0 eV /n ---> 6 GeV/n
512512
Model: FTFP: 3 GeV/n ---> 100 TeV/n
513-
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 100 TeV
513+
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 25.6 PeV
514514

515515
---------------------------------------------------
516516
Hadronic Processes for He3
517517

518518
Process: hadElastic
519519
Model: hElasticLHEP: 0 eV /n ---> 100 TeV/n
520-
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 100 TeV
520+
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 25.6 PeV
521521

522522
Process: He3Inelastic
523523
Model: Binary Light Ion Cascade: 0 eV /n ---> 6 GeV/n
524524
Model: FTFP: 3 GeV/n ---> 100 TeV/n
525-
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 100 TeV
525+
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 25.6 PeV
526526

527527
---------------------------------------------------
528528
Hadronic Processes for alpha
529529

530530
Process: hadElastic
531531
Model: hElasticLHEP: 0 eV /n ---> 100 TeV/n
532-
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 100 TeV
532+
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 25.6 PeV
533533

534534
Process: alphaInelastic
535535
Model: Binary Light Ion Cascade: 0 eV /n ---> 6 GeV/n
536536
Model: FTFP: 3 GeV/n ---> 100 TeV/n
537-
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 100 TeV
537+
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 25.6 PeV
538538

539539
---------------------------------------------------
540540
Hadronic Processes for anti_He3
541541

542542
Process: hadElastic
543543
Model: hElasticLHEP: 0 eV /n ---> 100.1 MeV/n
544544
Model: AntiAElastic: 100 MeV/n ---> 100 TeV/n
545-
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
545+
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
546546

547547
Process: anti_He3Inelastic
548548
Model: FTFP: 0 eV /n ---> 100 TeV/n
549-
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
549+
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
550550

551551
Process: hFritiofCaptureAtRest
552552

@@ -556,11 +556,11 @@ CoulombScat: for pi-, integral:1 SubType=1 BuildTable=1
556556
Process: hadElastic
557557
Model: hElasticLHEP: 0 eV /n ---> 100.1 MeV/n
558558
Model: AntiAElastic: 100 MeV/n ---> 100 TeV/n
559-
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
559+
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
560560

561561
Process: anti_alphaInelastic
562562
Model: FTFP: 0 eV /n ---> 100 TeV/n
563-
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
563+
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
564564

565565
Process: hFritiofCaptureAtRest
566566

@@ -570,11 +570,11 @@ CoulombScat: for pi-, integral:1 SubType=1 BuildTable=1
570570
Process: hadElastic
571571
Model: hElasticLHEP: 0 eV /n ---> 100.1 MeV/n
572572
Model: AntiAElastic: 100 MeV/n ---> 100 TeV/n
573-
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
573+
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
574574

575575
Process: anti_deuteronInelastic
576576
Model: FTFP: 0 eV /n ---> 100 TeV/n
577-
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
577+
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
578578

579579
Process: hFritiofCaptureAtRest
580580

@@ -584,11 +584,11 @@ CoulombScat: for pi-, integral:1 SubType=1 BuildTable=1
584584
Process: hadElastic
585585
Model: hElasticLHEP: 0 eV ---> 100.1 MeV
586586
Model: AntiAElastic: 100 MeV ---> 100 TeV
587-
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
587+
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
588588

589589
Process: anti_neutronInelastic
590590
Model: FTFP: 0 eV ---> 100 TeV
591-
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
591+
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
592592

593593
Process: hFritiofCaptureAtRest
594594

@@ -598,11 +598,11 @@ CoulombScat: for pi-, integral:1 SubType=1 BuildTable=1
598598
Process: hadElastic
599599
Model: hElasticLHEP: 0 eV ---> 100.1 MeV
600600
Model: AntiAElastic: 100 MeV ---> 100 TeV
601-
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
601+
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
602602

603603
Process: anti_protonInelastic
604604
Model: FTFP: 0 eV ---> 100 TeV
605-
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
605+
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
606606

607607
Process: hFritiofCaptureAtRest
608608

@@ -612,11 +612,11 @@ CoulombScat: for pi-, integral:1 SubType=1 BuildTable=1
612612
Process: hadElastic
613613
Model: hElasticLHEP: 0 eV /n ---> 100.1 MeV/n
614614
Model: AntiAElastic: 100 MeV/n ---> 100 TeV/n
615-
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
615+
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
616616

617617
Process: anti_tritonInelastic
618618
Model: FTFP: 0 eV /n ---> 100 TeV/n
619-
Cr_sctns: AntiAGlauber: 0 eV ---> 100 TeV
619+
Cr_sctns: AntiAGlauber: 0 eV ---> 25.6 PeV
620620

621621
Process: hFritiofCaptureAtRest
622622

@@ -625,12 +625,12 @@ CoulombScat: for pi-, integral:1 SubType=1 BuildTable=1
625625

626626
Process: hadElastic
627627
Model: hElasticLHEP: 0 eV /n ---> 100 TeV/n
628-
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 100 TeV
628+
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 25.6 PeV
629629

630630
Process: dInelastic
631631
Model: Binary Light Ion Cascade: 0 eV /n ---> 6 GeV/n
632632
Model: FTFP: 3 GeV/n ---> 100 TeV/n
633-
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 100 TeV
633+
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 25.6 PeV
634634

635635
---------------------------------------------------
636636
Hadronic Processes for e+
@@ -755,12 +755,12 @@ CoulombScat: for pi-, integral:1 SubType=1 BuildTable=1
755755

756756
Process: hadElastic
757757
Model: hElasticLHEP: 0 eV /n ---> 100 TeV/n
758-
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 100 TeV
758+
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 25.6 PeV
759759

760760
Process: tInelastic
761761
Model: Binary Light Ion Cascade: 0 eV /n ---> 6 GeV/n
762762
Model: FTFP: 3 GeV/n ---> 100 TeV/n
763-
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 100 TeV
763+
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 25.6 PeV
764764

765765
================================================================
766766
=======================================================================
@@ -1302,7 +1302,7 @@ Event 14456
13021302
Run terminated.
13031303
Run Summary
13041304
Number of events processed : 14457, effectively: 10
1305-
User=9.020000s Real=9.097572s Sys=0.010000s
1305+
User=8.700000s Real=8.902433s Sys=0.000000s
13061306

13071307
--- Setup acceptances (range | real (trg / mon) | rec (trg / mon / all)):
13081308
1 [ 1.0000, 0.8000) | 0.00246914 ( 1 / 405 ) | 0.00000000 ( 0 / 405 / 486 )

‎examples/advanced/STCyclotron/History

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
-------------------------------------------------------------------
22
-------------------------------------------------------------------
33

4-
=========================================================
5-
Geant4 - radiprotection example
6-
=========================================================
4+
==============================================================
5+
Geant4 - Solid-target cyclotron example
6+
==============================================================
77

88
Category History file
99
---------------------
1010

11+
05.11.2020 - Gunter Folger STCyclotron-V10-05-02
12+
- Update README to recommended environment variable G4PARTCILEHPDATA
13+
1114
19.11.2019 - G. Cosmo tag STCyclotron-V10-05-01
1215
- Fixed compilation warnings for cases of implicit type conversions.
1316

‎examples/advanced/STCyclotron/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ http://geant4.web.cern.ch/geant4/support/download.shtml (TENDL1.3)
5050
ftp://gdo-nuclear.ucllnl.org/pub/G4LEND/ (G4 Low Energy Nuclear Data)
5151

5252
In your bashrc file, add the following:
53-
export G4PROTONHPDATA=/PATH_TO_TENDL____OR____ENDF_DATABASE/Proton
53+
export G4PARTICLEHPDATA=/PATH_TO_TENDL____OR____ENDF_DATABASE
5454
export G4NEUTRONHPDATA=/PATHTO_GEANT4_INSTALLATION_FOLDER/share/Geant4-vXX.XX/data/G4NDL4.5
5555
export G4PHP_DO_NOT_ADJUST_FINAL_STATE=1
5656
export G4PHP_MULTIPLICITY_METHOD=Poisson

‎examples/advanced/air_shower/air_shower.out

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
############################################
55

66
**************************************************************
7-
Geant4 version Name: geant4-10-06-patch-02 (29-May-2020)
7+
Geant4 version Name: geant4-10-06-patch-03 (6-November-2020)
88
Copyright : Geant4 Collaboration
99
References : NIM A 506 (2003), 250-303
1010
: IEEE-TNS 53 (2006), 270-278
@@ -244,8 +244,8 @@ See commands in /vis/modeling/trajectories/ for other options.
244244
ooo Run 0 starts (global).
245245

246246
--------- Ranlux engine status ---------
247-
Initial seed = 1590745240
248-
float_seed_table[] = 0.769771 0.683744 0.431496 0.063198 0.981073 0.662218 0.139998 0.0275069 0.809529 0.691412 0.220709 0.553455 0.998968 0.80317 0.0774835 0.496753 0.139411 0.555612 0.271583 0.197803 0.878428 0.535016 0.310122 0.39858
247+
Initial seed = 1604571719
248+
float_seed_table[] = 0.203558 0.356527 0.224403 0.36744 0.753671 0.519655 0.504797 0.975752 0.93197 0.898234 0.141473 0.922045 0.824638 0.214732 0.332988 0.251394 0.316131 0.739038 0.874457 0.706021 0.884224 0.48462 0.666825 0.422042
249249
i_lag = 23, j_lag = 9
250250
carry = 0, count24 = 0
251251
luxury = 3 nskip = 199
@@ -256,7 +256,7 @@ mu- Mono Plane
256256
Run terminated.
257257
Run Summary
258258
Number of events processed : 100
259-
User=2.460000s Real=2.458819s Sys=0.000000s
259+
User=2.330000s Real=2.394100s Sys=0.000000s
260260
### Run 0 (global) ended.
261261
Graphics systems deleted.
262262
Visualization Manager deleting...
@@ -271,22 +271,22 @@ G4SDManager deleted.
271271
EventManager deleted.
272272
Units table cleared.
273273
TransportationManager deleted.
274-
Total navigation history collections cleaned: 10
274+
Total navigation history collections cleaned: 9
275275
================== Deleting memory pools ===================
276-
Pool ID '20G4NavigationLevelRep', size : 0.0135 MB
276+
Pool ID '20G4NavigationLevelRep', size : 0.0115 MB
277277
Pool ID '24G4ReferenceCountedHandleIvE', size : 0.000961 MB
278278
Pool ID '7G4Event', size : 0.000961 MB
279279
Pool ID '15G4PrimaryVertex', size : 0.000961 MB
280280
Pool ID '17G4PrimaryParticle', size : 0.000961 MB
281281
Pool ID '15G4HCofThisEvent', size : 0.000961 MB
282282
Pool ID '16G4HitsCollection', size : 0.000961 MB
283283
Pool ID '17G4DynamicParticle', size : 0.025 MB
284-
Pool ID '7G4Track', size : 0.049 MB
284+
Pool ID '7G4Track', size : 0.05 MB
285285
Pool ID '18G4TouchableHistory', size : 0.000961 MB
286286
Pool ID '15G4CountedObjectIvE', size : 0.000961 MB
287-
Pool ID '15UltraOpticalHit', size : 0.00481 MB
287+
Pool ID '15UltraOpticalHit', size : 0.00385 MB
288288
Number of memory pools allocated: 12 of which, static: 0
289-
Dynamic pools deleted: 12 / Total memory freed: 0.1 MB
289+
Dynamic pools deleted: 12 / Total memory freed: 0.098 MB
290290
============================================================
291291
G4Allocator objects are deleted.
292292
UImanager deleted.

‎examples/advanced/amsEcal/run1.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
############################################
55

66
**************************************************************
7-
Geant4 version Name: geant4-10-06-patch-02 (29-May-2020)
7+
Geant4 version Name: geant4-10-06-patch-03 (6-November-2020)
88
Copyright : Geant4 Collaboration
99
References : NIM A 506 (2003), 250-303
1010
: IEEE-TNS 53 (2006), 270-278
@@ -179,7 +179,7 @@ G4GeometryManager::ReportVoxelStats -- Voxel Statistics
179179
Run terminated.
180180
Run Summary
181181
Number of events processed : 10000
182-
User=7.940000s Real=8.196714s Sys=0.020000s
182+
User=8.250000s Real=8.310056s Sys=0.000000s
183183

184184
-------------------------------------------------------------
185185
---> The calorimeter is 9 Modules

0 commit comments

Comments
 (0)