From c8a68412f6de6d9391a01178b4903c7fb75e1988 Mon Sep 17 00:00:00 2001
From: deserevi <deserevi@nptool>
Date: Tue, 15 Feb 2011 11:15:58 +0000
Subject: [PATCH] * Compatibility of PhysicList.src with Geant 4.9.4 +
G4MultipleScattering.h headers removed for G4eMultipleScattering,
G4hMultipleScattering, G4MuMultipleScattering
---
Inputs/DetectorConfiguration/e530.detector | 2 +-
NPSimulation/src/PhysicsList.cc | 13 +++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Inputs/DetectorConfiguration/e530.detector b/Inputs/DetectorConfiguration/e530.detector
index 9eae88d6b..0c5aab9e4 100644
--- a/Inputs/DetectorConfiguration/e530.detector
+++ b/Inputs/DetectorConfiguration/e530.detector
@@ -19,7 +19,7 @@
GeneralTarget
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
Target
- THICKNESS= 10.755
+ THICKNESS= 18.87
RADIUS= 1.25
MATERIAL= CD2
ANGLE= 0
diff --git a/NPSimulation/src/PhysicsList.cc b/NPSimulation/src/PhysicsList.cc
index d96cdcab8..16f2cbb2e 100644
--- a/NPSimulation/src/PhysicsList.cc
+++ b/NPSimulation/src/PhysicsList.cc
@@ -40,7 +40,7 @@
#include "G4ComptonScattering.hh"
#include "G4GammaConversion.hh"
#include "G4PhotoElectricEffect.hh"
-#include "G4MultipleScattering.hh"
+#include "G4eMultipleScattering.hh"
#include "G4eIonisation.hh"
#include "G4eBremsstrahlung.hh"
#include "G4eplusAnnihilation.hh"
@@ -66,6 +66,7 @@
#include "G4MuIonisation.hh"
+#include "G4MuMultipleScattering.hh"
#include "G4MuBremsstrahlung.hh"
#include "G4MuPairProduction.hh"
@@ -230,7 +231,7 @@ void PhysicsList::ConstructEM()
} else if (particleName == "e-") {
//electron
- pmanager->AddProcess(new G4MultipleScattering , -1, 1, 1) ;
+ pmanager->AddProcess(new G4eMultipleScattering , -1, 1, 1) ;
//standard geant4:
pmanager->AddProcess(new G4eIonisation , -1, 2, 2) ;
pmanager->AddProcess(new G4eBremsstrahlung , -1, -1, 3) ;
@@ -244,7 +245,7 @@ void PhysicsList::ConstructEM()
} else if (particleName == "e+") {
//positron
- pmanager->AddProcess(new G4MultipleScattering , -1, 1, 1 );
+ pmanager->AddProcess(new G4eMultipleScattering , -1, 1, 1 );
// standard Geant4 and Low energy
pmanager->AddProcess(new G4eIonisation , -1, 2, 2 );
pmanager->AddProcess(new G4eBremsstrahlung , -1, -1, 3 );
@@ -260,13 +261,13 @@ void PhysicsList::ConstructEM()
particleName == "mu-") {
//muon
- /* pmanager->AddProcess(new G4MultipleScattering , -1, 1, 1 ) ;
+ /* pmanager->AddProcess(new G4muMultipleScattering , -1, 1, 1 ) ;
pmanager->AddProcess(new G4MuIonisation , -1, 2, 2 ) ;
pmanager->AddProcess(new G4MuBremsstrahlung , -1, -1, 3 ) ;
pmanager->AddProcess(new G4MuPairProduction , -1, -1, 4 ) ;*/
} else if (particleName == "GenericIon") {
- pmanager->AddProcess(new G4MultipleScattering(), -1, 1, 1) ;
+ pmanager->AddProcess(new G4hMultipleScattering(), -1, 1, 1) ;
G4ionIonisation* iI = new G4ionIonisation ;
// mod by Nicolas [07/05/09]
iI->ActivateNuclearStopping(true) ;
@@ -281,7 +282,7 @@ void PhysicsList::ConstructEM()
G4hIonisation* hI = new G4hIonisation ;
// mod by Nicolas [07/05/09]
// hI->ActivateNuclearStopping(true) ;
- pmanager->AddProcess(new G4MultipleScattering , -1, 1, 1) ;
+ pmanager->AddProcess(new G4hMultipleScattering , -1, 1, 1) ;
pmanager->AddProcess(hI , -1, 2, 2) ;
--
GitLab