diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..57a0b01b29618ace350ba83fa0b70724a4cba42b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+/Makefile
+/.cproject
+/.project
+/.settings/
+/InstallArea/
+/build.*/
+/.pydevproject
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71c021c141adc043c5e4e60daa4047580112d95b..d54ae447694ff8da43a7d08e00fe5f5fd25f0ead 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,16 +1,6 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
-set(Geant4_version 4.9.6.p04)
-
-if(DEFINED ENV{G4_NATIVE_VERSION})
- # Override the version of Geant4 from the variable
- set(Geant4_version $ENV{G4_NATIVE_VERSION})
- if(NOT Geant4_version MATCHES "^4\\.")
- # G4_NATIVE_VERSION might not contain the initial '4.' that we need
- # see https://its.cern.ch/jira/browse/LHCBGAUSS-43
- set(Geant4_version 4.${Geant4_version})
- endif()
-endif()
+# NO_NINJA : Geant4 build fails with Ninja
find_package(GaudiProject)
gaudi_project(Geant4 v96r4p3
diff --git a/Geant4/G4FR/.gitignore b/Geant4/G4FR/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..5aa9fd5c4936e9efc21a60b0fbcb82436c45073e
--- /dev/null
+++ b/Geant4/G4FR/.gitignore
@@ -0,0 +1,2 @@
+/FukuiRenderer/
+/G4FR/
diff --git a/Geant4/G4FR/doc/release.notes b/Geant4/G4FR/doc/release.notes
index f48cbe73a1780d27dea1724e486052a024af0125..29dcb0f5a8cde611cbb31ac4ef7b6dd42d71799f 100755
--- a/Geant4/G4FR/doc/release.notes
+++ b/Geant4/G4FR/doc/release.notes
@@ -4,6 +4,9 @@
! Purpose : Build of Fukui Renderer
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!========================== G4FR v4r4 2011-04-12 =============================
! 2011-04-12 - Gloria Corti
- Introduce use of pattern to switch off building this package on winxp
@@ -14,7 +17,7 @@
!========================== G4FR v4r2 2008-09-30 =============================
! 2008-09-30 - Gloria CORTI
- - requirements - Take DAWN and DAVID from the $LCG_external area (latest
+ - requirements - Take DAWN and DAVID from the $LCG_external area (latest
versions) rather then obsolete $SITEROOT/sw/contrib
!========================== G4FR v4r1 2004-08-10 ========================
diff --git a/Geant4/G4GDML/.gitignore b/Geant4/G4GDML/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..1662571d29d95f9509dc9ee00ca5a9b79c3f8309
--- /dev/null
+++ b/Geant4/G4GDML/.gitignore
@@ -0,0 +1,3 @@
+/G4GDML/
+/schema/
+/src/
diff --git a/Geant4/G4GDML/doc/release.notes b/Geant4/G4GDML/doc/release.notes
index 9818b0c0b5ad989f495a272bde2017052be02aee..8afec491c527cad472e580ddac547ed5a000eb53 100644
--- a/Geant4/G4GDML/doc/release.notes
+++ b/Geant4/G4GDML/doc/release.notes
@@ -1,8 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4GDML
-! Responsible :
+! Responsible :
! Purpose : Package holding the GDML code
!-----------------------------------------------------------------------------
+
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
! ======================= G4GDML v2r0 2015-03-06 ========================
! 2015-03-06 - Nigel Watsoncic
diff --git a/Geant4/G4LHCblists/doc/release.notes b/Geant4/G4LHCblists/doc/release.notes
index 9eea2a83135d2e99c5bc9998b38890427da16298..023b2c237684e62ed4e37b5b9ec3459ee0243b5c 100755
--- a/Geant4/G4LHCblists/doc/release.notes
+++ b/Geant4/G4LHCblists/doc/release.notes
@@ -4,15 +4,18 @@
! Purpose : Private LHCb physics lists
!----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!======================== G4LHCblists v3r2 2015-04-30 ========================
! 2015-04-30 - Timothy Williams
- - Replaced G4EmStandardPhysics_option1NoApplyCuts.cc and .hh with v9.6.p04
-of G4EmStandardPhysics_option1.cc and .hh but with the EmProcessOption of "SetApplyCuts"
-removed. Previous version was v9.4 of G4EmStandardPhysics_option1.cc with "SetApplyCuts" removed.
+ - Replaced G4EmStandardPhysics_option1NoApplyCuts.cc and .hh with v9.6.p04
+of G4EmStandardPhysics_option1.cc and .hh but with the EmProcessOption of "SetApplyCuts"
+removed. Previous version was v9.4 of G4EmStandardPhysics_option1.cc with "SetApplyCuts" removed.
!======================== G4LHCblists v3r1 2015-03-07 ========================
! 2015-03-07 - Timothy Williams
- - Modified G4EmStandardPhysics_option1NoApplyCuts.cc to use UrbanMsc93 and
+ - Modified G4EmStandardPhysics_option1NoApplyCuts.cc to use UrbanMsc93 and
WentzelVI models for multiple scattering as suggested by V.Ivanchenko.
!======================== G4LHCblists v3r0 2013-09-16 ========================
@@ -22,7 +25,7 @@ removed. Previous version was v9.4 of G4EmStandardPhysics_option1.cc with "SetA
!======================== G4LHCblists v2r2 2011-10-03 ========================
! 2011-10-03 - Gloria Corti
- - Add new list with suggestion from Matt Reid for improvement of Multiple
+ - Add new list with suggestion from Matt Reid for improvement of Multiple
scattering. It has the same options as the LHCb list.
. G4EmStandardPhysics_LHCbTest.{hh,cc}
@@ -35,7 +38,7 @@ removed. Previous version was v9.4 of G4EmStandardPhysics_option1.cc with "SetA
!======================== G4LHCblists v2r0 2011-07-13 ========================
! 2011-07-13 - Gloria Corti
- - Fix renaming in G4EmStandardPhysics_option1NoApplyCuts.cc
+ - Fix renaming in G4EmStandardPhysics_option1NoApplyCuts.cc
! 2011-07-12 - Gloria Corti
- Remove old physics list, that are obsolete.
@@ -51,4 +54,4 @@ removed. Previous version was v9.4 of G4EmStandardPhysics_option1.cc with "SetA
- New package to hold private LHCb physics lists. It has the QGSP_BERT_HP
list provided by H-P Wellish for low energy neutron studies
-!=============================================================================
\ No newline at end of file
+!=============================================================================
diff --git a/Geant4/G4OpenGL/.gitignore b/Geant4/G4OpenGL/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..21874ad1592b1499b2b37db301321d906e60a9ce
--- /dev/null
+++ b/Geant4/G4OpenGL/.gitignore
@@ -0,0 +1,2 @@
+/G4OpenGL/
+/OpenGL/
diff --git a/Geant4/G4OpenGL/doc/release.notes b/Geant4/G4OpenGL/doc/release.notes
index 9c1c79f4914dc42cf2f4201d800c2672f6a4060d..3b7b42a9635434cb25a6088012b4afd2e765ad1b 100755
--- a/Geant4/G4OpenGL/doc/release.notes
+++ b/Geant4/G4OpenGL/doc/release.notes
@@ -1,9 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4OpenGL
! Responsible : Gloria CORTI
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!======================== G4OpenGL v4r4 2011-06-17 ===========================
! 2011-06-17 - Gloria Corti
- Use new G4external package needed for resolving class G4OpenGL2PSAction at
diff --git a/Geant4/G4RayTracer/.gitignore b/Geant4/G4RayTracer/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..d724bb961e0fe6e9dd5a0079344282ade2f3161a
--- /dev/null
+++ b/Geant4/G4RayTracer/.gitignore
@@ -0,0 +1,2 @@
+/G4RayTracer/
+/RayTracer/
diff --git a/Geant4/G4RayTracer/doc/release.notes b/Geant4/G4RayTracer/doc/release.notes
index 8ad116a0cbdb445019c10c6c219dcf3c703488e8..332b9735fbcc9ea90b83ad7823a9643fabbc383c 100755
--- a/Geant4/G4RayTracer/doc/release.notes
+++ b/Geant4/G4RayTracer/doc/release.notes
@@ -1,9 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4RayTracer
! Responsible : Gloria CORTI, Silvia MIGLIORANZI
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!======================== G4RayTRacer v5r1 2011-07-14 ========================
! 2011-03-02 - Hubert Degaudenzi
- Added ignore properties in svn
diff --git a/Geant4/G4Tree/.gitignore b/Geant4/G4Tree/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..402227dda30192484ab688bf3e92403a94920d40
--- /dev/null
+++ b/Geant4/G4Tree/.gitignore
@@ -0,0 +1,2 @@
+/G4Tree/
+/Tree/
diff --git a/Geant4/G4Tree/doc/release.notes b/Geant4/G4Tree/doc/release.notes
index f2f47f1c9653cfa2d9af3c3977acc7a3d81e3520..6c39a6f318b1ef948e291d828b015476026c35b0 100755
--- a/Geant4/G4Tree/doc/release.notes
+++ b/Geant4/G4Tree/doc/release.notes
@@ -1,9 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4Tree
! Responsible : Gloria CORTI, Silvia MIGLIORANZI
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!========================== G4Tree v4r1p1 2011-07-14 =========================
! 2011-03-02 - Hubert Degaudenzi
- Added ignore properties in svn
diff --git a/Geant4/G4UIGAG/.gitignore b/Geant4/G4UIGAG/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..aa8510502f00bcf65306d93e84bcdf9bfe15edc1
--- /dev/null
+++ b/Geant4/G4UIGAG/.gitignore
@@ -0,0 +1,2 @@
+/G4UIGAG/
+/GAG/
diff --git a/Geant4/G4UIGAG/doc/release.notes b/Geant4/G4UIGAG/doc/release.notes
index 8bc706d884207159de8b317c356b862678ac794b..d5f5b2a3fc86b2e433b42fd1d1beb475d30e2a1c 100755
--- a/Geant4/G4UIGAG/doc/release.notes
+++ b/Geant4/G4UIGAG/doc/release.notes
@@ -1,9 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4UIGAG
! Responsible : Gloria CORTI
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!========================== G4UIGAG v4r3 2015-03-02 ==========================
! 20154-03-06 - Nigel Watson
- For release with 9.6 G4
diff --git a/Geant4/G4UIbasic/.gitignore b/Geant4/G4UIbasic/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..1c9cab1b806e78a7aa88a1ed23619336d5a6c443
--- /dev/null
+++ b/Geant4/G4UIbasic/.gitignore
@@ -0,0 +1,2 @@
+/basic/
+/G4UIbasic/
diff --git a/Geant4/G4UIbasic/doc/release.notes b/Geant4/G4UIbasic/doc/release.notes
index aac8478dfc96dc33c3ebfc079bd8075f15ee43ac..e2d29a6ff8f3984d9c6d333620eef24f6dbf88cd 100755
--- a/Geant4/G4UIbasic/doc/release.notes
+++ b/Geant4/G4UIbasic/doc/release.notes
@@ -1,8 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4UIbasic
! Responsible : Gloria CORTI, Silvia MIGLIORANZI
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!========================== G4UIbasic v4r4 2015-03-06 ========================
! 2015-03-06 - Nigel Watson
- tagged for release with G4 9.6
@@ -19,7 +23,7 @@
!========================== G4UIbasic v4r1 2008-06-25 ========================
! 2008-06-17 - Gloria CORTI
- - Add use of G4run required to solve undefined reference to
+ - Add use of G4run required to solve undefined reference to
`G4RunManager::GetRunManager()' with Geant4 v90r2 (9.0.p02)
!========================== G4UIbasic v4r0 2003-11-03 ========================
diff --git a/Geant4/G4UIcommon/.gitignore b/Geant4/G4UIcommon/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..051bcc29c1e8c632b4da64c48fb2dbf7ea6789e7
--- /dev/null
+++ b/Geant4/G4UIcommon/.gitignore
@@ -0,0 +1,2 @@
+/common/
+/G4UIcommon/
diff --git a/Geant4/G4UIcommon/doc/release.notes b/Geant4/G4UIcommon/doc/release.notes
index 6b941d7237a2e2d76046ffc46d9aa3ead8d4717a..517f1db376af0815186c1cabbe53677fc9424df8 100755
--- a/Geant4/G4UIcommon/doc/release.notes
+++ b/Geant4/G4UIcommon/doc/release.notes
@@ -1,9 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4UIcommon
! Responsible : Gloria CORTI
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!======================== G4UIcommon v5r3 2011-04-12 =========================
! 2011-04-12 - Gloria Corti
- Introduce use of pattern to switch off building this package on MacOS
@@ -14,12 +17,12 @@
!======================== G4UIcommon v5r1 2007-07-04 =========================
! 2007-07-04 - Gloria Corti
- - requirements - redefine X_linkopts for amd64
+ - requirements - redefine X_linkopts for amd64
!=========================== G4UIcommon v5r0 =================================
! 2004-07-07 - Florence RANJARD
- - requirements - on WIN32 append "gdi32.lib user32.lib" to
- G4UIcommon_shlibflags
+ - requirements - on WIN32 append "gdi32.lib user32.lib" to
+ G4UIcommon_shlibflags
!========================== G4UIcommon v4r0 2003-11-03 ========================
! 2003-11-03 - Florence RANJARD
diff --git a/Geant4/G4VRML/.gitignore b/Geant4/G4VRML/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..930fe416e212430c0f980b8f6a8c39b37087ab75
--- /dev/null
+++ b/Geant4/G4VRML/.gitignore
@@ -0,0 +1,2 @@
+/G4VRML/
+/VRML/
diff --git a/Geant4/G4VRML/doc/release.notes b/Geant4/G4VRML/doc/release.notes
index 62b3889d756881171cc5ecba9a596524d9369017..949ca01cdc4382e69263126dc41fe689b1485ffa 100755
--- a/Geant4/G4VRML/doc/release.notes
+++ b/Geant4/G4VRML/doc/release.notes
@@ -1,9 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4VRML
! Responsible : Gloria CORTI
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!============================ G4VRML v4r2 2011-04-12 =========================
! 2011-04-12 - Gloria Corti
- Introduce use of pattern to switch off building this package on winxp
diff --git a/Geant4/G4analysis/.gitignore b/Geant4/G4analysis/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..23bf069377b181daf2899395e7d08cbf4d5e572f
--- /dev/null
+++ b/Geant4/G4analysis/.gitignore
@@ -0,0 +1,2 @@
+/G4analysis/
+/src/
diff --git a/Geant4/G4analysis/doc/release.notes b/Geant4/G4analysis/doc/release.notes
index 29c064a1590307db471eb9c14c84eb1734c15162..ba4debffd784bd5715ff27c7da1f649035ecb587 100644
--- a/Geant4/G4analysis/doc/release.notes
+++ b/Geant4/G4analysis/doc/release.notes
@@ -4,6 +4,9 @@
! Purpose : Definition of analysis used in G4examples
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!===================== Geant4/G4analysis v1r0 2014-07-25 =====================
! 2014-03-06 - James Mccarthy
diff --git a/Geant4/G4config/CMakeLists.txt b/Geant4/G4config/CMakeLists.txt
index c70c6d32c0800211ffc8ba00efc68f273a66449b..27c43cfb739286d60379d12eb752e5728910ade8 100644
--- a/Geant4/G4config/CMakeLists.txt
+++ b/Geant4/G4config/CMakeLists.txt
@@ -21,11 +21,29 @@ else()
set(G4DATA ../share)
endif()
+if(DEFINED ENV{G4_NATIVE_VERSION})
+ set(Geant4_tag $ENV{G4_NATIVE_VERSION})
+ if(NOT Geant4_tag MATCHES "^4\\.")
+ # G4_NATIVE_VERSION might not contain the initial '4.' that we need
+ # see https://its.cern.ch/jira/browse/LHCBGAUSS-43
+ set(Geant4_tag 4.${Geant4_tag})
+ endif()
+ if(NOT Geant4_tag MATCHES "^geant")
+ set(Geant4_tag geant${Geant4_tag})
+ endif()
+else()
+ set(Geant4_tag ${CMAKE_PROJECT_VERSION})
+endif()
+# Special mapping of version HEAD
+if(Geant4_tag STREQUAL "HEAD")
+ set(Geant4_tag master)
+endif()
+
include(ExternalProject)
ExternalProject_Add(Geant4
- URL http://geant4.cern.ch/support/source/geant${Geant4_version}.tar.gz
- PATCH_COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/patches/patch_g4_sources.py ${CMAKE_SOURCE_DIR} ${Geant4_version}
+ GIT_REPOSITORY https://gitlab.cern.ch/lhcb/Geant4-srcs.git
+ GIT_TAG ${Geant4_tag}
CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/toolchain.cmake
-DGEANT4_BUILD_CXXSTD=${GAUDI_CXX_STANDARD}
-DGEANT4_INSTALL_DATA=OFF
diff --git a/Geant4/G4config/copy_sources.cmake.in b/Geant4/G4config/copy_sources.cmake.in
index d52b48d7447e61a5e7a2788ff84218c59a86e391..61a7ef180fde9b3660aabe6d94f38e612071d9f2 100644
--- a/Geant4/G4config/copy_sources.cmake.in
+++ b/Geant4/G4config/copy_sources.cmake.in
@@ -1,20 +1,28 @@
-# Normal packages
+# Aliases (LHCb names -> G4 names)
+
+set(parmodels_source parameterisations)
+
foreach(pack analysis digits_hits event geometry global graphics_reps intercoms
materials parmodels particles physics_lists processes readout run
track tracking)
- message(STATUS "Copying ${pack} sources")
+ if(${pack}_source)
+ set(src_pack ${${pack}_source})
+ else()
+ set(src_pack ${pack})
+ endif()
+ message(STATUS "Copying ${src_pack} sources to G4${pack}")
execute_process(COMMAND find ( -type d -a -name src
- -a -not ( -path "*test/*" -o -path "*/abla/*" ) )
- #-printf "copying ${pack}/%p\\n"
+ -a -not -path "*test/*" )
+ #-printf "copying ${src_pack}/%p\\n"
-exec mkdir -p "@G4DST@/G4${pack}/{}" ";"
-exec cp -r "{}/." "@G4DST@/G4${pack}/{}" ";"
- WORKING_DIRECTORY @G4SRC@/${pack})
+ WORKING_DIRECTORY @G4SRC@/${src_pack})
execute_process(COMMAND find ( -type d -a -name include
- -a -not ( -path "*test/*" -o -path "*/abla/*" ) )
+ -a -not -path "*test/*" )
#-printf "copying ${pack}/%p\\n"
-exec mkdir -p "@G4DST@/G4${pack}/G4${pack}" ";"
-exec cp -r "{}/." "@G4DST@/G4${pack}/G4${pack}" ";"
- WORKING_DIRECTORY @G4SRC@/${pack})
+ WORKING_DIRECTORY @G4SRC@/${src_pack})
endforeach()
# UI packages
@@ -38,7 +46,7 @@ foreach(pack FukuiRenderer modeling OpenGL RayTracer Tree
else()
set(local_pack G4${pack})
endif()
- message(STATUS "Copying visualization/${pack} sources")
+ message(STATUS "Copying visualization/${pack} sources to ${local_pack}")
execute_process(COMMAND mkdir -p @G4DST@/${local_pack}/${pack}/src
@G4DST@/${local_pack}/${local_pack})
execute_process(COMMAND cp -r @G4SRC@/visualization/${pack}/src/.
@@ -48,15 +56,15 @@ foreach(pack FukuiRenderer modeling OpenGL RayTracer Tree
endforeach()
set(pack externals)
-message(STATUS "Copying visualization/${pack} sources")
+message(STATUS "Copying visualization/${pack} sources to G4${pack}")
execute_process(COMMAND find ( -type d -a -name src
- -a -not ( -path "*test/*" -o -path "*/abla/*" ) )
+ -a -not -path "*test/*" )
#-printf "copying ${pack}/%p\\n"
- -exec mkdir -p "@G4DST@/G4${pack}/{}" ";"
- -exec cp -r "{}/." "@G4DST@/G4${pack}/{}" ";"
+ -exec mkdir -p "@G4DST@/G4${pack}/externals/{}" ";"
+ -exec cp -r "{}/." "@G4DST@/G4${pack}/externals/{}" ";"
WORKING_DIRECTORY @G4SRC@/visualization/${pack})
execute_process(COMMAND find ( -type d -a -name include
- -a -not ( -path "*test/*" -o -path "*/abla/*" ) )
+ -a -not -path "*test/*" )
#-printf "copying ${pack}/%p\\n"
-exec mkdir -p "@G4DST@/G4${pack}/G4${pack}" ";"
-exec cp -r "{}/." "@G4DST@/G4${pack}/G4${pack}" ";"
@@ -65,7 +73,7 @@ execute_process(COMMAND find ( -type d -a -name include
# Vis packages
set(pack gdml)
-message(STATUS "Copying persistency/${pack} sources")
+message(STATUS "Copying persistency/${pack} sources to ${local_pack}")
set(local_pack G4GDML)
execute_process(COMMAND mkdir -p @G4DST@/${local_pack}/src
@G4DST@/${local_pack}/schema
@@ -76,3 +84,25 @@ execute_process(COMMAND cp -r @G4SRC@/persistency/${pack}/schema/.
@G4DST@/${local_pack}/schema)
execute_process(COMMAND cp -r @G4SRC@/persistency/${pack}/include/.
@G4DST@/${local_pack}/${local_pack})
+
+
+# Examples
+foreach(ex_name TestEm3 TestEm5 TestEm7 TestEm9)
+ message(STATUS "Copying examples/.../${ex_name} sources to G4examples/.../G4${ex_name}")
+ set(src @G4SRC@/../examples/extended/electromagnetic/${ex_name})
+ set(dest @G4DST@/G4examples/extended/electromagnetic/G4${ex_name})
+ execute_process(COMMAND mkdir -p ${dest}/include ${dest}/src)
+ execute_process(COMMAND cp -r ${src}/include/. ${dest}/include)
+ execute_process(COMMAND cp -r ${src}/src/. ${dest}/src)
+ execute_process(COMMAND cp -r ${src}/${ex_name}.cc ${dest})
+endforeach()
+
+foreach(ex_name Hadr00)
+ message(STATUS "Copying examples/.../${ex_name} sources to G4examples/.../G4${ex_name}")
+ set(src @G4SRC@/../examples/extended/hadronic/${ex_name})
+ set(dest @G4DST@/G4examples/extended/hadronic/G4${ex_name})
+ execute_process(COMMAND mkdir -p ${dest}/include ${dest}/src)
+ execute_process(COMMAND cp -r ${src}/include/. ${dest}/include)
+ execute_process(COMMAND cp -r ${src}/src/. ${dest}/src)
+ execute_process(COMMAND cp -r ${src}/${ex_name}.cc ${dest})
+endforeach()
diff --git a/Geant4/G4config/doc/release.notes b/Geant4/G4config/doc/release.notes
index 325affe01311e3ea85be019f2b5bac5e435fd877..18ad5011d14e0ec1d4829041ec4d6dabd9b3aafd 100755
--- a/Geant4/G4config/doc/release.notes
+++ b/Geant4/G4config/doc/release.notes
@@ -4,6 +4,14 @@
! Purpose : Configuration package for Geant4 build
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Build Geant4 using the sources in https://gitlab.cern.ch/lhcb/Geant4-srcs
+ instead of using official tarballs and patching them.
+ - Added .gitignore file
+
+! 2015-10-13 - Marco Clemencic
+ - Fixed build of the selected examples.
+
! 2015-09-09 - Marco Clemencic
- Fixed ccache (and custom launchers) support in CMake build.
- Use the same C++ standard as Gaudi in CMake builds.
@@ -20,7 +28,7 @@
! ======================= G4config v96r3p0 2015-05-11 ========================
! 2015-05-12 - Timothy Williams
- Updated copy_examples_source.csh to copy private sources for TestEm5
-
+
! 2015-05-11 - Timothy Williams
- Added execution of srcnew copying to copy_examples_source.csh
diff --git a/Geant4/G4config/patches/cmake/Modules/FindCLHEP.cmake b/Geant4/G4config/patches/cmake/Modules/FindCLHEP.cmake
deleted file mode 100644
index 24587768abe70aab819934732b8aa333581bfaae..0000000000000000000000000000000000000000
--- a/Geant4/G4config/patches/cmake/Modules/FindCLHEP.cmake
+++ /dev/null
@@ -1,56 +0,0 @@
-# - Try to find CLHEP
-# Defines:
-#
-# CLHEP_FOUND
-# CLHEP_VERSION
-# CLHEP_INCLUDE_DIR
-# CLHEP_INCLUDE_DIRS (not cached)
-# CLHEP_<component>_LIBRARY
-# CLHEP_<component>_FOUND
-# CLHEP_LIBRARIES (not cached)
-# CLHEP_LIBRARY_DIRS (not cached)
-#
-# Note: version detection inspired by FindBoost.cmake
-
-find_path(CLHEP_INCLUDE_DIR CLHEP/ClhepVersion.h
- HINTS $ENV{CLHEP_ROOT_DIR}/include ${CLHEP_ROOT_DIR}/include)
-if(CLHEP_INCLUDE_DIR)
- if(NOT DEFINED CLHEP_VERSION)
- file(READ "${CLHEP_INCLUDE_DIR}/CLHEP/ClhepVersion.h" _CLHEP_VERSION_H_CONTENTS)
- string(REGEX REPLACE ".*static std::string String\\(\\)[^\"]*return \"([^\"]*)\".*" "\\1" CLHEP_VERSION "${_CLHEP_VERSION_H_CONTENTS}")
- set(CLHEP_VERSION ${CLHEP_VERSION} CACHE INTERNAL "Detected version of CLHEP")
- message(STATUS "CLHEP version: ${CLHEP_VERSION}")
- endif()
-endif()
-
-set(_CLHEP_COMPONENTS Cast Evaluator Exceptions GenericFunctions Geometry Random RandomObjects RefCount Vector Matrix)
-foreach(component ${_CLHEP_COMPONENTS})
- find_library(CLHEP_${component}_LIBRARY NAMES CLHEP-${component}-${CLHEP_VERSION}
- HINTS $ENV{CLHEP_ROOT_DIR}/lib ${CLHEP_ROOT_DIR}/lib)
- if (CLHEP_${component}_LIBRARY)
- set(CLHEP_${component}_FOUND 1)
- list(APPEND CLHEP_LIBRARIES ${CLHEP_${component}_LIBRARY})
-
- get_filename_component(libdir ${CLHEP_${component}_LIBRARY} PATH)
- list(APPEND CLHEP_LIBRARY_DIRS ${libdir})
- else()
- set(CLHEP_${component}_FOUND 0)
- endif()
- mark_as_advanced(CLHEP_${component}_LIBRARY)
-endforeach()
-
-if(CLHEP_LIBRARY_DIRS)
- list(REMOVE_DUPLICATES CLHEP_LIBRARY_DIRS)
-endif()
-
-set(CLHEP_INCLUDE_DIRS ${CLHEP_INCLUDE_DIR})
-
-# handle the QUIETLY and REQUIRED arguments and set CLHEP_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(CLHEP DEFAULT_MSG CLHEP_INCLUDE_DIR CLHEP_LIBRARIES)
-
-mark_as_advanced(CLHEP_FOUND CLHEP_INCLUDE_DIR)
-
-# Hack for Geeant4 compatibility (we choose a random library)
-set(CLHEP_LIBRARY ${CLHEP_Random_LIBRARY})
diff --git a/Geant4/G4config/patches/geant4.cmake.patch b/Geant4/G4config/patches/geant4.cmake.patch
deleted file mode 100644
index 896a6b3eefa24c16bf9ed643e70ad99a3df17242..0000000000000000000000000000000000000000
--- a/Geant4/G4config/patches/geant4.cmake.patch
+++ /dev/null
@@ -1,749 +0,0 @@
-diff -urN a/geant4.9.6.p04/cmake/Modules/Geant4BuildProjectConfig.cmake b/geant4.9.6.p04/cmake/Modules/Geant4BuildProjectConfig.cmake
---- a/geant4.9.6.p04/cmake/Modules/Geant4BuildProjectConfig.cmake 2015-02-04 09:53:22.000000000 +0100
-+++ b/geant4.9.6.p04/cmake/Modules/Geant4BuildProjectConfig.cmake 2015-09-09 17:03:22.291420708 +0200
-@@ -173,13 +173,13 @@
- # Use ABSOLUTE paths...
- set(GEANT4_INCLUDE_DIR_SETUP "
- # Geant4 configured for the install tree with absolute paths, so use these
--set(Geant4_INCLUDE_DIR \"${CMAKE_INSTALL_FULL_INCLUDEDIR}/Geant4\")
-+set(Geant4_INCLUDE_DIR \"${CMAKE_INSTALL_FULL_INCLUDEDIR}\")
- ")
- else()
- # Use RELATIVE paths... Where we measure relative to GEANT4_CMAKE_DIR
- file(RELATIVE_PATH GEANT4_RELATIVE_HEADER_PATH
- ${CMAKE_INSTALL_PREFIX}/${GEANT4_CMAKE_DIR}
-- ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
-+ ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}
- )
-
- set(GEANT4_INCLUDE_DIR_SETUP "
-diff -urN a/geant4.9.6.p04/cmake/Modules/Geant4ConfigureConfigScript.cmake b/geant4.9.6.p04/cmake/Modules/Geant4ConfigureConfigScript.cmake
---- a/geant4.9.6.p04/cmake/Modules/Geant4ConfigureConfigScript.cmake 2015-02-04 09:53:22.000000000 +0100
-+++ b/geant4.9.6.p04/cmake/Modules/Geant4ConfigureConfigScript.cmake 2015-09-09 17:03:22.291420708 +0200
-@@ -230,7 +230,7 @@
- set(GEANT4_CONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
- set(GEANT4_CONFIG_INSTALL_EXECPREFIX \"\")
- set(GEANT4_CONFIG_LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
-- set(GEANT4_CONFIG_INCLUDE_DIRS "${CMAKE_INSTALL_FULL_INCLUDEDIR}/Geant4")
-+ set(GEANT4_CONFIG_INCLUDE_DIRS "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
- else()
- # Calculate base of self contained install based on relative path from
- # CMAKE_INSTALL_FULL_BINDIR to CMAKE_INSTALL_PREFIX.
-@@ -241,7 +241,7 @@
- set(GEANT4_CONFIG_INSTALL_PREFIX "$scriptloc/${_bin_to_prefix}")
- set(GEANT4_CONFIG_INSTALL_EXECPREFIX \"\")
- set(GEANT4_CONFIG_LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
-- set(GEANT4_CONFIG_INCLUDE_DIRS "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}/Geant4")
-+ set(GEANT4_CONFIG_INCLUDE_DIRS "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
- endif()
-
- # Configure the install tree script
-diff -urN a/geant4.9.6.p04/cmake/Modules/Geant4MacroLibraryTargets.cmake b/geant4.9.6.p04/cmake/Modules/Geant4MacroLibraryTargets.cmake
---- a/geant4.9.6.p04/cmake/Modules/Geant4MacroLibraryTargets.cmake 2015-02-04 09:53:22.000000000 +0100
-+++ b/geant4.9.6.p04/cmake/Modules/Geant4MacroLibraryTargets.cmake 2015-09-09 17:03:22.292420731 +0200
-@@ -166,7 +166,7 @@
-
- # Header install?
- install(FILES ${${G4MODULENAME}_HEADERS}
-- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
- COMPONENT Development)
-
- # Store the include path of the component so that the build tree
-@@ -202,7 +202,7 @@
-
- # Header install?
- install(FILES ${${G4MODULENAME}_HEADERS}
-- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
- COMPONENT Development)
-
- # Store the include path of the component so that the build tree
-@@ -266,7 +266,7 @@
-
- # Header install?
- install(FILES ${${G4GLOBLIB_NAME}_GLOBAL_HEADERS}
-- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
- COMPONENT Development)
-
- # Store the include path of the component so that the build tree
-diff -urN a/geant4.9.6.p04/cmake/Modules/Geant4MakeRules_cxx.cmake b/geant4.9.6.p04/cmake/Modules/Geant4MakeRules_cxx.cmake
---- a/geant4.9.6.p04/cmake/Modules/Geant4MakeRules_cxx.cmake 2015-02-04 09:53:22.000000000 +0100
-+++ b/geant4.9.6.p04/cmake/Modules/Geant4MakeRules_cxx.cmake 2015-09-09 17:03:22.297420846 +0200
-@@ -240,3 +240,73 @@
- # - CMake may do a reasonable job on its own here...
- endif()
-
-+# Support for distcc, ccache and custom launch rules
-+find_program(ccache_cmd NAMES ccache ccache-swig)
-+find_program(distcc_cmd distcc)
-+mark_as_advanced(ccache_cmd distcc_cmd)
-+
-+if(ccache_cmd)
-+ option(CMAKE_USE_CCACHE "Use ccache to speed up compilation." OFF)
-+ if(CMAKE_USE_CCACHE)
-+ set(GAUDI_RULE_LAUNCH_COMPILE "${GAUDI_RULE_LAUNCH_COMPILE} ${ccache_cmd}")
-+ message(STATUS "Using ccache for building")
-+ endif()
-+endif()
-+
-+if(distcc_cmd)
-+ option(CMAKE_USE_DISTCC "Use distcc to speed up compilation." OFF)
-+ if(CMAKE_USE_DISTCC)
-+ if(CMAKE_USE_CCACHE)
-+ set(GAUDI_RULE_LAUNCH_COMPILE "${GAUDI_RULE_LAUNCH_COMPILE} CCACHE_PREFIX=${distcc_cmd} ${ccache_cmd}")
-+ message(STATUS "Enabling distcc builds in ccache")
-+ else()
-+ set(GAUDI_RULE_LAUNCH_COMPILE "${GAUDI_RULE_LAUNCH_COMPILE} ${distcc_cmd}")
-+ message(STATUS "Using distcc for building")
-+ endif()
-+ endif()
-+endif()
-+
-+option(GAUDI_USE_CTEST_LAUNCHERS "Use CTest launchers to record details about warnings and errors." OFF)
-+if(GAUDI_USE_CTEST_LAUNCHERS)
-+ file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/launch_logs)
-+
-+ # Code copied and adapted from the CTestUseLaunchers.cmake module
-+ set(__launch_common_options
-+ "--target-name <TARGET_NAME> --build-dir <CMAKE_CURRENT_BINARY_DIR>")
-+
-+ set(__launch_compile_options
-+ "${__launch_common_options} --output <OBJECT> --source <SOURCE> --language <LANGUAGE>")
-+
-+ set(__launch_link_options
-+ "${__launch_common_options} --output <TARGET> --target-type <TARGET_TYPE> --language <LANGUAGE>")
-+
-+ set(__launch_custom_options
-+ "${__launch_common_options} --output <OUTPUT>")
-+
-+ if("${CMAKE_GENERATOR}" MATCHES "Ninja" AND NOT CMAKE_VERSION VERSION_LESS 3.0)
-+ # this make sense only with CMamke >= 3.0
-+ set(__launch_compile_options "${__launch_compile_options} --filter-prefix <CMAKE_CL_SHOWINCLUDES_PREFIX>")
-+ endif()
-+
-+ set(GAUDI_RULE_LAUNCH_COMPILE
-+ "CTEST_LAUNCH_LOGS=${CMAKE_BINARY_DIR}/launch_logs \"${CMAKE_CTEST_COMMAND}\" --launch ${__launch_compile_options} -- ${GAUDI_RULE_LAUNCH_COMPILE}")
-+
-+ set(GAUDI_RULE_LAUNCH_LINK
-+ "CTEST_LAUNCH_LOGS=${CMAKE_BINARY_DIR}/launch_logs \"${CMAKE_CTEST_COMMAND}\" --launch ${__launch_link_options} -- ${GAUDI_RULE_LAUNCH_LINK}")
-+
-+ set(GAUDI_RULE_LAUNCH_CUSTOM
-+ "CTEST_LAUNCH_LOGS=${CMAKE_BINARY_DIR}/launch_logs \"${CMAKE_CTEST_COMMAND}\" --launch ${__launch_custom_options} -- ${GAUDI_RULE_LAUNCH_CUSTOM}")
-+
-+ if("${CMAKE_GENERATOR}" MATCHES "Make")
-+ set(GAUDI_RULE_LAUNCH_LINK "env ${GAUDI_RULE_LAUNCH_LINK}")
-+ endif()
-+endif()
-+
-+# apply launch rules
-+foreach(_rule COMPILE LINK CUSTOM)
-+ if(GAUDI_RULE_LAUNCH_${_rule})
-+ string(STRIP "${GAUDI_RULE_LAUNCH_${_rule}}" GAUDI_RULE_LAUNCH_${_rule})
-+ set_property(GLOBAL PROPERTY RULE_LAUNCH_${_rule} "${GAUDI_RULE_LAUNCH_${_rule}}")
-+ message(STATUS "Prefix ${_rule} commands with '${GAUDI_RULE_LAUNCH_${_rule}}'")
-+ endif()
-+endforeach()
-diff -urN a/geant4.9.6.p04/cmake/Modules/Geant4OptionalComponents.cmake b/geant4.9.6.p04/cmake/Modules/Geant4OptionalComponents.cmake
---- a/geant4.9.6.p04/cmake/Modules/Geant4OptionalComponents.cmake 2015-02-04 09:53:22.000000000 +0100
-+++ b/geant4.9.6.p04/cmake/Modules/Geant4OptionalComponents.cmake 2015-09-09 17:03:22.297420846 +0200
-@@ -34,7 +34,7 @@
- if(GEANT4_USE_SYSTEM_CLHEP)
- # We keep this as required, because if the user chooses to use a
- # system option we assume that we absolutely, positively require this.
-- find_package(CLHEP 2.1.2.3 REQUIRED)
-+ find_package(CLHEP REQUIRED)
- set(GEANT4_USE_SYSTEM_CLHEP TRUE)
- else()
- set(CLHEP_FOUND TRUE)
-diff -urN a/geant4.9.6.p04/cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake b/geant4.9.6.p04/cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake
---- a/geant4.9.6.p04/cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake 2015-02-04 09:53:22.000000000 +0100
-+++ b/geant4.9.6.p04/cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake 2015-09-09 17:03:22.297420846 +0200
-@@ -531,7 +531,7 @@
- # If we are relocatable, then the structure we will have is
- # +- CMAKE_INSTALL_PREFIX
- # +- LIBDIR/Geant4-VERSION (G4LIB)
--# +- INCLUDEDIR/Geant4 (G4INCLUDE)
-+# +- INCLUDEDIR (G4INCLUDE)
- # +- DATAROOTDIR/Geant4-VERSION/
- # +- geant4make (G4INSTALL!)
- # +- geant4make.(c)sh
-@@ -546,7 +546,7 @@
- file(RELATIVE_PATH
- G4MAKE_TO_INCLUDEDIR
- ${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
-- ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${PROJECT_NAME}
-+ ${CMAKE_INSTALL_FULL_INCLUDEDIR}
- )
- set(G4INCLUDE "\"`cd \$geant4make_root/${G4MAKE_TO_INCLUDEDIR} > /dev/null \; pwd`\"")
-
-diff -urN a/geant4.9.6.p04/cmake/Templates/Geant4Config.cmake.in b/geant4.9.6.p04/cmake/Templates/Geant4Config.cmake.in
---- a/geant4.9.6.p04/cmake/Templates/Geant4Config.cmake.in 2015-02-04 09:53:23.000000000 +0100
-+++ b/geant4.9.6.p04/cmake/Templates/Geant4Config.cmake.in 2015-09-09 16:11:28.000000000 +0200
-@@ -382,8 +382,6 @@
- set(_geant4_internal_libraries
- G4Tree${_geant4_lib_use_suffix}
- G4FR${_geant4_lib_use_suffix}
-- G4GMocren${_geant4_lib_use_suffix}
-- G4visHepRep${_geant4_lib_use_suffix}
- G4RayTracer${_geant4_lib_use_suffix}
- G4VRML${_geant4_lib_use_suffix}
- )
-@@ -413,13 +411,14 @@
- list(APPEND _geant4_internal_libraries
- G4vis_management${_geant4_lib_use_suffix}
- G4modeling${_geant4_lib_use_suffix}
-- G4interfaces${_geant4_lib_use_suffix}
-+ G4UIGAG${_geant4_lib_use_suffix}
-+ G4UIbasic${_geant4_lib_use_suffix}
-+ G4UIcommon${_geant4_lib_use_suffix}
- G4persistency${_geant4_lib_use_suffix}
- ${_geant4_g3tog4_library}
- G4analysis${_geant4_lib_use_suffix}
-- G4error_propagation${_geant4_lib_use_suffix}
- G4readout${_geant4_lib_use_suffix}
-- G4physicslists${_geant4_lib_use_suffix}
-+ G4physics_lists${_geant4_lib_use_suffix}
- G4run${_geant4_lib_use_suffix}
- G4event${_geant4_lib_use_suffix}
- G4tracking${_geant4_lib_use_suffix}
-diff -urN a/geant4.9.6.p04/CMakeLists.txt b/geant4.9.6.p04/CMakeLists.txt
---- a/geant4.9.6.p04/CMakeLists.txt 2015-02-04 10:03:00.000000000 +0100
-+++ b/geant4.9.6.p04/CMakeLists.txt 2015-09-09 17:03:22.298420869 +0200
-@@ -136,8 +136,8 @@
- # Generate any Use/Config files here once everything else has been processed
- # e.g. "UseGeant4.cmake", "Geant4Config.cmake" - library dependencies etc
- #
--include(Geant4ToolchainBackwardCompatibility)
--include(Geant4ConfigureConfigScript)
-+#include(Geant4ToolchainBackwardCompatibility)
-+#include(Geant4ConfigureConfigScript)
-
- #----------------------------------------------------------------------------
- # Create the Geant4Config files and supporting modules
-@@ -154,10 +154,18 @@
- add_subdirectory(benchmarks)
- endif()
- endif()
--if(GEANT4_BUILD_EXAMPLES)
-- set(Geant4_DIR ${CMAKE_BINARY_DIR} CACHE PATH "Current build directory")
-- add_subdirectory(examples)
--endif()
-+
-+# build examples required by LHCb (see LHCBGAUSS-505)
-+set(Geant4_DIR ${CMAKE_BINARY_DIR} CACHE PATH "Current build directory")
-+option(WITH_GEANT4_UIVIS "Build example with Geant4 UI and Vis drivers" OFF)
-+set(G4UI_NONE ON CACHE BOOL "disable UI for examples")
-+set(G4VIS_NONE ON CACHE BOOL "disable Vis for examples")
-+add_subdirectory(examples/extended/electromagnetic/TestEm3)
-+add_subdirectory(examples/extended/electromagnetic/TestEm5)
-+add_subdirectory(examples/extended/electromagnetic/TestEm7)
-+add_subdirectory(examples/extended/electromagnetic/TestEm9)
-+add_subdirectory(examples/extended/hadronic/Hadr00)
-+
- #-----------------------------------------------------------------------------
- # Provide packaging with CPack.
- include(Geant4CPackBase)
-diff -urN a/geant4.9.6.p04/source/CMakeLists.txt b/geant4.9.6.p04/source/CMakeLists.txt
---- a/geant4.9.6.p04/source/CMakeLists.txt 2015-02-04 09:57:54.000000000 +0100
-+++ b/geant4.9.6.p04/source/CMakeLists.txt 2015-09-09 17:03:22.298420869 +0200
-@@ -13,9 +13,7 @@
-
- add_subdirectory(analysis)
- add_subdirectory(digits_hits)
--add_subdirectory(error_propagation)
- add_subdirectory(event)
--add_subdirectory(externals)
-
- # Target G4g3tog4 is optional based on user selection...
- if(GEANT4_USE_G3TOG4)
-diff -urN a/geant4.9.6.p04/source/interfaces/basic/sources.cmake b/geant4.9.6.p04/source/interfaces/basic/sources.cmake
---- a/geant4.9.6.p04/source/interfaces/basic/sources.cmake 2015-02-04 09:53:34.000000000 +0100
-+++ b/geant4.9.6.p04/source/interfaces/basic/sources.cmake 2015-09-09 17:03:22.298420869 +0200
-@@ -145,6 +145,7 @@
- G4globman
- G4intercoms
- GLOBAL_DEPENDENCIES
-+ G4UIcommon
- G4global
- G4intercoms
- LINK_LIBRARIES
-diff -urN a/geant4.9.6.p04/source/interfaces/CMakeLists.txt b/geant4.9.6.p04/source/interfaces/CMakeLists.txt
---- a/geant4.9.6.p04/source/interfaces/CMakeLists.txt 2015-02-04 09:53:37.000000000 +0100
-+++ b/geant4.9.6.p04/source/interfaces/CMakeLists.txt 2015-09-09 17:03:22.299420892 +0200
-@@ -18,11 +18,27 @@
-
- if(NOT GEANT4_BUILD_GRANULAR_LIBS)
- include(Geant4MacroLibraryTargets)
-- GEANT4_GLOBAL_LIBRARY_TARGET(NAME G4interfaces
-+# GEANT4_GLOBAL_LIBRARY_TARGET(NAME G4interfaces
-+# COMPONENTS
-+# GAG/sources.cmake
-+# basic/sources.cmake
-+# common/sources.cmake
-+#)
-+
-+ GEANT4_GLOBAL_LIBRARY_TARGET(NAME G4UIcommon
- COMPONENTS
-- GAG/sources.cmake
-- basic/sources.cmake
- common/sources.cmake
--)
-+ )
-+
-+ GEANT4_GLOBAL_LIBRARY_TARGET(NAME G4UIbasic
-+ COMPONENTS
-+ basic/sources.cmake
-+ )
-+
-+ GEANT4_GLOBAL_LIBRARY_TARGET(NAME G4UIGAG
-+ COMPONENTS
-+ GAG/sources.cmake
-+ )
-+
- endif()
-
-diff -urN a/geant4.9.6.p04/source/interfaces/GAG/sources.cmake b/geant4.9.6.p04/source/interfaces/GAG/sources.cmake
---- a/geant4.9.6.p04/source/interfaces/GAG/sources.cmake 2015-02-04 09:53:37.000000000 +0100
-+++ b/geant4.9.6.p04/source/interfaces/GAG/sources.cmake 2015-09-09 17:03:22.299420892 +0200
-@@ -39,6 +39,7 @@
- G4globman
- G4intercoms
- GLOBAL_DEPENDENCIES
-+ G4UIcommon
- G4global
- G4intercoms
- LINK_LIBRARIES
-diff -urN a/geant4.9.6.p04/source/persistency/CMakeLists.txt b/geant4.9.6.p04/source/persistency/CMakeLists.txt
---- a/geant4.9.6.p04/source/persistency/CMakeLists.txt 2015-02-04 09:57:44.000000000 +0100
-+++ b/geant4.9.6.p04/source/persistency/CMakeLists.txt 2015-09-09 17:03:22.299420892 +0200
-@@ -12,30 +12,17 @@
- #
- #------------------------------------------------------------------------------
-
--add_subdirectory(ascii)
--
- # GDML only if required
- if(GEANT4_USE_GDML)
- add_subdirectory(gdml)
- endif()
-
--add_subdirectory(mctruth)
--
--
- if(NOT GEANT4_BUILD_GRANULAR_LIBS)
- include(Geant4MacroLibraryTargets)
- if(GEANT4_USE_GDML)
- GEANT4_GLOBAL_LIBRARY_TARGET(NAME G4persistency
- COMPONENTS
-- ascii/sources.cmake
- gdml/sources.cmake
-- mctruth/sources.cmake
-- )
-- else()
-- GEANT4_GLOBAL_LIBRARY_TARGET(NAME G4persistency
-- COMPONENTS
-- ascii/sources.cmake
-- mctruth/sources.cmake
- )
- endif()
- endif()
-diff -urN a/geant4.9.6.p04/source/physics_lists/builders/sources.cmake b/geant4.9.6.p04/source/physics_lists/builders/sources.cmake
---- a/geant4.9.6.p04/source/physics_lists/builders/sources.cmake 2015-02-04 09:54:21.000000000 +0100
-+++ b/geant4.9.6.p04/source/physics_lists/builders/sources.cmake 2015-09-09 17:03:22.299420892 +0200
-@@ -40,12 +40,6 @@
- include_directories(${CMAKE_SOURCE_DIR}/source/particles/shortlived/include)
- include_directories(${CMAKE_SOURCE_DIR}/source/processes/cuts/include)
- include_directories(${CMAKE_SOURCE_DIR}/source/processes/decay/include)
--include_directories(${CMAKE_SOURCE_DIR}/source/processes/electromagnetic/dna/management/include)
--include_directories(${CMAKE_SOURCE_DIR}/source/processes/electromagnetic/dna/molecules/management/include)
--include_directories(${CMAKE_SOURCE_DIR}/source/processes/electromagnetic/dna/molecules/types/include)
--include_directories(${CMAKE_SOURCE_DIR}/source/processes/electromagnetic/dna/models/include)
--include_directories(${CMAKE_SOURCE_DIR}/source/processes/electromagnetic/dna/processes/include)
--include_directories(${CMAKE_SOURCE_DIR}/source/processes/electromagnetic/dna/utils/include)
- include_directories(${CMAKE_SOURCE_DIR}/source/processes/electromagnetic/highenergy/include)
- include_directories(${CMAKE_SOURCE_DIR}/source/processes/electromagnetic/lowenergy/include)
- include_directories(${CMAKE_SOURCE_DIR}/source/processes/electromagnetic/muons/include)
-@@ -124,8 +118,6 @@
- G4DecayPhysics.hh
- G4ElectroNuclearBuilder.hh
- G4BertiniElectroNuclearBuilder.hh
-- G4EmDNAPhysicsChemistry.hh
-- G4EmDNAPhysics.hh
- G4EmExtraPhysics.hh
- G4EmLivermorePhysics.hh
- G4EmLivermorePolarizedPhysics.hh
-@@ -263,8 +255,6 @@
- G4DecayPhysics.cc
- G4ElectroNuclearBuilder.cc
- G4BertiniElectroNuclearBuilder.cc
-- G4EmDNAPhysics.cc
-- G4EmDNAPhysicsChemistry.cc
- G4EmExtraPhysics.cc
- G4EmLivermorePhysics.cc
- G4EmLivermorePolarizedPhysics.cc
-@@ -389,9 +379,6 @@
- G4bosons
- G4cuts
- G4decay
-- G4emdna-processes
-- G4emdna-models
-- G4emdna-utils
- G4emhighenergy
- G4emlowenergy
- G4emstandard
-diff -urN a/geant4.9.6.p04/source/physics_lists/CMakeLists.txt b/geant4.9.6.p04/source/physics_lists/CMakeLists.txt
---- a/geant4.9.6.p04/source/physics_lists/CMakeLists.txt 2015-02-04 09:54:23.000000000 +0100
-+++ b/geant4.9.6.p04/source/physics_lists/CMakeLists.txt 2015-09-09 17:03:22.300420915 +0200
-@@ -17,10 +17,11 @@
-
- if(NOT GEANT4_BUILD_GRANULAR_LIBS)
- include(Geant4MacroLibraryTargets)
-- GEANT4_GLOBAL_LIBRARY_TARGET(NAME G4physicslists
-+ GEANT4_GLOBAL_LIBRARY_TARGET(NAME G4physics_lists
- COMPONENTS
- builders/sources.cmake
- lists/sources.cmake
- )
- endif()
-
-+add_subdirectory(LHCb)
-diff -urN a/geant4.9.6.p04/source/physics_lists/LHCb/CMakeLists.txt b/geant4.9.6.p04/source/physics_lists/LHCb/CMakeLists.txt
---- a/geant4.9.6.p04/source/physics_lists/LHCb/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
-+++ b/geant4.9.6.p04/source/physics_lists/LHCb/CMakeLists.txt 2015-09-09 17:03:22.300420915 +0200
-@@ -0,0 +1,20 @@
-+#------------------------------------------------------------------------------
-+# CMakeLists.txt
-+# Module : G4LHCblists
-+# Package: Geant4.src.G4physicslists.G4LHCblists
-+#
-+# CMakeLists.txt for single level library that may be build global or granular
-+#
-+# Generated on : 12/6/2013
-+#
-+# $Id:$
-+#
-+#------------------------------------------------------------------------------
-+
-+include(Geant4MacroLibraryTargets)
-+if(GEANT4_BUILD_GRANULAR_LIBS)
-+ GEANT4_GRANULAR_LIBRARY_TARGET(COMPONENT sources.cmake)
-+else()
-+ GEANT4_GLOBAL_LIBRARY_TARGET(COMPONENTS sources.cmake)
-+endif()
-+
-diff -urN a/geant4.9.6.p04/source/physics_lists/LHCb/sources.cmake b/geant4.9.6.p04/source/physics_lists/LHCb/sources.cmake
---- a/geant4.9.6.p04/source/physics_lists/LHCb/sources.cmake 1970-01-01 01:00:00.000000000 +0100
-+++ b/geant4.9.6.p04/source/physics_lists/LHCb/sources.cmake 2015-09-09 17:03:22.300420915 +0200
-@@ -0,0 +1,210 @@
-+#------------------------------------------------------------------------------
-+# sources.cmake
-+# Module : G4phys_lists
-+# Package: Geant4.src.G4physicslists.G4phys_lists
-+#
-+# Sources description for a library.
-+# Lists the sources and headers of the code explicitely.
-+# Lists include paths needed.
-+# Lists the internal granular and global dependencies of the library.
-+# Source specific properties should be added at the end.
-+#
-+# Generated on : 24/9/2010
-+#
-+# $Id: sources.cmake,v 1.2 2010-11-29 17:29:30 bmorgan Exp $
-+# GEANT4 Tag $Name: not supported by cvs2svn $
-+#
-+#------------------------------------------------------------------------------
-+
-+# List external includes needed.
-+include_directories(${CLHEP_INCLUDE_DIRS})
-+include_directories(${EXPAT_INCLUDE_DIRS})
-+
-+# List internal includes needed.
-+include_directories(${CMAKE_SOURCE_DIR}/source/digits_hits/digits/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/digits_hits/hits/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/event/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/geometry/magneticfield/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/geometry/management/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/geometry/navigation/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/geometry/volumes/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/global/HEPGeometry/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/global/HEPRandom/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/global/management/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/intercoms/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/materials/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/particles/bosons/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/particles/hadrons/barions/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/particles/hadrons/ions/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/particles/hadrons/mesons/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/particles/leptons/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/particles/management/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/particles/shortlived/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/physics_lists/builders/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/cuts/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/decay/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/electromagnetic/highenergy/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/electromagnetic/lowenergy/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/electromagnetic/muons/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/electromagnetic/standard/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/electromagnetic/utils/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/electromagnetic/xrays/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/cross_sections/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/management/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/binary_cascade/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/cascade/cascade/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/cascade/evaporation/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/cascade/utils/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/chiral_inv_phase_space/body/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/chiral_inv_phase_space/fragmentation/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/chiral_inv_phase_space/interface/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/chiral_inv_phase_space/processes/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/coherent_elastic/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/de_excitation/evaporation/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/de_excitation/fermi_breakup/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/de_excitation/fission/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/de_excitation/gem_evaporation/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/de_excitation/handler/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/de_excitation/management/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/de_excitation/multifragmentation/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/de_excitation/photon_evaporation/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/de_excitation/util/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/high_energy/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/im_r_matrix/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/incl/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/inclxx/utils/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/inclxx/incl_physics/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/inclxx/interface/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/isotope_production/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/lend/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/low_energy/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/management/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/management/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/neutron_hp/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/parton_string/diffraction/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/parton_string/hadronization/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/parton_string/management/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/parton_string/qgsm/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/pre_equilibrium/exciton_model/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/radioactive_decay/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/theo_high_energy/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/util/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/processes/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/stopping/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/util/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/util/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/management/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/optical/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/processes/transportation/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/run/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/track/include)
-+include_directories(${CMAKE_SOURCE_DIR}/source/tracking/include)
-+
-+#
-+# Define the Geant4 Module.
-+#
-+include(Geant4MacroDefineModule)
-+GEANT4_DEFINE_MODULE(NAME G4LHCblists
-+ HEADERS
-+ G4EmStandardPhysics_LHCbTest.hh
-+ G4EmStandardPhysics_option1LHCb.hh
-+ G4EmStandardPhysics_option1NoApplyCuts.hh
-+ SOURCES
-+ G4EmStandardPhysics_LHCbTest.cc
-+ G4EmStandardPhysics_option1LHCb.cc
-+ G4EmStandardPhysics_option1NoApplyCuts.cc
-+ GRANULAR_DEPENDENCIES
-+ G4baryons
-+ G4bosons
-+ G4cuts
-+ G4decay
-+ G4digits
-+ G4emhighenergy
-+ G4emlowenergy
-+ G4emstandard
-+ G4emutils
-+ G4event
-+ G4geometrymng
-+ G4globman
-+ G4had_im_r_matrix
-+ G4had_lend
-+ G4had_mod_man
-+ G4had_mod_util
-+ G4had_muon_nuclear
-+ G4had_neu_hp
-+ G4had_preequ_exciton
-+ G4had_string_diff
-+ G4had_string_frag
-+ G4had_string_man
-+ G4had_theo_max
-+ G4hadronic_HE
-+ G4hadronic_LE
-+ G4hadronic_bert_cascade
-+ G4hadronic_binary
-+ G4hadronic_body_ci
-+ G4hadronic_coherent_elastic
-+ G4hadronic_crosec_ci
-+ G4hadronic_deex_evaporation
-+ G4hadronic_deex_fermi_breakup
-+ G4hadronic_deex_fission
-+ G4hadronic_deex_gem_evaporation
-+ G4hadronic_deex_handler
-+ G4hadronic_deex_management
-+ G4hadronic_deex_multifragmentation
-+ G4hadronic_deex_photon_evaporation
-+ G4hadronic_deex_util
-+ G4hadronic_fragm_ci
-+ G4hadronic_hetcpp_evaporation
-+ G4hadronic_hetcpp_utils
-+ G4hadronic_incl_cascade
-+ G4hadronic_interface_ci
-+ G4hadronic_iso
-+ G4hadronic_mgt
-+ G4hadronic_proc
-+ G4hadronic_proc_ci
-+ G4hadronic_qgstring
-+ G4hadronic_radioactivedecay
-+ G4hadronic_stop
-+ G4hadronic_util
-+ G4hadronic_xsect
-+ G4hits
-+ G4intercoms
-+ G4ions
-+ G4leptons
-+ G4magneticfield
-+ G4materials
-+ G4mesons
-+ G4muons
-+ G4navigation
-+ G4optical
-+ G4partman
-+ G4phys_builders
-+ G4phys_lists
-+ G4procman
-+ G4run
-+ G4shortlived
-+ G4track
-+ G4tracking
-+ G4transportation
-+ G4volumes
-+ G4xrays
-+ GLOBAL_DEPENDENCIES
-+ G4digits_hits
-+ G4event
-+ G4geometry
-+ G4global
-+ G4intercoms
-+ G4materials
-+ G4particles
-+ G4processes
-+ G4run
-+ G4track
-+ G4tracking
-+ G4physics_lists
-+ LINK_LIBRARIES
-+)
-+
-+# List any source specific properties here
-+
-diff -urN a/geant4.9.6.p04/source/physics_lists/lists/sources.cmake b/geant4.9.6.p04/source/physics_lists/lists/sources.cmake
---- a/geant4.9.6.p04/source/physics_lists/lists/sources.cmake 2015-02-04 09:54:23.000000000 +0100
-+++ b/geant4.9.6.p04/source/physics_lists/lists/sources.cmake 2015-09-09 17:03:22.301420938 +0200
-@@ -43,7 +43,6 @@
- include_directories(${CMAKE_SOURCE_DIR}/source/physics_lists/builders/include)
- include_directories(${CMAKE_SOURCE_DIR}/source/processes/cuts/include)
- include_directories(${CMAKE_SOURCE_DIR}/source/processes/decay/include)
--include_directories(${CMAKE_SOURCE_DIR}/source/processes/electromagnetic/dna/include)
- include_directories(${CMAKE_SOURCE_DIR}/source/processes/electromagnetic/highenergy/include)
- include_directories(${CMAKE_SOURCE_DIR}/source/processes/electromagnetic/lowenergy/include)
- include_directories(${CMAKE_SOURCE_DIR}/source/processes/electromagnetic/muons/include)
-@@ -247,7 +246,6 @@
- G4cuts
- G4decay
- G4digits
-- G4emdna
- G4emhighenergy
- G4emlowenergy
- G4emstandard
-diff -urN a/geant4.9.6.p04/source/processes/CMakeLists.txt b/geant4.9.6.p04/source/processes/CMakeLists.txt
---- a/geant4.9.6.p04/source/processes/CMakeLists.txt 2015-02-04 09:57:35.000000000 +0100
-+++ b/geant4.9.6.p04/source/processes/CMakeLists.txt 2015-09-09 17:03:22.301420938 +0200
-@@ -37,12 +37,6 @@
- cuts/sources.cmake
- decay/sources.cmake
- electromagnetic/adjoint/sources.cmake
-- electromagnetic/dna/processes/sources.cmake
-- electromagnetic/dna/models/sources.cmake
-- electromagnetic/dna/utils/sources.cmake
-- electromagnetic/dna/management/sources.cmake
-- electromagnetic/dna/molecules/management/sources.cmake
-- electromagnetic/dna/molecules/types/sources.cmake
- electromagnetic/highenergy/sources.cmake
- electromagnetic/lowenergy/sources.cmake
- electromagnetic/muons/sources.cmake
-diff -urN a/geant4.9.6.p04/source/processes/electromagnetic/CMakeLists.txt b/geant4.9.6.p04/source/processes/electromagnetic/CMakeLists.txt
---- a/geant4.9.6.p04/source/processes/electromagnetic/CMakeLists.txt 2015-02-04 09:55:49.000000000 +0100
-+++ b/geant4.9.6.p04/source/processes/electromagnetic/CMakeLists.txt 2015-09-09 17:03:22.301420938 +0200
-@@ -12,7 +12,6 @@
- #------------------------------------------------------------------------------
-
- add_subdirectory(adjoint)
--add_subdirectory(dna)
- add_subdirectory(highenergy)
- add_subdirectory(lowenergy)
- add_subdirectory(muons)
-diff -urN a/geant4.9.6.p04/source/processes/hadronic/models/im_r_matrix/src/G4CollisionInitialState.cc b/geant4.9.6.p04/source/processes/hadronic/models/im_r_matrix/src/G4CollisionInitialState.cc
---- a/geant4.9.6.p04/source/processes/hadronic/models/im_r_matrix/src/G4CollisionInitialState.cc 2015-02-04 09:57:06.000000000 +0100
-+++ b/geant4.9.6.p04/source/processes/hadronic/models/im_r_matrix/src/G4CollisionInitialState.cc 2015-09-09 17:03:22.301420938 +0200
-@@ -100,7 +100,7 @@
- return theFSGenerator->GetFinalState(thePrimary, theTs);
- }
-
--//#include <typeinfo>
-+#include <typeinfo>
-
- void G4CollisionInitialState::Print() const
- {
-diff -urN a/geant4.9.6.p04/source/visualization/CMakeLists.txt b/geant4.9.6.p04/source/visualization/CMakeLists.txt
---- a/geant4.9.6.p04/source/visualization/CMakeLists.txt 2015-02-04 09:54:58.000000000 +0100
-+++ b/geant4.9.6.p04/source/visualization/CMakeLists.txt 2015-09-09 17:03:22.302420961 +0200
-@@ -12,13 +12,10 @@
- #------------------------------------------------------------------------------
-
- add_subdirectory(FukuiRenderer)
--add_subdirectory(HepRep)
- add_subdirectory(RayTracer)
- add_subdirectory(Tree)
- add_subdirectory(VRML)
--add_subdirectory(XXX)
- add_subdirectory(externals)
--add_subdirectory(gMocren)
- add_subdirectory(management)
- add_subdirectory(modeling)
-
-diff -urN a/geant4.9.6.p04/source/visualization/OpenGL/sources.cmake b/geant4.9.6.p04/source/visualization/OpenGL/sources.cmake
---- a/geant4.9.6.p04/source/visualization/OpenGL/sources.cmake 2015-02-04 09:54:39.000000000 +0100
-+++ b/geant4.9.6.p04/source/visualization/OpenGL/sources.cmake 2015-09-09 17:03:22.302420961 +0200
-@@ -312,7 +312,8 @@
- G4global
- G4graphics_reps
- G4intercoms
-- G4interfaces
-+ G4UIbasic
-+ G4UIcommon
- G4modeling
- G4tracking
- G4vis_management
-diff -urN a/geant4.9.6.p04/source/visualization/OpenInventor/sources.cmake b/geant4.9.6.p04/source/visualization/OpenInventor/sources.cmake
---- a/geant4.9.6.p04/source/visualization/OpenInventor/sources.cmake 2015-02-04 09:54:47.000000000 +0100
-+++ b/geant4.9.6.p04/source/visualization/OpenInventor/sources.cmake 2015-09-09 17:03:22.302420961 +0200
-@@ -195,7 +195,7 @@
- G4global
- G4graphics_reps
- G4intercoms
-- G4interfaces
-+ G4UIcommon
- G4materials
- G4modeling
- G4tracking
diff --git a/Geant4/G4config/patches/patch_g4_sources.py b/Geant4/G4config/patches/patch_g4_sources.py
deleted file mode 100644
index c82d6c174837ee482ba44834b23dca84198780c6..0000000000000000000000000000000000000000
--- a/Geant4/G4config/patches/patch_g4_sources.py
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-'''
-Script to patch Geant 4 sources for LHCb.
-'''
-
-import sys
-import os
-import shutil
-import logging
-
-from subprocess import call
-from os.path import join, basename, exists
-
-logging.basicConfig(level=logging.INFO)
-log = logging.getLogger()
-
-# root directory of the project and Geant4 version
-root_dir, g4vers = sys.argv[1:]
-script_dir = os.path.realpath(os.path.dirname(sys.argv[0]))
-
-# apply patch to CMake configuration
-log.info('patching Geant4 CMake configuration')
-call(['patch', '-p2', '-i', join(script_dir, 'geant4.cmake.patch')])
-
-# copy physics lists
-def copydir(src, dst):
- if not os.path.exists(dst):
- log.info('creating directory %s', dst)
- os.makedirs(dst)
- for f in os.listdir(src):
- if f in ('.', '..', '.svn'):
- continue
- if os.path.isdir(join(src, f)):
- copydir(join(src, f), join(dst, f))
- else:
- log.info('copying %s -> %s', join(src, f), join(dst, f))
- shutil.copy(join(src, f), join(dst, f))
-
-copydir(join(root_dir, 'Geant4', 'G4LHCblists', 'G4LHCblists'),
- join('source', 'physics_lists', 'LHCb', 'include'))
-copydir(join(root_dir, 'Geant4', 'G4LHCblists', 'src'),
- join('source', 'physics_lists', 'LHCb', 'src'))
-
-
-# replace fixed files
-fixes_root = join(root_dir, 'Geant4', 'G4processes', 'srcnew')
-fixes_dst_root = join('source', 'processes', 'hadronic')
-# (fixes is a list of pairs, src+dst)
-fixes = [(join('cross_sections', 'G4ElectroNuclearCrossSection.cc'), join(fixes_dst_root, 'cross_sections', 'src'))]
-for src, dst in fixes:
- log.info('copying %s to dir %s', join(fixes_root, src), dst)
- # bkup
- old = join(dst, basename(src))
- if exists(old):
- shutil.copy(old, old + '.orig')
- shutil.copy(join(fixes_root, src), dst)
-
-# override Geant4 cmake modules
-copydir(join(script_dir, 'cmake', 'Modules'),
- join('cmake', 'Modules'))
-
diff --git a/Geant4/G4digits_hits/.gitignore b/Geant4/G4digits_hits/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..b13d84cf3a976280241de095c96c391eda825f1c
--- /dev/null
+++ b/Geant4/G4digits_hits/.gitignore
@@ -0,0 +1,6 @@
+/detector/
+/digits/
+/G4digits_hits/
+/hits/
+/scorer/
+/utils/
diff --git a/Geant4/G4digits_hits/doc/release.notes b/Geant4/G4digits_hits/doc/release.notes
index 48d8099421723bfc28ff850d996d5f0d517dd26e..cf778e17081c5a270250c473762dd8ab0ce8b5fe 100755
--- a/Geant4/G4digits_hits/doc/release.notes
+++ b/Geant4/G4digits_hits/doc/release.notes
@@ -1,9 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4digits_hits
! Responsible : Gloria CORTI, Silvia MIGLIORANZI
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!====================== G4digits_hits v7r1p1 2011-07-14 ======================
! 2011-03-02 - Hubert Degaudenzi
- Added ignore properties in svn
diff --git a/Geant4/G4event/.gitignore b/Geant4/G4event/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..8d0f71dfef038fdb258d2de09f3831d7b3917945
--- /dev/null
+++ b/Geant4/G4event/.gitignore
@@ -0,0 +1,2 @@
+/G4event/
+/src/
diff --git a/Geant4/G4event/doc/release.notes b/Geant4/G4event/doc/release.notes
index cdb51e274fe3dad05ce6d19bf84ecf6edadec6ae..974cdf594c8c86cfb703bce1c0b34ff88de295aa 100755
--- a/Geant4/G4event/doc/release.notes
+++ b/Geant4/G4event/doc/release.notes
@@ -1,9 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4event
! Responsible : Florence RANJARD
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!========================= G4event v6r0p1 2011-06-29 =========================
! 2011-06-29 - Hubert DEGAUDENZI
- Added ignore properties in svn
diff --git a/Geant4/G4examples/Makefile b/Geant4/G4examples/Makefile
deleted file mode 100644
index 46d73c68f3df6967e814db62956a2464090989fb..0000000000000000000000000000000000000000
--- a/Geant4/G4examples/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include ${LBCONFIGURATIONROOT}/data/Makefile
diff --git a/Geant4/G4examples/cmt/Makefile b/Geant4/G4examples/cmt/Makefile
deleted file mode 100644
index c2c9dbbed79a7894e694cf7a0c7d1bf0756334c3..0000000000000000000000000000000000000000
--- a/Geant4/G4examples/cmt/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(CMTROOT)/src/Makefile.header
-
-include $(CMTROOT)/src/constituents.make
-
diff --git a/Geant4/G4examples/doc/release.notes b/Geant4/G4examples/doc/release.notes
index 0200630b102239986f9cb0da48d21e38ec7ebf4e..72273da48b9fec53dab1c530e54bad92568a6b6a 100644
--- a/Geant4/G4examples/doc/release.notes
+++ b/Geant4/G4examples/doc/release.notes
@@ -3,6 +3,10 @@
! Responsible : James McCarthy, Luca Pescatore
! Purpose : Examples packages provided my Geant4, used as standalone tests
!-----------------------------------------------------------------------------
+
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!2015-07-29- Tim Williams
- Installed scripts to run TestEm3 and TestEm5, can be run with 'Calorimeter_test' and 'MultipleScattering_test' respectively
- Removed unused and unnecessary scripts from TestEm3 and TestEm5
@@ -38,12 +42,12 @@
! 2014-07-16 - Gloria Corti
- Modified all requirements files to use pattern linker_library instead of
- appending library to XXX_use_linkopts. This fixes compilation issues on
+ appending library to XXX_use_linkopts. This fixes compilation issues on
slc5, see details on https://its.cern.ch/jira/browse/LHCBGAUSS-193
!===================== Geant4/G4examples v4r0 2014-07-11 =====================
! 2014-03-27 - Nigel Watson
- - Adapted requirements for nightly builds, following Marco Cl.'s
+ - Adapted requirements for nightly builds, following Marco Cl.'s
recommendations.
!=============================================================================
diff --git a/Geant4/G4examples/extended/electromagnetic/G4TestEm3/.gitignore b/Geant4/G4examples/extended/electromagnetic/G4TestEm3/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..45670cd985607ce87e6f419cefa02f37c78a928c
--- /dev/null
+++ b/Geant4/G4examples/extended/electromagnetic/G4TestEm3/.gitignore
@@ -0,0 +1,3 @@
+/include/
+/src/
+/TestEm3.cc
diff --git a/Geant4/G4examples/extended/electromagnetic/G4TestEm3/CMakeLists.txt b/Geant4/G4examples/extended/electromagnetic/G4TestEm3/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..4deffc41a445006d02a9007dec20362d41063f07
--- /dev/null
+++ b/Geant4/G4examples/extended/electromagnetic/G4TestEm3/CMakeLists.txt
@@ -0,0 +1,8 @@
+gaudi_depends_on_subdirs(Geant4/G4config)
+
+gaudi_install_scripts()
+
+gaudi_alias(Calorimeter_test ExampleTestEm3run.sh)
+
+# CMT-compatibility alias
+gaudi_alias(testEm3.exe TestEm3)
diff --git a/Geant4/G4examples/extended/electromagnetic/G4TestEm3/doc/release.notes b/Geant4/G4examples/extended/electromagnetic/G4TestEm3/doc/release.notes
index df8c0c2c9b102d8b6d0096e3549ff209dfc69d4b..63387df7b896819010abdadae4abdfb0d83c4e5f 100644
--- a/Geant4/G4examples/extended/electromagnetic/G4TestEm3/doc/release.notes
+++ b/Geant4/G4examples/extended/electromagnetic/G4TestEm3/doc/release.notes
@@ -3,6 +3,11 @@
! Responsible : Timothy Williams
! Purpose : Standalone Geant4 example used to test EM shower simulation
!-----------------------------------------------------------------------------
+
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+ - Added CMake configuration.
+
================================================================================
! 2015-05-07 - Timothy Williams
-Added srcnew diractory to store private source files. These get copied over with copyPatchedsource.py in cmt after sources are copied from LCG area.
diff --git a/Geant4/G4examples/extended/electromagnetic/G4TestEm5/.gitignore b/Geant4/G4examples/extended/electromagnetic/G4TestEm5/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..9cb100b14d5a1047d5a530c4e87425dde6055702
--- /dev/null
+++ b/Geant4/G4examples/extended/electromagnetic/G4TestEm5/.gitignore
@@ -0,0 +1,3 @@
+/include/
+/src/
+/TestEm5.cc
diff --git a/Geant4/G4examples/extended/electromagnetic/G4TestEm5/CMakeLists.txt b/Geant4/G4examples/extended/electromagnetic/G4TestEm5/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f8741303414a31e06daf99bd353a388d3b495e71
--- /dev/null
+++ b/Geant4/G4examples/extended/electromagnetic/G4TestEm5/CMakeLists.txt
@@ -0,0 +1,8 @@
+gaudi_depends_on_subdirs(Geant4/G4config)
+
+gaudi_install_scripts()
+
+gaudi_alias(MultipleScattering_test Em5run.sh)
+
+# CMT-compatibility alias
+gaudi_alias(testEm5.exe TestEm5)
diff --git a/Geant4/G4examples/extended/electromagnetic/G4TestEm5/doc/release.notes b/Geant4/G4examples/extended/electromagnetic/G4TestEm5/doc/release.notes
index 8ae85762037157ae5947d9623c25684926c8123b..d2ac6987eec3649dc96d0ccf9fe7e2b627f9ca93 100644
--- a/Geant4/G4examples/extended/electromagnetic/G4TestEm5/doc/release.notes
+++ b/Geant4/G4examples/extended/electromagnetic/G4TestEm5/doc/release.notes
@@ -4,5 +4,9 @@
! Purpose : Standalone Geant4 example used to test and validate multiple cattering
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+ - Added CMake configuration.
+
! 2015-05-12 - Timothy Williams
- First Commit, validation test of multiple scattering. Produces plots of MSc theta_0 parameter as function of energy.
diff --git a/Geant4/G4examples/extended/electromagnetic/G4TestEm7/.gitignore b/Geant4/G4examples/extended/electromagnetic/G4TestEm7/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..e79ae1256b766fdb06ab2ff61ab661bb5308ebc9
--- /dev/null
+++ b/Geant4/G4examples/extended/electromagnetic/G4TestEm7/.gitignore
@@ -0,0 +1,3 @@
+/include/
+/src/
+/TestEm7.cc
diff --git a/Geant4/G4examples/extended/electromagnetic/G4TestEm7/CMakeLists.txt b/Geant4/G4examples/extended/electromagnetic/G4TestEm7/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ed3f83571051db7527fc3782ccfc75ef89e92264
--- /dev/null
+++ b/Geant4/G4examples/extended/electromagnetic/G4TestEm7/CMakeLists.txt
@@ -0,0 +1,4 @@
+gaudi_depends_on_subdirs(Geant4/G4config)
+
+# CMT-compatibility alias
+gaudi_alias(testEm7.exe TestEm7)
diff --git a/Geant4/G4examples/extended/electromagnetic/G4TestEm7/doc/release.notes b/Geant4/G4examples/extended/electromagnetic/G4TestEm7/doc/release.notes
index 12c0251fbcfbe3ad645fe2d0c4abd2fe117682e7..5a0e73b49d3e18a2191c12e9e267154775c7e968 100644
--- a/Geant4/G4examples/extended/electromagnetic/G4TestEm7/doc/release.notes
+++ b/Geant4/G4examples/extended/electromagnetic/G4TestEm7/doc/release.notes
@@ -4,6 +4,10 @@
! Purpose : Examples packages provided my Geant4, used as standalone tests
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+ - Added CMake configuration.
+
! 2014-07-24 - Gloria Corti
- Modify requirements to remove src and include directory
otherwise made by cmt and copy is not done since directories exist
diff --git a/Geant4/G4examples/extended/electromagnetic/G4TestEm9/.gitignore b/Geant4/G4examples/extended/electromagnetic/G4TestEm9/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..cb98b13075472ba3ea3bae47bc1975cecd50b237
--- /dev/null
+++ b/Geant4/G4examples/extended/electromagnetic/G4TestEm9/.gitignore
@@ -0,0 +1,3 @@
+/include/
+/src/
+/TestEm9.cc
diff --git a/Geant4/G4examples/extended/electromagnetic/G4TestEm9/CMakeLists.txt b/Geant4/G4examples/extended/electromagnetic/G4TestEm9/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5b93a182f85dbf1a5578811924b293389097d46c
--- /dev/null
+++ b/Geant4/G4examples/extended/electromagnetic/G4TestEm9/CMakeLists.txt
@@ -0,0 +1,4 @@
+gaudi_depends_on_subdirs(Geant4/G4config)
+
+# CMT-compatibility alias
+gaudi_alias(testEm9.exe TestEm9)
diff --git a/Geant4/G4examples/extended/electromagnetic/G4TestEm9/doc/release.notes b/Geant4/G4examples/extended/electromagnetic/G4TestEm9/doc/release.notes
index 618f973a5b77eec67cc680909a0d65e11c2915de..7254ec745583d8e508f446e4f53b16a3f30ffe1f 100644
--- a/Geant4/G4examples/extended/electromagnetic/G4TestEm9/doc/release.notes
+++ b/Geant4/G4examples/extended/electromagnetic/G4TestEm9/doc/release.notes
@@ -1,4 +1,8 @@
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+ - Added CMake configuration.
+
! 2014-07-24 - Gloria Corti
- Modify requirements to remove src and include directory
otherwise made by cmt and copy is not done since directories exist
diff --git a/Geant4/G4examples/extended/hadronic/G4Hadr00/.gitignore b/Geant4/G4examples/extended/hadronic/G4Hadr00/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..3902dfdd5d1c49d0f324a384efed3208c458821d
--- /dev/null
+++ b/Geant4/G4examples/extended/hadronic/G4Hadr00/.gitignore
@@ -0,0 +1,3 @@
+/Hadr00.cc
+/include/
+/src/
diff --git a/Geant4/G4examples/extended/hadronic/G4Hadr00/CMakeLists.txt b/Geant4/G4examples/extended/hadronic/G4Hadr00/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..79736b6eecc1c98daebf4c8c5ffff88b344e0799
--- /dev/null
+++ b/Geant4/G4examples/extended/hadronic/G4Hadr00/CMakeLists.txt
@@ -0,0 +1,8 @@
+gaudi_depends_on_subdirs(Geant4/G4config)
+
+gaudi_install_scripts()
+
+gaudi_alias(hadronic_tests run_hadronic_tests.py)
+
+# CMT-compatibility alias
+gaudi_alias(hard00.exe Hadr00)
diff --git a/Geant4/G4examples/extended/hadronic/G4Hadr00/doc/release.notes b/Geant4/G4examples/extended/hadronic/G4Hadr00/doc/release.notes
index d15136790a96f1f723457fc35dda9589f8edd12a..0e77f8dcc635f8024692068baeaed468da75946e 100644
--- a/Geant4/G4examples/extended/hadronic/G4Hadr00/doc/release.notes
+++ b/Geant4/G4examples/extended/hadronic/G4Hadr00/doc/release.notes
@@ -4,6 +4,10 @@
! Purpose : Examples packages provided my Geant4, used as standalone tests
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+ - Added CMake configuration.
+
! 2015-10-07 - Luca Pescatore
- Fixed TGraph filling that caused not compiling on v95 versions
diff --git a/Geant4/G4externals/.gitignore b/Geant4/G4externals/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..51d2ea90672e354976171a6fc2e7d15b5109280e
--- /dev/null
+++ b/Geant4/G4externals/.gitignore
@@ -0,0 +1,2 @@
+/G4externals/
+/externals/
diff --git a/Geant4/G4externals/doc/release.notes b/Geant4/G4externals/doc/release.notes
index 0d58b4329190db6607a43bfc28d5bd9221c98b45..40a641bbeeea65be42e12575c627f0b50a01cd6f 100644
--- a/Geant4/G4externals/doc/release.notes
+++ b/Geant4/G4externals/doc/release.notes
@@ -4,11 +4,14 @@
! Purpose : Hold external library for visualization of Geant4
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!========================= G4external v1r0 2011-06-15 ========================
! 2011-06-15 - Gloria Corti
- Introduce compilation option -DG4VIS_BUILD_OPENGL_DRIVER needed to resolve
- class definition. Also linking statemnts to pick up opengl library from
+ class definition. Also linking statemnts to pick up opengl library from
Mesa distribution in LCG external area.
! 2011-06-09 - Gloria Corti
diff --git a/Geant4/G4geometry/.gitignore b/Geant4/G4geometry/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..6cf81069b5b294648109cfc9cf9519a1ab268c16
--- /dev/null
+++ b/Geant4/G4geometry/.gitignore
@@ -0,0 +1,8 @@
+/biasing/
+/divisions/
+/G4geometry/
+/magneticfield/
+/management/
+/navigation/
+/solids/
+/volumes/
diff --git a/Geant4/G4geometry/doc/release.notes b/Geant4/G4geometry/doc/release.notes
index de2bbfb06226d4da7dc264bd762002c1ba6dca53..274268f18e6e9d1a000149464e63ecae280e9218 100755
--- a/Geant4/G4geometry/doc/release.notes
+++ b/Geant4/G4geometry/doc/release.notes
@@ -1,9 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4geometry
! Responsible : Gloria CORTI, Silvia MIGLIORANZI
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!======================= G4geometry v6r2p1 2011-07-14 ========================
! 2011-07-14 - Hubert DEGAUDENZI
- Added ignore properties in svn
diff --git a/Geant4/G4global/.gitignore b/Geant4/G4global/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..61d494f441d39f69a61e0c2de30e05a7eae5eaff
--- /dev/null
+++ b/Geant4/G4global/.gitignore
@@ -0,0 +1,3 @@
+/G4global/
+/HEPNumerics/
+/management/
diff --git a/Geant4/G4global/doc/release.notes b/Geant4/G4global/doc/release.notes
index a9c7dbd0a235d0a2a73a0b2a2298f23e2d9e0de5..ccb01e8b693cfb88fe0886551f5bccdd55fc8ce9 100644
--- a/Geant4/G4global/doc/release.notes
+++ b/Geant4/G4global/doc/release.notes
@@ -1,9 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4global
! Responsible : Gloria CORTI
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!========================= G4global v5r1p1 2011-07-14 =========================
! 2011-03-02 - Hubert Degaudenzi
- Added ignore properties in svn
diff --git a/Geant4/G4graphics_reps/.gitignore b/Geant4/G4graphics_reps/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..f104db483a463ab5176edc423b3da60a410dc969
--- /dev/null
+++ b/Geant4/G4graphics_reps/.gitignore
@@ -0,0 +1,2 @@
+/G4graphics_reps/
+/src/
diff --git a/Geant4/G4graphics_reps/doc/release.notes b/Geant4/G4graphics_reps/doc/release.notes
index ef5e88a69d1ff20cdb0730305915ceadca726108..c220a618dabf0d6fe3d5c7a6e6839d229400c9aa 100755
--- a/Geant4/G4graphics_reps/doc/release.notes
+++ b/Geant4/G4graphics_reps/doc/release.notes
@@ -1,9 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4graphics_reps
! Responsible : Gloria CORTI, Silvia MIGLIORANZI
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!=================== G4graphics_reps v4r1p1 2011-07-14 =======================
! 2011-03-02 - Hubert Degaudenzi
- Added ignore properties in svn
diff --git a/Geant4/G4intercoms/.gitignore b/Geant4/G4intercoms/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..59d5f3cb9d564b726913ae51a6fd19b60329ff4d
--- /dev/null
+++ b/Geant4/G4intercoms/.gitignore
@@ -0,0 +1,2 @@
+/G4intercoms/
+/src/
diff --git a/Geant4/G4intercoms/doc/release.notes b/Geant4/G4intercoms/doc/release.notes
index ccacb17799bbd35f60bbcfd55ef403cd3183c8ec..b6abf071628c90dd41435cae3aab6433b744bf9f 100755
--- a/Geant4/G4intercoms/doc/release.notes
+++ b/Geant4/G4intercoms/doc/release.notes
@@ -1,9 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4intercoms
! Responsible : Gloria CORTI, Silvia MIGLIORANZI
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!======================= G4intercoms v4r1p1 2011-06-29 =======================
! 2011-03-02 - Hubert Degaudenzi
- Add ignore properties in svn
diff --git a/Geant4/G4materials/.gitignore b/Geant4/G4materials/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..a925a844ce1a954fb989dd466268fe132dc3681e
--- /dev/null
+++ b/Geant4/G4materials/.gitignore
@@ -0,0 +1,2 @@
+/G4materials/
+/src/
diff --git a/Geant4/G4materials/doc/release.notes b/Geant4/G4materials/doc/release.notes
index e707eb86c536bf0b7d667f4144d370ea06ba8bbc..dd50acc4c22ba08aae0905f30673c8a506c31cff 100755
--- a/Geant4/G4materials/doc/release.notes
+++ b/Geant4/G4materials/doc/release.notes
@@ -1,9 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4materials
! Responsible : Florence RANJARD
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!======================= G4materials v5r0p1 2011-07-14 =======================
! 2011-03-02 - Hubert Degaudenzi
- Added ignore properties in svn
diff --git a/Geant4/G4modeling/.gitignore b/Geant4/G4modeling/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..e9e8975b0ae8464f2a3b748bedd863f1f8257b69
--- /dev/null
+++ b/Geant4/G4modeling/.gitignore
@@ -0,0 +1,2 @@
+/G4modeling/
+/modeling/
diff --git a/Geant4/G4modeling/doc/release.notes b/Geant4/G4modeling/doc/release.notes
index 34d69405119e0a00d59a75df75fe51c56e3f7d32..9ca302cf1473f6d4f0067b520c3e208808e22070 100755
--- a/Geant4/G4modeling/doc/release.notes
+++ b/Geant4/G4modeling/doc/release.notes
@@ -1,9 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4modeling
! Responsible : Gloria CORTI, Silvia MIGLIORANZI
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!======================== G4modeling v4r1p1 2011-07-14 =======================
! 2011-03-02 - Hubert Degaudenzi
- Added ignore properties in svn
diff --git a/Geant4/G4parmodels/.gitignore b/Geant4/G4parmodels/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..adee69a33a8fb884dc1059728a78f53833b66d8e
--- /dev/null
+++ b/Geant4/G4parmodels/.gitignore
@@ -0,0 +1,2 @@
+/G4parmodels/
+/gflash/
diff --git a/Geant4/G4parmodels/doc/release.notes b/Geant4/G4parmodels/doc/release.notes
index fae48cadd8e422e8bb64970e072a8cb22b273441..6a468bbe688d6913e9e8d9f3c4aef2efb61f9e8a 100755
--- a/Geant4/G4parmodels/doc/release.notes
+++ b/Geant4/G4parmodels/doc/release.notes
@@ -1,9 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4parmodels
! Responsible : Gloria CORTI, Silvia MIGLIORANZI
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!======================= G4parmodels v6r2p1 2011-07-14 =======================
! 2011-03-02 - Hubert Degaudenzi
- Added ignore properties in svn
diff --git a/Geant4/G4particles/.gitignore b/Geant4/G4particles/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..f3218bb72290a5f5d053552d413e4c8248f514c5
--- /dev/null
+++ b/Geant4/G4particles/.gitignore
@@ -0,0 +1,8 @@
+/adjoint/
+/bosons/
+/G4particles/
+/hadrons/
+/leptons/
+/management/
+/shortlived/
+/utils/
diff --git a/Geant4/G4particles/doc/release.notes b/Geant4/G4particles/doc/release.notes
index ea1a84b032c6086e1312620f0d9209a6de68734b..6b76cde826f770c2f59db7a04644dac9667b4e3f 100755
--- a/Geant4/G4particles/doc/release.notes
+++ b/Geant4/G4particles/doc/release.notes
@@ -1,9 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4particles
! Responsible : Gloria CORTI, Silvia MIGLIORANZI
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!======================= G4particles v6r2p1 2011-06-29 =======================
! 2011-03-02 - Hubert DeGaudenzi
- Add ignore properties in svn
diff --git a/Geant4/G4physics_lists/.gitignore b/Geant4/G4physics_lists/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..fad6a6898e927769fc534137218613ef7aaf6e1c
--- /dev/null
+++ b/Geant4/G4physics_lists/.gitignore
@@ -0,0 +1,4 @@
+/builders/
+/G4physics_lists/
+/LHCb/
+/lists/
diff --git a/Geant4/G4physics_lists/doc/release.notes b/Geant4/G4physics_lists/doc/release.notes
index cfcb2127e364c70cc294aa2c001a208546c0928f..423cc7124ccf8ee7939692fdf72f054ebc7794fe 100755
--- a/Geant4/G4physics_lists/doc/release.notes
+++ b/Geant4/G4physics_lists/doc/release.notes
@@ -1,9 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4physics_lists
! Responsible : Gloria CORTI, Silvia MIGLIORANZI
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!===================== G4physics_lists v1r4 2015-04-23 =====================
! 2015-04-23 - Nigel Watson/Tim Williams
- Introduce srcnew copying a la G4processes to allow updated version of HadronPhysicsFTFP_BERT.cc
diff --git a/Geant4/G4processes/.gitignore b/Geant4/G4processes/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..416c07e42a5f1ea0bde305fd4143116fa4c22718
--- /dev/null
+++ b/Geant4/G4processes/.gitignore
@@ -0,0 +1,11 @@
+/biasing/
+/cuts/
+/decay/
+/electromagnetic/
+/G4processes/
+/hadronic/
+/management/
+/optical/
+/parameterisation/
+/scoring/
+/transportation/
diff --git a/Geant4/G4processes/doc/release.notes b/Geant4/G4processes/doc/release.notes
index e901db7106fb0be347711e8836aae84a1c221057..42e1353e5ab6eab70c6db936f0e9e5ad38545f60 100755
--- a/Geant4/G4processes/doc/release.notes
+++ b/Geant4/G4processes/doc/release.notes
@@ -1,14 +1,17 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4processes
! Responsible : Gloria CORTI, Nigel Watson
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
! ======================= G4processes v9r2 2015-07-24 ========================
! 2015-07-23 Tim Williams
- Created patch of G4CollisionInitialState.cc to enable building with GCC4.9
- compiler, located in srcnew/models directory.
- Updated copyPatchedsource.py to copy patched G4CollisionInitialState.cc
+ compiler, located in srcnew/models directory.
+ Updated copyPatchedsource.py to copy patched G4CollisionInitialState.cc
into place.
! ======================= G4processes v9r1 2015-04-24 ========================
@@ -59,7 +62,7 @@
! 2012-06-18 - James Mccarthy
- Removed path for dna model. Not compatible with our version of CLHEP
- and not useful anyway. Can be included at a later date.
+ and not useful anyway. Can be included at a later date.
! 2012-06-17 - James Mccarthy
- Added new path for LEND model, dna and INCL++ library in g4 v9.5.p01
@@ -106,7 +109,7 @@
(see details in geant4 9.1 release notes
http://geant4.web.cern.ch/geant4/support/ReleaseNotes4.9.1.html)
. hadronic/models/incl, Liege cascade INCL model, including ABLA evaporation
- and fission
+ and fission
. hadronic/models/qmd, QMD reaction model based on JQMD
. hadronic/models/rpg, Re-Parametrized Gheisha-style model
@@ -121,7 +124,7 @@
- Remove code G4CascadeInterface.cc from srcnew since no longer used beacuase
fix was introduced in Geant4 itself
- Add in library some more source subdirectories even if not used in our
- physics lists:
+ physics lists:
. scoring (new in 8.2)
. electromagnetic/highenergy (new 7.0)
. electromagnetic/polarization (new in 8.2)
@@ -147,7 +150,7 @@
!======================= G4processes v4r1 =================================
! 2005-11-07 - Gloria CORTI
- introduce path to G4CascadeInterface to prevent crash when using it
- with problematic materials with fractional Z. Will remove it when
+ with problematic materials with fractional Z. Will remove it when
materials will be described without it.
!======================= G4processes v4r0 =================================
diff --git a/Geant4/G4readout/.gitignore b/Geant4/G4readout/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..c6d30b02f9ad0226e4a10e840f88313c9ae1c00a
--- /dev/null
+++ b/Geant4/G4readout/.gitignore
@@ -0,0 +1,2 @@
+/G4readout/
+/src/
diff --git a/Geant4/G4readout/doc/release.notes b/Geant4/G4readout/doc/release.notes
index 92e5ee83010bebc2431adda86996d0c13233fe53..257901bb6d461a3a35c6588a7e120ce287e12f12 100755
--- a/Geant4/G4readout/doc/release.notes
+++ b/Geant4/G4readout/doc/release.notes
@@ -1,9 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4readout
! Responsible : Gloria CORTI, Silvia MIGLIORANZI
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!====================== G4readout v4r1p1 2011-07-14 ==========================
! 2011-03-02 - Hubert Degaudenzi
- Added ignore properties in svn
diff --git a/Geant4/G4run/.gitignore b/Geant4/G4run/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..2dc546a4fa0b04b00aa24341ce8f3acec3881515
--- /dev/null
+++ b/Geant4/G4run/.gitignore
@@ -0,0 +1,2 @@
+/G4run/
+/src/
diff --git a/Geant4/G4run/doc/release.notes b/Geant4/G4run/doc/release.notes
index 6063c409ab67be540157c1a4935c7584750122ee..76c53ec2390fc80ee16462a48b8c3433089185dc 100755
--- a/Geant4/G4run/doc/release.notes
+++ b/Geant4/G4run/doc/release.notes
@@ -1,10 +1,13 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4run
! Responsible : Gloria CORTI, Silvia MIGLIORANZI
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
-!========================== G4run v5r1p1 2011-07-14 ==========================
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
+!========================== G4run v5r1p1 2011-07-14 ==========================
! 2011-03-02 - Hubert Degaudenzi
- Added ignore properties in svn
diff --git a/Geant4/G4track/.gitignore b/Geant4/G4track/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..04bd58178e10e252c34aec27901a6cd99739e9e8
--- /dev/null
+++ b/Geant4/G4track/.gitignore
@@ -0,0 +1,2 @@
+/G4track/
+/src/
diff --git a/Geant4/G4track/doc/release.notes b/Geant4/G4track/doc/release.notes
index d1a2e6a8c19864fd7d2d03dcce6f5838c4a485a9..95b004f196fa1a91c2bdd2992bf0403262af107a 100755
--- a/Geant4/G4track/doc/release.notes
+++ b/Geant4/G4track/doc/release.notes
@@ -1,9 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4track
! Responsible : Gloria CORTI, Silvia MIGLIORANZI
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!========================= G4track v5r1p1 2011-07-14 =========================
! 2011-07-14 - Hubert DEGAUDENZI
- Added ignore properties in svn
diff --git a/Geant4/G4tracking/.gitignore b/Geant4/G4tracking/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..6e354f7905e6c8d83cd0d4dfbcf161ac2c2a698f
--- /dev/null
+++ b/Geant4/G4tracking/.gitignore
@@ -0,0 +1,2 @@
+/G4tracking/
+/src/
diff --git a/Geant4/G4tracking/doc/release.notes b/Geant4/G4tracking/doc/release.notes
index a32e6bb1375ee4e17d486e3031c4d74919fb7402..03a523a3c75ea2abd15317b19006fc9c884c8bea 100755
--- a/Geant4/G4tracking/doc/release.notes
+++ b/Geant4/G4tracking/doc/release.notes
@@ -1,9 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4tracking
! Responsible : Gloria CORTI, Silvia MIGLIORANZI
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!======================= G4tracking v6r1p1 2011-07-14 ========================
! 2011-03-02 - Hubert Degaudenzi
- Added ignore properties in svn
@@ -18,7 +21,7 @@
!=========================== G4tracking v6r0 ==============================
! 2004-10-26 - Florence RANJARD
-requirements - uses G4processes instead of G4progen, G4electromagnetic and
- G4hadronic
+ G4hadronic
!=========================== G4tracking v5r0 ==============================
! 2004-07-07 - Florence RANJARD
diff --git a/Geant4/G4useVisUI/doc/release.notes b/Geant4/G4useVisUI/doc/release.notes
index 8ccb7eb5445e21c30c751bff4af77fbe0362de57..d4ebc64cee145086b3d289f0b53e5438cc75791b 100644
--- a/Geant4/G4useVisUI/doc/release.notes
+++ b/Geant4/G4useVisUI/doc/release.notes
@@ -4,9 +4,12 @@
! Purpose : Put togheter visualization package for use
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!======================== G4useVisUI v3r1 2011-04-12 =========================
! 2011-04-12 - Gloria Corti
- Remove conditional use of packages as they are handled by pattern in
packages themselves.
-!=============================================================================
\ No newline at end of file
+!=============================================================================
diff --git a/Geant4/G4vis_management/.gitignore b/Geant4/G4vis_management/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..6a6e12ca391914bbe1c16d3250f7b8f145437dd0
--- /dev/null
+++ b/Geant4/G4vis_management/.gitignore
@@ -0,0 +1,2 @@
+/G4vis_management/
+/management/
diff --git a/Geant4/G4vis_management/doc/release.notes b/Geant4/G4vis_management/doc/release.notes
index 91abdff878e62552a8c4549700e7c12e1eb28a09..93a883090b25bd4d8acc5807d5cdc62f01865ed6 100755
--- a/Geant4/G4vis_management/doc/release.notes
+++ b/Geant4/G4vis_management/doc/release.notes
@@ -1,9 +1,12 @@
!-----------------------------------------------------------------------------
! Package : Geant4/G4vis_management
! Responsible : Gloria CORTI, Silvia MIGLIORANZI
-! Purpose :
+! Purpose :
!-----------------------------------------------------------------------------
+! 2015-11-02 - Marco Clemencic
+ - Added .gitignore file
+
!================== G4vis_management v4r2p1 2011-07-14 =======================
! 2011-03-02 - Hubert Degaudenzi
- Added ignore properties in svn
@@ -14,7 +17,7 @@
!================== G4vis_management v4r1 2004-10-28 =======================
! 2004-10-28 - Florence RANJARD
- - requirements - remove setting of pp_cppflags which are set in G4FR and
+ - requirements - remove setting of pp_cppflags which are set in G4FR and
G4VRML
!=================== G4vis_management v4r0 2003-11-03 ========================