Merge branch 'Sim09ToMaster' into 'master'

Sim09 to master

See merge request !17

CMakeLists.txt

@@ -5,7 +5,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
 set(GEANT4_SRCS_REPOSITORY https://gitlab.cern.ch/lhcb/Geant4-srcs.git CACHE STRING "Repository for Geant4 sources")
 
 find_package(GaudiProject)
-gaudi_project(Geant4 v96r4p3
+gaudi_project(Geant4 v96r4p4
               DATA Geant4Files VERSION v96r*)
 
 # FIXME: hack for compatibility with CMT build

Geant4/G4examples/doc/release.notes

@@ -7,6 +7,8 @@
 !2016-05-10 - Alexander Mazurov
 	- Fix LHCBGAUSS-741. 
 	  Typo in Geant4/G4examples/extended/hadronic/G4Hadr00/CMakeLists.txt
+! 2016-04-27 - Marco Clemencic
+ - Added dependency on ROOT for tests runtime.
 
 !2016-03-16 - Nigel Watson
 	- Tagged as v6r2, with small corrections to TestEm5, etc.

Geant4/G4examples/extended/electromagnetic/G4TestEm3/CMakeLists.txt

@@ -6,3 +6,6 @@ gaudi_alias(Calorimeter_test ExampleTestEm3run.sh)
 
 # CMT-compatibility alias
 gaudi_alias(testEm3.exe TestEm3)
+
+# Required for tests
+find_package(ROOT)

Geant4/G4examples/extended/electromagnetic/G4TestEm3/scripts/ExampleTestEm3run.sh

@@ -15,7 +15,8 @@ fi
 testEm3.exe $G4TESTEM3ROOT/scripts/opt1noapplycuts.mac
 
 #There is a bug with ROOT 6 opening Geant4 created histograms, have to use old root for now
-source /afs/cern.ch/sw/lcg/app/releases/ROOT/5.34.30/$CMTCONFIG/root/bin/thisroot.sh
+# amazurov: Currentlu I could not observe this problem: 
+# source /afs/cern.ch/sw/lcg/app/releases/ROOT/5.34.30/$CMTCONFIG/root/bin/thisroot.sh
 
 g++ -c `root-config --cflags` $G4TESTEM3ROOT/scripts/Plot.C
 g++ -o Plot `root-config --glibs` Plot.o

Geant4/G4examples/extended/electromagnetic/G4TestEm5/CMakeLists.txt

@@ -6,3 +6,6 @@ gaudi_alias(MultipleScattering_test  Em5run.sh)
 
 # CMT-compatibility alias
 gaudi_alias(testEm5.exe TestEm5)
+
+# Required for tests
+find_package(ROOT)

Geant4/G4examples/extended/hadronic/G4Hadr00/CMakeLists.txt

@@ -6,3 +6,6 @@ gaudi_alias(hadronic_tests run_hadronic_tests.py)
 
 # CMT-compatibility alias
 gaudi_alias(hadr00.exe Hadr00)
+
+# Required for tests
+find_package(ROOT)

Geant4Sys/cmt/requirements

 package     Geant4Sys
-version     v96r4p3
+version     v96r4p4
 
 branches    cmt doc 
- 
-use     G4config              v96r4p3 Geant4 
+
+# This package is essential for the cmt build 
+use     G4config              v* Geant4
  
 # =============================================================================
 # =========== global libraries ================================================
 # =============================================================================
-use	G4event               v6r0p1 Geant4 
-use	G4intercoms           v4r1p1 Geant4 
-use	G4particles           v6r2p1 Geant4 
-use	G4track               v5r1p1 Geant4 
-use	G4geometry            v6r2p1 Geant4 
-use 	G4processes	      v9r2   Geant4
-use     G4physics_lists       v1r4   Geant4
-use     G4tracking            v6r1p1 Geant4
-use     G4global              v5r1p1 Geant4 
-use     G4materials           v5r0p1 Geant4 
-use     G4readout             v4r1p1 Geant4  
-use     G4digits_hits         v7r1p1 Geant4
-use     G4graphics_reps       v4r1p1 Geant4 
-use     G4run                 v5r1p1 Geant4  
-use     G4parmodels           v6r2p1 Geant4
-use     G4GDML                v2r0   Geant4
+use	G4event               v* Geant4 
+use	G4intercoms           v* Geant4 
+use	G4particles           v* Geant4 
+use	G4track               v* Geant4 
+use	G4geometry            v* Geant4 
+use 	G4processes	      v* Geant4
+use     G4physics_lists       v* Geant4
+use     G4tracking            v* Geant4
+use     G4global              v* Geant4 
+use     G4materials           v* Geant4 
+use     G4readout             v* Geant4  
+use     G4digits_hits         v* Geant4
+use     G4graphics_reps       v* Geant4 
+use     G4run                 v* Geant4  
+use     G4parmodels           v* Geant4
+use     G4GDML                v* Geant4
  
 # Visualization
-use     G4useVisUI            v3r1   Geant4
-use     G4Tree                v4r1p1 Geant4 
-use     G4modeling            v4r1p1 Geant4 
-use     G4vis_management      v4r2p1 Geant4 
-use	G4RayTracer           v5r1p1 Geant4 
+use     G4useVisUI            v* Geant4
+use     G4Tree                v* Geant4 
+use     G4modeling            v* Geant4 
+use     G4vis_management      v* Geant4 
+use	G4RayTracer           v* Geant4 
 # Will not be built on Windows
-use     G4FR                  v4r4 Geant4
-use     G4VRML                v4r2 Geant4
+use     G4FR                  v* Geant4
+use     G4VRML                v* Geant4
 # Will not be built on Darwin nor Windows
-use     G4externals           v1r0 Geant4
-use     G4OpenGL              v4r4 Geant4
+use     G4externals           v* Geant4
+use     G4OpenGL              v* Geant4
 
 # User Interface
 # Will not be built on Darwin
-use     G4UIcommon            v5r3 Geant4
-use     G4UIbasic             v4r4 Geant4
+use     G4UIcommon            v* Geant4
+use     G4UIbasic             v* Geant4
 # Will not be built on Darwin nor Windows
-use     G4UIGAG               v4r3 Geant4
+use     G4UIGAG               v* Geant4
 
 # LHCb additional package (eg. for MC11 G4LHCblists)
-use     G4LHCblists           v3r2 Geant4
+use     G4LHCblists           v* Geant4
 
 # G4 examples package - for checks
-use    G4analysis             v1r0 Geant4
-use    G4examples             v6r2 Geant4
+use    G4analysis             v* Geant4
+use    G4examples             v* Geant4
 
 #=============================================================================
 # ======== the end ============================================================

Geant4Sys/doc/release.notes

@@ -5,6 +5,30 @@ Purpose            : LHCb build using cmt of Geant4
 
 !=============================================================================
 
+!</PRE><H1><A NAME=v96r4p4>2016-06-10 Geant4Sys v96r4p4</A></H1><PRE>
+This version is based on Geant4 9.6.p04 with patches for LHCb and examples for validation
+<P>
+This version is essentially identical to v94r4p3 but it uses Gaudi v27r1 and LCG_84
+<b>BEWARE:
+<ul>
+<li>This version exists only in Git, on Sim09 branch
+<li>The package release notes are no longer maintained, look at the Git Merge Request (MR) comments
+<li>The pacakge versions are no longer maintained, use the Git commit IDs
+</ul>
+</b>
+
+<h2>Only functional changes in Examples>/h2>
+<dl>
+<dt>[<a href="https://gitlab.cern.ch/lhcb/Geant4/merge_requests/7">MR 7</a>] 
+Remove use of G4VERS when tunning the hadronic tests
+<dd>
+<dt>[<a href="https://gitlab.cern.ch/lhcb/Geant4/merge_requests/8">MR 8</a>] 
+Remove hardcoded version of root and use default
+<dd>
+</dl>
+
+!=============================================================================
+
 !</PRE><H1><A NAME=v96r4p3>2016-03-16 Geant4Sys v96r4p3</A></H1><PRE>
  - Based on Geant4 9.6.p04 with patches for LHCb and examples for validation