Import Geant4 10.5.0.beta source tree
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4RichTrajectory.cc 91269 2015-06-29 07:05:59Z gcosmo $
|
||||
// $Id: G4RichTrajectory.cc 110262 2018-05-17 14:25:55Z gcosmo $
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
//
|
||||
@@ -58,7 +58,11 @@
|
||||
|
||||
#include <sstream>
|
||||
|
||||
G4ThreadLocal G4Allocator<G4RichTrajectory> *aRichTrajectoryAllocator = 0;
|
||||
G4Allocator<G4RichTrajectory>*& aRichTrajectoryAllocator()
|
||||
{
|
||||
G4ThreadLocalStatic G4Allocator<G4RichTrajectory>* _instance = nullptr;
|
||||
return _instance;
|
||||
}
|
||||
|
||||
G4RichTrajectory::G4RichTrajectory():
|
||||
fpRichPointsContainer(0),
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4RichTrajectoryPoint.cc 69003 2013-04-15 09:25:23Z gcosmo $
|
||||
// $Id: G4RichTrajectoryPoint.cc 110262 2018-05-17 14:25:55Z gcosmo $
|
||||
//
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
@@ -61,7 +61,11 @@
|
||||
|
||||
#include <sstream>
|
||||
|
||||
G4ThreadLocal G4Allocator<G4RichTrajectoryPoint> *aRichTrajectoryPointAllocator = 0;
|
||||
G4Allocator<G4RichTrajectoryPoint>*& aRichTrajectoryPointAllocator()
|
||||
{
|
||||
G4ThreadLocalStatic G4Allocator<G4RichTrajectoryPoint>* _instance = nullptr;
|
||||
return _instance;
|
||||
}
|
||||
|
||||
G4RichTrajectoryPoint::G4RichTrajectoryPoint():
|
||||
fpAuxiliaryPointVector(0),
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4SmoothTrajectory.cc 69003 2013-04-15 09:25:23Z gcosmo $
|
||||
// $Id: G4SmoothTrajectory.cc 110262 2018-05-17 14:25:55Z gcosmo $
|
||||
//
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
@@ -53,7 +53,11 @@
|
||||
#include "G4AttCheck.hh"
|
||||
#endif
|
||||
|
||||
G4ThreadLocal G4Allocator<G4SmoothTrajectory> *aSmoothTrajectoryAllocator = 0;
|
||||
G4Allocator<G4SmoothTrajectory>*& aSmoothTrajectoryAllocator()
|
||||
{
|
||||
G4ThreadLocalStatic G4Allocator<G4SmoothTrajectory>* _instance = nullptr;
|
||||
return _instance;
|
||||
}
|
||||
|
||||
G4SmoothTrajectory::G4SmoothTrajectory()
|
||||
: positionRecord(0), fTrackID(0), fParentID(0),
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4SmoothTrajectoryPoint.cc 69003 2013-04-15 09:25:23Z gcosmo $
|
||||
// $Id: G4SmoothTrajectoryPoint.cc 110262 2018-05-17 14:25:55Z gcosmo $
|
||||
//
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
@@ -45,7 +45,11 @@
|
||||
#include "G4AttCheck.hh"
|
||||
#endif
|
||||
|
||||
G4ThreadLocal G4Allocator<G4SmoothTrajectoryPoint> *aSmoothTrajectoryPointAllocator = 0;
|
||||
G4Allocator<G4SmoothTrajectoryPoint>*& aSmoothTrajectoryPointAllocator()
|
||||
{
|
||||
G4ThreadLocalStatic G4Allocator<G4SmoothTrajectoryPoint>* _instance = nullptr;
|
||||
return _instance;
|
||||
}
|
||||
|
||||
G4SmoothTrajectoryPoint::G4SmoothTrajectoryPoint()
|
||||
: fAuxiliaryPointVector(0)
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4SteppingManager2.cc 106991 2017-10-31 10:13:42Z gcosmo $
|
||||
// $Id: G4SteppingManager2.cc 109172 2018-04-03 06:49:31Z gcosmo $
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
//
|
||||
@@ -369,12 +369,24 @@ void G4SteppingManager::InvokeAtRestDoItProcs()
|
||||
// it invokes a rest process at the beginning of the tracking
|
||||
if(tempSecondaryTrack->GetKineticEnergy() <= DBL_MIN){
|
||||
G4ProcessManager* pm = tempSecondaryTrack->GetDefinition()->GetProcessManager();
|
||||
if(!pm && tempSecondaryTrack->GetDefinition()->IsGeneralIon())
|
||||
{ pm = G4ParticleTable::GetParticleTable()->GetGenericIon()->GetProcessManager(); }
|
||||
#ifdef G4MUATOMS_INUSE
|
||||
if(!pm && tempSecondaryTrack->GetDefinition()->IsMuonicAtom())
|
||||
{ pm = G4ParticleTable::GetParticleTable()->GetGenericMuonicAtom()->GetProcessManager(); }
|
||||
#endif
|
||||
if(!pm)
|
||||
{
|
||||
G4ExceptionDescription ED;
|
||||
ED << "A track without proper process manager is pushed into the track stack.\n"
|
||||
<< " Particle name : " << tempSecondaryTrack->GetDefinition()->GetParticleName() << " -- ";
|
||||
if(tempSecondaryTrack->GetParentID()<0)
|
||||
{ ED << "created by a primary particle generator."; }
|
||||
else
|
||||
{
|
||||
const G4VProcess* vp = tempSecondaryTrack->GetCreatorProcess();
|
||||
if(vp)
|
||||
{ ED << "created by " << vp->GetProcessName() << "."; }
|
||||
else
|
||||
{ ED << "creaded by unknown process."; }
|
||||
}
|
||||
G4Exception("G4SteppingManager::InvokeAtRestDoItProcs()","Tracking10051",
|
||||
FatalException,ED);
|
||||
}
|
||||
if (pm->GetAtRestProcessVector()->entries()>0){
|
||||
tempSecondaryTrack->SetTrackStatus( fStopButAlive );
|
||||
fSecondary->push_back( tempSecondaryTrack );
|
||||
@@ -408,7 +420,7 @@ void G4SteppingManager::InvokeAlongStepDoItProcs()
|
||||
// If the current Step is defined by a 'ExclusivelyForced'
|
||||
// PostStepDoIt, then don't invoke any AlongStepDoIt
|
||||
if(fStepStatus == fExclusivelyForcedProc){
|
||||
return; // Take note 'return' at here !!!
|
||||
return; // Take note 'return' is here !!!
|
||||
}
|
||||
|
||||
// Invoke the all active continuous processes
|
||||
@@ -449,12 +461,24 @@ void G4SteppingManager::InvokeAlongStepDoItProcs()
|
||||
// it invokes a rest process at the beginning of the tracking
|
||||
if(tempSecondaryTrack->GetKineticEnergy() <= DBL_MIN){
|
||||
G4ProcessManager* pm = tempSecondaryTrack->GetDefinition()->GetProcessManager();
|
||||
if(!pm && tempSecondaryTrack->GetDefinition()->IsGeneralIon())
|
||||
{ pm = G4ParticleTable::GetParticleTable()->GetGenericIon()->GetProcessManager(); }
|
||||
#ifdef G4MUATOMS_INUSE
|
||||
if(!pm && tempSecondaryTrack->GetDefinition()->IsMuonicAtom())
|
||||
{ pm = G4ParticleTable::GetParticleTable()->GetGenericMuonicAtom()->GetProcessManager(); }
|
||||
#endif
|
||||
if(!pm)
|
||||
{
|
||||
G4ExceptionDescription ED;
|
||||
ED << "A track without proper process manager is pushed into the track stack.\n"
|
||||
<< " Particle name : " << tempSecondaryTrack->GetDefinition()->GetParticleName() << " -- ";
|
||||
if(tempSecondaryTrack->GetParentID()<0)
|
||||
{ ED << "created by a primary particle generator."; }
|
||||
else
|
||||
{
|
||||
const G4VProcess* vp = tempSecondaryTrack->GetCreatorProcess();
|
||||
if(vp)
|
||||
{ ED << "created by " << vp->GetProcessName() << "."; }
|
||||
else
|
||||
{ ED << "creaded by unknown process."; }
|
||||
}
|
||||
G4Exception("G4SteppingManager::InvokeAlongStepDoItProcs()","Tracking10051",
|
||||
FatalException,ED);
|
||||
}
|
||||
if (pm->GetAtRestProcessVector()->entries()>0){
|
||||
tempSecondaryTrack->SetTrackStatus( fStopButAlive );
|
||||
fSecondary->push_back( tempSecondaryTrack );
|
||||
@@ -571,12 +595,24 @@ void G4SteppingManager::InvokePSDIP(size_t np)
|
||||
// it invokes a rest process at the beginning of the tracking
|
||||
if(tempSecondaryTrack->GetKineticEnergy() <= DBL_MIN){
|
||||
G4ProcessManager* pm = tempSecondaryTrack->GetDefinition()->GetProcessManager();
|
||||
if(!pm && tempSecondaryTrack->GetDefinition()->IsGeneralIon())
|
||||
{ pm = G4ParticleTable::GetParticleTable()->GetGenericIon()->GetProcessManager(); }
|
||||
#ifdef G4MUATOMS_INUSE
|
||||
if(!pm && tempSecondaryTrack->GetDefinition()->IsMuonicAtom())
|
||||
{ pm = G4ParticleTable::GetParticleTable()->GetGenericMuonicAtom()->GetProcessManager(); }
|
||||
#endif
|
||||
if(!pm)
|
||||
{
|
||||
G4ExceptionDescription ED;
|
||||
ED << "A track without proper process manager is pushed into the track stack.\n"
|
||||
<< " Particle name : " << tempSecondaryTrack->GetDefinition()->GetParticleName() << " -- ";
|
||||
if(tempSecondaryTrack->GetParentID()<0)
|
||||
{ ED << "created by a primary particle generator."; }
|
||||
else
|
||||
{
|
||||
const G4VProcess* vp = tempSecondaryTrack->GetCreatorProcess();
|
||||
if(vp)
|
||||
{ ED << "created by " << vp->GetProcessName() << "."; }
|
||||
else
|
||||
{ ED << "creaded by unknown process."; }
|
||||
}
|
||||
G4Exception("G4SteppingManager::InvokePSDIP()","Tracking10053",
|
||||
FatalException,ED);
|
||||
}
|
||||
if (pm->GetAtRestProcessVector()->entries()>0){
|
||||
tempSecondaryTrack->SetTrackStatus( fStopButAlive );
|
||||
fSecondary->push_back( tempSecondaryTrack );
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4Trajectory.cc 69003 2013-04-15 09:25:23Z gcosmo $
|
||||
// $Id: G4Trajectory.cc 110262 2018-05-17 14:25:55Z gcosmo $
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
//
|
||||
@@ -52,7 +52,11 @@
|
||||
#include "G4AttCheck.hh"
|
||||
#endif
|
||||
|
||||
G4ThreadLocal G4Allocator<G4Trajectory> *aTrajectoryAllocator = 0;
|
||||
G4Allocator<G4Trajectory>*& aTrajectoryAllocator()
|
||||
{
|
||||
G4ThreadLocalStatic G4Allocator<G4Trajectory>* _instance = nullptr;
|
||||
return _instance;
|
||||
}
|
||||
|
||||
G4Trajectory::G4Trajectory()
|
||||
: positionRecord(0), fTrackID(0), fParentID(0),
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4TrajectoryPoint.cc 69003 2013-04-15 09:25:23Z gcosmo $
|
||||
// $Id: G4TrajectoryPoint.cc 110262 2018-05-17 14:25:55Z gcosmo $
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
//
|
||||
@@ -44,7 +44,11 @@
|
||||
#include "G4AttCheck.hh"
|
||||
#endif
|
||||
|
||||
G4ThreadLocal G4Allocator<G4TrajectoryPoint> *aTrajectoryPointAllocator = 0;
|
||||
G4Allocator<G4TrajectoryPoint>*& aTrajectoryPointAllocator()
|
||||
{
|
||||
G4ThreadLocalStatic G4Allocator<G4TrajectoryPoint>* _instance = nullptr;
|
||||
return _instance;
|
||||
}
|
||||
|
||||
G4TrajectoryPoint::G4TrajectoryPoint()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user