Skip to content
Snippets Groups Projects
Commit 2808b5eb authored by Walter Lampl's avatar Walter Lampl
Browse files

Merge branch 'master-pfo-photon-links' into 'master' 

Photon PFO Links

See merge request !28852
parents 091a16f7 a76060f0
No related branches found
No related tags found
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!28852Photon PFO Links
Hide whitespace changes
Inline Side-by-side
Reconstruction/eflowRec/eflowRec/PFEGammaPFOAssoc.h
+ 16
− 6
View file @ 2808b5eb
......@@ -15,18 +15,19 @@
#include "AthenaBaseComps/AthAlgorithm.h"
#include "xAODEgamma/ElectronContainer.h"
#include "xAODEgamma/PhotonContainer.h"
#include "xAODPFlow/PFOContainer.h"
#include "StoreGate/WriteDecorHandle.h"
/**
This is the algorithm, which inherits from AthAlgorithm, that adds element links
between particle flow objects (PFOs) and electrons. The algorithm associates charged (c) PFOs
to all electron tracks, and neutral (n) PFOs to all electron clusters.
This is done by adding decorations to the "Electron" container, for charged cPFOs and nPFOs separately,
between particle flow objects (PFOs) and Egamma objects. The algorithm associates charged (c) PFOs
to all electron and converted photon tracks, and neutral (n) PFOs to all electron and photon clusters.
This is done by adding decorations to the "Electron" and "Photon" container, for charged cPFOs and nPFOs separately,
in the form of vectors of element links to the associated PFOs.
The algorithm also adds decorations to the "JetETMissNeutralParticleFlowObjects" and
"JetETMissChargedParticleFlowObjects" containers,
in the form of vectors of element links to the associated electrons.
in the form of vectors of element links to the associated electrons and photons.
*/
class PFEGammaPFOAssoc : public AthAlgorithm {
......@@ -47,9 +48,18 @@ private:
/** The write key for adding cPFO element link decorations to electrons */
SG::WriteDecorHandleKey<xAOD::ElectronContainer> m_electronChargedPFOWriteDecorKey;
/** The write key for adding electron element link decorations to nPFOs */
SG::WriteDecorHandleKey<xAOD::PFOContainer> m_neutralpfoWriteDecorKey;
SG::WriteDecorHandleKey<xAOD::PFOContainer> m_neutralpfoElectronWriteDecorKey;
/** The write key for adding electron element link decorations to cPFOs */
SG::WriteDecorHandleKey<xAOD::PFOContainer> m_chargedpfoWriteDecorKey;
SG::WriteDecorHandleKey<xAOD::PFOContainer> m_chargedpfoElectronWriteDecorKey;
/** The write key for adding nPFO element link decorations to photons */
SG::WriteDecorHandleKey<xAOD::PhotonContainer> m_photonNeutralPFOWriteDecorKey;
/** The write key for adding cPFO element link decorations to photons */
SG::WriteDecorHandleKey<xAOD::PhotonContainer> m_photonChargedPFOWriteDecorKey;
/** The write key for adding photon element link decorations to nPFOs */
SG::WriteDecorHandleKey<xAOD::PFOContainer> m_neutralpfoPhotonWriteDecorKey;
/** The write key for adding photon element link decorations to cPFOs */
SG::WriteDecorHandleKey<xAOD::PFOContainer> m_chargedpfoPhotonWriteDecorKey;
};
......
Reconstruction/eflowRec/python/eflowRecFlags.py
+ 1
− 1
View file @ 2808b5eb
......@@ -115,7 +115,7 @@ class useCalibHitTruth(JobProperty):
StoredValue = False
class usePFEGammaPFOAssoc(JobProperty):
""" Flag to toggle use of linking between electrons and PFOs
""" Flag to toggle use of linking between Egamma objects and PFOs
"""
statusOn = True
allowedTypes = ['bool']
......
Reconstruction/eflowRec/src/PFEGammaPFOAssoc.cxx
+ 120
− 43
View file @ 2808b5eb
......@@ -5,13 +5,16 @@
#include "eflowRec/PFEGammaPFOAssoc.h"
#include "StoreGate/WriteDecorHandle.h"
#include "xAODEgamma/ElectronContainer.h"
#include "xAODEgamma/PhotonContainer.h"
#include "xAODEgamma/Electron.h"
#include "xAODEgamma/Photon.h"
#include "xAODEgamma/ElectronxAODHelpers.h"
#include "xAODEgamma/EgammaxAODHelpers.h"
#include "xAODPFlow/PFOContainer.h"
#include "xAODPFlow/PFO.h"
typedef ElementLink<xAOD::ElectronContainer> ElectronLink_t;
typedef ElementLink<xAOD::PhotonContainer> PhotonLink_t;
typedef ElementLink<xAOD::PFOContainer> PFOLink_t;
// =============================================================
......@@ -22,8 +25,13 @@ PFEGammaPFOAssoc::PFEGammaPFOAssoc(const std::string& name,
// Declare the decoration keys
declareProperty ("ElectronNeutralPFODecorKey", m_electronNeutralPFOWriteDecorKey = "Electrons.neutralpfoLinks");
declareProperty ("ElectronChargedPFODecorKey", m_electronChargedPFOWriteDecorKey = "Electrons.chargedpfoLinks");
declareProperty ("NeutralPFODecorKey", m_neutralpfoWriteDecorKey = "JetETMissNeutralParticleFlowObjects.pfo_ElectronLinks");
declareProperty ("ChargedPFODecorKey", m_chargedpfoWriteDecorKey = "JetETMissChargedParticleFlowObjects.pfo_ElectronLinks");
declareProperty ("NeutralPFOElectronDecorKey", m_neutralpfoElectronWriteDecorKey = "JetETMissNeutralParticleFlowObjects.pfo_ElectronLinks");
declareProperty ("ChargedPFOElectronDecorKey", m_chargedpfoElectronWriteDecorKey = "JetETMissChargedParticleFlowObjects.pfo_ElectronLinks");
declareProperty ("PhotonNeutralPFODecorKey", m_photonNeutralPFOWriteDecorKey = "Photons.neutralpfoLinks");
declareProperty ("PhotonChargedPFODecorKey", m_photonChargedPFOWriteDecorKey = "Photons.chargedpfoLinks");
declareProperty ("NeutralPFOPhotonDecorKey", m_neutralpfoPhotonWriteDecorKey = "JetETMissNeutralParticleFlowObjects.pfo_PhotonLinks");
declareProperty ("ChargedPFOPhotonDecorKey", m_chargedpfoPhotonWriteDecorKey = "JetETMissChargedParticleFlowObjects.pfo_PhotonLinks");
}
PFEGammaPFOAssoc::~PFEGammaPFOAssoc() {}
......@@ -36,8 +44,13 @@ StatusCode PFEGammaPFOAssoc::initialize() {
// Initialise the decoration keys
ATH_CHECK(m_electronNeutralPFOWriteDecorKey.initialize());
ATH_CHECK(m_electronChargedPFOWriteDecorKey.initialize());
ATH_CHECK(m_neutralpfoWriteDecorKey.initialize());
ATH_CHECK(m_chargedpfoWriteDecorKey.initialize());
ATH_CHECK(m_neutralpfoElectronWriteDecorKey.initialize());
ATH_CHECK(m_chargedpfoElectronWriteDecorKey.initialize());
ATH_CHECK(m_photonNeutralPFOWriteDecorKey.initialize());
ATH_CHECK(m_photonChargedPFOWriteDecorKey.initialize());
ATH_CHECK(m_neutralpfoPhotonWriteDecorKey.initialize());
ATH_CHECK(m_chargedpfoPhotonWriteDecorKey.initialize());
ATH_MSG_DEBUG("Initialization completed successfully");
......@@ -52,32 +65,42 @@ StatusCode PFEGammaPFOAssoc::finalize() {
// =========================================================================
StatusCode PFEGammaPFOAssoc::execute() {
// WriteDecorHandles for the electron and PFO containers
// Each electron receives a decoration that is a vector of element links to PFOs - one such decoration for both cPFOs and nPFOs
// Similarly each PFO receives a decoration that is a vector of element links to electrons
// WriteDecorHandles for the electron, photon, and PFO containers
// Each electron and photon receives a decoration that is a vector of element links to PFOs - one such decoration for both cPFOs and nPFOs
// Similarly each PFO receives a decoration that is a vector of element links to electrons and a decoration that is a vector of element
// links to photons
SG::WriteDecorHandle<xAOD::ElectronContainer, std::vector<PFOLink_t> > electronNeutralPFOWriteDecorHandle (m_electronNeutralPFOWriteDecorKey);
SG::WriteDecorHandle<xAOD::ElectronContainer, std::vector<PFOLink_t> > electronChargedPFOWriteDecorHandle (m_electronChargedPFOWriteDecorKey);
SG::WriteDecorHandle<xAOD::PFOContainer, std::vector<ElectronLink_t> > neutralpfoWriteDecorHandle (m_neutralpfoWriteDecorKey);
SG::WriteDecorHandle<xAOD::PFOContainer, std::vector<ElectronLink_t> > chargedpfoWriteDecorHandle (m_chargedpfoWriteDecorKey);
// Store the ReadHandles for electron and PFO containers
SG::ReadHandle<xAOD::ElectronContainer> electronReadHandle (m_electronNeutralPFOWriteDecorKey.contHandleKey());
SG::ReadHandle<xAOD::PFOContainer> neutralpfoReadHandle (m_neutralpfoWriteDecorKey.contHandleKey());
SG::ReadHandle<xAOD::PFOContainer> chargedpfoReadHandle (m_chargedpfoWriteDecorKey.contHandleKey());
SG::WriteDecorHandle<xAOD::PFOContainer, std::vector<ElectronLink_t> > neutralpfoElectronWriteDecorHandle (m_neutralpfoElectronWriteDecorKey);
SG::WriteDecorHandle<xAOD::PFOContainer, std::vector<ElectronLink_t> > chargedpfoElectronWriteDecorHandle (m_chargedpfoElectronWriteDecorKey);
SG::WriteDecorHandle<xAOD::PhotonContainer, std::vector<PFOLink_t> > photonNeutralPFOWriteDecorHandle (m_photonNeutralPFOWriteDecorKey);
SG::WriteDecorHandle<xAOD::PhotonContainer, std::vector<PFOLink_t> > photonChargedPFOWriteDecorHandle (m_photonChargedPFOWriteDecorKey);
SG::WriteDecorHandle<xAOD::PFOContainer, std::vector<PhotonLink_t> > neutralpfoPhotonWriteDecorHandle (m_neutralpfoPhotonWriteDecorKey);
SG::WriteDecorHandle<xAOD::PFOContainer, std::vector<PhotonLink_t> > chargedpfoPhotonWriteDecorHandle (m_chargedpfoPhotonWriteDecorKey);
// Store the ReadHandles for electron, photon, and PFO containers
SG::ReadHandle<xAOD::ElectronContainer> electronReadHandle (m_electronNeutralPFOWriteDecorKey.contHandleKey());
SG::ReadHandle<xAOD::PhotonContainer> photonReadHandle (m_photonNeutralPFOWriteDecorKey.contHandleKey());
SG::ReadHandle<xAOD::PFOContainer> neutralpfoReadHandle (m_neutralpfoElectronWriteDecorKey.contHandleKey());
SG::ReadHandle<xAOD::PFOContainer> chargedpfoReadHandle (m_chargedpfoElectronWriteDecorKey.contHandleKey());
// Containers for the PFO links to electrons
// Containers for the PFO links to electrons and photons
std::vector< std::vector<PFOLink_t> > electronNeutralPFOVec (electronReadHandle->size());
std::vector< std::vector<PFOLink_t> > electronChargedPFOVec (electronReadHandle->size());
std::vector< std::vector<PFOLink_t> > photonNeutralPFOVec (photonReadHandle->size());
std::vector< std::vector<PFOLink_t> > photonChargedPFOVec (photonReadHandle->size());
///////////////////////////
// Loop over neutral PFOs
///////////////////////////
for (const xAOD::PFO* pfo : *neutralpfoWriteDecorHandle) {
for (const xAOD::PFO* pfo : *neutralpfoElectronWriteDecorHandle) {
// Obtain the index of the PFO topo-cluster
size_t pfoClusterIndex = pfo->cluster(0)->index();
// Initialise a vector of element links to electrons
// Initialise a vector of element links to electrons and photons
std::vector<ElectronLink_t> pfoElectronLinks;
std::vector<PhotonLink_t> pfoPhotonLinks;
// Loop over electrons
for (const xAOD::Electron* electron : *electronNeutralPFOWriteDecorHandle) {
......@@ -85,33 +108,58 @@ StatusCode PFEGammaPFOAssoc::execute() {
const std::vector<const xAOD::CaloCluster*> electronTopoClusters = xAOD::EgammaHelpers::getAssociatedTopoClusters(electron->caloCluster());
for (const xAOD::CaloCluster* cluster : electronTopoClusters) {
// Obtain the index of the electron seed topo-cluster
size_t electronClusterIndex = cluster->index();
// Obtain the index of the electron seed topo-cluster
size_t electronClusterIndex = cluster->index();
// Link the electron to the PFO if the cluster indices match
if (electronClusterIndex == pfoClusterIndex) {
// Add electron element link to a vector
// index() is the unique index of the electron in the electron container
pfoElectronLinks.push_back( ElectronLink_t(*electronReadHandle, electron->index()) );
// Add pfo element link to a vector
// index() is the unique index of the nPFO in the nPFO container
electronNeutralPFOVec.at(electron->index()).push_back( PFOLink_t(*neutralpfoReadHandle, pfo->index()) );
}
// Link the electron to the PFO if the cluster indices match
if (electronClusterIndex == pfoClusterIndex) {
// Add electron element link to a vector
// index() is the unique index of the electron in the electron container
pfoElectronLinks.push_back( ElectronLink_t(*electronReadHandle, electron->index()) );
// Add pfo element link to a vector
// index() is the unique index of the nPFO in the nPFO container
electronNeutralPFOVec.at(electron->index()).push_back( PFOLink_t(*neutralpfoReadHandle, pfo->index()) );
}
}
}
// Loop over photons
for (const xAOD::Photon* photon : *photonNeutralPFOWriteDecorHandle) {
const std::vector<const xAOD::CaloCluster*> photonTopoClusters = xAOD::EgammaHelpers::getAssociatedTopoClusters(photon->caloCluster());
for (const xAOD::CaloCluster* cluster : photonTopoClusters) {
// Obtain the index of the photon seed topo-cluster
size_t photonClusterIndex = cluster->index();
// Link the photon to the PFO if the cluster indices match
if (photonClusterIndex == pfoClusterIndex) {
// Add photon element link to a vector
// index() is the unique index of the nPFO in the nPFO container
pfoPhotonLinks.push_back( PhotonLink_t(*photonReadHandle, photon->index()) );
// Add pfo element link to a vector
// index() is the unique index of the nPFO in the nPFO container
photonNeutralPFOVec.at(photon->index()).push_back( PFOLink_t(*neutralpfoReadHandle, pfo->index()) );
}
}
}
// Add vector of electron element links as decoration to PFO container
neutralpfoWriteDecorHandle (*pfo) = pfoElectronLinks;
neutralpfoElectronWriteDecorHandle (*pfo) = pfoElectronLinks;
// Add vector of photon element links as decoration to PFO container
neutralpfoPhotonWriteDecorHandle (*pfo) = pfoPhotonLinks;
}
///////////////////////////
// Loop over charged PFOs
///////////////////////////
for (const xAOD::PFO* pfo : *chargedpfoWriteDecorHandle) {
for (const xAOD::PFO* pfo : *chargedpfoElectronWriteDecorHandle) {
size_t pfoTrackIndex = pfo->track(0)->index();
// Initialise a vector of element links to electrons
std::vector<ElectronLink_t> pfoElectronLinks;
std::vector<ElectronLink_t> pfoElectronLinks;
// Initialise a vector of element links to photons
std::vector<PhotonLink_t> pfoPhotonLinks;
// Loop over electrons
for (const xAOD::Electron* electron : *electronChargedPFOWriteDecorHandle) {
......@@ -120,22 +168,45 @@ StatusCode PFEGammaPFOAssoc::execute() {
for (const xAOD::TrackParticle* electronTrack : electronTrackParticles) {
size_t electronTrackIndex = electronTrack->index();
// Link the electron to the PFO if the track indices match
if (electronTrackIndex == pfoTrackIndex) {
// Add electron element link to a vector
// index() is the unique index of the electron in the electron container
pfoElectronLinks.push_back( ElectronLink_t(*electronReadHandle, electron->index()) );
// Add pfo element link to a vector
// index() is the unique index of the cPFO in the cPFO container
electronChargedPFOVec.at(electron->index()).push_back( PFOLink_t(*chargedpfoReadHandle, pfo->index()) );
}
size_t electronTrackIndex = electronTrack->index();
// Link the electron to the PFO if the track indices match
if (electronTrackIndex == pfoTrackIndex) {
// Add electron element link to a vector
// index() is the unique index of the electron in the electron container
pfoElectronLinks.push_back( ElectronLink_t(*electronReadHandle, electron->index()) );
// Add pfo element link to a vector
// index() is the unique index of the cPFO in the cPFO container
electronChargedPFOVec.at(electron->index()).push_back( PFOLink_t(*chargedpfoReadHandle, pfo->index()) );
}
}
}
// Loop over photons
for (const xAOD::Photon* photon : *photonChargedPFOWriteDecorHandle) {
// Obtain the indices of the converted photon's original tracks
const std::set<const xAOD::TrackParticle*> photonTrackParticles = xAOD::EgammaHelpers::getTrackParticles(photon, true);
for (const xAOD::TrackParticle* photonTrack : photonTrackParticles) {
size_t photonTrackIndex = photonTrack->index();
// Link the photon to the PFO if the track indices match
if (photonTrackIndex == pfoTrackIndex) {
// Add photon element link to a vector
// index() is the unique index of the photon in the photon container
pfoPhotonLinks.push_back( PhotonLink_t(*photonReadHandle, photon->index()) );
// Add pfo element link to a vector
// index() is the unique index of the cPFO in the cPFO container
photonChargedPFOVec.at(photon->index()).push_back( PFOLink_t(*chargedpfoReadHandle, pfo->index()) );
}
}
}
// Add vector of electron element links as decoration to PFO container
chargedpfoWriteDecorHandle (*pfo) = pfoElectronLinks;
chargedpfoElectronWriteDecorHandle (*pfo) = pfoElectronLinks;
// Add vector of photon element links as decoration to PFO container
chargedpfoPhotonWriteDecorHandle (*pfo) = pfoPhotonLinks;
}
// Add the vectors of pfo element links as decorations to the electron container
......@@ -144,6 +215,12 @@ StatusCode PFEGammaPFOAssoc::execute() {
electronChargedPFOWriteDecorHandle (*electron) = electronChargedPFOVec.at(electron->index());
}
// Add the vectors of pfo element links as decorations to the photon container
for (const xAOD::Photon* photon : *photonNeutralPFOWriteDecorHandle) {
photonNeutralPFOWriteDecorHandle (*photon) = photonNeutralPFOVec.at(photon->index());
photonChargedPFOWriteDecorHandle (*photon) = photonChargedPFOVec.at(photon->index());
}
ATH_MSG_DEBUG("Execute completed successfully");
return StatusCode::SUCCESS;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment