simhadteam team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12
committer: Daniel Cussol <cussol@xxxxxxxx>
branch nick: G4LPC
timestamp: Wed 2012-04-11 13:56:26 +0200
message:
  Ajout du fichier "G4LPCVersion.hh" contenant une macro de pre-processeur pour 
  gerer les versions de GEANT4 a la compilation.
  Prise en compte de cette gestion dans "G4LPCPhysicsList.cc" et dans
  "GNUmakefile".
added:
  include/G4LPCVersion.hh
modified:
  GNUmakefile
  src/G4LPCPhysicsList.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-05 13:32:08 +0000
+++ GNUmakefile	2012-04-11 11:56:26 +0000
@@ -20,7 +20,6 @@
  LDFLAGS += -bind_at_load
 endif
 
-CPPFLAGS += -DG4_9_5 
 CPPFLAGS += -I$(shell root-config --incdir)
 
 #LDFLAGS += -pg

=== added file 'include/G4LPCVersion.hh'
--- include/G4LPCVersion.hh	1970-01-01 00:00:00 +0000
+++ include/G4LPCVersion.hh	2012-04-11 11:56:26 +0000
@@ -0,0 +1,12 @@
+//
+// Gestion des versions de GEANT4
+//
+
+#ifndef G4LPCVERSION_HH
+#define G4LPCVERSION_HH
+
+#include "G4Version.hh"
+
+#define G4VERSION(a,b,c) a*100+b*10+c
+
+#endif

=== modified file 'src/G4LPCPhysicsList.cc'
--- src/G4LPCPhysicsList.cc	2012-04-05 13:32:08 +0000
+++ src/G4LPCPhysicsList.cc	2012-04-11 11:56:26 +0000
@@ -39,6 +39,7 @@
 #include "TString.h"
 
 #include "G4LPCHistogramManager.hh"
+#include "G4LPCVersion.hh"
 
 
 G4LPCPhysicsList::G4LPCPhysicsList():G4VUserPhysicsList()
@@ -214,7 +215,7 @@
 #include "G4GammaConversion.hh"
 #include "G4PhotoElectricEffect.hh"
 
-#ifdef G4_9_5
+#if G4VERSION_NUMBER >= G4VERSION(9,4,0)
 #include "G4eMultipleScattering.hh"
 #include "G4MuMultipleScattering.hh"
 #include "G4hMultipleScattering.hh"
@@ -260,7 +261,7 @@
     } else if (particleName == "e-") {
       //electron
       //G4cout << "Adding processes for e-. " << G4endl;
-#ifdef G4_9_5
+#if G4VERSION_NUMBER >= G4VERSION(9,4,0)
       pmanager->AddProcess(new G4eMultipleScattering,-1, 1,1);
 #else
       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
@@ -271,7 +272,7 @@
     } else if (particleName == "e+") {
       //positron
       //G4cout << "Adding processes for e+. " << G4endl;
-#ifdef G4_9_5
+#if G4VERSION_NUMBER >= G4VERSION(9,4,0)
       pmanager->AddProcess(new G4eMultipleScattering,-1, 1,1);
 #else
       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
@@ -284,7 +285,7 @@
                particleName == "mu-"    ) {
       //muon  
       //G4cout << "Adding processes for muons. " << G4endl;
-#ifdef G4_9_5
+#if G4VERSION_NUMBER >= G4VERSION(9,4,0)
       pmanager->AddProcess(new G4MuMultipleScattering,-1, 1,1);
 #else
       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
@@ -296,7 +297,7 @@
     } else if( particleName == "GenericIon" ) {
       //Generic Ion  
       //G4cout << "Adding processes for " << particleName << ". " << G4endl;
-#ifdef G4_9_5
+#if G4VERSION_NUMBER >= G4VERSION(9,4,0)
       pmanager->AddProcess(new G4hMultipleScattering,-1, 1,1);
 #else
       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
@@ -309,7 +310,7 @@
 	       (particle->GetParticleName() != "chargedgeantino")) {
       //all others charged particles except geantino
       //G4cout << "Adding processes for " <<particleName << ". " << G4endl;
-#ifdef G4_9_5
+#if G4VERSION_NUMBER >= G4VERSION(9,4,0)
       pmanager->AddProcess(new G4hMultipleScattering,-1, 1,1);
 #else
       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);