Skip to content
Snippets Groups Projects
Commit 572a7e5d authored by Edward Moyse's avatar Edward Moyse
Browse files

Merge branch 'test.ISF_Services-20220928' into 'master'

ISF_Services: Protect against null particle in TruthIncident.

See merge request !57124
parents 8cd0abcb bbabcd61
No related branches found
No related tags found
16 merge requests!59674InDetPerformanceMonitoring with LumiBlock selection,!59383cppcheck in trigger code: Prefer prefix ++/-- operators for non-primitive types.,!58990Draft:Fixing bug in FTF config when running with Reco_tf,!58835DataQualityConfigurations: Modify L1Calo config for web display,!58791DataQualityConfigurations: Modify L1Calo config for web display,!58373Modification of V2.3 processing to work well with all clients,!58289New NVSI calibration,!58286New NVSI calibration,!58106Update NVSI example algorithm,!57937Draft: New nighlty test for trigger with a Run 4 single muon RDO,!57841Edits to ZDC signal processing in preparation for analysis of data from LHCf run,!57590Fixing LAr DT dumper,!57584Draft: LAr DB fixes,!57316ATR-26311 and ATR-25754 moving one dimuon and few egamma chains from dev to phys or MC,!57124ISF_Services: Protect against null particle in TruthIncident.,!57090ATLASRECTS-7305: fixes for large cluster building
...@@ -373,17 +373,19 @@ void ISF::TruthSvc::recordIncidentToMCTruth( ISF::ITruthIncident& ti, bool passW ...@@ -373,17 +373,19 @@ void ISF::TruthSvc::recordIncidentToMCTruth( ISF::ITruthIncident& ti, bool passW
} }
} }
p = ti.childParticle( i, secBC ); // potentially overrides secBC p = ti.childParticle( i, secBC ); // potentially overrides secBC
// add particle to vertex if (p) {
vtx->add_particle_out( p); // add particle to vertex
vtx->add_particle_out( p);
#ifdef HEPMC3 #ifdef HEPMC3
Barcode::ParticleBarcode secBCFromTI = ti.childBarcode(i); Barcode::ParticleBarcode secBCFromTI = ti.childBarcode(i);
if (secBCFromTI) { if (secBCFromTI) {
HepMC::suggest_barcode( p, secBCFromTI ); HepMC::suggest_barcode( p, secBCFromTI );
} }
else { else {
HepMC::suggest_barcode( p, secBC ); HepMC::suggest_barcode( p, secBC );
} }
#endif #endif
}
} }
ATH_MSG_VERBOSE ( "Writing out " << i << "th child particle: " << p); ATH_MSG_VERBOSE ( "Writing out " << i << "th child particle: " << p);
} // <-- if write out child particle } // <-- if write out child particle
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment