Skip to content
Snippets Groups Projects
Commit 9a530393 authored by Sylvester Joosten's avatar Sylvester Joosten
Browse files

Undo particle handler patch as it was causing issues

parent 31ff96cf
Branches
Tags
1 merge request!229Undo particle handler patch as it was causing issues
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;
}
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment