Skip to content
Snippets Groups Projects
Commit 8c87fe78 authored by Gabriele Cosmo's avatar Gabriele Cosmo
Browse files

Import Geant4 10.6.1 source tree

parent 5baee230
Branches master
No related tags found
No related merge requests found
Showing
with 16890 additions and 15828 deletions
......@@ -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 0)
set(${PROJECT_NAME}_VERSION_PATCH 1)
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
......
Geant4 10.6 - patch-01 Release Notes
------------------------------------
14 February 2020
List of fixes included in this public patch since the public release 10.6:
o Configuration:
-------------
+ CMake:
o Applied patch to allow compilation on Windows using Clang.
o Quote VECGEOM_COMPILE_DEFINITIONS to avoid incorrect argument errors.
o Fix to prevent errors when a shell is in "set -u" mode.
Addressing problem report #2221.
o No longer create symlinks on Windows; Windows permissions may prevent
creation of symlinks, leading to errors at install time.
o Updated to data-set G4EMLOW-7.9.1.
+ GNUMake:
o Fixed and updated legacy setup for DLL builds on Windows.
o Digits_Hits:
-----------
+ G4ScoringManager, G4VScoreWriter, G4ScoringMessenger: added missing
setter/getter functions.
+ In G4ScoreQuantityMessenger, changed SetDefaultUnit() in trackLength
scorer to SetDefaultValue() to support various unit category.
Addressing problem report #2216.
o Geometry:
--------
+ magneticfield:
o Turn off verbosity flags by default in G4IntegratorDriver,
G4InterpolationDriver and G4MagIntegratorDriver.
+ navigation:
o Avoid looping infinitely by pushing N times with increasing step size.
Addressing problem report #2196.
+ solids/specific:
o Re-established parameterisation mechanism for G4Tet and G4UTet which was
removed by mistake. Addressing problem report #2209.
o Revision of G4Tet, for speed-up and issues detected in unit tests.
Implemented SetVertices(), direct modifier for vertices.
o Revision of G4Ellipsoid, fixing issues with previous implementation,
and 30%-70% speed-up in all main methods.
Also addressing problem report #2206.
o Added protection in G4VFacet header for double definition of global
symbols from Windows Kits code.
o Global:
------
+ Fixed symbol exporting problem in G4coutDestination on Windows; define
'masterG4coutDestination' as normal pointer.
Addressing problem report #2217.
+ Added windefs.hh header, including protections for double definition
of global symbols from Windows Kits code.
+ Updated date and version for 10.6.p01.
o Interfaces:
----------
+ Fixed obsolete URLs in UIQt splash screen.
o Particles
---------
+ Fixed broken if-block in G4DecayTableMessenger.
Addressing problem report #2193.
o Physics Lists
-------------
+ constructors/electromagnetic:
o G4EmModelActivator: fixed configuration of the default EM multiple
scattering on top of any other physics configuration.
Addressing problem report #2106.
+ constructors/gamma_lepto_nuclear
o Fixed reports from Coverity; removed double delete in destructor of
G4LENDBertiniGammaElectroNuclearBuilder.
+ lists:
o LBE: updated cross-sections to avoid crashes caused by the removal of
default Gheisha cross-sections, and to have consistency between elastic
and inelastic cross-sections.
o Processes - Electromagnetic:
---------------------------
+ muons:
o G4MuPairProductionModel: added Store/Retrieve data methods.
Co-works with new data-set G4EMLOW-7.9.1.
+ standard:
o G4BetheHeitler5DModel: added protection against negative argument of
sqrt(), due to precision lost.
+ utils:
o G4EmParameters, G4EmParametersMessenger: added new parameter to enable
read of e+e- production table from file.
Co-works with new data-set G4EMLOW-7.9.1.
o Processes - Hadronic:
--------------------
+ cross_sections:
o G4HadronInelasticDataSet: fixed wrong GHEISHA x-section.
Addressing problem report #2220.
+ management:
o G4HadronicProcess: for charge check assume that all final electrons
come from internal conversion.
+ cascade:
o G4CascadeCheckBalance: fixed outstanding problem of the interface with
native pre-compound model, happening when in the default de-excitation
internal electron conversion gets enabled.
o G4CascadeInterface: fixed memory leak by deleting ltcollider in class
destructor.
o G4CascadeParamMessenger.cc: ensure that Bertini-specific commands get
added to "/process/had/cascade/" UI directory, instead of
"/process/had".
+ models/coherent_elastic:
o G4ElasticHadrNucleusHE: for pi- and Z>1 reuse data structure computed
for pi+ in order to reduce memory and CPU at initialisation; added new
private methods to store/retrieve data tables. Co-works with new
data-set G4EMLOW-7.9.1. Fixed Coverity report.
Switch to parameterized model by cut on kinetic energy and not momentum.
+ models/lend:
o Removed inclusion of amp_math header on Windows as it is not required.
+ models/parton_string/qgsm:
o G4FTFParameters: fixed division by zero (Coverity report) due to wrong
protection.
+ models/radioactive_decay:
o In G4Radioactivation::AddDeexcitationSpectrumForBiasMode(), fixed
memory leak. Addressing problem report #2164.
o G4RadioactiveDecay, G4RadioactiveDecayBase: changed default verbosity
from 0 to 1, and remove G4cerr wherever it occurs and replace it with
G4Exception or G4cout.
Increased verbosity thresholds in order to reduce printout size.
o G4BetaPlusDecay: changed sign of daughterZ argument in
G4BetaDecayCorrections according to problem report #2199.
o Fixed Coverity warnings in G4RadioactiveDecay and
G4RadioactiveDecayBase. Fixed uninitialized data in G4SFDecay.
+ processes:
o G4HadronElasticProcess: removed forgotten try/catch pattern for
target isotope selection.
+ stopping:
o G4MuonicAtomDecay: fixed Coverity warning by addition of G4Exception.
o Visualization:
-------------
+ OpenInventor:
o Added include paths to Inventor to usage requirements on G4OpenInventor.
Inventor does not yet support imported targets, and paths added by
include_directories are now explicitly removed.
Addressing problem report #2215
o Data sets:
---------
+ G4EMLOW-7.9.1:
o Added a new directory mupair for double differential probability
of e+e- pairs produced by muons or hadrons.
o Examples:
--------
+ basic
o Fixed comment for suggested command "/run/numberOfThreads" in macros.
+ extended/hadronic/Hadr01
o HistoManager: fixed FPE happening if check on volume's material
is not vacuum.
----------------------------------------------------------------------------
Technical Notes
---------------
o This patch should be applied on top of release 10.6.
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.p01 are available
through the Geant4 "Download" Web page.
Please refer to the Geant4 User Documentation for further information about
using Geant4.
......@@ -30,6 +30,27 @@ add this in the documentation for the changed file as [BUGFIX #BUGNUMBER].
----------------------------------------------------------
14th February 2020 - Ben Morgan (cmake-V10-05-34)
- No longer create gnumake symlinks on Windows
Windows permissions may prevent creation of symlinks, leading to
errors at install time. As gnumake is no longer supported on
Windows, protect symlink creation with test on host platform.
5th February 2020 - Ben Morgan (cmake-V10-05-33)
- Apply patch from TXCorp to allow compilation on Windows using Clang
4th February 2020 - Ben Morgan (cmake-V10-05-32)
- BUGFIX 2221
Use "${FOO:-}" variable expansion and "-z" test to check for
undefined variables in Bourne Shell scripts. Prevents errors when
shell is in "set -u" mode. Report and patch supplied by Michael Reilly
28th January 2020 - Gunter Folger (cmake-V10-05-31)
- Switch to patched dataset for G4EMLOW 7.9.1
15th January 2020 - Ben Morgan (cmake-V10-05-30)
- Quote VECGEOM_COMPILE_DEFINITIONS to avoid incorrect argument errors
25th November 2019 - Ben Morgan (cmake-V10-05-29)
- Disable configuration of Wt UI/Vis driver due to it no longer
compiling with recent Wt versions
......
......@@ -284,7 +284,7 @@ function(_g4tc_setenv_ifnotset_command TEMPLATE_NAME SHELL_FAMILY VARIABLE_NAME
# Have to make this section verbatim to get correct formatting
set(${TEMPLATE_NAME}
"
if test \"x\$${VARIABLE_NAME}\" = \"x\" ; then
if [ -z \"\$\{${VARIABLE_NAME}-\}\" ] ; then
export ${VARIABLE_NAME}=${VARIABLE_VALUE}
fi
"
......@@ -317,7 +317,7 @@ function(_g4tc_prepend_path TEMPLATE_NAME SHELL_FAMILY PATH_VARIABLE
# We have to make this section verbatim
set(${TEMPLATE_NAME}
"
if test \"x\$${PATH_VARIABLE}\" = \"x\" ; then
if [ -z \"\$\{${PATH_VARIABLE}-\}\" ] ; then
export ${PATH_VARIABLE}=${APPEND_VARIABLE}
else
export ${PATH_VARIABLE}=${APPEND_VARIABLE}:\${${PATH_VARIABLE}}
......@@ -354,7 +354,7 @@ function(_g4tc_append_path TEMPLATE_NAME SHELL_FAMILY PATH_VARIABLE
# We have to make this section verbatim
set(${TEMPLATE_NAME}
"
if test \"x\$${PATH_VARIABLE}\" = \"x\" ; then
if [ -z \"\$\{${PATH_VARIABLE}-\}\" ] ; then
export ${PATH_VARIABLE}=${APPEND_VARIABLE}
else
export ${PATH_VARIABLE}=\${${PATH_VARIABLE}}:${APPEND_VARIABLE}
......@@ -805,14 +805,11 @@ install(DIRECTORY config
PATTERN "scripts/" EXCLUDE
)
# Compatibility softlink to library directory, we do this on all
# platforms, but it does nothing on Windows (well, at least the
# attempted symlink creation does not)
# Take care to quote the path names to avoid issues with spaces
install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E make_directory \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_LIBDIR}/Geant4-${Geant4_VERSION}\")")
install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink .. ${GEANT4_SYSTEM}-${GEANT4_COMPILER} WORKING_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_LIBDIR}/Geant4-${Geant4_VERSION}\")")
# Compatibility softlink to library directory on UNIX only
if(UNIX)
install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E make_directory \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_LIBDIR}/Geant4-${Geant4_VERSION}\")")
install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink .. ${GEANT4_SYSTEM}-${GEANT4_COMPILER} WORKING_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_LIBDIR}/Geant4-${Geant4_VERSION}\")")
endif()
#-----------------------------------------------------------------------
# TEMPORARY
......
......@@ -11,7 +11,7 @@ if(VecGeom_FOUND)
string(REGEX REPLACE "^\-D|;-D" ";" VECGEOM_COMPILE_DEFINITIONS "${VECGEOM_DEFINITIONS}")
set_target_properties(VecGeom::VecGeom PROPERTIES
INTERFACE_COMPILE_DEFINITIONS ${VECGEOM_COMPILE_DEFINITIONS}
INTERFACE_COMPILE_DEFINITIONS "${VECGEOM_COMPILE_DEFINITIONS}"
INTERFACE_INCLUDE_DIRECTORIES "${VECGEOM_INCLUDE_DIRS}"
INTERFACE_LINK_LIBRARIES "${VECGEOM_LIBRARIES}"
IMPORTED_LOCATION "${VECGEOM_LIBRARY}")
......
......@@ -18,11 +18,11 @@ geant4_add_dataset(
# - Low energy electromagnetics
geant4_add_dataset(
NAME G4EMLOW
VERSION 7.9
VERSION 7.9.1
FILENAME G4EMLOW
EXTENSION tar.gz
ENVVAR G4LEDATA
MD5SUM d28a09f0c93243522512cf2a3a733348
MD5SUM 1308dc5d73b5539557e2ec6b96f7e5ef
)
# - Photon evaporation
......
......@@ -11,25 +11,31 @@
# 2) Set the compile flags/features when using CMake < 3.10
#
if(MSVC)
# This seems to indicate CMAKE_C_SIMULATE_ID
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
# Require MSVC that supports standard flags and std::filesystem
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.20)
message(FATAL_ERROR "Geant4 requires MSVC 19.20 (Visual Studio 2019 Version 16.0) or newer")
else()
# Set cxxstd flags on CMake < 3.10
if(CMAKE_VERSION VERSION_LESS 3.10)
# VS 2015 Update 3 and above support language standard level flags,
# with the default and minimum level being C++14.
set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "")
set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "")
set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "")
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "")
set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std:c++14")
set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std:c++14")
set(CMAKE_CXX17_STANDARD_COMPILE_OPTION "-std:c++17")
set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std:c++17")
list(APPEND CMAKE_CXX17_COMPILE_FEATURES cxx_std_17)
set(CMAKE_CXX_COMPILE_FEATURES ${CMAKE_CXX_COMPILE_FEATURES} "${CMAKE_CXX17_COMPILE_FEATURES}")
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.20)
message(FATAL_ERROR "Geant4 requires MSVC 19.20 (Visual Studio 2019 Version 16.0) or newer")
else()
# Set cxxstd flags on CMake < 3.10
if(CMAKE_VERSION VERSION_LESS 3.10)
# VS 2015 Update 3 and above support language standard level flags,
# with the default and minimum level being C++14.
set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "")
set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "")
set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "")
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "")
set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std:c++14")
set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std:c++14")
set(CMAKE_CXX17_STANDARD_COMPILE_OPTION "-std:c++17")
set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std:c++17")
list(APPEND CMAKE_CXX17_COMPILE_FEATURES cxx_std_17)
set(CMAKE_CXX_COMPILE_FEATURES ${CMAKE_CXX_COMPILE_FEATURES} "${CMAKE_CXX17_COMPILE_FEATURES}")
endif()
endif()
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
else()
message(FATAL_ERROR "Geant4 requires Visual Studio or Clang.")
endif()
endif()
......@@ -15,6 +15,9 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
12th Feb 2020 Gabriele Cosmo (config-V10-05-09)
- Fixed and updated setup for DLL builds on Windows.
20th Nov 2019 Gabriele Cosmo (config-V10-05-08)
- interactivity.gmk: added -DQT_NO_DEPRECATED_WARNINGS to Qt compilation
settings, to silence warnings from Qt for use of deprecated features.
......
......@@ -261,10 +261,6 @@ ifdef GLOBALLIBS
LDLIBS2 += -lG4expat
endif
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
LDLIBS2 += -lG4expat
endif
ifdef G4LIB_USE_ZLIB
LDLIBS2 += -lG4zlib
endif
......
......@@ -102,7 +102,7 @@ typedef MEMORY_MAPPED_FILE* PMEMORY_MAPPED_FILE;
using namespace std;
#define MakePtr( cast, ptr, addValue ) (cast)( (DWORD)(ptr) + (DWORD)(addValue))
#define MakePtr( cast, ptr, addValue ) (cast)( (DWORD_PTR)(ptr) + (DWORD_PTR)(addValue))
/////////////////////////////////////////////////////////////////////////////
// CLibSymbolInfo
......
......@@ -12,8 +12,9 @@ ifeq ($(G4SYSTEM),WIN32-VC)
endif
CXXFLAGS += -GR -EHsc -Zm200 -nologo -std:c++17
CXXFLAGS += -D_CONSOLE -D_WIN32 -DOS
CPPFLAGS += -DWIN32 -DXPNET -D_CRT_SECURE_NO_DEPRECATE
CPPFLAGS += -DWIN32 -DXPNET -D_CRT_SECURE_NO_DEPRECATE -D_NO_CRT_STDIO_INLINE
LDFLAGS += -FORCE /NODEFAULTLIB:MSVCRT.dll /STACK:12582912
LOADLIBS += legacy_stdio_definitions.lib
SHEXT := dll
AR := LIB
......@@ -93,15 +94,15 @@ ifeq ($(G4SYSTEM),WIN32-VC)
$(ECHO) "Building lib$(name).exp and lib$(name).lib file ...";\
$(RM) $(G4LIBDIR)/lib$(name).exp;\
$(RM) $(G4LIBDIR)/lib$(name).lib;\
lib.exe /nologo /machine:ix86 /def:$(name).def \
lib.exe /nologo /machine:x64 /def:$(name).def \
/out:$(G4LIBDIR)/lib$(name).lib;\
$(RM) $(G4LIBDIR)/$(name).dll;\
$(ECHO) "Building $(name).dll file ...";\
link.exe /nologo /dll /out:$(G4LIBDIR)/$(name).dll \
link.exe /nologo /machine:x64 /dll /out:$(G4LIBDIR)/$(name).dll \
$(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \
$(LIB_PATH)$(G4LIBDIR) $(GLOBLIBS) \
$(LIB_PATH)$(CLHEP_LIB_DIR) $(CLHEP_LIB) \
$(INTYLIBS) $(GDMLLIBS) $(ANALYSISLIBS) $(UI32LIBS)
$(INTYLIBS) $(GDMLLIBS) $(ANALYSISLIBS) $(UI32LIBS) $(LOADLIBS)
endef
define build-global-shared-lib
@libdir=`(cd $(@D);/bin/pwd)`;\
......@@ -112,14 +113,14 @@ ifeq ($(G4SYSTEM),WIN32-VC)
$(ECHO) "Building lib$(name).exp and lib$(name).lib ...";\
$(RM) $(G4LIBDIR)/lib$(name).exp;\
$(RM) $(G4LIBDIR)/lib$(name).lib;\
lib.exe /nologo /machine:ix86 /def:$(name).def \
lib.exe /nologo /machine:x64 /def:$(name).def \
/out:$(G4LIBDIR)/lib$(name).lib;\
$(RM) $(G4LIBDIR)/$(name).dll;\
$(ECHO) "Building $(name).dll ...";\
link.exe /nologo /dll /out:$(G4LIBDIR)/$(name).dll \
link.exe /nologo /machine:x64 /dll /out:$(G4LIBDIR)/$(name).dll \
$(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \
$(LIB_PATH)$(G4LIBDIR) $(GLOBLIBS) \
$(LIB_PATH)$(CLHEP_LIB_DIR) $(CLHEP_LIB) \
$(INTYLIBS) $(GDMLLIBS) $(ANALYSISLIBS) $(UI32LIBS)
$(INTYLIBS) $(GDMLLIBS) $(ANALYSISLIBS) $(UI32LIBS) $(LOADLIBS)
endef
endif
......@@ -4,7 +4,7 @@
############################################
**************************************************************
Geant4 version Name: geant4-10-06-ref-00 (6-December-2019)
Geant4 version Name: geant4-10-06-patch-01 (14-February-2020)
Copyright : Geant4 Collaboration
References : NIM A 506 (2003), 250-303
: IEEE-TNS 53 (2006), 270-278
......@@ -1278,7 +1278,7 @@ Event 14455
Run terminated.
Run Summary
Number of events processed : 14456, effectively: 10
User=8.780000s Real=9.096388s Sys=0.030000s
User=8.590000s Real=8.667211s Sys=0.010000s
--- Setup acceptances (range | real (trg / mon) | rec (trg / mon / all)):
1 [ 1.0000, 0.8000) | 0.00254453 ( 1 / 393 ) | 0.00000000 ( 0 / 393 / 480 )
......
......@@ -4,7 +4,7 @@
############################################
**************************************************************
Geant4 version Name: geant4-10-06-ref-00 (6-December-2019)
Geant4 version Name: geant4-10-06-patch-01 (14-February-2020)
Copyright : Geant4 Collaboration
References : NIM A 506 (2003), 250-303
: IEEE-TNS 53 (2006), 270-278
......@@ -244,8 +244,8 @@ See commands in /vis/modeling/trajectories/ for other options.
ooo Run 0 starts (global).
--------- Ranlux engine status ---------
Initial seed = 1575548249
float_seed_table[] = 0.636971 0.80368 0.477473 0.77956 0.386704 0.678484 0.893229 0.819829 0.749979 0.779605 0.210427 0.0392667 0.297203 0.429559 0.550057 0.0868152 0.840908 0.125298 0.800472 0.247863 0.0465301 0.967462 0.0514111 0.299733
Initial seed = 1581670685
float_seed_table[] = 0.771425 0.857793 0.786471 0.959849 0.54189 0.251619 0.336965 0.48616 0.231617 0.975826 0.760323 0.680841 0.384682 0.719225 0.266291 0.500768 0.777779 0.245909 0.829786 0.237351 0.567685 0.441431 0.607113 0.0855538
i_lag = 23, j_lag = 9
carry = 0, count24 = 0
luxury = 3 nskip = 199
......@@ -256,7 +256,7 @@ mu- Mono Plane
Run terminated.
Run Summary
Number of events processed : 100
User=1.900000s Real=1.911033s Sys=0.000000s
User=2.090000s Real=2.091367s Sys=0.000000s
### Run 0 (global) ended.
Graphics systems deleted.
Visualization Manager deleting...
......@@ -284,9 +284,9 @@ Pool ID '17G4DynamicParticle', size : 0.025 MB
Pool ID '7G4Track', size : 0.049 MB
Pool ID '18G4TouchableHistory', size : 0.000961 MB
Pool ID '15G4CountedObjectIvE', size : 0.000961 MB
Pool ID '15UltraOpticalHit', size : 0.00385 MB
Pool ID '15UltraOpticalHit', size : 0.000961 MB
Number of memory pools allocated: 12 of which, static: 0
Dynamic pools deleted: 12 / Total memory freed: 0.097 MB
Dynamic pools deleted: 12 / Total memory freed: 0.094 MB
============================================================
G4Allocator objects are deleted.
UImanager deleted.
......
......@@ -4,7 +4,7 @@
############################################
**************************************************************
Geant4 version Name: geant4-10-06-ref-00 (6-December-2019)
Geant4 version Name: geant4-10-06-patch-01 (14-February-2020)
Copyright : Geant4 Collaboration
References : NIM A 506 (2003), 250-303
: IEEE-TNS 53 (2006), 270-278
......@@ -179,7 +179,7 @@ G4GeometryManager::ReportVoxelStats -- Voxel Statistics
Run terminated.
Run Summary
Number of events processed : 10000
User=7.540000s Real=7.561025s Sys=0.000000s
User=7.470000s Real=7.527727s Sys=0.000000s
-------------------------------------------------------------
---> The calorimeter is 9 Modules
......
......@@ -4,7 +4,7 @@
############################################
**************************************************************
Geant4 version Name: geant4-10-06-ref-00 (6-December-2019)
Geant4 version Name: geant4-10-06-patch-01 (14-February-2020)
Copyright : Geant4 Collaboration
References : NIM A 506 (2003), 250-303
: IEEE-TNS 53 (2006), 270-278
......
......@@ -4,7 +4,7 @@
############################################
**************************************************************
Geant4 version Name: geant4-10-06-ref-00 (6-December-2019)
Geant4 version Name: geant4-10-06-patch-01 (14-February-2020)
Copyright : Geant4 Collaboration
References : NIM A 506 (2003), 250-303
: IEEE-TNS 53 (2006), 270-278
......@@ -902,7 +902,7 @@ G4GeometryManager::ReportVoxelStats -- Voxel Statistics
Run terminated.
Run Summary
Number of events processed : 20
User=18.970000s Real=19.354676s Sys=0.030000s
User=19.750000s Real=20.570038s Sys=0.040000s
### Run 0 end.
... write Root file : ccal.root - done
... close Root file : ccal.root - done
......@@ -918,23 +918,23 @@ G4SDManager deleted.
EventManager deleted.
Units table cleared.
TransportationManager deleted.
Total navigation history collections cleaned: 47
Total navigation history collections cleaned: 48
================== Deleting memory pools ===================
Pool ID '20G4NavigationLevelRep', size : 0.0683 MB
Pool ID '20G4NavigationLevelRep', size : 0.0721 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.0702 MB
Pool ID '7G4Track', size : 0.139 MB
Pool ID '17G4DynamicParticle', size : 0.0538 MB
Pool ID '7G4Track', size : 0.108 MB
Pool ID '18G4TouchableHistory', size : 0.00577 MB
Pool ID '15G4CountedObjectIvE', size : 0.000961 MB
Pool ID '17G4ReactionProduct', size : 0.0125 MB
Pool ID '17G4ReactionProduct', size : 0.0135 MB
Pool ID '10G4Fragment', size : 0.00481 MB
Number of memory pools allocated: 13 of which, static: 0
Dynamic pools deleted: 13 / Total memory freed: 0.31 MB
Dynamic pools deleted: 13 / Total memory freed: 0.26 MB
============================================================
G4Allocator objects are deleted.
UImanager deleted.
......
......@@ -4,7 +4,7 @@
############################################
**************************************************************
Geant4 version Name: geant4-10-06-ref-00 (6-December-2019)
Geant4 version Name: geant4-10-06-patch-01 (14-February-2020)
Copyright : Geant4 Collaboration
References : NIM A 506 (2003), 250-303
: IEEE-TNS 53 (2006), 270-278
......@@ -200,4 +200,4 @@ Index : 2 used in the geometry : Yes
---- eRosita event counter: 9000
---- eRosita event counter: 10000
--- Run 00 ends (Number of events = 10000).
User=39.150000s Real=39.511848s Sys=0.010000s
User=37.830000s Real=37.981702s Sys=0.010000s
This diff is collapsed.
This diff is collapsed.
......@@ -4,7 +4,7 @@
############################################
**************************************************************
Geant4 version Name: geant4-10-06-ref-00 (6-December-2019)
Geant4 version Name: geant4-10-06-patch-01 (14-February-2020)
Copyright : Geant4 Collaboration
References : NIM A 506 (2003), 250-303
: IEEE-TNS 53 (2006), 270-278
......@@ -586,17 +586,17 @@ Run 0 starts ...
Run terminated.
Run Summary
Number of events processed : 500
User=5.400000s Real=5.566863s Sys=0.070000s
User=5.280000s Real=5.353012s Sys=0.050000s
... write Csv file : Hadrontherapy_h1_Ekin.csv - done
... write Csv file : Hadrontherapy_h1_Edep.csv - done
... write Csv files : - done
Graphics systems deleted.
Visualization Manager deleting...
The simulation took: 9.47318 s to run (real time)
The simulation took: 9.36765 s to run (real time)
Dose is being written to Dose.out
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.45 MB
Dynamic pools deleted: 12 / Total memory freed: 0.39 MB
============================================================
RunManagerKernel is deleted. Good bye :)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment