diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM1.py
index 192bde287051759f4297e4ab7dfdf6abbc2122f7..c38471e32e48b88ac7e2fba639fbc30fd81a0f53 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM1.py
@@ -326,6 +326,7 @@ def EGAM1KernelCfg(ConfigFlags, name='EGAM1Kernel', **kwargs):
SGKey = 'Photons',
GSFTrackParticlesKey = 'GSFTrackParticles',
InDetTrackParticlesKey = 'InDetTrackParticles',
+ GSFConversionVerticesKey = 'GSFConversionVertices',
SelectionString = 'Photons.pt > 0*GeV',
BestMatchOnly = True,
ConeSize = 0.3)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM10.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM10.py
index 7c0c06241c420048bdfab32cc6eeb1f6d3497f18..879c14c23c4f1be8387a2cda83769662a5b15b30 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM10.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM10.py
@@ -194,6 +194,7 @@ def EGAM10KernelCfg(ConfigFlags, name='EGAM10Kernel', **kwargs):
SGKey = 'Photons',
GSFTrackParticlesKey = 'GSFTrackParticles',
InDetTrackParticlesKey = 'InDetTrackParticles',
+ GSFConversionVerticesKey = 'GSFConversionVertices',
SelectionString = photonRequirements,
BestMatchOnly = False,
ConeSize = 0.6)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM2.py
index 88955be2c7507040e2c2530c26bb4ca26b968b96..a3885a9dc1d344d8684305ec0a87f613241ab157 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM2.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM2.py
@@ -247,6 +247,7 @@ def EGAM2KernelCfg(ConfigFlags, name='EGAM2Kernel', **kwargs):
SGKey = 'Photons',
GSFTrackParticlesKey = 'GSFTrackParticles',
InDetTrackParticlesKey = 'InDetTrackParticles',
+ GSFConversionVerticesKey = 'GSFConversionVertices',
SelectionString = 'Photons.pt > 0*GeV',
BestMatchOnly = True,
ConeSize = 0.3)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM3.py
index 5ced52d88cc600c0e5477d21c85805820d778ed3..a5cb8b04254f3820a987d5dd69f710036b559fcf 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM3.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM3.py
@@ -290,6 +290,7 @@ def EGAM3KernelCfg(ConfigFlags, name='EGAM3Kernel', **kwargs):
SGKey = 'Photons',
GSFTrackParticlesKey = 'GSFTrackParticles',
InDetTrackParticlesKey = 'InDetTrackParticles',
+ GSFConversionVerticesKey = 'GSFConversionVertices',
SelectionString = 'Photons.pt > 0*GeV',
BestMatchOnly = True,
ConeSize = 0.3)
@@ -306,6 +307,7 @@ def EGAM3KernelCfg(ConfigFlags, name='EGAM3Kernel', **kwargs):
SGKey = 'Photons',
GSFTrackParticlesKey = 'GSFTrackParticles',
InDetTrackParticlesKey = 'InDetTrackParticles',
+ GSFConversionVerticesKey = 'GSFConversionVertices',
SelectionString = 'Photons.pt > 9.5*GeV',
BestMatchOnly = False,
ConeSize = 0.6)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM4.py
index 11a4154f999c8c8182d20523ed73c5c99eaef104..5854565631280572802af4c1d0e20417b9d71820 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM4.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM4.py
@@ -195,6 +195,7 @@ def EGAM4KernelCfg(ConfigFlags, name='EGAM4Kernel', **kwargs):
SGKey = 'Photons',
GSFTrackParticlesKey = 'GSFTrackParticles',
InDetTrackParticlesKey = 'InDetTrackParticles',
+ GSFConversionVerticesKey = 'GSFConversionVertices',
SelectionString = 'Photons.pt > 0*GeV',
BestMatchOnly = True,
ConeSize = 0.3)
@@ -211,6 +212,7 @@ def EGAM4KernelCfg(ConfigFlags, name='EGAM4Kernel', **kwargs):
SGKey = 'Photons',
GSFTrackParticlesKey = 'GSFTrackParticles',
InDetTrackParticlesKey = 'InDetTrackParticles',
+ GSFConversionVerticesKey = 'GSFConversionVertices',
SelectionString = 'Photons.pt > 9.5*GeV',
BestMatchOnly = False,
ConeSize = 0.6)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM5.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM5.py
index 878c199afadfff16791d5f2e0f45de84beb45708..c069ff4d422645340cf525b5e258c0a019b4c238 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM5.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM5.py
@@ -231,6 +231,7 @@ def EGAM5KernelCfg(ConfigFlags, name='EGAM5Kernel', **kwargs):
SGKey = 'Photons',
GSFTrackParticlesKey = 'GSFTrackParticles',
InDetTrackParticlesKey = 'InDetTrackParticles',
+ GSFConversionVerticesKey = 'GSFConversionVertices',
SelectionString = 'Photons.pt > 0*GeV',
BestMatchOnly = True,
ConeSize = 0.3)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM7.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM7.py
index 4db83210ef2c81c7284af81c956e9e9535dd0b70..57049764848f2806c31a8e4e097a4b42e0106a66 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM7.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM7.py
@@ -186,6 +186,7 @@ def EGAM7KernelCfg(ConfigFlags, name='EGAM7Kernel', **kwargs):
SGKey = 'Photons',
GSFTrackParticlesKey = 'GSFTrackParticles',
InDetTrackParticlesKey = 'InDetTrackParticles',
+ GSFConversionVerticesKey = 'GSFConversionVertices',
SelectionString = 'Photons.pt > 0*GeV',
BestMatchOnly = True,
ConeSize = 0.3)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM8.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM8.py
index 2e6c98acd79510b3a48a70d513d167d150daa3d3..40b7e731d43c5898d892b6556bff39030ab1d8d4 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM8.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM8.py
@@ -221,6 +221,7 @@ def EGAM8KernelCfg(ConfigFlags, name='EGAM8Kernel', **kwargs):
SGKey = 'Photons',
GSFTrackParticlesKey = 'GSFTrackParticles',
InDetTrackParticlesKey = 'InDetTrackParticles',
+ GSFConversionVerticesKey = 'GSFConversionVertices',
SelectionString = 'Photons.pt > 0*GeV',
BestMatchOnly = True,
ConeSize = 0.3)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM9.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM9.py
index 64bab768005d2136cb0ef5dd94ca85f7c2fb0168..5083a29ed924d1233971e9c336cd160b0c266d8c 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM9.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM9.py
@@ -172,6 +172,7 @@ def EGAM9KernelCfg(ConfigFlags, name='EGAM9Kernel', **kwargs):
SGKey = 'Photons',
GSFTrackParticlesKey = 'GSFTrackParticles',
InDetTrackParticlesKey = 'InDetTrackParticles',
+ GSFConversionVerticesKey = 'GSFConversionVertices',
SelectionString = 'Photons.pt > 0*GeV',
BestMatchOnly = True,
ConeSize = 0.3)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/EgammaTrackParticleThinning.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/EgammaTrackParticleThinning.cxx
index 9f4bc414728af24305dfbbd5060bf5ab02097eae..89b69285d820785934eacaa7aa11c0c76b726f22 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/EgammaTrackParticleThinning.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/EgammaTrackParticleThinning.cxx
@@ -238,6 +238,12 @@ DerivationFramework::EgammaTrackParticleThinning::setPhotonMasks(
const xAOD::TrackParticleContainer* tps,
const xAOD::TrackParticleContainer* gsfs) const
{
+ if (m_gsfVtxSGKey.empty()) {
+ ATH_MSG_ERROR("Thinning track particles/vertices associated to photons"
+ "but no conversion vertex key provided");
+ return;
+ }
+
SG::ThinningHandle<xAOD::VertexContainer> importedGSFConversionVtx(
m_gsfVtxSGKey, Gaudi::Hive::currentContext());
const xAOD::VertexContainer* gsfVtxs = importedGSFConversionVtx.cptr();
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM12.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM12.py
index 340d754ee22cc33f1df77590595d7bf022e120fa..3b3893edba23ff6e09ba62154fe1cabf38ddbebf 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM12.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM12.py
@@ -137,10 +137,11 @@ def JETM12KernelCfg(ConfigFlags, name='JETM12Kernel', **kwargs):
# Include inner detector tracks associated with photons
JETM12PhotonTPThinningTool = acc.getPrimaryAndMerge(EgammaTrackParticleThinningCfg(
ConfigFlags,
- name = "JETM12PhotonTPThinningTool",
- StreamName = kwargs['StreamName'],
- SGKey = "Photons",
- InDetTrackParticlesKey = "InDetTrackParticles"))
+ name = "JETM12PhotonTPThinningTool",
+ StreamName = kwargs['StreamName'],
+ SGKey = "Photons",
+ InDetTrackParticlesKey = "InDetTrackParticles",
+ GSFConversionVerticesKey = "GSFConversionVertices"))
# Include inner detector tracks associated with taus
JETM12TauTPThinningTool = acc.getPrimaryAndMerge(TauTrackParticleThinningCfg(
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM3.py
index 29b981679fe35f383b32528030bbdef38cc709af..78a2133de558e19686a3769ee337f91c9b2e6882 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM3.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM3.py
@@ -93,10 +93,11 @@ def JETM3KernelCfg(ConfigFlags, name='JETM3Kernel', **kwargs):
# Include inner detector tracks associated with photons
JETM3PhotonTPThinningTool = acc.getPrimaryAndMerge(EgammaTrackParticleThinningCfg(
ConfigFlags,
- name = "JETM3PhotonTPThinningTool",
- StreamName = kwargs['StreamName'],
- SGKey = "Photons",
- InDetTrackParticlesKey = "InDetTrackParticles"))
+ name = "JETM3PhotonTPThinningTool",
+ StreamName = kwargs['StreamName'],
+ SGKey = "Photons",
+ InDetTrackParticlesKey = "InDetTrackParticles",
+ GSFConversionVerticesKey = "GSFConversionVertices"))
# Include inner detector tracks associated with taus
JETM3TauTPThinningTool = acc.getPrimaryAndMerge(TauTrackParticleThinningCfg(
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM4.py
index d294d77db7f87876199eeeb855e2711b8d09cc3d..234a0821e367981a3254bf60f9919e2d85c404ab 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM4.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM4.py
@@ -68,10 +68,11 @@ def JETM4KernelCfg(ConfigFlags, name='JETM4Kernel', **kwargs):
# Include inner detector tracks associated with photons
JETM4PhotonTPThinningTool = acc.getPrimaryAndMerge(EgammaTrackParticleThinningCfg(
ConfigFlags,
- name = "JETM4PhotonTPThinningTool",
- StreamName = kwargs['StreamName'],
- SGKey = "Photons",
- InDetTrackParticlesKey = "InDetTrackParticles"))
+ name = "JETM4PhotonTPThinningTool",
+ StreamName = kwargs['StreamName'],
+ SGKey = "Photons",
+ InDetTrackParticlesKey = "InDetTrackParticles",
+ GSFConversionVerticesKey = "GSFConversionVertices"))
# Include inner detector tracks associated with taus
JETM4TauTPThinningTool = acc.getPrimaryAndMerge(TauTrackParticleThinningCfg(
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM5.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM5.py
index 0db89433b8b401d4e9ef7ea179acd9142f65e481..82364d92e228f73aaff438e4625c2ac0310dc2aa 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM5.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM5.py
@@ -56,10 +56,11 @@ def JETM5KernelCfg(ConfigFlags, name='JETM5Kernel', **kwargs):
# Include inner detector tracks associated with photons
JETM5PhotonTPThinningTool = acc.getPrimaryAndMerge(EgammaTrackParticleThinningCfg(
ConfigFlags,
- name = "JETM5PhotonTPThinningTool",
- StreamName = kwargs['StreamName'],
- SGKey = "Photons",
- InDetTrackParticlesKey = "InDetTrackParticles"))
+ name = "JETM5PhotonTPThinningTool",
+ StreamName = kwargs['StreamName'],
+ SGKey = "Photons",
+ InDetTrackParticlesKey = "InDetTrackParticles",
+ GSFConversionVerticesKey = "GSFConversionVertices"))
thinningTools = [JETM5MuonTPThinningTool,
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/METTriggerDerivationContentConfig.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/METTriggerDerivationContentConfig.py
index 0a6ae7a41c64212d19ed4a986b65d208f879756e..750bf6a9ce8cdeb20145efacc1671c6fed80c118 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/METTriggerDerivationContentConfig.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/METTriggerDerivationContentConfig.py
@@ -64,10 +64,11 @@ def METTriggerDerivationKernelCfg(ConfigFlags, name, **kwargs):
photonTPThinningTool = acc.getPrimaryAndMerge(EgammaTrackParticleThinningCfg(
ConfigFlags,
- name = kwargs['StreamName']+"PhotonTPThinningTool",
- StreamName = kwargs['StreamName'],
- SGKey = "Photons",
- InDetTrackParticlesKey = "InDetTrackParticles"))
+ name = kwargs['StreamName']+"PhotonTPThinningTool",
+ StreamName = kwargs['StreamName'],
+ SGKey = "Photons",
+ InDetTrackParticlesKey = "InDetTrackParticles",
+ GSFConversionVerticesKey = "GSFConversionVertices"))
tauTPThinningTool = acc.getPrimaryAndMerge(TauTrackParticleThinningCfg(
ConfigFlags,