Import Geant4 10.3.0 source tree
This commit is contained in:
@@ -153,10 +153,10 @@ private:
|
||||
G4double toINCLKineticEnergy(G4HadProjectile const &) const;
|
||||
|
||||
/// \brief Convert an INCL particle to a G4DynamicParticle
|
||||
G4DynamicParticle *toG4Particle(G4int A, G4int Z , G4double kinE, G4double px, G4double py, G4double pz) const;
|
||||
G4DynamicParticle *toG4Particle(G4int A, G4int Z, G4int PDGCode , G4double kinE, G4double px, G4double py, G4double pz) const;
|
||||
|
||||
/// \brief Convert A and Z to a G4ParticleDefinition
|
||||
G4ParticleDefinition *toG4ParticleDefinition (G4int A, G4int Z) const;
|
||||
G4ParticleDefinition *toG4ParticleDefinition (G4int A, G4int Z, G4int PDGCode) const;
|
||||
|
||||
/// \brief Rescale remnant momentum if necessary
|
||||
G4double remnant4MomentumScaling(G4double mass,
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#
|
||||
# Generated on : 24/9/2010
|
||||
#
|
||||
# $Id: sources.cmake 94565 2015-11-24 10:21:17Z gcosmo $
|
||||
# $Id: sources.cmake 98741 2016-08-09 13:01:15Z gcosmo $
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
@@ -42,7 +42,6 @@ include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/de_exci
|
||||
include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/de_excitation/handler/include)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/de_excitation/management/include)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/de_excitation/util/include)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/abla/include)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/pre_equilibrium/exciton_model/include)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/management/include)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/source/processes/hadronic/models/util/include)
|
||||
@@ -57,10 +56,10 @@ include_directories(${CMAKE_SOURCE_DIR}/source/intercoms/include)
|
||||
include(Geant4MacroDefineModule)
|
||||
GEANT4_DEFINE_MODULE(NAME G4hadronic_inclxx_interface
|
||||
HEADERS
|
||||
G4INCLXXInterfaceMessenger.hh
|
||||
G4INCLXXInterface.hh
|
||||
G4INCLXXVInterfaceTally.hh
|
||||
G4INCLXXInterfaceMessenger.hh
|
||||
G4INCLXXInterfaceStore.hh
|
||||
G4INCLXXVInterfaceTally.hh
|
||||
|
||||
SOURCES
|
||||
G4INCLXXInterface.cc
|
||||
@@ -95,7 +94,6 @@ GEANT4_DEFINE_MODULE(NAME G4hadronic_inclxx_interface
|
||||
G4hadronic_deex_multifragmentation
|
||||
G4hadronic_deex_photon_evaporation
|
||||
G4hadronic_deex_util
|
||||
G4hadronic_abla_abla
|
||||
G4hadronic_inclxx_utils
|
||||
G4hadronic_inclxx_physics
|
||||
|
||||
@@ -107,4 +105,4 @@ GEANT4_DEFINE_MODULE(NAME G4hadronic_inclxx_interface
|
||||
G4track
|
||||
G4intercoms
|
||||
|
||||
LINK_LIBRARIES)# List any source specific properties here
|
||||
LINK_LIBRARIES)# List any source specific properties here
|
||||
@@ -330,13 +330,14 @@ G4HadFinalState* G4INCLXXInterface::ApplyYourself(const G4HadProjectile& aTrack,
|
||||
|
||||
for(G4int i = 0; i < eventInfo.nParticles; ++i) {
|
||||
G4int A = eventInfo.A[i];
|
||||
G4int Z = eventInfo.Z[i];
|
||||
G4int Z = eventInfo.Z[i];
|
||||
G4int PDGCode = eventInfo.PDGCode[i];
|
||||
// G4cout <<"INCL particle A = " << A << " Z = " << Z << G4endl;
|
||||
G4double kinE = eventInfo.EKin[i];
|
||||
G4double px = eventInfo.px[i];
|
||||
G4double py = eventInfo.py[i];
|
||||
G4double pz = eventInfo.pz[i];
|
||||
G4DynamicParticle *p = toG4Particle(A, Z , kinE, px, py, pz);
|
||||
G4DynamicParticle *p = toG4Particle(A, Z, PDGCode, kinE, px, py, pz);
|
||||
if(p != 0) {
|
||||
G4LorentzVector momentum = p->Get4Momentum();
|
||||
|
||||
@@ -538,12 +539,16 @@ G4double G4INCLXXInterface::toINCLKineticEnergy(G4HadProjectile const &aTrack) c
|
||||
return aTrack.GetKineticEnergy();
|
||||
}
|
||||
|
||||
G4ParticleDefinition *G4INCLXXInterface::toG4ParticleDefinition(G4int A, G4int Z) const {
|
||||
G4ParticleDefinition *G4INCLXXInterface::toG4ParticleDefinition(G4int A, G4int Z, G4int PDGCode) const {
|
||||
if (A == 1 && Z == 1) return G4Proton::Proton();
|
||||
else if(A == 1 && Z == 0) return G4Neutron::Neutron();
|
||||
else if(A == 0 && Z == 1) return G4PionPlus::PionPlus();
|
||||
else if(A == 0 && Z == -1) return G4PionMinus::PionMinus();
|
||||
else if(A == 0 && Z == 0) return G4PionZero::PionZero();
|
||||
else if(A == 0 && Z == 0) {
|
||||
if (PDGCode == 221) return G4Eta::Eta();
|
||||
else if (PDGCode == 22) return G4Gamma::Gamma();
|
||||
else return G4PionZero::PionZero();
|
||||
}
|
||||
else if(A == 2 && Z == 1) return G4Deuteron::Deuteron();
|
||||
else if(A == 3 && Z == 1) return G4Triton::Triton();
|
||||
else if(A == 3 && Z == 2) return G4He3::He3();
|
||||
@@ -555,11 +560,11 @@ G4ParticleDefinition *G4INCLXXInterface::toG4ParticleDefinition(G4int A, G4int Z
|
||||
}
|
||||
}
|
||||
|
||||
G4DynamicParticle *G4INCLXXInterface::toG4Particle(G4int A, G4int Z,
|
||||
G4DynamicParticle *G4INCLXXInterface::toG4Particle(G4int A, G4int Z, G4int PDGCode,
|
||||
G4double kinE,
|
||||
G4double px,
|
||||
G4double py, G4double pz) const {
|
||||
const G4ParticleDefinition *def = toG4ParticleDefinition(A, Z);
|
||||
const G4ParticleDefinition *def = toG4ParticleDefinition(A, Z, PDGCode);
|
||||
if(def == 0) { // Check if we have a valid particle definition
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user