Print

Print


Commit in slic on MAIN
GNUmakefile+7-71.43 -> 1.44
config/make/lcio.gmk+4-31.2 -> 1.3
include/G4PhysicsBuilders.icc+28added 1.1
       /G4PhysicsLists.hh+28added 1.1
src/PhysicsListFactory.cc+7-11.26 -> 1.27
+74-11
2 added + 3 modified, total 5 files
fix up slic for geant4 9.4

slic
GNUmakefile 1.43 -> 1.44
diff -u -r1.43 -r1.44
--- GNUmakefile	10 Sep 2010 20:59:10 -0000	1.43
+++ GNUmakefile	2 Jan 2011 06:44:31 -0000	1.44
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/GNUmakefile,v 1.43 2010/09/10 20:59:10 jeremy Exp $
+# $Header: /cvs/lcd/slic/GNUmakefile,v 1.44 2011/01/02 06:44:31 jeremy Exp $
 #
 # Makefile for SLIC simulation package based on examples GNUmakefile by G. Cosmo.
 #
@@ -34,9 +34,6 @@
 # G4 arch include
 include $(G4INSTALL)/config/architecture.gmk
 
-# HepPDT
-include $(MAKEINCLUDES)/heppdt.gmk
-
 # LCDD
 include $(MAKEINCLUDES)/lcdd.gmk
 
@@ -46,12 +43,15 @@
 # Xerces
 include $(MAKEINCLUDES)/xerces.gmk
 
-# LCIO
-include $(MAKEINCLUDES)/lcio.gmk
-
 # Geant4 binmake and special settings
 include $(MAKEINCLUDES)/geant4.gmk
 
+# HepPDT
+include $(MAKEINCLUDES)/heppdt.gmk
+
+# LCIO
+include $(MAKEINCLUDES)/lcio.gmk
+
 # Qt
 include $(MAKEINCLUDES)/qt.gmk
 

slic/config/make
lcio.gmk 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- lcio.gmk	6 Dec 2005 00:54:18 -0000	1.2
+++ lcio.gmk	2 Jan 2011 06:44:32 -0000	1.3
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/config/make/lcio.gmk,v 1.2 2005/12/06 00:54:18 jeremy Exp $
+# $Header: /cvs/lcd/slic/config/make/lcio.gmk,v 1.3 2011/01/02 06:44:32 jeremy Exp $
 
 #
 # LCIO make fragment
@@ -11,9 +11,10 @@
   CPPFLAGS += -I$(LCIO)/sio/include
 
   # libs
-  LCIO_LIBS = -llcio -lsio
+  #LCIO_LIBS = -llcio -lsio
   LDFLAGS += -L$(LCIO)/lib -L$(LCIO)/sio/lib
-  LOADLIBS += $(LCIO_LIBS)
+  #LOADLIBS += $(LCIO_LIBS)
+  LOADLIBS += -llcio -lsio  
   LOADLIBS += -lz
 else
   $(error define LCIO=/path/to/lcio)

slic/include
G4PhysicsBuilders.icc added at 1.1
diff -N G4PhysicsBuilders.icc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ G4PhysicsBuilders.icc	2 Jan 2011 06:44:32 -0000	1.1
@@ -0,0 +1,28 @@
+BUILDER( CHIPS, "" )
+BUILDER( FTFP_BERT, "" )
+BUILDER( FTFP_BERT_EMV, "" )
+BUILDER( FTFP_BERT_EMX, "" )
+BUILDER( FTFP_BERT_TRV, "" )
+BUILDER( FTF_BIC, "" )
+BUILDER( LBE, "" )
+BUILDER( LHEP, "" )
+BUILDER( LHEP_EMV, "" )
+BUILDER( QBBC, "" )
+BUILDER( QGSC_BERT, "" )
+BUILDER( QGSC_CHIPS, "" )
+BUILDER( QGSP, "" )
+BUILDER( QGSP_BERT, "" )
+BUILDER( QGSP_BERT_CHIPS, "" )
+BUILDER( QGSP_BERT_EMV, "" )
+BUILDER( QGSP_BERT_EMX, "" )
+BUILDER( QGSP_BERT_HP, "" )
+BUILDER( QGSP_BERT_NOLEP, "" )
+BUILDER( QGSP_BERT_TRV, "" )
+BUILDER( QGSP_BIC, "" )
+BUILDER( QGSP_BIC_EMY, "" )
+BUILDER( QGSP_BIC_HP, "" )
+BUILDER( QGSP_FTFP_BERT, "" )
+BUILDER( QGSP_INCL_ABLA, "" )
+BUILDER( QGSP_QEL, "" )
+BUILDER( QGS_BIC, "" )
+BUILDER( Shielding, "" )

slic/include
G4PhysicsLists.hh added at 1.1
diff -N G4PhysicsLists.hh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ G4PhysicsLists.hh	2 Jan 2011 06:44:32 -0000	1.1
@@ -0,0 +1,28 @@
+#include "CHIPS.hh"
+#include "FTFP_BERT.hh"
+#include "FTFP_BERT_EMV.hh"
+#include "FTFP_BERT_EMX.hh"
+#include "FTFP_BERT_TRV.hh"
+#include "FTF_BIC.hh"
+#include "LBE.hh"
+#include "LHEP.hh"
+#include "LHEP_EMV.hh"
+#include "QBBC.hh"
+#include "QGSC_BERT.hh"
+#include "QGSC_CHIPS.hh"
+#include "QGSP.hh"
+#include "QGSP_BERT.hh"
+#include "QGSP_BERT_CHIPS.hh"
+#include "QGSP_BERT_EMV.hh"
+#include "QGSP_BERT_EMX.hh"
+#include "QGSP_BERT_HP.hh"
+#include "QGSP_BERT_NOLEP.hh"
+#include "QGSP_BERT_TRV.hh"
+#include "QGSP_BIC.hh"
+#include "QGSP_BIC_EMY.hh"
+#include "QGSP_BIC_HP.hh"
+#include "QGSP_FTFP_BERT.hh"
+#include "QGSP_INCL_ABLA.hh"
+#include "QGSP_QEL.hh"
+#include "QGS_BIC.hh"
+#include "Shielding.hh"

slic/src
PhysicsListFactory.cc 1.26 -> 1.27
diff -u -r1.26 -r1.27
--- PhysicsListFactory.cc	26 Aug 2010 18:05:24 -0000	1.26
+++ PhysicsListFactory.cc	2 Jan 2011 06:44:32 -0000	1.27
@@ -1,7 +1,9 @@
-// $Header: /cvs/lcd/slic/src/PhysicsListFactory.cc,v 1.26 2010/08/26 18:05:24 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/PhysicsListFactory.cc,v 1.27 2011/01/02 06:44:32 jeremy Exp $
 #include "PhysicsListFactory.hh"
 
 // Geant4
+#include "G4PhysicsLists.hh"
+/*
 #include "FTFC.hh"
 #include "FTFP.hh"
 #include "LBE.hh"
@@ -31,6 +33,7 @@
 #include "QGSP_BERT_DIF.hh"
 #include "QGS_BIC.hh"
 #include "FTF_BIC.hh"
+*/
 
 // slic
 #include "PhysicsListBuilder.hh"
@@ -104,6 +107,8 @@
      */
     void PhysicsListFactory::initializeBuilders()
     {
+#include "G4PhysicsBuilders.icc"        
+/*
         BUILDER(FTFC,          "Fritiof with CHIPS")
         BUILDER(FTFP,          "Fritiof with precompound")
         BUILDER(FTFP_BERT,     "FTFP with Bertini Cascade")
@@ -133,6 +138,7 @@
         BUILDER(QGSP_NQE,      "QGSP with quasi-elastic processes removed")
         BUILDER(QGSP_QEL,      "QGSP with elastic cross sections and model from CHIPS")
         BUILDER(QGS_BIC,       "QGS with new Bertini developments")
+*/
     }
 
     void PhysicsListFactory::addBuilder(VPhysicsListBuilder* builder)
CVSspam 0.2.8