Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
eic_container
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
containers
eic_container
Commits
9a530393
Commit
9a530393
authored
3 years ago
by
Sylvester Joosten
Browse files
Options
Downloads
Patches
Plain Diff
Undo particle handler patch as it was causing issues
parent
31ff96cf
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!229
Undo particle handler patch as it was causing issues
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
spack/packages/dd4hep/geant4_particle_handler.patch
+0
-27
0 additions, 27 deletions
spack/packages/dd4hep/geant4_particle_handler.patch
spack/packages/dd4hep/package.py
+0
-1
0 additions, 1 deletion
spack/packages/dd4hep/package.py
with
0 additions
and
28 deletions
spack/packages/dd4hep/geant4_particle_handler.patch
deleted
100644 → 0
+
0
−
27
View file @
31ff96cf
diff --git a/DDG4/src/Geant4ParticleHandler.cpp b/DDG4/src/Geant4ParticleHandler.cpp
index 82a4b702..779dd044 100644
--- a/DDG4/src/Geant4ParticleHandler.cpp
+++ b/DDG4/src/Geant4ParticleHandler.cpp
@@ -436,11 +436,8 @@
void Geant4ParticleHandler::rebaseSimulatedTracks(int ) {
for(count = 0, iend=pm.end(), i=pm.begin(); i!=iend; ++i) {
Particle* p = (*i).second;
orgParticles[p->id] = p->id;
- finalParticles[p->id] = p;
+ finalParticles[p->id] = p->addRef();
if ( p->id > count ) count = p->id;
- if ( (p->reason&G4PARTICLE_PRIMARY) != G4PARTICLE_PRIMARY ) {
- p->addRef();
- }
}
// (1.1) Define the new particle mapping for the simulated tracks
for(++count, iend=m_particleMap.end(), i=m_particleMap.begin(); i!=iend; ++i) {
@@ -448,7 +445,8 @@
void Geant4ParticleHandler::rebaseSimulatedTracks(int ) {
if ( (p->reason&G4PARTICLE_PRIMARY) != G4PARTICLE_PRIMARY ) {
//if ( orgParticles.find(p->id) == orgParticles.end() ) {
orgParticles[p->id] = count;
- finalParticles[count] = p;
+ finalParticles[count]->release();
+ finalParticles[count] = p->addRef();
p->id = count;
++count;
}
This diff is collapsed.
Click to expand it.
spack/packages/dd4hep/package.py
+
0
−
1
View file @
9a530393
...
...
@@ -53,7 +53,6 @@ class Dd4hep(CMakePackage):
# hack to fix refcount underflow
patch
(
'
refcount_underflow.patch
'
,
when
=
'
@1.17:
'
)
patch
(
'
geant4_particle_handler.patch
'
,
when
=
'
@1.17:
'
)
patch
(
'
pdg.patch
'
,
when
=
'
@1.17:
'
)
# custom hash for the 2021-07-27 version, needed to include
...
...
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