simhadteam team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14
committer: Daniel Cussol <cussol@xxxxxxxx>
branch nick: G4LPC
timestamp: Fri 2012-04-13 16:48:01 +0200
message:
  Prise en compte de la version dans "G4LPCRunAction" pour les infos sur l'energie
  d'ionisation.
  Gestion de la version de GEANT4 dans GNUmakefile.
modified:
  GNUmakefile
  src/G4LPCRunAction.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 'GNUmakefile'
--- GNUmakefile	2012-04-11 11:56:26 +0000
+++ GNUmakefile	2012-04-13 14:48:01 +0000
@@ -6,13 +6,24 @@
 name := G4LPC
 G4TARGET := $(name)
 G4EXLIB := true
+G4VERSION := $(shell ~/private/G4conf/GetGeant4Version)
 
 ifndef G4INSTALL
   G4INSTALL = ../../..
 endif
 
 .PHONY: all
-all: lib bin
+all: lib bin cpLib
+	echo "Compilation for Geant4 "$(G4VERSION)
+
+cpLib: 
+	echo "Copie des libraries dans $(G4WORKDIR)/lib-$(G4VERSION)"
+	mkdir -p $(G4WORKDIR)/lib-$(G4VERSION)
+	mkdir -p $(G4WORKDIR)/exe-$(G4VERSION)
+	cp $(G4WORKDIR)/tmp/$(G4SYSTEM)/$(G4TARGET)/lib* \
+	   $(G4WORKDIR)/lib-$(G4VERSION)/
+	cp $(G4WORKDIR)/bin/$(G4SYSTEM)/$(G4TARGET) \
+	   $(G4WORKDIR)/exe-$(G4VERSION)/
 
 include $(G4INSTALL)/config/binmake.gmk
 

=== modified file 'src/G4LPCRunAction.cc'
--- src/G4LPCRunAction.cc	2012-04-05 13:32:08 +0000
+++ src/G4LPCRunAction.cc	2012-04-13 14:48:01 +0000
@@ -44,6 +44,7 @@
 #include "globals.hh"
 
 #include "G4LPCHistogramManager.hh"
+#include "G4LPCVersion.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
@@ -85,8 +86,11 @@
    cout << "  Densite   : " << mat->GetDensity()/(g/cm3) << " g/cm3" << endl;
    cout << "  Ionisation: " << mat->GetIonisation()
                                 ->GetMeanExcitationEnergy()/eV << " eV / " 
+#if G4VERSION_NUMBER >= G4VERSION(9,2,0)
                             << mat->GetIonisation()
-                                ->GetMeanEnergyPerIonPair()/eV << " eV." << endl;
+                                ->GetMeanEnergyPerIonPair()/eV << " eV." 
+#endif
+			    << endl;
    cout << "  Epaisseur : " << det->GetLayerThickness(i)/mm << " mm." << endl;
    }
   }