Skip to content

Commit

Permalink
Import Geant4 10.6.3 source tree
Browse files Browse the repository at this point in the history
  • Loading branch information
gcosmo committed Nov 6, 2020
1 parent 2d174b7 commit 744cc45
Show file tree
Hide file tree
Showing 213 changed files with 4,428 additions and 2,480 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX
project(Geant4)
set(${PROJECT_NAME}_VERSION_MAJOR 10)
set(${PROJECT_NAME}_VERSION_MINOR 6)
set(${PROJECT_NAME}_VERSION_PATCH 2)
set(${PROJECT_NAME}_VERSION_PATCH 3)
set(${PROJECT_NAME}_VERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}")

# - Prepend our own CMake Modules to the search path
Expand Down
114 changes: 114 additions & 0 deletions ReleaseNotes/Patch4.10.6-3.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@

Geant4 10.6 - patch-03 Release Notes
------------------------------------

6 November 2020

List of fixes included in this public patch since the public release 10.6.p02:

o Analysis:
--------
+ Fixed definition of UI commands in G4AnalysisMessenger (for 2D and
3D histograms).
+ Updated to g4tools 5.0.6:
o Changed usage of Google style fonts.
o Fixed compilation warnings on clang-10.

o Event:
-----
+ Fixed misleading error message in G4SPSPosDistribution.
Addressing problem report #2275.

o Global:
------
+ Re-instate static pointer for 'masterG4coutDestination' in
G4coutDestination with proper symbol exporting on Windows
(necessary for MT builds). Restores trapping of G4cout from
workers in Qt GUI.
+ Updated date and version for 10.6.p03.

o Intercoms:
---------
+ Added StoL() method in G4UImessenger for parsing string to long int.
Addressing problem report #2276.

o Interfaces:
----------
+ Added fix in G4Qt to properly set GL on Windows (see Forum topic #3144).

o Persistency - gdml:
------------------
+ Fixed treatment of loops. Addressing problem report #2273.

o Processes - Hadronic:
--------------------
+ cross_sections:
o G4CrossSectionElastic, G4CrossSectionInelastic: fix for ions and
anti-ions, where the max energy of applicability of the (elastic and
inelastic) cross-sections must scale with the absolute baryonic number;
however, the cross-sections objects are often shared between the
different types of ions (d, t, He3, alpha, and genericIon), therefore
we scale by a large value (256, safely larger than the number of
nucleons of the heaviest nuclides).
+ models/de_excitation:
o G4NuclearLevelData: more safe initialisation of data in MT mode, use
mutex locks only within each method, whithout calls to other methods.
o G4ExcitationHandler: call to G4NuclearLevelData to initialise data for
levels for all elements possibly involved in the geometry.
o G4FermiFragmentsPoolVI: use old interface to nuclear levels.
+ models/particle_hp:
o G4ParticleHPInelastic, G4ParticleHPInelasticData: improved error
message in the case that both G4PARTICLEHPDATA and the related
particle-specific environmental variable (e.g. G4PROTONHPDATA) are
not defined. The recommendation is to define only G4PARTICLEHPDATA.
+ models/parton_string/diffraction:
o G4FTFModel: quasi-elastic is not applied any longer when the target
nucleus has one nucleon and the projectile hadron is not an ion. This
avoids to double count elastic scattering (as reported by NA61/SHINE
in 158 GeV/c proton interactions on liquid hydrogen).
Addressing problem report #2274.
+ models/parton_string/hadronization:
o G4VLongitudinalStringDecay: fix in ProduceOneHadron() method, to remove
an inconsistency in the treatment of low-mass strings with respect to
the method G4QGSMFragmentation::FragmentString(). As consequence of
this inconsistency, interactions with fewer intra-nuclear collisions
were favored, therefore producing fewer secondary hadrons.
o G4QGSMFragmentation : proper exit in the method FragmentString()
when the string mass is below the threshold.
+ models/parton_string/qgsm:
o G4BaryonSplitter: removed inexisting in Geant4 excited hyperon states
(Sigma* and Xi*).

o Run:
---
+ Fix for rndmSaveThisEvent() not properly working in multi-threaded mode.
Addressing problem report #2278.
+ Allow setting of seeds with 'long' values for '/random/setSeeds'
UI command. Addresses problem report #2276.

o Visualization:
-------------
+ Fixed compilation warnings on clang-10 in gMocren and gl2ps.

o Examples:
--------
+ advanced/brachytherapy
o Added missing call to "/run/initialize" in VisualisationMacro.mac.
+ advanced/purging_magnet
+ advanced/STCyclotron
o Fixed README.

----------------------------------------------------------------------------

Technical Notes
---------------

o This patch should be applied on top of release 10.6 or 10.6.p01/p02.
o Technical notes distributed for release 10.6 are also applicable and
valid for this patch.

The code and rebuilt binary libraries for release 10.6.p03 are available
through the Geant4 "Download" Web page.

Please refer to the Geant4 User Documentation for further information about
using Geant4.
46 changes: 23 additions & 23 deletions examples/advanced/ChargeExchangeMC/ChargeExchangeMC.out
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
############################################

**************************************************************
Geant4 version Name: geant4-10-06-patch-02 (29-May-2020)
Geant4 version Name: geant4-10-06-patch-03 (6-November-2020)
Copyright : Geant4 Collaboration
References : NIM A 506 (2003), 250-303
: IEEE-TNS 53 (2006), 270-278
Expand Down Expand Up @@ -510,43 +510,43 @@ CoulombScat: for pi-, integral:1 SubType=1 BuildTable=1
Process: ionInelastic
Model: Binary Light Ion Cascade: 0 eV /n ---> 6 GeV/n
Model: FTFP: 3 GeV/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

---------------------------------------------------
Hadronic Processes for He3

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
Model: FTFP: 3 GeV/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

---------------------------------------------------
Hadronic Processes for alpha

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
Model: FTFP: 3 GeV/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

---------------------------------------------------
Hadronic Processes for anti_He3

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

Expand All @@ -556,11 +556,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

Expand All @@ -570,11 +570,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

Expand All @@ -584,11 +584,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

Expand All @@ -598,11 +598,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

Expand All @@ -612,11 +612,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

Expand All @@ -625,12 +625,12 @@ 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
Model: FTFP: 3 GeV/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

---------------------------------------------------
Hadronic Processes for e+
Expand Down Expand Up @@ -755,12 +755,12 @@ 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: tInelastic
Model: Binary Light Ion Cascade: 0 eV /n ---> 6 GeV/n
Model: FTFP: 3 GeV/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

================================================================
=======================================================================
Expand Down Expand Up @@ -1302,7 +1302,7 @@ Event 14456
Run terminated.
Run Summary
Number of events processed : 14457, effectively: 10
User=9.020000s Real=9.097572s Sys=0.010000s
User=8.700000s Real=8.902433s Sys=0.000000s

--- Setup acceptances (range | real (trg / mon) | rec (trg / mon / all)):
1 [ 1.0000, 0.8000) | 0.00246914 ( 1 / 405 ) | 0.00000000 ( 0 / 405 / 486 )
Expand Down
9 changes: 6 additions & 3 deletions examples/advanced/STCyclotron/History
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
-------------------------------------------------------------------
-------------------------------------------------------------------

=========================================================
Geant4 - radiprotection example
=========================================================
==============================================================
Geant4 - Solid-target cyclotron example
==============================================================

Category History file
---------------------

05.11.2020 - Gunter Folger STCyclotron-V10-05-02
- Update README to recommended environment variable G4PARTCILEHPDATA

19.11.2019 - G. Cosmo tag STCyclotron-V10-05-01
- Fixed compilation warnings for cases of implicit type conversions.

Expand Down
2 changes: 1 addition & 1 deletion examples/advanced/STCyclotron/README
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ http://geant4.web.cern.ch/geant4/support/download.shtml (TENDL1.3)
ftp://gdo-nuclear.ucllnl.org/pub/G4LEND/ (G4 Low Energy Nuclear Data)

In your bashrc file, add the following:
export G4PROTONHPDATA=/PATH_TO_TENDL____OR____ENDF_DATABASE/Proton
export G4PARTICLEHPDATA=/PATH_TO_TENDL____OR____ENDF_DATABASE
export G4NEUTRONHPDATA=/PATHTO_GEANT4_INSTALLATION_FOLDER/share/Geant4-vXX.XX/data/G4NDL4.5
export G4PHP_DO_NOT_ADJUST_FINAL_STATE=1
export G4PHP_MULTIPLICITY_METHOD=Poisson
Expand Down
18 changes: 9 additions & 9 deletions examples/advanced/air_shower/air_shower.out
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
############################################

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

--------- Ranlux engine status ---------
Initial seed = 1590745240
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
Initial seed = 1604571719
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
i_lag = 23, j_lag = 9
carry = 0, count24 = 0
luxury = 3 nskip = 199
Expand All @@ -256,7 +256,7 @@ mu- Mono Plane
Run terminated.
Run Summary
Number of events processed : 100
User=2.460000s Real=2.458819s Sys=0.000000s
User=2.330000s Real=2.394100s Sys=0.000000s
### Run 0 (global) ended.
Graphics systems deleted.
Visualization Manager deleting...
Expand All @@ -271,22 +271,22 @@ G4SDManager deleted.
EventManager deleted.
Units table cleared.
TransportationManager deleted.
Total navigation history collections cleaned: 10
Total navigation history collections cleaned: 9
================== Deleting memory pools ===================
Pool ID '20G4NavigationLevelRep', size : 0.0135 MB
Pool ID '20G4NavigationLevelRep', size : 0.0115 MB
Pool ID '24G4ReferenceCountedHandleIvE', size : 0.000961 MB
Pool ID '7G4Event', size : 0.000961 MB
Pool ID '15G4PrimaryVertex', size : 0.000961 MB
Pool ID '17G4PrimaryParticle', size : 0.000961 MB
Pool ID '15G4HCofThisEvent', size : 0.000961 MB
Pool ID '16G4HitsCollection', size : 0.000961 MB
Pool ID '17G4DynamicParticle', size : 0.025 MB
Pool ID '7G4Track', size : 0.049 MB
Pool ID '7G4Track', size : 0.05 MB
Pool ID '18G4TouchableHistory', size : 0.000961 MB
Pool ID '15G4CountedObjectIvE', size : 0.000961 MB
Pool ID '15UltraOpticalHit', size : 0.00481 MB
Pool ID '15UltraOpticalHit', size : 0.00385 MB
Number of memory pools allocated: 12 of which, static: 0
Dynamic pools deleted: 12 / Total memory freed: 0.1 MB
Dynamic pools deleted: 12 / Total memory freed: 0.098 MB
============================================================
G4Allocator objects are deleted.
UImanager deleted.
Expand Down
4 changes: 2 additions & 2 deletions examples/advanced/amsEcal/run1.out
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
############################################

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

-------------------------------------------------------------
---> The calorimeter is 9 Modules
Expand Down
Loading

0 comments on commit 744cc45

Please sign in to comment.