lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 11.1.0 source tree

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
source/tracking/src/G4AdjointTrackingAction.cc
+1 -1
View File
@@ -112,7 +112,7 @@ void G4AdjointTrackingAction::PostUserTrackingAction(const G4Track* aTrack)
if ((*pListOfPrimaryFwdParticles)[i]->GetParticleName()
== last_fwd_part_name)
{
last_fwd_part_index=i;
last_fwd_part_index=(G4int)i;
}
++i;
}
source/tracking/src/G4SteppingManager.cc
+7 -18
View File
@@ -500,7 +500,7 @@ void G4SteppingManager::DefinePhysicalStepLength()
for(std::size_t np=0; np<MAXofPostStepLoops; ++np)
{
fCurrentProcess = (*fPostStepGetPhysIntVector)(np);
fCurrentProcess = (*fPostStepGetPhysIntVector)((G4int)np);
if (fCurrentProcess == nullptr)
{
(*fSelectedPostStepDoItVector)[np] = InActivated;
@@ -573,7 +573,7 @@ void G4SteppingManager::DefinePhysicalStepLength()
for(std::size_t kp=0; kp<MAXofAlongStepLoops; ++kp)
{
fCurrentProcess = (*fAlongStepGetPhysIntVector)[kp];
fCurrentProcess = (*fAlongStepGetPhysIntVector)[(G4int)kp];
if (fCurrentProcess == nullptr) continue;
// NULL means the process is inactivated by a user on fly
@@ -717,16 +717,14 @@ void G4SteppingManager::InvokeAtRestDoItProcs()
fAtRestDoItProcTriggered = 0;
shortestLifeTime = DBL_MAX;
unsigned int NofInactiveProc = 0;
for( std::size_t ri=0 ; ri < MAXofAtRestLoops ; ++ri )
{
fCurrentProcess = (*fAtRestGetPhysIntVector)[ri];
fCurrentProcess = (*fAtRestGetPhysIntVector)[(G4int)ri];
if (fCurrentProcess == nullptr)
{
(*fSelectedAtRestDoItVector)[ri] = InActivated;
++NofInactiveProc;
continue;
} // NULL means the process is inactivated by a user on fly
} // nullptr means the process is inactivated by a user on fly
lifeTime = fCurrentProcess->AtRestGPIL( *fTrack, &fCondition );
@@ -748,18 +746,9 @@ void G4SteppingManager::InvokeAtRestDoItProcs()
(*fSelectedAtRestDoItVector)[fAtRestDoItProcTriggered] = NotForced;
// at least one process is necessary to destroy the particle exit with warning
//
if(NofInactiveProc==MAXofAtRestLoops)
{
G4Exception("G4SteppingManager::InvokeAtRestDoItProcs()", "Tracking0013",
JustWarning, "No AtRestDoIt process is active!" );
}
fStep->SetStepLength( 0. ); // the particle has stopped
fTrack->SetStepLength( 0. );
// Condition to avoid that stable ions are handled by Radioactive Decay.
// We use a very large time threshold (many orders of magnitude bigger than
// the universe's age) but not DBL_MAX because shortestLifeTime can be
@@ -776,7 +765,7 @@ void G4SteppingManager::InvokeAtRestDoItProcs()
//
if( (*fSelectedAtRestDoItVector)[MAXofAtRestLoops-np-1] != InActivated)
{
fCurrentProcess = (*fAtRestDoItVector)[np];
fCurrentProcess = (*fAtRestDoItVector)[(G4int)np];
fParticleChange = fCurrentProcess->AtRestDoIt(*fTrack, *fStep);
// Update Step
@@ -818,7 +807,7 @@ void G4SteppingManager::InvokeAlongStepDoItProcs()
//
for( std::size_t ci=0; ci<MAXofAlongStepLoops; ++ci )
{
fCurrentProcess = (*fAlongStepDoItVector)[ci];
fCurrentProcess = (*fAlongStepDoItVector)[(G4int)ci];
if (fCurrentProcess== 0) continue;
// NULL means the process is inactivated by a user on fly.
@@ -905,7 +894,7 @@ void G4SteppingManager::InvokePostStepDoItProcs()
void G4SteppingManager::InvokePSDIP(size_t np)
////////////////////////////////////////////////////////
{
fCurrentProcess = (*fPostStepDoItVector)[np];
fCurrentProcess = (*fPostStepDoItVector)[(G4int)np];
fParticleChange = fCurrentProcess->PostStepDoIt( *fTrack, *fStep);
// Update PostStepPoint of Step according to ParticleChange
source/tracking/src/G4SteppingVerbose.cc
+9 -9
View File
@@ -87,7 +87,7 @@ void G4SteppingVerbose::AtRestDoItInvoked()
if( (*fSelectedAtRestDoItVector)[npGPIL] == G4ForceCondition::Forced )
{
++npt;
ptProcManager = (*fAtRestDoItVector)[np];
ptProcManager = (*fAtRestDoItVector)[(G4int)np];
G4cout << " # " << npt << " : "
<< ptProcManager->GetProcessName()
<< " (Forced)" << G4endl;
@@ -95,7 +95,7 @@ void G4SteppingVerbose::AtRestDoItInvoked()
else if ( (*fSelectedAtRestDoItVector)[npGPIL] == G4ForceCondition::NotForced )
{
++npt;
ptProcManager = (*fAtRestDoItVector)[np];
ptProcManager = (*fAtRestDoItVector)[(G4int)np];
G4cout << " # " << npt << " : " << ptProcManager->GetProcessName()
<< G4endl;
}
@@ -153,7 +153,7 @@ void G4SteppingVerbose::AlongStepDoItAllDone()
for(std::size_t ci=0; ci<MAXofAlongStepLoops; ++ci)
{
ptProcManager = (*fAlongStepDoItVector)(ci);
ptProcManager = (*fAlongStepDoItVector)((G4int)ci);
G4cout << " " << ci+1 << ") ";
if(ptProcManager != nullptr)
{
@@ -220,7 +220,7 @@ void G4SteppingVerbose::PostStepDoItAllDone()
if( (*fSelectedPostStepDoItVector)[npGPIL] == G4ForceCondition::Forced )
{
++npt;
ptProcManager = (*fPostStepDoItVector)[np];
ptProcManager = (*fPostStepDoItVector)[(G4int)np];
G4cout << " " << npt << ") "
<< ptProcManager->GetProcessName()
<< " (Forced)" << G4endl;
@@ -228,7 +228,7 @@ void G4SteppingVerbose::PostStepDoItAllDone()
else if ( (*fSelectedPostStepDoItVector)[npGPIL] == G4ForceCondition::NotForced )
{
++npt;
ptProcManager = (*fPostStepDoItVector)[np];
ptProcManager = (*fPostStepDoItVector)[(G4int)np];
G4cout << " " << npt << ") " << ptProcManager->GetProcessName()
<< G4endl;
}
@@ -276,7 +276,7 @@ void G4SteppingVerbose::StepInfo()
CopyState();
G4cout.precision(16);
G4int prec = G4cout.precision(3);
G4long prec = G4cout.precision(3);
if( verboseLevel >= 1 )
{
@@ -487,7 +487,7 @@ void G4SteppingVerbose::TrackingStarted()
CopyState();
G4int prec = G4cout.precision(3);
G4long prec = G4cout.precision(3);
if( verboseLevel > 0 )
{
#ifdef G4_USE_G4BESTUNIT_FOR_VERBOSE
@@ -655,7 +655,7 @@ void G4SteppingVerbose::VerboseTrack()
G4cout << G4endl;
G4cout << " ++G4Track Information " << G4endl;
G4int prec = G4cout.precision(3);
G4long prec = G4cout.precision(3);
G4cout << " -----------------------------------------------"
@@ -847,7 +847,7 @@ void G4SteppingVerbose::ShowStep() const
{
if(Silent==1){ return; }
G4String volName;
G4int oldprc;
G4long oldprc;
// Show header
G4cout << G4endl;
source/tracking/src/G4SteppingVerboseWithUnits.cc
+9 -9
View File
@@ -72,7 +72,7 @@ void G4SteppingVerboseWithUnits::SetManager(G4SteppingManager* const fMan)
void G4SteppingVerboseWithUnits::TrackingStarted()
{
CopyState();
G4int oldprec = G4cout.precision(fprec);
G4long oldprec = G4cout.precision(fprec);
// Step zero
//
@@ -108,7 +108,7 @@ void G4SteppingVerboseWithUnits::TrackingStarted()
void G4SteppingVerboseWithUnits::StepInfo()
{
CopyState();
G4int oldprec = G4cout.precision(fprec);
G4long oldprec = G4cout.precision(fprec);
if( verboseLevel >= 1 )
{
@@ -193,7 +193,7 @@ void G4SteppingVerboseWithUnits::AtRestDoItInvoked()
if( (*fSelectedAtRestDoItVector)[npGPIL] == G4ForceCondition::Forced )
{
++npt;
ptProcManager = (*fAtRestDoItVector)[np];
ptProcManager = (*fAtRestDoItVector)[(G4int)np];
G4cout << " # " << npt << " : "
<< ptProcManager->GetProcessName()
<< " (Forced)" << G4endl;
@@ -201,7 +201,7 @@ void G4SteppingVerboseWithUnits::AtRestDoItInvoked()
else if ( (*fSelectedAtRestDoItVector)[npGPIL] == G4ForceCondition::NotForced )
{
++npt;
ptProcManager = (*fAtRestDoItVector)[np];
ptProcManager = (*fAtRestDoItVector)[(G4int)np];
G4cout << " # " << npt << " : " << ptProcManager->GetProcessName()
<< G4endl;
}
@@ -257,7 +257,7 @@ void G4SteppingVerboseWithUnits::AlongStepDoItAllDone()
for(std::size_t ci=0; ci<MAXofAlongStepLoops; ++ci)
{
ptProcManager = (*fAlongStepDoItVector)(ci);
ptProcManager = (*fAlongStepDoItVector)((G4int)ci);
G4cout << " " << ci+1 << ") ";
if(ptProcManager != nullptr)
{
@@ -322,7 +322,7 @@ void G4SteppingVerboseWithUnits::PostStepDoItAllDone()
if( (*fSelectedPostStepDoItVector)[npGPIL] == G4ForceCondition::Forced )
{
++npt;
ptProcManager = (*fPostStepDoItVector)[np];
ptProcManager = (*fPostStepDoItVector)[(G4int)np];
G4cout << " " << npt << ") "
<< ptProcManager->GetProcessName()
<< " (Forced)" << G4endl;
@@ -330,7 +330,7 @@ void G4SteppingVerboseWithUnits::PostStepDoItAllDone()
else if ( (*fSelectedPostStepDoItVector)[npGPIL] == G4ForceCondition::NotForced )
{
++npt;
ptProcManager = (*fPostStepDoItVector)[np];
ptProcManager = (*fPostStepDoItVector)[(G4int)np];
G4cout << " " << npt << ") " << ptProcManager->GetProcessName()
<< G4endl;
}
@@ -567,7 +567,7 @@ void G4SteppingVerboseWithUnits::VerboseTrack()
G4cout << G4endl;
G4cout << " ++G4Track Information " << G4endl;
G4int oldprec = G4cout.precision(fprec);
G4long oldprec = G4cout.precision(fprec);
G4cout << " -----------------------------------------------" << G4endl;
@@ -695,7 +695,7 @@ void G4SteppingVerboseWithUnits::ShowStep() const
// Show header
G4cout << G4endl;
G4cout << " ++G4Step Information " << G4endl;
G4int oldprc = G4cout.precision(fprec);
G4long oldprc = G4cout.precision(fprec);
// Show G4Step specific information
G4cout << " Address of G4Track : "