diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a14f063970e541a71688f75999cc1e216219e7b..02270b0485c0ccbf5a2d04a921d982b2128cf09d 100644 --- a/CMakeLists.txt +++ b/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 diff --git a/Geant4/G4examples/doc/release.notes b/Geant4/G4examples/doc/release.notes index db28961d1f62c3848cdbebc2ee559f1c8951b805..a1ef0d76e597f2609aa703af8819d5122829ac63 100644 --- a/Geant4/G4examples/doc/release.notes +++ b/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. diff --git a/Geant4/G4examples/extended/electromagnetic/G4TestEm3/CMakeLists.txt b/Geant4/G4examples/extended/electromagnetic/G4TestEm3/CMakeLists.txt index 4deffc41a445006d02a9007dec20362d41063f07..918f4bc921e6dff19c4279453380a4b08f502f3e 100644 --- a/Geant4/G4examples/extended/electromagnetic/G4TestEm3/CMakeLists.txt +++ b/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) diff --git a/Geant4/G4examples/extended/electromagnetic/G4TestEm3/scripts/ExampleTestEm3run.sh b/Geant4/G4examples/extended/electromagnetic/G4TestEm3/scripts/ExampleTestEm3run.sh index 4722bd0485a4704e4228d3ab6db97b09397bc123..e3bf4390bbb14c61ec7356dddd6b953edb4c52d3 100755 --- a/Geant4/G4examples/extended/electromagnetic/G4TestEm3/scripts/ExampleTestEm3run.sh +++ b/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 diff --git a/Geant4/G4examples/extended/electromagnetic/G4TestEm5/CMakeLists.txt b/Geant4/G4examples/extended/electromagnetic/G4TestEm5/CMakeLists.txt index f8741303414a31e06daf99bd353a388d3b495e71..a1db88d4de75329a6c2f32c77bf8dbfc09211509 100644 --- a/Geant4/G4examples/extended/electromagnetic/G4TestEm5/CMakeLists.txt +++ b/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) diff --git a/Geant4/G4examples/extended/hadronic/G4Hadr00/CMakeLists.txt b/Geant4/G4examples/extended/hadronic/G4Hadr00/CMakeLists.txt index a51029808156be250606413e8f5a42d199a64318..efa80da9c4cae2ff5bae5cb89af882a2e2c41794 100644 --- a/Geant4/G4examples/extended/hadronic/G4Hadr00/CMakeLists.txt +++ b/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) diff --git a/Geant4Sys/cmt/requirements b/Geant4Sys/cmt/requirements index 78fee01a08b4e02ff6322bd29b83eb21f2e7885a..5cad9b85a739eaf8c35e2d0ae636aa3f8ea275b9 100755 --- a/Geant4Sys/cmt/requirements +++ b/Geant4Sys/cmt/requirements @@ -1,56 +1,57 @@ 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 ============================================================ diff --git a/Geant4Sys/doc/release.notes b/Geant4Sys/doc/release.notes index 648214eeed1125f85d6e8dd1997896b567902d81..54a883e41b6d0babb96368ba16f7fe095b0cda47 100755 --- a/Geant4Sys/doc/release.notes +++ b/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