v95r2

Geant4/G4config/cmt/copy_externalslcg_source.csh

+#!/usr/bin/env csh
+#nkw 21-jun-2012
+# expat available on most linux, and also in LCG external area, but propose to adopt the version packaged within G4 to reduce unnecessary external dependences.
+# Initially, set up for copying only expat, but anticipate we re-use this to use the g4 provided version of clhep as well.
+set echo on
+#copy files from G4Dir = externals
+set G4Dir = "externals"
+
+set here = $PWD
+ 
+set pack = `cmt -quiet show macro_value package`
+if ( "$pack" == "G4externalslcg" ) then
+   set p = "expat/src"
+endif  
+
+
+cd $here/..
+
+if !( -d $p) then
+  mkdir -p $p
+  echo "about to..." 
+  echo $G4_UNIX_COPY ${G4SRC}/${G4Dir}/${p}/*.* ${p}/.
+  echo  $G4_UNIX_COPY ${G4SRC}/${G4Dir}/${p}/../include/*.* ${pack}/.
+
+  $G4_UNIX_COPY ${G4SRC}/${G4Dir}/${p}/*.* ${p}/.
+  $G4_UNIX_COPY ${G4SRC}/${G4Dir}/${p}/../include/*.* ${pack}/.
+  echo " Source files have been copied from ${G4SRC}/{$G4Dir}/${p}"
+else
+  echo "  ${G4SRC}/${p} already exists, skipped copy"
+endif
+
+cd $here
+
+unset echo
+

Geant4/G4config/cmt/copy_externalslcg_source.sh

+#set echo on
+#nkw 21-jun-2012
+#copy files from G4 directory  = externals
+# expat available on most linux, and also in LCG external area, but propose to adopt the version packaged within G4 to reduce unnecessary external dependences.
+# Initially, set up for copying only expat, but anticipate we re-use this to use the g4 provided version of clhep as well.
+G4Dir="externals"
+
+here=$PWD
+ 
+pack=`cmt -quiet show macro_value package`
+if [ "$pack" == "G4externalslcg" ]
+then
+  p="expat/src"
+fi  
+
+
+cd $here/..
+
+if [ ! -d $p ] 
+ then
+   mkdir -p $p
+   $G4_UNIX_COPY ${G4SRC}/${G4Dir}/${p}/*.* ${p}/.
+   $G4_UNIX_COPY ${G4SRC}/${G4Dir}/${p}/../include/*.* ${pack}/.
+   echo "Source files have been copied from ${G4SRC}/${G4Dir}/${p}"
+else
+   echo "${G4Dir}/${p} already exists, skipped copy"
+fi
+
+cd $here
+
+unset echo
+

Geant4/G4config/cmt/copy_gdml_source.csh

 #!/usr/bin/env csh
-# NKW  17-Jul-2012
+# NKW  18-Jul-2012
 # Non-standard copy script required to get GDML sources from G4 release area.
-set echo on
-#copy files from G4Dir = externals
+#set echo on
 set G4Dir = "persistency/gdml"
 
 set here = $PWD
- 
+set list = ""
 set pack = `cmt -quiet show macro_value package`
 if ( "$pack" == "G4GDML" ) then
    set list = "src schema"
 endif  
 
-
 cd $here/..
 
 foreach p ($list[*])
@@ -29,5 +27,5 @@ end
 
 cd $here
 
-unset echo
+#unset echo
 

Geant4/G4config/cmt/copy_gdml_source.sh

 #!/usr/bin/env csh
-# NKW  17-Jul-2012
+# NKW  18-Jul-2012
 # Non-standard copy script required to get GDML sources from G4 release area.
-set -x
-#copy files from G4Dir = externals
+#set -x
 G4Dir = "persistency/gdml"
 
 here = $PWD
- 
+list="" 
 pack = `cmt -quiet show macro_value package`
 if [ "$pack" == "G4GDML" ] then
   list = "src schema"
 fi
 
-
 cd $here/..
 
 for p in $list
@@ -31,5 +29,5 @@ done
 
 cd $here
 
-set +x
+#set +x
 

Geant4/G4config/cmt/copy_include.csh

@@ -6,12 +6,13 @@ set here = $PWD
 
 cd ../../..
 
-set incl_dir = $G4SHARE/include
+set incl_dir = $G4SHARE/include/
 
 if !( -d InstallArea/include ) then 
   if  !( -d InstallArea ) mkdir -p InstallArea
+
   cd InstallArea
-  $G4_UNIX_COPY ${incl_dir} include
+  $G4_UNIX_COPY ${incl_dir} .
   echo ' include files have been copied from '${incl_dir}
 else
   echo ' include files exist - NO copy from '${incl_dir}

Geant4/G4config/cmt/copy_include.sh

@@ -2,7 +2,7 @@ here=$PWD
 
 cd ../../..
 
-incl_dir=${G4SHARE}/include
+incl_dir=${G4SHARE}/include/
 
 
  if [ ! -d InstallArea/include ] 
@@ -12,7 +12,7 @@ incl_dir=${G4SHARE}/include
        mkdir -p InstallArea
     fi
     cd InstallArea
-    $G4_UNIX_COPY ${incl_dir} include
+    $G4_UNIX_COPY ${incl_dir} .
     echo ' include files have been copied from '${incl_dir}
   else
     echo ' include files exist - NO copy from '${incl_dir}

Geant4/G4config/cmt/requirements

 package        G4config
-version        v94r2p6
+version        v95r2
 branches       cmt doc
 
 
@@ -11,8 +11,8 @@ use CLHEP       v* LCG_Interfaces
 #==============================================================================
 # set versions of Geant4
 #==============================================================================
-set G4_native_version     "9.4.p02"
-set G4VERS v94r2p6
+set G4_native_version     "9.5.p02"
+set G4VERS v95r2
 
 # =============================================================================
 # set Geant4 environment variables
@@ -86,10 +86,6 @@ pattern G4_copy_hadlists_source \
 pattern G4_copy_gdml_source \
      apply_pattern G4_copy_pattern type=gdml
 
-
-
-
-
 private
 
 action G4config_copy_include "$(G4CONFIGROOT)/cmt/copy_include.csh" WIN32 "$(G4CONFIGROOT)\cmt\copy_include.bat"

Geant4/G4config/cmt/version.cmt

-v94r2p6
+v95r2

Geant4/G4config/doc/release.notes

 !-----------------------------------------------------------------------------
 ! Package     : Geant4/G4config
-! Responsible : Gloria Corti
+! Responsible : Gloria Corti/ Nigel Watson
 ! Purpose     : Configuration package for Geant4 build
 !-----------------------------------------------------------------------------
 
-! ======================= G4config v94r2p6 2012-10-30 ========================
-! 2012-11-30 - Nigel Watson
- - New release, built on branch vb94r2b from v94r2p5, only revised Gaudi v23r5.
+! ======================= G4config v95r2 2012-11-23 ========================
+! 2012-11-23 - Nigel Watson
+ - Updated local version number.
 
+! 2012-11-13 - Nigel Watson
+ - Adopt 9.5.p02 for release.
 
-! ======================= G4config v94r2p5 2012-10-17 ========================
-! 2012-10-17 - Nigel Watson
- - Built on branch vb94r2b fom v94r2p4 for Gaudi v23r4.
- - 
+! 2012-07-30 - Nigel Watson
+ - Permissions on existing GDML copy scripts fixed (properly).
 
-! ======================= G4config v94r2p4 2012-07-16 ========================
-! 2012-07-16 - Nigel Watson
- - Built on branch vb94r2b fom v94r2p3.
+! 2012-07-27 - Nigel Watson
+ - Removed redundant copying of headers in copy_include scripts, changed
+permissions.
+
+! 2012-07-26 - Nigel Watson
+ - Removed G4externalslcg, using LCG_Interfaces instead.
+
+! 2012-07-18 - Nigel Watson
+ - Added copy pattern for G4GDML and copy scripts.
+
+! 2012-06-19 - James McCarthy
+
+ - Added include path for new files in G4 9.5
+
+! 2012-04-27 - Nigel Watson
+ - New version in 9.5 release series.
 
 ! ======================= G4config v94r2p3 2012-04-03 ========================
 ! 2012-04-03 - Gloria Corti

Geant4/G4physics_lists/cmt/requirements

@@ -3,7 +3,7 @@
 # Maintainer : Gloria CORTI 
 #============================================================================
 package           G4physics_lists
-version           v1r2p1
+version           v1r3
 
 # Structure, i.e. directories to process. 
 #============================================================================
@@ -15,7 +15,7 @@ use   G4run       v*      Geant4
 
 # Library building rule
 #============================================================================
-library G4physics_lists $(G4LibraryFlags)     \
+library G4physics_lists -x=DNA $(G4LibraryFlags)     \
                         ../lists/src/*.cc     \
                         ../builders/src/*.cc  
 

Geant4/G4physics_lists/cmt/version.cmt

-v1r2p1
+v1r3

Geant4/G4physics_lists/doc/release.notes

@@ -4,6 +4,10 @@
 ! Purpose     : 
 !-----------------------------------------------------------------------------
 
+!===================== G4physics_lists v1r3 2012-11-23 =====================
+! 2012-11-23 - Nigel Watson
+ - Tagged version for G4 9.5.p02 release.
+
 !===================== G4physics_lists v1r2p1 2011-07-14 =====================
 ! 2011-03-02 - Hubert Degaudenzi
  - Added ignore properties in svn

Geant4/G4processes/cmt/requirements

@@ -3,7 +3,7 @@
 # Maintainer : Gloria CORTI
 #============================================================================
 package           G4processes
-version           v8r1
+version           v8r2
 
 # Structure, i.e. directories to process. 
 #============================================================================
@@ -11,8 +11,10 @@ branches          cmt doc G4processes
 
 # Dependencies 
 #============================================================================
-use   G4digits_hits  v*      Geant4
-
+use   G4digits_hits   v*      Geant4
+#nkw 26/7/2012 use   G4externalslcg  v*      Geant4
+#nkw
+use   Expat          v*       LCG_Interfaces
 # apply_pattern install_more_includes more=G4processes
 
 include_dirs $(G4processes_root)/G4processes 
@@ -37,8 +39,17 @@ library        G4processes $(G4LibraryFlags) \
                                lowenergy/src/*.cc                   \
                                highenergy/src/*.cc                  \
                                pii/src/*.cc                         \
-                               polarisation/src/*.cc                \
- 
+                               polarisation/src/*.cc                       
+
+# The DNA library cannot be used with this version of CLHEP
+# Not useful for LHCb anyway, but can be included later 
+#	              -s=../electromagnetic/dna/           \
+#			       management/src/*.cc                  \
+#                     	       untils/src/*.cc                      \
+#			       molecules/src/*.cc                   \
+#                               models/src/*.cc                      \
+#                               processes/src/*.cc                   
+                                
 # the library had to be split in 2 parts: there is too many symbols
 # exported for the windows linker otherwise (>32768), Hubert DeGaudenzi
 
@@ -57,11 +68,13 @@ library        G4processeshad $(G4LibraryFlags) \
                                im_r_matrix/src/*.cc                 \
                                incl/src/*.cc                        \
                                isotope_production/src/*.cc          \
+      			       lend/src/*.cc                        \
                                lll_fission/src/*.cc                 \
                                low_energy/src/*.cc                  \
                                management/src/*.cc                  \
                                neutron_hp/src/*.cc                  \
                                qmd/src/*.cc                         \
+	     		       quasi_elastic/src/*.cc		    \	
                                radioactive_decay/src/*.cc           \
                                rpg/src/*.cc                         \
                                theo_high_energy/src/*.cc            \
@@ -87,7 +100,11 @@ library        G4processeshad $(G4LibraryFlags) \
                                multifragmentation/src/*.cc          \
                                photon_evaporation/src/*.cc          \
                                util/src/*.cc                        \
-                      -s=../hadronic/models/parton_string           \
+                       -s=../hadronic/models/inclxx/  \
+                               incl_physics/src/*.cc                \
+                               interface/src/*.cc                   \
+                               utils/src/*.cc                       \
+                       -s=../hadronic/models/parton_string  \
                                diffraction/src/*.cc                 \
                                hadronization/src/*.cc               \
                                management/src/*.cc                  \

Geant4/G4processes/cmt/version.cmt

-v8r1
+v8r2

Geant4/G4processes/doc/release.notes

@@ -4,6 +4,20 @@
 ! Purpose     : 
 !-----------------------------------------------------------------------------
 
+! ======================= G4processes v8r2 2012-11-23 ========================
+! 2012-11-23 - Nigel Watson
+ - Tagged for release with G4 v95r2.
+
+! 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.  
+
+! 2012-06-17 - James Mccarthy
+ - Added new path for LEND model, dna and INCL++ library in g4 v9.5.p01
+
+! 2012-05-17 - James Mccarthy
+ - Added new path for quasi_elastic library in g4 v9.5.p01
+
 ! ======================= G4processes v8r1 2011-07-14 ========================
 ! 2011-05-16 - Gloria Corti
  - Include in library new source directories introduced in geant4 9.4.patch01

Geant4Sys/cmt/requirements

 package     Geant4Sys
-version     v94r2p6
+version     v95r2
 
 branches    cmt doc 
  
-use     G4config              v94r2p6  Geant4 
+use     G4config              v95r2 Geant4 
  
 # =============================================================================
 # =========== global libraries ================================================
@@ -13,8 +13,8 @@ use	G4intercoms           v4r1p1 Geant4
 use	G4particles           v6r2p1 Geant4 
 use	G4track               v5r1p1 Geant4 
 use	G4geometry            v6r2p1 Geant4 
-use 	G4processes	      v8r1   Geant4
-use     G4physics_lists       v1r2p1 Geant4
+use 	G4processes	      v8r2   Geant4
+use     G4physics_lists       v1r3   Geant4
 use     G4tracking            v6r1p1 Geant4
 use     G4global              v5r1p1 Geant4 
 use     G4materials           v5r0p1 Geant4 

Geant4Sys/cmt/version.cmt

-v94r2p6
+v95r2

Geant4Sys/doc/release.notes

@@ -3,29 +3,63 @@ Package            : Geant4Sys
 Package manager(s) : Gloria Corti, Hubert DeGaudenzi, Nigel Watson
 Purpose            : LHCb build using cmt of Geant4
 
-</PRE><H1><A NAME=v94r2p6>2012-10-30 Geant4Sys v94r2p6</A></H1><PRE>
-! ======================= G4config v94r2p6 2012-10-30 ========================
-! 2012-10-30 - Nigel Watson
- - New release, built on branch vb94r2b from v94r2p5.
+!=============================================================================
+!</PRE><H1><A NAME=v95r2>2012-11-23 Geant4Sys v95r2</A></H1><PRE>
 
- -              New release built on Gaudi v23r5 and geant4 9.4.patch02
+  Use Gaudi v23r4 Geant4 9.5.patch02
 
-</PRE><H1><A NAME=v94r2p5>2012-10-17 Geant4Sys v94r2p5</A></H1><PRE>
-! ======================= G4config v94r2p5 2012-10-17 ========================
-! 2012-10-17 - Nigel Watson
- -              New branch based on V94r2p4.
-                use Gaudi v23r4 and geant4 9.4.patch02
+! ======================= G4processes v8r2 2012-11-23 ========================
+! 2012-11-23 - Nigel Watson
+ - Tagged for release with G4 v95r2.
 
-!=============================================================================
+! 2012-06-18 - James Mccarthy
+ - Removed  path for dna model - not compatible with our version of CLHEP
+ and not useful anyway
+ - Added new path for LEND model and INCL++ library
+ - Added new path for quasi_elastic library in g4 v9.5.p01
+
+!===================== G4physics_lists v1r3 2012-11-23 =====================
+! 2012-11-23 - Nigel Watson
+ - Tagged version for G4 9.5.p02 release.  Includes pattern to exclude
+ builder for DNA-related physics list (proble with requiring CLHEP headers
+ not present in 1.9.4.7).
+
+! ======================= G4config v95r2 2012-11-23 ========================
+! 2012-11-23 - Nigel Watson
+ - Updated local version number.
+
+! 2012-11-13 - Nigel Watson
+ - Adopt 9.5.p02 for release.
+
+! 2012-07-30 - Nigel Watson
+ - Permissions on existing GDML copy scripts fixed (properly).
+
+! 2012-07-27 - Nigel Watson
+ - Removed redundant copying of headers in copy_include scripts, changed
+permissions.
 
-</PRE><H1><A NAME=v94r2p4>2012-07-16 Geant4Sys v94r2p4</A></H1><PRE>
-! ======================= G4config v94r2p4 2012-07-16 ========================
-! 2012-07-16 - Nigel Watson
- -              New branch based on V94r2p3.
-                use Gaudi v23r3 and geant4 9.4.patch02
+! 2012-07-26 - Nigel Watson
+ - Removed G4externalslcg, using LCG_Interfaces instead.
+
+! 2012-07-18 - Nigel Watson
+ - Added copy pattern for G4GDML and copy scripts.
+
+! 2012-06-19 - James McCarthy
+
+ - Added include path for new files in G4 9.5
+
+! 2012-04-27 - Nigel Watson
+ - New version in 9.5 release series.
+
+
+</PRE><H1><A NAME=v94r2p4>2012-07-17 Geant4Sys v94r2p4</A></H1><PRE>
+! ======================= G4config v94r2b 2012-07-17 ========================
+! 2012-07-17 - Nigel Watson
+ -             Added G4GDML
 
 !=============================================================================
 
+
 !</PRE><H1><A NAME=v94r2p3>2012-04-03 Geant4Sys v94r2p3</A></H1><PRE>
                 use Gaudi v23r2 and geant4 9.4.patch02
                 built on slc5 i686(32-bit), x86_64(64-bit) and icc11