Import Geant4 10.5.0 source tree

Author: gcosmo

CMakeLists.txt

@@ -3,7 +3,6 @@
 #
 # 21st September 2010 Ben Morgan
 #
-# $Id: CMakeLists.txt 110849 2018-06-20 06:36:08Z gcosmo $
 #
 
 #-----------------------------------------------------------------------

ReleaseNotes/Beta4.10.5-1.txt

@@ -58,8 +58,6 @@
   o G4LindhardSorensenIonModel, G4LindhardSorensenData: new relativistic ion 
     ionisation model.
   o Introduced switch in cross-sections to allow transuranic elements.
-  o Implemented simple algorithm in visualization to allow colouring of
-    detector elements based on materials density.
   o Removed unnecessary checks of process manager for generic ion and muonic
     atom in G4SteppingManager.
   o Implemented simple algorithm in visualization to allow colouring of
@@ -840,8 +838,6 @@ List of features and fixes included in this Beta release since 10.4.p02:
       o Removed obsloete class PhysListEmStandardSSM.
       o PhysicsList: make Opt4 default, removed local instantiation of G4Decay.
       o Corrected input macros to optimise output.
-    + extended/electromagnetic/TestEm5
-      o Corrected input macros to optimise output.
     + extended/electromagnetic/TestEm7
       o SteppingAction: added edep at end of step for photo-electric.
       o Fixed compilation warning on gcc-8.1.0.

ReleaseNotes/ReleaseNotes4.10.5.html

@@ -1,4 +1,3 @@
-cvs log $Id: History,v 1.3 2010-12-03 17:58:51 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -31,6 +30,53 @@ add this in the documentation for the changed file as [BUGFIX #BUGNUMBER].
 
      ----------------------------------------------------------
 
+5th November 2018 - Gunter Folger  (cmake-V10-04-27)
+- Switch to G4PARTICLEXS 1.1
+
+5th November 2018 - Gunter Folger  (cmake-V10-04-26)
+- Modules/Geant4DatasetDefinitions.cmake:
+   remove entry for G4NEUTRONXS 
+
+2nd November 2018 - Gunter Folger  (cmake-V10-04-25)
+- Modules/Geant4DatasetDefinitions.cmake: 
+   Add new  G4PARTICLEXS data set; this replaces G4NEUTRONXS
+- fix dates of two entries below; was wrong, not even a typo   
+
+29th October 2018 - Gunter Folger  (cmake-V10-04-24)
+- Switch to new dataset RadioactiveDecay5.3
+
+29th October 2018 - Gunter Folger  (cmake-V10-04-23)
+- Switch to new dataset PhotonEvaporation5.3
+
+18th October 2018 - Ben Morgan (cmake-V10-04-22)
+- Modules/Geant4InstallData.cmake: Use https for URL
+- Templates/geant4-config.in: Add -L flag to curl to follow redirects
+  when accessing dataset url
+
+28th September 2018  - Gabriele Cosmo (cmake-V10-04-21)
+- Modules/Geant4MakeRules_cxx.cmake: added -DGL_SILENCE_DEPRECATION
+  to CMAKE_CXX_FLAGS_INIT for clang to silence GL deprecation compilation
+  warnings on MacOS 10.14 Mojave.
+
+19th September 2018  - Gunter Folger (cmake-V10-04-20)
+- Switch to G4SAIDDATA2.0
+
+17th September 2018  - Gunter Folger (cmake-V10-04-19)
+- Switch to G4EMLOW7.7
+
+22nd August 2018 - Gabriele Cosmo (cmake-V10-04-18)
+- Updated FindInventor.cmake to properly setup SoQt if existing.
+- Geant4InterfaceOptions.cmake: added check for existance of SoQt package.
+
+9th August 2018  - Gunter Folger (cmake-V10-04-17)
+- Switch to G4EMLOW7.6
+
+3rd August 2018  - Gunter Folger (cmake-V10-04-16)
+- Add new dataset for INCL, G4INCL1.0
+
+4th July 2018  - Gunter Folger (cmake-V10-04-15)
+- Switch to G4EMLOW7.5
+
 19th June 2018 - Gunter Folger (cmake-V10-04-14)
 - Templates/geant4_validate_sources.cmake.in, revert addition of .c and .h
   Skip checking sources for zlib

cmake/History

@@ -213,24 +213,48 @@ if(UNIX)
     PATHS ${INVENTOR_LIB_SEARCH_PATH}
     )
 
-  # try to find SoXt debug lib (priority paths)
-  #FIND_LIBRARY(INVENTOR_SOXT_LIBRARY_DEBUG
-  #  NAMES soxt1d
-  #  PATHS ${SOXT_PREFIX}/lib
-  #  $ENV{COINDIR}/lib
-  #  NO_DEFAULT_PATH
-  #  )
-
-  # try to find SoXt debug lib (regular paths)
-  #FIND_LIBRARY(INVENTOR_SOXT_LIBRARY_DEBUG
-  #  NAMES soxt1d
-  #  PATHS ${INVENTOR_LIB_SEARCH_PATH}
-  #  )
-
-  # SoXt debug library defaults to non-debug lib
-  #IF(NOT INVENTOR_SOXT_LIBRARY_DEBUG)
-  #  IF(INVENTOR_SOXT_LIBRARY)
-  #    SET(INVENTOR_SOXT_LIBRARY_DEBUG INVENTOR_SOXT_LIBRARY)
-  #  ENDIF(INVENTOR_SOXT_LIBRARY)
-  #ENDIF(NOT INVENTOR_SOXT_LIBRARY_DEBUG)
+  #
+  #  SoQt
+  #
+  #  notes:
+  #  - SoQt is detected by soqt-config script (as expected by
+  #    Coin's SoQt on Linux/Unix) and on standard system locations
+  #
+
+  # soqt-config tells much of SoQt installation (if present)
+  execute_process (COMMAND soqt-config --prefix
+    OUTPUT_VARIABLE SOQT_PREFIX
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  # try to find Inventor includes (priority paths from coin-config and COINDIR)
+  FIND_PATH(INVENTOR_SOQT_INCLUDE_DIR Inventor/Qt/SoQt.h
+    ${SOQT_PREFIX}/include
+    $ENV{COINDIR}/include
+    NO_DEFAULT_PATH
+  )
+
+  # try to find Inventor includes (system paths)
+  FIND_PATH(INVENTOR_SOQT_INCLUDE_DIR Inventor/Qt/SoQt.h
+    /usr/local/include
+    /usr/include
+    /sw/include
+    /opt/local/include
+    /opt/csw/include
+    /opt/include
+  )
+
+  # try to find SoQt lib (priority paths)
+  FIND_LIBRARY(INVENTOR_SOQT_LIBRARY
+    NAMES soqt1 SoQt
+    PATHS ${SOQT_PREFIX}/lib
+    $ENV{COINDIR}/lib
+    NO_DEFAULT_PATH
+    )
+
+  # try to find SoQt lib (regular paths)
+  FIND_LIBRARY(INVENTOR_SOQT_LIBRARY
+    NAMES soqt1 SoQt
+    PATHS ${INVENTOR_LIB_SEARCH_PATH}
+    )
+
 endif()

cmake/Modules/FindInventor.cmake

@@ -197,8 +197,6 @@ endif()
 # Smart pointers are a library implementation feature
 # Hashed containers are a library implementation feature
 # Random numbers are a library implementation feature?
-# - Thread local? Yes, though on AppleClang platforms, see this:
-  #http://stackoverflow.com/questions/28094794/why-does-apple-clang-disallow-c11-thread-local-when-official-clang-supports
 # An example of where a workaround is needed
 # Rest of concurrency a library implementation feature
 

cmake/Modules/G4BuildSettings.cmake

@@ -18,41 +18,41 @@ geant4_add_dataset(
 # - Low energy electromagnetics
 geant4_add_dataset(
   NAME      G4EMLOW
-  VERSION   7.4
+  VERSION   7.7
   FILENAME  G4EMLOW
   EXTENSION tar.gz
   ENVVAR    G4LEDATA
-  MD5SUM    a4443411b1a8782640b6eec691e7c25f
+  MD5SUM    0f650ea65c028e862a05293c10ec1089
   )
 
 # - Photon evaporation
 geant4_add_dataset(
   NAME      PhotonEvaporation
-  VERSION   5.2
+  VERSION   5.3
   FILENAME  G4PhotonEvaporation
   EXTENSION tar.gz
   ENVVAR    G4LEVELGAMMADATA
-  MD5SUM    37c5dea9614a07885050350d071a6973
+  MD5SUM    8991682af997e71bdd87f72ee3b3e9ee
   )
 
 # - Radioisotopes
 geant4_add_dataset(
   NAME      RadioactiveDecay
-  VERSION   5.2
+  VERSION   5.3
   FILENAME  G4RadioactiveDecay
   EXTENSION tar.gz
   ENVVAR    G4RADIOACTIVEDATA
-  MD5SUM    e035ed77e12be3a69c2d32806d1b5cde
+  MD5SUM    ce1fe5e4d82d1a2ce89380e5e7e16cc8
   )
 
-# - Neutron XS
+# - Particle XS - replaces Neutron XS
 geant4_add_dataset(
-  NAME      G4NEUTRONXS
-  VERSION   2.0
-  FILENAME  G4NEUTRONXS
+  NAME      G4PARTICLEXS
+  VERSION   1.1
+  FILENAME  G4PARTICLEXS
   EXTENSION tar.gz
-  ENVVAR    G4NEUTRONXSDATA
-  MD5SUM    c3af588c26522f289ec60dcb7c847ade
+  ENVVAR    G4PARTICLEXSDATA
+  MD5SUM    17dc6c6f11db7ca81dea1c2c2b3707d2
   )
 
 # - PII
@@ -78,11 +78,11 @@ geant4_add_dataset(
 # - SAID
 geant4_add_dataset(
   NAME      G4SAIDDATA
-  VERSION   1.1
+  VERSION   2.0
   FILENAME  G4SAIDDATA
   EXTENSION tar.gz
   ENVVAR    G4SAIDXSDATA
-  MD5SUM    d88a31218fdf28455e5c5a3609f7216f
+  MD5SUM    d5d4e9541120c274aeed038c621d39da
   )
 
 # - ABLA
@@ -95,6 +95,17 @@ geant4_add_dataset(
   MD5SUM    180f1f5d937733b207f8d5677f76296e
   )
 
+
+# - INCL
+geant4_add_dataset(
+  NAME      G4INCL
+  VERSION   1.0
+  FILENAME  G4INCL
+  EXTENSION tar.gz
+  ENVVAR    G4INCLDATA
+  MD5SUM    85fe937b6df46d41814f07175d3f5b51
+  )
+
 # - ENSDFSTATE
 geant4_add_dataset(
   NAME      G4ENSDFSTATE

cmake/Modules/Geant4DatasetDefinitions.cmake

@@ -99,7 +99,7 @@
 # retrieving them globally
 #-----------------------------------------------------------------------
 # Geant4 Data Repository
-set(GEANT4_DATASETS_URL "http://cern.ch/geant4-data/datasets")
+set(GEANT4_DATASETS_URL "https://cern.ch/geant4-data/datasets")
 
 # Where to install data in the build tree
 set(GEANT4_BUILD_FULL_DATADIR ${PROJECT_BINARY_DIR}/data)

cmake/Modules/Geant4InstallData.cmake

@@ -52,6 +52,11 @@ if(GEANT4_USE_INVENTOR)
     if(NOT INVENTOR_SOXT_LIBRARY OR NOT INVENTOR_SOXT_INCLUDE_DIR)
       message(FATAL_ERROR "Could not find SoXt library and/or headers")
     endif()
+    if (GEANT4_USE_INVENTOR_QT)
+      if (NOT INVENTOR_SOQT_LIBRARY OR NOT INVENTOR_SOQT_INCLUDE_DIR)
+        message(FATAL_ERROR "Could not find SoQt library and/or headers")
+      endif()
+    endif()
     set(INVENTOR_INCLUDE_DIR "${INVENTOR_INCLUDE_DIR}" "${INVENTOR_SOXT_INCLUDE_DIR}")
     find_package(Motif REQUIRED)
     find_package(X11 REQUIRED)

cmake/Modules/Geant4InterfaceOptions.cmake

@@ -41,9 +41,9 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
   set(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
 
-  # Remove superfluous "unused argument" "warnings" from Clang
+  # Remove superfluous "unused argument" and "GL deprecation" "warnings" from Clang
   if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
-    set(CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS_INIT} -Qunused-arguments")
+    set(CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS_INIT} -Qunused-arguments -DGL_SILENCE_DEPRECATION")
   endif()
 
   # Though it should be the default, always use libc++ with AppleClang