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

Import Geant4 10.7.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2020-12-04 12:30:43 +01:00
parent 67ba86d073
commit dab42d2018
3770 changed files with 226369 additions and 286486 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/tracking/src/G4SteppingManager.cc
+8 -1
View File
@@ -41,6 +41,8 @@
#include "G4UserLimits.hh"
#include "G4VSensitiveDetector.hh" // Include from 'hits/digi'
#include "G4GeometryTolerance.hh"
#include "G4Profiler.hh"
#include "G4TiMemory.hh"
//////////////////////////////////////
G4SteppingManager::G4SteppingManager()
@@ -112,6 +114,10 @@ G4SteppingManager::~G4SteppingManager()
G4StepStatus G4SteppingManager::Stepping()
//////////////////////////////////////////
{
#ifdef GEANT4_USE_TIMEMORY
ProfilerConfig profiler{ fStep };
#endif
//--------
// Prelude
//--------
@@ -254,7 +260,8 @@ G4StepStatus G4SteppingManager::Stepping()
G4UserSteppingAction* regionalAction = fStep->GetPreStepPoint()
->GetPhysicalVolume()->GetLogicalVolume()
->GetRegion()->GetRegionalSteppingAction();
if( regionalAction ) regionalAction->UserSteppingAction(fStep);
if(regionalAction)
regionalAction->UserSteppingAction(fStep);
// Stepping process finish. Return the value of the StepStatus
//
source/tracking/src/G4SteppingManager2.cc
+1
View File
@@ -691,6 +691,7 @@ void G4SteppingManager::ApplyProductionCut(G4Track* aSecondary)
= G4ProductionCutsTable::GetProductionCutsTable();
G4int tCoupleIdx
= tCutsTbl->GetCoupleIndex(fPreStepPoint->GetMaterialCutsCouple());
if (tCoupleIdx<0) { return; }
G4double tProdThreshold
= (*(tCutsTbl->GetEnergyCutsVector(tPtclIdx)))[tCoupleIdx];
if( aSecondary->GetKineticEnergy()<tProdThreshold )
source/tracking/src/G4TrackingManager.cc
+56 -37
View File
@@ -36,6 +36,8 @@
#include "G4SmoothTrajectory.hh"
#include "G4RichTrajectory.hh"
#include "G4ios.hh"
#include "G4Profiler.hh"
#include "G4TiMemory.hh"
//////////////////////////////////////
G4TrackingManager::G4TrackingManager()
@@ -85,52 +87,69 @@ void G4TrackingManager::ProcessOneTrack(G4Track* apValueG4Track)
{
fpUserTrackingAction->PreUserTrackingAction(fpTrack);
}
#ifdef G4_STORE_TRAJECTORY
// Construct a trajectory if it is requested
//
if(StoreTrajectory&&(fpTrajectory == nullptr))
{
// default trajectory concrete class object
switch (StoreTrajectory)
{
default:
case 1: fpTrajectory = new G4Trajectory(fpTrack); break;
case 2: fpTrajectory = new G4SmoothTrajectory(fpTrack); break;
case 3: fpTrajectory = new G4RichTrajectory(fpTrack); break;
case 4: fpTrajectory = new G4RichTrajectory(fpTrack); break;
}
}
#endif
// Give SteppingManger the maxmimum number of processes
fpSteppingManager->GetProcessNumber();
// Give track the pointer to the Step
fpTrack->SetStep(fpSteppingManager->GetStep());
// Inform beginning of tracking to physics processes
fpTrack->GetDefinition()->GetProcessManager()->StartTracking(fpTrack);
// Track the particle Step-by-Step while it is alive
//
while( (fpTrack->GetTrackStatus() == fAlive) ||
(fpTrack->GetTrackStatus() == fStopButAlive) )
// we need this to scope the G4Track::ProfilerConfig b/t
// the PreUserTrackingAction and PostUserTrackingAction
{
fpTrack->IncrementCurrentStepNumber();
fpSteppingManager->Stepping();
#if defined(GEANT4_USE_TIMEMORY)
ProfilerConfig profiler{ fpTrack };
#endif
#ifdef G4_STORE_TRAJECTORY
if(StoreTrajectory)
// Construct a trajectory if it is requested
//
if(StoreTrajectory && (fpTrajectory == nullptr))
{
fpTrajectory->AppendStep(fpSteppingManager->GetStep());
// default trajectory concrete class object
switch(StoreTrajectory)
{
default:
case 1:
fpTrajectory = new G4Trajectory(fpTrack);
break;
case 2:
fpTrajectory = new G4SmoothTrajectory(fpTrack);
break;
case 3:
fpTrajectory = new G4RichTrajectory(fpTrack);
break;
case 4:
fpTrajectory = new G4RichTrajectory(fpTrack);
break;
}
}
#endif
if(EventIsAborted)
// Give SteppingManger the maxmimum number of processes
fpSteppingManager->GetProcessNumber();
// Give track the pointer to the Step
fpTrack->SetStep(fpSteppingManager->GetStep());
// Inform beginning of tracking to physics processes
fpTrack->GetDefinition()->GetProcessManager()->StartTracking(fpTrack);
// Track the particle Step-by-Step while it is alive
//
while((fpTrack->GetTrackStatus() == fAlive) ||
(fpTrack->GetTrackStatus() == fStopButAlive))
{
fpTrack->SetTrackStatus( fKillTrackAndSecondaries );
fpTrack->IncrementCurrentStepNumber();
fpSteppingManager->Stepping();
#ifdef G4_STORE_TRAJECTORY
if(StoreTrajectory)
{
fpTrajectory->AppendStep(fpSteppingManager->GetStep());
}
#endif
if(EventIsAborted)
{
fpTrack->SetTrackStatus(fKillTrackAndSecondaries);
}
}
// Inform end of tracking to physics processes
fpTrack->GetDefinition()->GetProcessManager()->EndTracking();
}
// Inform end of tracking to physics processes
fpTrack->GetDefinition()->GetProcessManager()->EndTracking();
// Post tracking user intervention process.
if( fpUserTrackingAction != nullptr )