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

Merge branch 'ufoEnergyPerLayerFix' into 'master'

UFO energy per layer fix

See merge request atlas/athena!57021
parents 7744fa70 0be9b790
No related branches found
No related tags found
18 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,!57090ATLASRECTS-7305: fixes for large cluster building,!57021UFO energy per layer fix,!56828Draft: [trigEGam] Integration beteween mongroups and TrigEgammaMonitoring,!55609Add Athena TEvent-based file access
......@@ -209,7 +209,7 @@ void JetCaloEnergies::fillEperSamplingFE(const xAOD::Jet& jet, std::vector<float
for (size_t n = 0; n < constit->otherObjects().size(); ++n) {
if(! constit->otherObject(n)) continue;
int index_pfo = constit->otherObject(n)->index();
int index_pfo = constit->otherObject(n)->index();
if(index_pfo<0) continue;
const auto* fe = (constit->otherObject(n));
......@@ -222,7 +222,7 @@ void JetCaloEnergies::fillEperSamplingFE(const xAOD::Jet& jet, std::vector<float
//If we have a PFO, we should still get the associated cluster first
else {
const xAOD::FlowElement* pfo = dynamic_cast<const xAOD::FlowElement*>(fe);
if(pfo->otherObjects().size() > 0 && pfo->otherObject(0)->type() == xAOD::Type::CaloCluster){
if(pfo->otherObjects().size() > 0 && pfo->otherObject(0) && pfo->otherObject(0)->type() == xAOD::Type::CaloCluster){
cluster = dynamic_cast<const xAOD::CaloCluster*> (pfo->otherObject(0));
}
}
......
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