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

Import Geant4 10.6.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2019-12-06 15:12:28 +01:00
parent b2a62ae692
commit 5baee230e9
2997 changed files with 141580 additions and 98673 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/event/src/G4SPSEneDistribution.cc
+10
View File
@@ -58,6 +58,7 @@
#include "G4Exp.hh"
#include "G4SystemOfUnits.hh"
#include "G4UnitsTable.hh"
#include "Randomize.hh"
#include "G4AutoLock.hh"
#include "G4Threading.hh"
@@ -1869,6 +1870,15 @@ G4double G4SPSEneDistribution::GenerateOne(G4ParticleDefinition* a)
params.cept = cept;
params.weight = weight;
//particle_energy = -1.;
if((EnergyDisType == "Mono") && ((MonoEnergy>Emax)||(MonoEnergy<Emin)))
{
G4ExceptionDescription ed;
ed << "MonoEnergy " << G4BestUnit(MonoEnergy,"Energy") << " is outside of [Emin,Emax] = ["
<< G4BestUnit(Emin,"Energy") << ", " << G4BestUnit(Emax,"Energy") << ". MonoEnergy is used anyway.";
G4Exception("G4SPSEneDistribution::GenerateOne()","GPS0001",JustWarning,ed);
params.particle_energy=MonoEnergy;
return params.particle_energy;
}
while ((EnergyDisType == "Arb") ? (params.particle_energy < ArbEmin || params.particle_energy > ArbEmax) : (params.particle_energy < params.Emin|| params.particle_energy > params.Emax))
{
if (Biased)
source/event/src/G4SmartTrackStack.cc
+60 -59
View File
@@ -23,8 +23,8 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
//
//
// Author: S.Kamperis - 04/Oct/12
// --------------------------------------------------------------------
#include "G4SmartTrackStack.hh"
#include "G4VTrajectory.hh"
@@ -32,75 +32,70 @@
void G4SmartTrackStack::dumpStatistics()
{
// Print to stderr so that we can split stats output from normal
// output of Geant4 which is typically being printed to stdout
for (int i = 0; i < nTurn; i++) {
G4cerr << stacks[i]->GetNTrack() << " ";
G4cerr << stacks[i]->getTotalEnergy() << " ";
}
G4cerr << G4endl;
// Print to stderr so that we can split stats output from normal
// output of Geant4 which is typically being printed to stdout
for (G4int i=0; i<nTurn; ++i)
{
G4cerr << stacks[i]->GetNTrack() << " ";
G4cerr << stacks[i]->getTotalEnergy() << " ";
}
G4cerr << G4endl;
}
G4SmartTrackStack::G4SmartTrackStack()
:fTurn(0), nTurn(5), maxNTracks(0), nTracks(0)
: fTurn(0), nTurn(5), maxNTracks(0), nTracks(0)
{
for(int i=0;i<nTurn;i++)
{
stacks[i] = new G4TrackStack(5000);
energies[i] = 0.;
}
for(G4int i=0; i<nTurn; ++i)
{
stacks[i] = new G4TrackStack(5000);
energies[i] = 0.;
}
}
G4SmartTrackStack::~G4SmartTrackStack()
{
for (int i = 0; i < nTurn; i++) {
delete stacks[i];
}
}
const G4SmartTrackStack &
G4SmartTrackStack::operator=(const G4SmartTrackStack &) {
return *this;
}
G4bool G4SmartTrackStack::operator==(const G4SmartTrackStack &right) const {
return (this==&right);
}
G4bool G4SmartTrackStack::operator!=(const G4SmartTrackStack &right) const {
return (this!=&right);
for (G4int i=0; i<nTurn; ++i)
{
delete stacks[i];
}
}
void G4SmartTrackStack::TransferTo(G4TrackStack* aStack)
{
for (int i = 0; i < nTurn; i++) {
stacks[i]->TransferTo(aStack);
}
for (G4int i=0; i<nTurn; ++i)
{
stacks[i]->TransferTo(aStack);
}
nTracks = 0;
}
G4StackedTrack G4SmartTrackStack::PopFromStack()
{
G4StackedTrack aStackedTrack;
G4StackedTrack aStackedTrack;
if (nTracks) {
while (true) {
if (stacks[fTurn]->GetNTrack()) {
aStackedTrack = stacks[fTurn]->PopFromStack();
energies[fTurn] -= aStackedTrack.GetTrack()->GetDynamicParticle()->GetTotalEnergy();
nTracks--;
if (nTracks)
{
while (true)
{
if (stacks[fTurn]->GetNTrack())
{
aStackedTrack = stacks[fTurn]->PopFromStack();
energies[fTurn] -= aStackedTrack.GetTrack()->GetDynamicParticle()->GetTotalEnergy();
--nTracks;
break;
} else {
fTurn = (fTurn+1) % nTurn;
}
}
}
}
else
{
fTurn = (fTurn+1) % nTurn;
}
}
}
// dumpStatistics();
return aStackedTrack;
return aStackedTrack;
}
enum {
enum
{
electronCode = 11, positronCode = -11, gammaCode = 22, neutronCode = 2112
};
@@ -108,7 +103,8 @@ void G4SmartTrackStack::PushToStack( const G4StackedTrack& aStackedTrack )
{
G4int iDest = 0;
if (aStackedTrack.GetTrack()->GetParentID()) {
if (aStackedTrack.GetTrack()->GetParentID())
{
G4int code = aStackedTrack.GetTrack()->GetDynamicParticle()->GetPDGcode();
if (code == electronCode)
iDest = 2;
@@ -118,29 +114,33 @@ void G4SmartTrackStack::PushToStack( const G4StackedTrack& aStackedTrack )
iDest = 4;
else if (code == neutronCode)
iDest = 1;
} else {
}
else
{
// We have a primary track, which should go first.
fTurn = 0; // reseting the turn
}
stacks[iDest]->PushToStack(aStackedTrack);
energies[iDest] += aStackedTrack.GetTrack()->GetDynamicParticle()->GetTotalEnergy();
nTracks++;
++nTracks;
G4int dy1 = stacks[iDest]->GetNTrack() - stacks[iDest]->GetSafetyValve1();
G4int dy2 = stacks[fTurn]->GetNTrack() - stacks[fTurn]->GetSafetyValve2();
G4int dy1 = stacks[iDest]->GetNTrack() - stacks[iDest]->GetSafetyValue1();
G4int dy2 = stacks[fTurn]->GetNTrack() - stacks[fTurn]->GetSafetyValue2();
if (dy1 > 0 || dy1 > dy2 ||
(iDest == 2 &&
stacks[iDest]->GetNTrack() < 50 && energies[iDest] < energies[fTurn])) {
fTurn = iDest;
}
stacks[iDest]->GetNTrack() < 50 && energies[iDest] < energies[fTurn]))
{
fTurn = iDest;
}
if (nTracks > maxNTracks) maxNTracks = nTracks;
}
void G4SmartTrackStack::clear()
{
for (int i = 0; i < nTurn; i++) {
for (G4int i = 0; i < nTurn; ++i)
{
stacks[i]->clear();
energies[i] = 0.0;
fTurn = 0;
@@ -150,7 +150,8 @@ void G4SmartTrackStack::clear()
void G4SmartTrackStack::clearAndDestroy()
{
for (int i = 0; i < nTurn; i++) {
for (G4int i = 0; i < nTurn; ++i)
{
stacks[i]->clearAndDestroy();
energies[i] = 0.0;
fTurn = 0;
source/event/src/G4TrackStack.cc
+20 -13
View File
@@ -23,8 +23,8 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
//
//
// Author: Makoto Asai (SLAC)
// --------------------------------------------------------------------
#include "G4TrackStack.hh"
#include "G4SmartTrackStack.hh"
@@ -38,30 +38,37 @@ G4TrackStack::~G4TrackStack()
void G4TrackStack::clearAndDestroy()
{
for( iterator i = begin(); i != end(); i++ ) {
for( auto i = begin(); i != end(); ++i )
{
delete (*i).GetTrack();
delete (*i).GetTrajectory();
}
clear();
}
void G4TrackStack::TransferTo(G4TrackStack* aStack) {
for(iterator i = begin(); i != end(); i++) aStack->push_back(*i);
void G4TrackStack::TransferTo(G4TrackStack* aStack)
{
for(auto i = begin(); i != end(); ++i)
{
aStack->push_back(*i);
}
clear();
}
void G4TrackStack::TransferTo(G4SmartTrackStack * aStack)
{
while(size()) { aStack->PushToStack(PopFromStack()); }
while (size())
{
aStack->PushToStack(PopFromStack());
}
}
G4double G4TrackStack::getTotalEnergy(void) const
{
G4double totalEnergy = 0.0;
for (const_iterator i = begin(); i != end(); i++) {
totalEnergy += (*i).GetTrack()->GetDynamicParticle()->GetTotalEnergy();
}
return totalEnergy;
G4double totalEnergy = 0.0;
for ( auto i = cbegin(); i != cend(); ++i )
{
totalEnergy += (*i).GetTrack()->GetDynamicParticle()->GetTotalEnergy();
}
return totalEnergy;
}
source/event/src/G4TrajectoryContainer.cc
+8 -6
View File
@@ -23,15 +23,15 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
//
//
// Author: Makoto Asai (SLAC)
// --------------------------------------------------------------------
#include "G4TrajectoryContainer.hh"
G4Allocator<G4TrajectoryContainer>*& aTrajectoryContainerAllocator()
{
G4ThreadLocalStatic G4Allocator<G4TrajectoryContainer>* _instance = nullptr;
return _instance;
G4ThreadLocalStatic G4Allocator<G4TrajectoryContainer>* _instance = nullptr;
return _instance;
}
G4TrajectoryContainer::G4TrajectoryContainer()
@@ -45,12 +45,14 @@ G4TrajectoryContainer::~G4TrajectoryContainer()
delete vect;
}
G4bool G4TrajectoryContainer::operator==(const G4TrajectoryContainer& right) const
G4bool
G4TrajectoryContainer::operator==(const G4TrajectoryContainer& right) const
{
return (this==&right);
}
G4bool G4TrajectoryContainer::operator!=(const G4TrajectoryContainer& right) const
G4bool
G4TrajectoryContainer::operator!=(const G4TrajectoryContainer& right) const
{
return (this!=&right);
}