v95r2p4

Geant4/G4config/cmt/requirements

 package        G4config
-version        v95r2p3
+version        v95r2p4
 branches       cmt doc
 
 
@@ -12,7 +12,7 @@ use CLHEP       v* LCG_Interfaces
 # set versions of Geant4
 #==============================================================================
 set G4_native_version     "9.5.p02"
-set G4VERS v95r2p3
+set G4VERS v95r2p4
 
 # =============================================================================
 # set Geant4 environment variables

Geant4/G4config/cmt/version.cmt

-v95r2p3
+v95r2p4

Geant4/G4config/doc/release.notes

@@ -4,6 +4,10 @@
 ! Purpose     : Configuration package for Geant4 build
 !-----------------------------------------------------------------------------
 
+! ======================= G4config v95r2p4 2013-04-10 ========================
+! 2013-04-10 - Nigel Watson
+ - Tagged for new release for use fixed FTF model in G4processes.
+
 ! ======================= G4config v95r2p3 2013-03-28 ========================
 ! 2013-03-28 - Nigel Watson
  - Tagged for new release for use with Gaudi v23r7, for upgrade/Gauss v46 series

Geant4/G4processes/cmt/copyPatchedSource.py

@@ -10,10 +10,13 @@ import  os, sys, fnmatch, shutil
 def main():    
 # Dir in which we keep updated source/headers.
   SRCNEW_Dir="../srcnew"
+  SRCNEW_diffraction_Dir="../srcnew/diffraction"
 
 # Dir for original source
   SRC_Dir="../hadronic/models/chiral_inv_phase_space/interface/src"
-
+# Dir for original FTF source to be replaced
+  SRC_diffraction_Dir="../hadronic/models/parton_string/diffraction/src"
+  
 # Can we get cmt macro values in .python?
 # Expanded by cmt to be $(GEANT4_home)/$(GEANT4_installarea_prefix)/include
 #  INSTALLAREA_project=os.environ['GEANT4_install_include']
@@ -23,7 +26,7 @@ def main():
 
 #$(G4processes_root)/G4processes
 
-# Find any files in the srcnew dir
+# Find any files in the srcnew dir (CHIPS cross-section fixes)
   for newfile in os.listdir(SRCNEW_Dir):
     if fnmatch.fnmatch(newfile, '*.hh'):
 #Replace old headers in install areas with new.
@@ -35,5 +38,19 @@ def main():
       fname = os.path.join(SRCNEW_Dir, newfile)
       shutil.copy2(fname,SRC_Dir)
 
+
+# Find any files in the srcnew dir (FTF mass problem fixes)
+  for newfile in os.listdir(SRCNEW_diffraction_Dir):
+# Only .cc to replace for FTF fix.
+#    if fnmatch.fnmatch(newfile, '*.hh'):
+#Replace old headers in install areas with new.
+#      fname = os.path.join(SRCNEW_Dir, newfile)
+#      shutil.copy2(fname,INSTALLAREA_project)
+#      shutil.copy2(fname,INSTALLAREA_package)
+# Replace old .cc with new.
+    if fnmatch.fnmatch(newfile, '*.cc'):
+      fname = os.path.join(SRCNEW_diffraction_Dir, newfile)
+      shutil.copy2(fname,SRC_diffraction_Dir)
+
 if __name__ == "__main__":
     main()

Geant4/G4processes/cmt/requirements

@@ -3,7 +3,7 @@
 # Maintainer : Gloria CORTI
 #============================================================================
 package           G4processes
-version           v8r3p1
+version           v8r3p2
 
 # Structure, i.e. directories to process. 
 #============================================================================

Geant4/G4processes/cmt/version.cmt

-v8r3p1
+v8r3p2

Geant4/G4processes/doc/release.notes

@@ -4,6 +4,11 @@
 ! Purpose     : 
 !-----------------------------------------------------------------------------
 
+! ======================= G4processes v8r3p2 2013-04-10 ========================
+! 2013-04-10 - Nigel Watson
+ - Update copyPatchedSource.py, add srcnew_diffraction and .cc to fix (?) FTF
+   mass problems.
+
 ! ======================= G4processes v8r3p1 2013-02-14 ========================
 ! 2013-02-14 - Nigel Watson
  - Remove copyPatchedIncludes.py, add copyPatchedSource.py, replaces .cc/.hh from ../srcnew

Geant4Sys/cmt/requirements

 package     Geant4Sys
-version     v95r2p3
+version     v95r2p4
 
 branches    cmt doc 
  
-use     G4config              v95r2p3 Geant4 
+use     G4config              v95r2p4 Geant4 
  
 # =============================================================================
 # =========== global libraries ================================================
@@ -13,7 +13,7 @@ use	G4intercoms           v4r1p1 Geant4
 use	G4particles           v6r2p1 Geant4 
 use	G4track               v5r1p1 Geant4 
 use	G4geometry            v6r2p1 Geant4 
-use 	G4processes	      v8r3p1 Geant4
+use 	G4processes	      v8r3p2 Geant4
 use     G4physics_lists       v1r3   Geant4
 use     G4tracking            v6r1p1 Geant4
 use     G4global              v5r1p1 Geant4 

Geant4Sys/cmt/version.cmt

-v95r2p3
+v95r2p4

Geant4Sys/doc/release.notes

@@ -3,6 +3,11 @@ Package            : Geant4Sys
 Package manager(s) : Gloria Corti, Hubert DeGaudenzi, Nigel Watson
 Purpose            : LHCb build using cmt of Geant4
 
+!=============================================================================
+!</PRE><H1><A NAME=v95r2p4>2013-04-10 Geant4Sys v95r2p4</A></H1><PRE>
+! 2013-04-10 - Nigel Watson
+ - Tagged for new release for use fixed FTF model in G4processes.
+
 !=============================================================================
 !</PRE><H1><A NAME=v95r2p3>2013-03-28 Geant4Sys v95r2p3</A></H1><PRE>
 ! 2013-03-28 - Nigel Watson

cmt/project.cmt

 project GEANT4
 
-use GAUDI	GAUDI_v23r7
+use GAUDI	GAUDI_v23r6
 
 build_strategy	with_installarea
 setup_strategy	root