Import Geant4 11.1.0 source tree

This commit is contained in:
Gabriele Cosmo
2022-12-09 14:43:28 +01:00
parent c07cea1fe0
commit 9f34590941
3810 changed files with 200490 additions and 182326 deletions
@@ -95,7 +95,7 @@ void G4FastSimulationPhysics::ConstructProcess()
if ( itr != fParticlesUnderFastSimulation.end() )
{
size_t ipos = itr - fParticlesUnderFastSimulation.begin();
std::size_t ipos = itr - fParticlesUnderFastSimulation.begin();
G4String geometry = fGeometries[ipos];
if ( geometry == "" ) G4FastSimulationHelper::ActivateFastSimulation(pmanager);
else G4FastSimulationHelper::ActivateFastSimulation(pmanager, geometry);
@@ -119,7 +119,7 @@ void G4FastSimulationPhysics::ConstructProcess()
G4int icount(0);
G4ProcessVector* vprocess = pmanager->GetProcessList();
for (size_t ip = 0 ; ip < vprocess->size() ; ++ip)
for (G4int ip = 0 ; ip < (G4int)vprocess->size() ; ++ip)
{
G4VProcess* process = (*vprocess)[ip];
G4FastSimulationManagerProcess* pb = dynamic_cast< G4FastSimulationManagerProcess* >(process);
@@ -229,14 +229,14 @@ void G4GenericBiasingPhysics::AddParallelGeometry( G4int PDGlow, G4int PDGhigh,
fPDGlowParallelGeometries .push_back( PDGlow );
fPDGhighParallelGeometries.push_back( PDGhigh );
G4int rangeIndex = fPDGlowParallelGeometries.size() - 1;
G4int rangeIndex = G4int(fPDGlowParallelGeometries.size() - 1);
fPDGrangeParallelGeometries[rangeIndex].push_back( parallelGeometryName );
if ( includeAntiParticle )
{
fPDGlowParallelGeometries .push_back( -PDGhigh );
fPDGhighParallelGeometries.push_back( -PDGlow );
rangeIndex = fPDGlowParallelGeometries.size() - 1;
rangeIndex = G4int(fPDGlowParallelGeometries.size() - 1);
fPDGrangeParallelGeometries[rangeIndex].push_back( parallelGeometryName );
}
@@ -342,7 +342,7 @@ void G4GenericBiasingPhysics::ConstructProcess()
if ( biasAll )
{
G4ProcessVector* vprocess = pmanager->GetProcessList();
for (std::size_t ip = 0 ; ip < vprocess->size() ; ++ip)
for (G4int ip = 0 ; ip < (G4int)vprocess->size() ; ++ip)
{
G4VProcess* process = (*vprocess)[ip];
biasedProcesses.push_back( process->GetProcessName() );
@@ -387,13 +387,13 @@ void G4GenericBiasingPhysics::ConstructProcess()
auto PDG = particle->GetPDGEncoding();
// -- include particle if in right PDG range:
for ( size_t i = 0 ; i < fPhysBiasByPDGRangeLow.size() ; i++ )
for ( std::size_t i = 0 ; i < fPhysBiasByPDGRangeLow.size() ; i++ )
if ( ( PDG >= fPhysBiasByPDGRangeLow[i] ) && ( PDG <= fPhysBiasByPDGRangeHigh[i] ) )
{
physBias = true;
break;
}
for ( size_t i = 0 ; i < fNonPhysBiasByPDGRangeLow.size() ; i++ )
for ( std::size_t i = 0 ; i < fNonPhysBiasByPDGRangeLow.size() ; i++ )
if ( ( PDG >= fNonPhysBiasByPDGRangeLow[i] ) && ( PDG <= fNonPhysBiasByPDGRangeHigh[i] ) )
{
nonPhysBias = true;
@@ -422,7 +422,7 @@ void G4GenericBiasingPhysics::ConstructProcess()
{
std::vector < G4String > biasedProcesses;
G4ProcessVector* vprocess = pmanager->GetProcessList();
for (std::size_t ip = 0 ; ip < vprocess->size() ; ++ip)
for (G4int ip = 0 ; ip < (G4int)vprocess->size() ; ++ip)
{
G4VProcess* process = (*vprocess)[ip];
biasedProcesses.push_back( process->GetProcessName() );
@@ -465,7 +465,7 @@ void G4GenericBiasingPhysics::ConstructProcess()
G4int icount(0);
G4ProcessVector* vprocess = pmanager->GetProcessList();
for (std::size_t ip = 0 ; ip < vprocess->size() ; ++ip)
for (G4int ip = 0 ; ip < (G4int)vprocess->size() ; ++ip)
{
G4VProcess* process = (*vprocess)[ip];
G4BiasingProcessInterface* pb = dynamic_cast< G4BiasingProcessInterface* >(process);
@@ -557,7 +557,7 @@ void G4GenericBiasingPhysics::AssociateParallelGeometries()
G4ParallelGeometriesLimiterProcess* limiter = G4BiasingHelper::AddLimiterProcess(pmanager);
// -- attached the requested worlds to this process:
for ( auto geometry : geometries ) limiter->AddParallelWorld( geometry );
for ( auto& geometry : geometries ) limiter->AddParallelWorld( geometry );
}
}
// -- increment index for next PDG range:
@@ -43,6 +43,8 @@
#include "G4Neutron.hh"
#include "G4NeutronKiller.hh"
#include "G4HadronicProcessStore.hh"
#include "G4PhysListUtil.hh"
#include "G4NeutronGeneralProcess.hh"
#include "G4BuilderType.hh"
#include "G4Threading.hh"
@@ -56,7 +58,7 @@ G4_DECLARE_PHYSCONSTR_FACTORY(G4NeutronTrackingCut);
G4NeutronTrackingCut::G4NeutronTrackingCut(G4int ver)
: G4VPhysicsConstructor("neutronTrackingCut"), verbose(ver)
{
timeLimit = 10.*microsecond;
timeLimit = 10*CLHEP::microsecond;
kineticEnergyLimit = 0.0;
SetPhysicsType(bUnknown);
}
@@ -75,8 +77,11 @@ void G4NeutronTrackingCut::ConstructParticle()
void G4NeutronTrackingCut::ConstructProcess()
{
auto particle = G4Neutron::Neutron();
auto proc = dynamic_cast<G4NeutronGeneralProcess*>(G4PhysListUtil::FindProcess(particle, fNeutronGeneral));
if(nullptr != proc) { return; }
G4NeutronKiller* pNeutronKiller = new G4NeutronKiller();
G4ParticleDefinition * particle = G4Neutron::Neutron();
G4ProcessManager * pmanager = particle->GetProcessManager();
if(verbose > 0 && G4Threading::IsMasterThread()) {
@@ -87,7 +92,7 @@ void G4NeutronTrackingCut::ConstructProcess()
<< " KinEnergyCut(MeV)= " << kineticEnergyLimit/MeV
<< G4endl;
}
pmanager -> AddDiscreteProcess(pNeutronKiller);
pmanager->AddDiscreteProcess(pNeutronKiller);
pNeutronKiller->SetKinEnergyLimit(kineticEnergyLimit);
pNeutronKiller->SetTimeLimit(timeLimit);