simhadteam team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 22
committer: Daniel Cussol <cussol@xxxxxxxx>
branch nick: G4LPC
timestamp: Tue 2013-04-30 15:36:52 +0200
message:
  Corrections mineures.
modified:
  GNUmakefileOldStyle
  defineLdLibraryPath
  src/MyIonBinaryCascadePhysics.cc


--
lp:simulationshadrontherapie/g4lpc
https://code.launchpad.net/~simhadteam/simulationshadrontherapie/G4LPC

Your team Simulateurs pour la Hadronthérapie is subscribed to branch lp:simulationshadrontherapie/g4lpc.
To unsubscribe from this branch go to https://code.launchpad.net/~simhadteam/simulationshadrontherapie/G4LPC/+edit-subscription

=== modified file 'GNUmakefileOldStyle'
--- GNUmakefileOldStyle	2013-04-30 09:04:29 +0000
+++ GNUmakefileOldStyle	2013-04-30 13:36:52 +0000
@@ -3,17 +3,17 @@
 # GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
 # --------------------------------------------------------------
 
-name := G4LPCnew
+name := G4LPC
 G4TARGET := $(name)
 G4EXLIB := true
-G4VERSION := $(shell $(G4WORKDIR)/G4conf/GetGeant4Version)
+G4VERSION := $(shell $(G4WORKDIR)/G4LPC/GetGeant4Version)
 
 ifndef G4INSTALL
   G4INSTALL = ../../..
 endif
 
 .PHONY: all
-all: cpInc lib bin cpLib
+all: cpInc lib bin cpLib rmInc
 	echo "Compilation for Geant4 $(G4VERSION)"
 
 cpInc:  
@@ -34,8 +34,9 @@
 	sed s/private/protected/g tmp.tmp > include/G4ExcitationHandler.hh
 	@rm tmp.tmp
 	cp $(G4INCLUDE)/G4Evaporation.hh tmp.tmp
-	sed s/protected/public/g tmp.tmp > include/G4Evaporation.hh
-	@rm tmp.tmp
+	sed s/protected/public/g tmp.tmp > tmp2.tmp
+	sed s/private/public/g tmp2.tmp > include/G4Evaporation.hh
+	@rm tmp*.tmp
 
 cpLib: 
 	echo "Copie des libraries dans $(G4WORKDIR)/lib-$(G4VERSION)"
@@ -47,6 +48,9 @@
 	cp $(G4WORKDIR)/bin/$(G4SYSTEM)/$(G4TARGET) \
 	   $(G4WORKDIR)/exe-$(G4VERSION)/
 	rm $(G4WORKDIR)/bin/$(G4SYSTEM)/$(G4TARGET)
+
+rmInc: 
+	echo "Effacement des includes GEANT4"
 	@rm include/G4QMDReaction.hh
 	@rm include/G4IonQMDPhysics.hh
 	@rm include/G4BinaryLightIonReaction.hh
@@ -66,5 +70,5 @@
 #LDFLAGS += -m  elf_x86_64 $(shell root-config --libs) -lMinuit
 LDFLAGS += -Wl,--no-as-needed
 LDFLAGS += $(shell root-config --libs) -lMinuit
-LDFLAGS += -L$(G4WORKDIR)/lib-$(G4VERSION) -lG4LPCnew
+LDFLAGS += -L$(G4WORKDIR)/lib-$(G4VERSION) -lG4LPC
 #LDFLAGS += -L/scratch/cussol/xerces/lib -lxerces-c

=== modified file 'defineLdLibraryPath'
--- defineLdLibraryPath	2013-04-30 09:04:29 +0000
+++ defineLdLibraryPath	2013-04-30 13:36:52 +0000
@@ -1,3 +1,3 @@
 #!/bin/csh
 setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:$G4WORKDIR/lib-${G4VERSION}"
-alias G4LPCnew "${G4WORKDIR}/exe-${G4VERSION}/G4LPCnew"
+alias G4LPC "${G4WORKDIR}/exe-${G4VERSION}/G4LPC"

=== modified file 'src/MyIonBinaryCascadePhysics.cc'
--- src/MyIonBinaryCascadePhysics.cc	2013-04-30 09:04:29 +0000
+++ src/MyIonBinaryCascadePhysics.cc	2013-04-30 13:36:52 +0000
@@ -101,7 +101,7 @@
   mTripathi= new MyTripathiCrossSection;
   mTripathiLight= new MyTripathiLightCrossSection;
 
-#if G4VERSION_NUMBER >= G4VERSION(9,6,0)
+#if G4VERSION_NUMBER >= G4VERSION(9,4,0)
   fIonH = new G4IonProtonCrossSection;
 #endif