Import Geant4 10.5.1 source tree

cmake/History

@@ -30,6 +30,11 @@ add this in the documentation for the changed file as [BUGFIX #BUGNUMBER].
 
      ----------------------------------------------------------
 
+21st December 2018 - Makoto Asai (cmake-V10-04-28)
+- Modules/Geant4OptionalComponents.cmake:
+- Template/Geant4Config.cmake.in:
+   Add GEANT4_USE_SMARTSTACK
+
 5th November 2018 - Gunter Folger  (cmake-V10-04-27)
 - Switch to G4PARTICLEXS 1.1
 

cmake/Modules/Geant4OptionalComponents.cmake

@@ -191,6 +191,26 @@ endif()
 
 GEANT4_ADD_FEATURE(GEANT4_USE_GDML "Building Geant4 with GDML support")
 
+#-----------------------------------------------------------------------
+# Optional use of smart stack
+#  With this option, G4StackManager uses G4SmartTrackStack instead of
+# ordinary G4TrackStack as the Urgent stack. G4SmartTrackStack tries to
+# stick to the same kind of particle as the previous track when Pop()
+# is called. This G4SmartTrackStack may provide some performance 
+# improvements in particular for crystal calorimeters in high energy
+# physics experiments. On the other hand, G4SmartTrackStack won't give
+# any benefit for granular geometry or lower energy applications, while
+# it may causes some visible memory footprint increase.
+
+option(GEANT4_USE_SMARTSTACK "Use smart track stack" OFF)
+mark_as_advanced(GEANT4_USE_SMARTSTACK)
+
+if(GEANT4_USE_SMARTSTACK)
+  add_definitions(-DG4_USESMARTSTACK)
+endif()
+
+GEANT4_ADD_FEATURE(GEANT4_USE_SMARTSTACK "Use smart track stack")
+
 #-----------------------------------------------------------------------
 # Optional Support for TiMemory -- cross-language timing and memory
 # easily installed via:
@@ -208,6 +228,7 @@ endif()
 option(GEANT4_USE_TIMEMORY "Build Geant4 with TiMemory support"
     ${_default_use_timemory}
 )
+mark_as_advanced(GEANT4_USE_TIMEMORY)
 
 if(GEANT4_USE_TIMEMORY)
     find_package(TiMemory REQUIRED)

cmake/Templates/Geant4Config.cmake.in

@@ -322,6 +322,13 @@ if(Geant4_gdml_FOUND)
   list(REMOVE_ITEM Geant4_FIND_COMPONENTS gdml)
 endif()
 
+# - Smart track stack
+set(Geant4_use_smartstack_FOUND @GEANT4_USE_SMARTSTACK@)
+if(Geant4_use_smartstack_FOUND)
+  list(REMOVE_ITEM Geant4_FIND_COMPONENTS smartstack)
+  list(APPEND Geant4_DEFINITIONS -DG4_USESMARTSTACK)
+endif()
+
 # - TiMemory
 set(Geant4_timemory_FOUND @GEANT4_USE_TIMEMORY@)
 if(Geant4_timemory_FOUND)