Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Shaun Roe
athena
Commits
f54dae30
Commit
f54dae30
authored
4 years ago
by
John Chapman
Browse files
Options
Downloads
Patches
Plain Diff
Extra debugging printout
parent
87bec751
Branches
v36r14-patches
Tags
v36r14p1
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernel.cxx
+14
-1
14 additions, 1 deletion
Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernel.cxx
Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernelMT.cxx
+13
-2
13 additions, 2 deletions
Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernelMT.cxx
with
27 additions
and
3 deletions
Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernel.cxx
+
14
−
1
View file @
f54dae30
/*
Copyright (C) 2002-20
19
CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-20
20
CERN for the benefit of the ATLAS collaboration
*/
// ISF_Algs includes
...
...
@@ -26,6 +26,8 @@
#include
"GeneratorObjects/McEventCollection.h"
#include
"GeneratorObjects/HepMcParticleLink.h"
#undef ISFDEBUG
///////////////////////////////////////////////////////////////////
// Public methods:
///////////////////////////////////////////////////////////////////
...
...
@@ -382,6 +384,7 @@ StatusCode ISF::SimKernel::execute()
const
ISF
::
ConstISFParticleVector
&
particles
=
m_particleBroker
->
popVector
(
m_maxParticleVectorSize
);
const
unsigned
int
numParticlesLeftInBroker
=
m_particleBroker
->
numParticles
();
int
numParticles
=
particles
.
size
();
// particle vector empty -> end simulation
if
(
numParticles
==
0
)
break
;
...
...
@@ -396,6 +399,16 @@ StatusCode ISF::SimKernel::execute()
ATH_MSG_DEBUG
(
"Took "
<<
numParticles
<<
" particles from queue (remaining: "
<<
m_particleBroker
->
numParticles
()
<<
")"
);
ATH_MSG_VERBOSE
(
" -> All particles will be sent to '"
<<
m_simSvcNames
[
simID
]
<<
"' simulator (SimSvcID="
<<
simID
<<
")"
);
#ifdef ISFDEBUG
if
(
loopCounter
>
100
&&
numParticles
<
3
)
{
ATH_MSG_INFO
(
"Main Loop pass no. "
<<
loopCounter
);
ATH_MSG_INFO
(
"Selected "
<<
numParticles
<<
" particles to be processed by "
<<
m_simSvcNames
[
simID
]);
for
(
const
ISFParticle
*
particle
:
particles
)
{
ATH_MSG_INFO
(
*
particle
);
}
}
#endif // ISFDEBUG
// ensure that all particles in the vector have the same SimID
for
(
const
ISFParticle
*
particle
:
particles
)
{
if
(
particle
->
nextSimID
()
!=
simID
)
{
...
...
This diff is collapsed.
Click to expand it.
Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernelMT.cxx
+
13
−
2
View file @
f54dae30
/*
Copyright (C) 2002-20
19
CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-20
20
CERN for the benefit of the ATLAS collaboration
*/
/**
...
...
@@ -20,6 +20,7 @@
#include
<queue>
#include
<utility>
#undef ISFDEBUG
ISF
::
SimKernelMT
::
SimKernelMT
(
const
std
::
string
&
name
,
ISvcLocator
*
pSvcLocator
)
:
::
AthAlgorithm
(
name
,
pSvcLocator
),
...
...
@@ -129,7 +130,7 @@ StatusCode ISF::SimKernelMT::initialize() {
StatusCode
ISF
::
SimKernelMT
::
execute
()
{
//
Release the e
vent fr
om
all simulators (TODO: make the tools do this)
//
Call setupE
vent f
o
r all simulators (TODO: make the tools do this)
for
(
auto
&
curSimTool
:
m_simulationTools
)
{
if
(
curSimTool
)
{
ATH_CHECK
(
curSimTool
->
setupEvent
());
...
...
@@ -223,6 +224,16 @@ StatusCode ISF::SimKernelMT::execute() {
}
}
particleQueue
=
std
::
move
(
tempQueue
);
#ifdef ISFDEBUG
if
(
loopCounter
>
100
&&
particles
.
size
()
<
3
)
{
ATH_MSG_INFO
(
"Main Loop pass no. "
<<
loopCounter
);
ATH_MSG_INFO
(
"Selected "
<<
particles
.
size
()
<<
" particles to be processed by "
<<
lastSimulator
->
name
());
for
(
const
ISFParticle
*
particle
:
particles
)
{
ATH_MSG_INFO
(
*
particle
);
}
}
#endif // ISFDEBUG
ATH_MSG_VERBOSE
(
"Selected "
<<
particles
.
size
()
<<
" particles to be processed by "
<<
lastSimulator
->
name
());
// Run the simulation
ATH_CHECK
(
lastSimulator
->
simulateVector
(
particles
,
newSecondaries
,
outputTruth
.
ptr
()
)
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment