diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/CMakeLists.txt b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/CMakeLists.txt
index ed2f1499363a833facfa5bb5c950ab3c00e8c685..12941799f08b9a420c2d1317a0938fb458112f5a 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/CMakeLists.txt
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/CMakeLists.txt
@@ -13,6 +13,6 @@ atlas_add_component( DerivationFrameworkEGamma
LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools AthContainers AthenaBaseComps CaloCalibHitRecLib DerivationFrameworkInterfaces EgammaAnalysisHelpersLib EgammaAnalysisInterfacesLib ExpressionEvaluationLib GaudiKernel MCTruthClassifierLib PATCoreLib xAODBase xAODCaloEvent xAODEgamma xAODMissingET xAODMuon xAODTracking xAODTruth )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM1ExtraContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM1ExtraContent.py
index c9f84c6756f3b96fcdd09ff6b134a686170f3e8e..c55bdc9568425508a92b29b1b3934b58aebebfc0 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM1ExtraContent.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM1ExtraContent.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#Content included in addition to the Smart Slimming Content
@@ -40,8 +40,8 @@ ExtraMuonsTruth=[
]
ExtraContentPhotons=[
- ]
-
+ ]
+
ExtraContentPrimaryVertices=["PrimaryVertices.x.y.sumPt2"]
ExtraPhotonsTruth=[
@@ -51,18 +51,18 @@ ExtraPhotonsTruth=[
]
ExtraContentGSFConversionVertices=[
- "GSFConversionVertices.x",
- "GSFConversionVertices.y",
- "GSFConversionVertices.z",
- "GSFConversionVertices.px",
- "GSFConversionVertices.py",
- "GSFConversionVertices.pz",
- "GSFConversionVertices.pt1",
- "GSFConversionVertices.pt2",
- "GSFConversionVertices.etaAtCalo",
- "GSFConversionVertices.phiAtCalo",
- "GSFConversionVertices.trackParticleLinks"
- ]
+ "GSFConversionVertices.x",
+ "GSFConversionVertices.y",
+ "GSFConversionVertices.z",
+ "GSFConversionVertices.px",
+ "GSFConversionVertices.py",
+ "GSFConversionVertices.pz",
+ "GSFConversionVertices.pt1",
+ "GSFConversionVertices.pt2",
+ "GSFConversionVertices.etaAtCalo",
+ "GSFConversionVertices.phiAtCalo",
+ "GSFConversionVertices.trackParticleLinks"
+ ]
#ExtraContentHLTElectrons=[
# "HLT_xAOD__ElectronContainer_egamma_Electrons.e.pt.Rhad.Rhad1.e277.Reta.Rphi.weta2.f1.fracs1.wtots1.weta1.DeltaE.Eratio.caloClusterLinks"
@@ -84,10 +84,10 @@ ExtraContainersTruth=["TruthEvents",
"TruthParticles",
"TruthVertices",
"AntiKt4TruthJets",
- "egammaTruthParticles"
+ "egammaTruthParticles"
#,"BTagging_AntiKt4TruthWZ"
#,"AntiKt4TruthWZJets"
- ]
+ ]
ExtraContainersElectrons=["Electrons",
"GSFTrackParticles",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM2ExtraContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM2ExtraContent.py
index e248b0a25cb25bd3e53edc2e5ba0b26f78482d46..1f077a8f6480de97c9bb751c6905d65547f0cbb2 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM2ExtraContent.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM2ExtraContent.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#Content included in addition to the Smart Slimming Content
@@ -28,7 +28,7 @@ ExtraMuonsTruth=[
]
ExtraContentPhotons=[
- ]
+ ]
ExtraContentElectrons=[]
@@ -41,34 +41,34 @@ ExtraPhotonsTruth=[
]
ExtraContentGSFConversionVertices=[
- "GSFConversionVertices.x",
- "GSFConversionVertices.y",
- "GSFConversionVertices.z",
- "GSFConversionVertices.px",
- "GSFConversionVertices.py",
- "GSFConversionVertices.pz",
- "GSFConversionVertices.pt1",
- "GSFConversionVertices.pt2",
- "GSFConversionVertices.etaAtCalo",
- "GSFConversionVertices.phiAtCalo",
- "GSFConversionVertices.trackParticleLinks"
- ]
+ "GSFConversionVertices.x",
+ "GSFConversionVertices.y",
+ "GSFConversionVertices.z",
+ "GSFConversionVertices.px",
+ "GSFConversionVertices.py",
+ "GSFConversionVertices.pz",
+ "GSFConversionVertices.pt1",
+ "GSFConversionVertices.pt2",
+ "GSFConversionVertices.etaAtCalo",
+ "GSFConversionVertices.phiAtCalo",
+ "GSFConversionVertices.trackParticleLinks"
+ ]
#cells = ("Cells5x5","Cells3x5","Cells3x7","Cells7x11")
-#layers_gains = ( "_Lr0", "_Lr1", "_Lr2", "_Lr3",
-# "_Lr0_LwG", "_Lr1_LwG", "_Lr2_LwG", "_Lr3_LwG",
-# "_Lr0_LwG", "_Lr1_MdG", "_Lr2_MdG", "_Lr3_MdG",
-# "_Lr0_LwG", "_Lr1_HiG", "_Lr2_HiG", "_Lr3_HiG" )
+#layers_gains = ( "_Lr0", "_Lr1", "_Lr2", "_Lr3",
+# "_Lr0_LwG", "_Lr1_LwG", "_Lr2_LwG", "_Lr3_LwG",
+# "_Lr0_LwG", "_Lr1_MdG", "_Lr2_MdG", "_Lr3_MdG",
+# "_Lr0_LwG", "_Lr1_HiG", "_Lr2_HiG", "_Lr3_HiG" )
#
#for cell in cells:
-# ExtraContentPhotons.append("Photons."+cell)
-# for layer in layers_gains:
-# ExtraContentPhotons.append("Photons."+cell+layer)
+# ExtraContentPhotons.append("Photons."+cell)
+# for layer in layers_gains:
+# ExtraContentPhotons.append("Photons."+cell+layer)
#
#for cell in cells:
-# ExtraContentElectrons.append("Electrons."+cell)
-# for layer in layers_gains:
-# ExtraContentElectrons.append("Electrons."+cell+layer)
+# ExtraContentElectrons.append("Electrons."+cell)
+# for layer in layers_gains:
+# ExtraContentElectrons.append("Electrons."+cell+layer)
from DerivationFrameworkCalo.DerivationFrameworkCaloFactories import GainDecorator, getGainDecorations
GainDecoratorTool = GainDecorator()
ExtraContentPhotons.extend( getGainDecorations(GainDecoratorTool) )
@@ -82,7 +82,7 @@ ExtraContainersTruth=["TruthEvents",
"TruthParticles",
"TruthVertices",
"AntiKt4TruthJets",
- "egammaTruthParticles"
+ "egammaTruthParticles"
#,"BTagging_AntiKt4TruthWZ"
#,"AntiKt4TruthWZJets"
]
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM3ExtraContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM3ExtraContent.py
index 990c084d3c0fb1c978d9ae9dabd4c83d75d482e5..bd1d12d646c7fa69e278714aaef19807134d91fa 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM3ExtraContent.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM3ExtraContent.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#Content included in addition to the Smart Slimming Content
@@ -42,39 +42,39 @@ ExtraPhotonsTruth=[
]
ExtraContentGSFConversionVertices=[
- "GSFConversionVertices.x",
- "GSFConversionVertices.y",
- "GSFConversionVertices.z",
- "GSFConversionVertices.px",
- "GSFConversionVertices.py",
- "GSFConversionVertices.pz",
- "GSFConversionVertices.pt1",
- "GSFConversionVertices.pt2",
- "GSFConversionVertices.etaAtCalo",
- "GSFConversionVertices.phiAtCalo",
- "GSFConversionVertices.trackParticleLinks"
- ]
+ "GSFConversionVertices.x",
+ "GSFConversionVertices.y",
+ "GSFConversionVertices.z",
+ "GSFConversionVertices.px",
+ "GSFConversionVertices.py",
+ "GSFConversionVertices.pz",
+ "GSFConversionVertices.pt1",
+ "GSFConversionVertices.pt2",
+ "GSFConversionVertices.etaAtCalo",
+ "GSFConversionVertices.phiAtCalo",
+ "GSFConversionVertices.trackParticleLinks"
+ ]
ExtraContentHLTPhotons=[
- "HLT_xAOD__PhotonContainer_egamma_Photons.e.pt.m.author.Rhad.Rhad1.e277.Reta.Rphi.weta2.f1.fracs1.wtots1.weta1.DeltaE.Eratio.caloClusterLinks",
- "HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFex.calE.calEta.calPhi.calM.e_sampl.eta_sampl.etaCalo.phiCalo.ETACALOFRAME.PHICALOFRAME"
+ "HLT_xAOD__PhotonContainer_egamma_Photons.e.pt.m.author.Rhad.Rhad1.e277.Reta.Rphi.weta2.f1.fracs1.wtots1.weta1.DeltaE.Eratio.caloClusterLinks",
+ "HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFex.calE.calEta.calPhi.calM.e_sampl.eta_sampl.etaCalo.phiCalo.ETACALOFRAME.PHICALOFRAME"
]
#cells = ("Cells5x5","Cells3x5","Cells3x7","Cells7x11")
-#layers_gains = ( "_Lr0", "_Lr1", "_Lr2", "_Lr3",
-# "_Lr0_LwG", "_Lr1_LwG", "_Lr2_LwG", "_Lr3_LwG",
-# "_Lr0_LwG", "_Lr1_MdG", "_Lr2_MdG", "_Lr3_MdG",
-# "_Lr0_LwG", "_Lr1_HiG", "_Lr2_HiG", "_Lr3_HiG" )
+#layers_gains = ( "_Lr0", "_Lr1", "_Lr2", "_Lr3",
+# "_Lr0_LwG", "_Lr1_LwG", "_Lr2_LwG", "_Lr3_LwG",
+# "_Lr0_LwG", "_Lr1_MdG", "_Lr2_MdG", "_Lr3_MdG",
+# "_Lr0_LwG", "_Lr1_HiG", "_Lr2_HiG", "_Lr3_HiG" )
#
#for cell in cells:
-# ExtraContentPhotons.append("Photons."+cell)
-# for layer in layers_gains:
-# ExtraContentPhotons.append("Photons."+cell+layer)
+# ExtraContentPhotons.append("Photons."+cell)
+# for layer in layers_gains:
+# ExtraContentPhotons.append("Photons."+cell+layer)
#
#for cell in cells:
-# ExtraContentElectrons.append("Electrons."+cell)
-# for layer in layers_gains:
-# ExtraContentElectrons.append("Electrons."+cell+layer)
+# ExtraContentElectrons.append("Electrons."+cell)
+# for layer in layers_gains:
+# ExtraContentElectrons.append("Electrons."+cell+layer)
from DerivationFrameworkCalo.DerivationFrameworkCaloFactories import GainDecorator, getGainDecorations
GainDecoratorTool = GainDecorator()
ExtraContentPhotons.extend( getGainDecorations(GainDecoratorTool) )
@@ -87,8 +87,8 @@ ExtraContainersTruth=["TruthEvents",
"TruthParticles",
"TruthVertices",
"AntiKt4TruthJets",
- "egammaTruthParticles",
- "MuonTruthParticles"
+ "egammaTruthParticles",
+ "MuonTruthParticles"
#,"BTagging_AntiKt4TruthWZ"
#,"AntiKt4TruthWZJets"
]
@@ -105,39 +105,39 @@ ExtraContainersPhotons=["Photons",
# for trigger studies
ExtraContainersTrigger=[
- "HLT_xAOD__ElectronContainer_egamma_Electrons",
- "HLT_xAOD__ElectronContainer_egamma_ElectronsAux.",
- "HLT_xAOD__PhotonContainer_egamma_Photons",
- "HLT_xAOD__PhotonContainer_egamma_PhotonsAux.",
+ "HLT_xAOD__ElectronContainer_egamma_Electrons",
+ "HLT_xAOD__ElectronContainer_egamma_ElectronsAux.",
+ "HLT_xAOD__PhotonContainer_egamma_Photons",
+ "HLT_xAOD__PhotonContainer_egamma_PhotonsAux.",
"HLT_xAOD__PhotonContainer_egamma_Iso_Photons",
"HLT_xAOD__PhotonContainer_egamma_Iso_PhotonsAux.",
- "HLT_xAOD__TrigElectronContainer_L2ElectronFex",
- "HLT_xAOD__TrigElectronContainer_L2ElectronFexAux.",
- "HLT_xAOD__TrigPhotonContainer_L2PhotonFex",
- "HLT_xAOD__TrigPhotonContainer_L2PhotonFexAux.",
- "HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFex",
- "HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFexAux.",
- "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_EFID",
- "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_EFIDAux.",
- "LVL1EmTauRoIs",
- "LVL1EmTauRoIsAux.",
- "HLT_TrigPassBitsCollection_passbits",
- "HLT_TrigPassBitsCollection_passbitsAux.",
- "HLT_TrigPassFlagsCollection_passflags",
- "HLT_TrigPassFlagsCollection_passflagsAux.",
- "HLT_TrigRoiDescriptorCollection_initialRoI",
- "HLT_TrigRoiDescriptorCollection_initialRoIAux."
- ]
+ "HLT_xAOD__TrigElectronContainer_L2ElectronFex",
+ "HLT_xAOD__TrigElectronContainer_L2ElectronFexAux.",
+ "HLT_xAOD__TrigPhotonContainer_L2PhotonFex",
+ "HLT_xAOD__TrigPhotonContainer_L2PhotonFexAux.",
+ "HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFex",
+ "HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFexAux.",
+ "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_EFID",
+ "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_EFIDAux.",
+ "LVL1EmTauRoIs",
+ "LVL1EmTauRoIsAux.",
+ "HLT_TrigPassBitsCollection_passbits",
+ "HLT_TrigPassBitsCollection_passbitsAux.",
+ "HLT_TrigPassFlagsCollection_passflags",
+ "HLT_TrigPassFlagsCollection_passflagsAux.",
+ "HLT_TrigRoiDescriptorCollection_initialRoI",
+ "HLT_TrigRoiDescriptorCollection_initialRoIAux."
+ ]
ExtraContainersTriggerDataOnly=[
- "HLT_xAOD__TrigEMClusterContainer_TrigT2CaloEgamma",
- "HLT_xAOD__TrigEMClusterContainer_TrigT2CaloEgammaAux.",
- "HLT_xAOD__CaloClusterContainer_TrigCaloClusterMaker",
- "HLT_xAOD__CaloClusterContainer_TrigCaloClusterMakerAux.",
- "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_FTF",
- "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_FTFAux.",
- "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_L2ID",
- "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_L2IDAux.",
- "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_IDTrig",
- "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_IDTrigAux."
- ]
+ "HLT_xAOD__TrigEMClusterContainer_TrigT2CaloEgamma",
+ "HLT_xAOD__TrigEMClusterContainer_TrigT2CaloEgammaAux.",
+ "HLT_xAOD__CaloClusterContainer_TrigCaloClusterMaker",
+ "HLT_xAOD__CaloClusterContainer_TrigCaloClusterMakerAux.",
+ "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_FTF",
+ "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_FTFAux.",
+ "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_L2ID",
+ "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_L2IDAux.",
+ "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_IDTrig",
+ "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_IDTrigAux."
+ ]
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM4ExtraContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM4ExtraContent.py
index 27a494b113c2beb84d53433e74742388f00609ab..2fbf7a3688ec5999ab9ef46f531dafd49ea6d9fe 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM4ExtraContent.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM4ExtraContent.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#Content included in addition to the Smart Slimming Content
@@ -48,22 +48,22 @@ ExtraPhotonsTruth=[
]
ExtraContentGSFConversionVertices=[
- "GSFConversionVertices.x",
- "GSFConversionVertices.y",
- "GSFConversionVertices.z",
- "GSFConversionVertices.px",
- "GSFConversionVertices.py",
- "GSFConversionVertices.pz",
- "GSFConversionVertices.pt1",
- "GSFConversionVertices.pt2",
- "GSFConversionVertices.etaAtCalo",
- "GSFConversionVertices.phiAtCalo",
- "GSFConversionVertices.trackParticleLinks"
- ]
+ "GSFConversionVertices.x",
+ "GSFConversionVertices.y",
+ "GSFConversionVertices.z",
+ "GSFConversionVertices.px",
+ "GSFConversionVertices.py",
+ "GSFConversionVertices.pz",
+ "GSFConversionVertices.pt1",
+ "GSFConversionVertices.pt2",
+ "GSFConversionVertices.etaAtCalo",
+ "GSFConversionVertices.phiAtCalo",
+ "GSFConversionVertices.trackParticleLinks"
+ ]
ExtraContentHLTPhotons=[
"HLT_xAOD__PhotonContainer_egamma_Photons.e.pt.m.author.Rhad.Rhad1.e277.Reta.Rphi.weta2.f1.fracs1.wtots1.weta1.DeltaE.Eratio.caloClusterLinks",
- "HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFex.calE.calEta.calPhi.calM.e_sampl.eta_sampl.etaCalo.phiCalo.ETACALOFRAME.PHICALOFRAME"
+ "HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFex.calE.calEta.calPhi.calM.e_sampl.eta_sampl.etaCalo.phiCalo.ETACALOFRAME.PHICALOFRAME"
]
from DerivationFrameworkCalo.DerivationFrameworkCaloFactories import GainDecorator, getGainDecorations
@@ -79,8 +79,8 @@ ExtraContainersTruth=["TruthEvents",
"TruthParticles",
"TruthVertices",
"AntiKt4TruthJets",
- "egammaTruthParticles",
- "MuonTruthParticles"
+ "egammaTruthParticles",
+ "MuonTruthParticles"
#,"BTagging_AntiKt4TruthWZ"
#,"AntiKt4TruthWZJets"
]
@@ -95,31 +95,31 @@ ExtraContainersPhotons=["Photons",
# for trigger studies and for trigger matching
ExtraContainersTrigger=[
- "HLT_xAOD__MuonContainer_MuonEFInfo",
- "HLT_xAOD__MuonContainer_MuonEFInfoAux.",
+ "HLT_xAOD__MuonContainer_MuonEFInfo",
+ "HLT_xAOD__MuonContainer_MuonEFInfoAux.",
"HLT_xAOD__MuonContainer_MuonEFInfo_FullScan",
"HLT_xAOD__MuonContainer_MuonEFInfo_FullScanAux.",
- "HLT_xAOD__PhotonContainer_egamma_Photons",
- "HLT_xAOD__PhotonContainer_egamma_PhotonsAux.",
+ "HLT_xAOD__PhotonContainer_egamma_Photons",
+ "HLT_xAOD__PhotonContainer_egamma_PhotonsAux.",
"HLT_xAOD__PhotonContainer_egamma_Iso_Photons",
"HLT_xAOD__PhotonContainer_egamma_Iso_PhotonsAux.",
- "HLT_xAOD__TrigPhotonContainer_L2PhotonFex",
- "HLT_xAOD__TrigPhotonContainer_L2PhotonFexAux.",
- "HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFex",
- "HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFexAux.",
- "LVL1EmTauRoIs",
- "LVL1EmTauRoIsAux.",
- "HLT_TrigPassBitsCollection_passbits",
- "HLT_TrigPassBitsCollection_passbitsAux.",
- "HLT_TrigPassFlagsCollection_passflags",
- "HLT_TrigPassFlagsCollection_passflagsAux.",
- "HLT_TrigRoiDescriptorCollection_initialRoI",
- "HLT_TrigRoiDescriptorCollection_initialRoIAux."
+ "HLT_xAOD__TrigPhotonContainer_L2PhotonFex",
+ "HLT_xAOD__TrigPhotonContainer_L2PhotonFexAux.",
+ "HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFex",
+ "HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFexAux.",
+ "LVL1EmTauRoIs",
+ "LVL1EmTauRoIsAux.",
+ "HLT_TrigPassBitsCollection_passbits",
+ "HLT_TrigPassBitsCollection_passbitsAux.",
+ "HLT_TrigPassFlagsCollection_passflags",
+ "HLT_TrigPassFlagsCollection_passflagsAux.",
+ "HLT_TrigRoiDescriptorCollection_initialRoI",
+ "HLT_TrigRoiDescriptorCollection_initialRoIAux."
]
ExtraContainersTriggerDataOnly=[
- "HLT_xAOD__TrigEMClusterContainer_TrigT2CaloEgamma",
- "HLT_xAOD__TrigEMClusterContainer_TrigT2CaloEgammaAux.",
- "HLT_xAOD__CaloClusterContainer_TrigCaloClusterMaker",
- "HLT_xAOD__CaloClusterContainer_TrigCaloClusterMakerAux."
- ]
+ "HLT_xAOD__TrigEMClusterContainer_TrigT2CaloEgamma",
+ "HLT_xAOD__TrigEMClusterContainer_TrigT2CaloEgammaAux.",
+ "HLT_xAOD__CaloClusterContainer_TrigCaloClusterMaker",
+ "HLT_xAOD__CaloClusterContainer_TrigCaloClusterMakerAux."
+ ]
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM5ExtraContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM5ExtraContent.py
index eca0e30a85720475ece329349965f899bc0f4bce..590f71a6a4467444c58ec0ebdeefd9e43a26bb4d 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM5ExtraContent.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM5ExtraContent.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#Content included in addition to the Smart Slimming Content
@@ -42,34 +42,34 @@ ExtraPhotonsTruth=[
]
ExtraContentGSFConversionVertices=[
- "GSFConversionVertices.x",
- "GSFConversionVertices.y",
- "GSFConversionVertices.z",
- "GSFConversionVertices.px",
- "GSFConversionVertices.py",
- "GSFConversionVertices.pz",
- "GSFConversionVertices.pt1",
- "GSFConversionVertices.pt2",
- "GSFConversionVertices.etaAtCalo",
- "GSFConversionVertices.phiAtCalo",
- "GSFConversionVertices.trackParticleLinks"
+ "GSFConversionVertices.x",
+ "GSFConversionVertices.y",
+ "GSFConversionVertices.z",
+ "GSFConversionVertices.px",
+ "GSFConversionVertices.py",
+ "GSFConversionVertices.pz",
+ "GSFConversionVertices.pt1",
+ "GSFConversionVertices.pt2",
+ "GSFConversionVertices.etaAtCalo",
+ "GSFConversionVertices.phiAtCalo",
+ "GSFConversionVertices.trackParticleLinks"
]
#cells = ("Cells5x5","Cells3x5","Cells3x7","Cells7x11")
-#layers_gains = ( "_Lr0", "_Lr1", "_Lr2", "_Lr3",
-# "_Lr0_LwG", "_Lr1_LwG", "_Lr2_LwG", "_Lr3_LwG",
-# "_Lr0_LwG", "_Lr1_MdG", "_Lr2_MdG", "_Lr3_MdG",
-# "_Lr0_LwG", "_Lr1_HiG", "_Lr2_HiG", "_Lr3_HiG" )
+#layers_gains = ( "_Lr0", "_Lr1", "_Lr2", "_Lr3",
+# "_Lr0_LwG", "_Lr1_LwG", "_Lr2_LwG", "_Lr3_LwG",
+# "_Lr0_LwG", "_Lr1_MdG", "_Lr2_MdG", "_Lr3_MdG",
+# "_Lr0_LwG", "_Lr1_HiG", "_Lr2_HiG", "_Lr3_HiG" )
#
#for cell in cells:
-# ExtraContentPhotons.append("Photons."+cell)
-# for layer in layers_gains:
-# ExtraContentPhotons.append("Photons."+cell+layer)
+# ExtraContentPhotons.append("Photons."+cell)
+# for layer in layers_gains:
+# ExtraContentPhotons.append("Photons."+cell+layer)
#
#for cell in cells:
-# ExtraContentElectrons.append("Electrons."+cell)
-# for layer in layers_gains:
-# ExtraContentElectrons.append("Electrons."+cell+layer)
+# ExtraContentElectrons.append("Electrons."+cell)
+# for layer in layers_gains:
+# ExtraContentElectrons.append("Electrons."+cell+layer)
#
from DerivationFrameworkCalo.DerivationFrameworkCaloFactories import GainDecorator, getGainDecorations
GainDecoratorTool = GainDecorator()
@@ -83,7 +83,7 @@ ExtraContainersTruth=["TruthEvents",
"TruthParticles",
"TruthVertices",
"AntiKt4TruthJets",
- "egammaTruthParticles"
+ "egammaTruthParticles"
#,"BTagging_AntiKt4TruthWZ"
#,"AntiKt4TruthWZJets"
]
@@ -95,32 +95,32 @@ ExtraContainersElectrons=["Electrons",
# for trigger studies
ExtraContainersTrigger=[
- "HLT_xAOD__ElectronContainer_egamma_Electrons",
- "HLT_xAOD__ElectronContainer_egamma_ElectronsAux.",
- "HLT_xAOD__PhotonContainer_egamma_Photons",
- "HLT_xAOD__PhotonContainer_egamma_PhotonsAux.",
- "HLT_xAOD__TrigElectronContainer_L2ElectronFex",
- "HLT_xAOD__TrigElectronContainer_L2ElectronFexAux.",
- "HLT_xAOD__TrigPhotonContainer_L2PhotonFex",
- "HLT_xAOD__TrigPhotonContainer_L2PhotonFexAux.",
- "HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFex",
- "HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFexAux.",
- "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_EFID",
- "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_EFIDAux.",
- "LVL1EmTauRoIs",
- "LVL1EmTauRoIsAux.",
- "HLT_TrigPassBitsCollection_passbits",
- "HLT_TrigPassBitsCollection_passbitsAux.",
- "HLT_TrigPassFlagsCollection_passflags",
- "HLT_TrigPassFlagsCollection_passflagsAux.",
- "HLT_TrigRoiDescriptorCollection_initialRoI",
- "HLT_TrigRoiDescriptorCollection_initialRoIAux."
- ]
+ "HLT_xAOD__ElectronContainer_egamma_Electrons",
+ "HLT_xAOD__ElectronContainer_egamma_ElectronsAux.",
+ "HLT_xAOD__PhotonContainer_egamma_Photons",
+ "HLT_xAOD__PhotonContainer_egamma_PhotonsAux.",
+ "HLT_xAOD__TrigElectronContainer_L2ElectronFex",
+ "HLT_xAOD__TrigElectronContainer_L2ElectronFexAux.",
+ "HLT_xAOD__TrigPhotonContainer_L2PhotonFex",
+ "HLT_xAOD__TrigPhotonContainer_L2PhotonFexAux.",
+ "HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFex",
+ "HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFexAux.",
+ "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_EFID",
+ "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_EFIDAux.",
+ "LVL1EmTauRoIs",
+ "LVL1EmTauRoIsAux.",
+ "HLT_TrigPassBitsCollection_passbits",
+ "HLT_TrigPassBitsCollection_passbitsAux.",
+ "HLT_TrigPassFlagsCollection_passflags",
+ "HLT_TrigPassFlagsCollection_passflagsAux.",
+ "HLT_TrigRoiDescriptorCollection_initialRoI",
+ "HLT_TrigRoiDescriptorCollection_initialRoIAux."
+ ]
ExtraContainersTriggerDataOnly=[
- "HLT_xAOD__TrigEMClusterContainer_TrigT2CaloEgamma",
- "HLT_xAOD__TrigEMClusterContainer_TrigT2CaloEgammaAux."
- ]
+ "HLT_xAOD__TrigEMClusterContainer_TrigT2CaloEgamma",
+ "HLT_xAOD__TrigEMClusterContainer_TrigT2CaloEgammaAux."
+ ]
#should probably slim electron/fwdelectrons/cluster collections and keep only relevant subset of variables..
# no ForwardElectrons, InDetTrackParticlesForward, ForwardElectronClusters, CaloCalTopoCluster
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM7ExtraContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM7ExtraContent.py
index 2088e310366dd84b952298f48ad02feeaf5be89d..183b85a3223f3dd9e396cf278b98f48f2dea4851 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM7ExtraContent.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM7ExtraContent.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#Content included in addition to the Smart Slimming Content
@@ -40,8 +40,8 @@ ExtraMuonsTruth=[
]
ExtraContentPhotons=[
- ]
-
+ ]
+
ExtraContentPrimaryVertices=["PrimaryVertices.x.y.sumPt2"]
ExtraPhotonsTruth=[
@@ -51,18 +51,18 @@ ExtraPhotonsTruth=[
]
ExtraContentGSFConversionVertices=[
- "GSFConversionVertices.x",
- "GSFConversionVertices.y",
- "GSFConversionVertices.z",
- "GSFConversionVertices.px",
- "GSFConversionVertices.py",
- "GSFConversionVertices.pz",
- "GSFConversionVertices.pt1",
- "GSFConversionVertices.pt2",
- "GSFConversionVertices.etaAtCalo",
- "GSFConversionVertices.phiAtCalo",
- "GSFConversionVertices.trackParticleLinks"
- ]
+ "GSFConversionVertices.x",
+ "GSFConversionVertices.y",
+ "GSFConversionVertices.z",
+ "GSFConversionVertices.px",
+ "GSFConversionVertices.py",
+ "GSFConversionVertices.pz",
+ "GSFConversionVertices.pt1",
+ "GSFConversionVertices.pt2",
+ "GSFConversionVertices.etaAtCalo",
+ "GSFConversionVertices.phiAtCalo",
+ "GSFConversionVertices.trackParticleLinks"
+ ]
#ExtraContentHLTElectrons=[
# "HLT_xAOD__ElectronContainer_egamma_Electrons.e.pt.Rhad.Rhad1.e277.Reta.Rphi.weta2.f1.fracs1.wtots1.weta1.DeltaE.Eratio.caloClusterLinks"
@@ -84,10 +84,10 @@ ExtraContainersTruth=["TruthEvents",
"TruthParticles",
"TruthVertices",
"AntiKt4TruthJets",
- "egammaTruthParticles"
+ "egammaTruthParticles"
#,"BTagging_AntiKt4TruthWZ"
#,"AntiKt4TruthWZJets"
- ]
+ ]
ExtraContainersElectrons=["Electrons",
"GSFTrackParticles",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM8ExtraContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM8ExtraContent.py
index b2b8645ca4251d4bd4e0ace83b67d891cf574728..12707ad40866bbdb990237bf5e908fe5d7ff8351 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM8ExtraContent.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM8ExtraContent.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#Content included in addition to the Smart Slimming Content
@@ -31,8 +31,8 @@ ExtraMuonsTruth=[
]
ExtraContentPhotons=[
- ]
-
+ ]
+
ExtraContentPrimaryVertices=["PrimaryVertices.x.y.sumPt2"]
ExtraPhotonsTruth=[
@@ -42,18 +42,18 @@ ExtraPhotonsTruth=[
]
ExtraContentGSFConversionVertices=[
- "GSFConversionVertices.x",
- "GSFConversionVertices.y",
- "GSFConversionVertices.z",
- "GSFConversionVertices.px",
- "GSFConversionVertices.py",
- "GSFConversionVertices.pz",
- "GSFConversionVertices.pt1",
- "GSFConversionVertices.pt2",
- "GSFConversionVertices.etaAtCalo",
- "GSFConversionVertices.phiAtCalo",
- "GSFConversionVertices.trackParticleLinks"
- ]
+ "GSFConversionVertices.x",
+ "GSFConversionVertices.y",
+ "GSFConversionVertices.z",
+ "GSFConversionVertices.px",
+ "GSFConversionVertices.py",
+ "GSFConversionVertices.pz",
+ "GSFConversionVertices.pt1",
+ "GSFConversionVertices.pt2",
+ "GSFConversionVertices.etaAtCalo",
+ "GSFConversionVertices.phiAtCalo",
+ "GSFConversionVertices.trackParticleLinks"
+ ]
from DerivationFrameworkCalo.DerivationFrameworkCaloFactories import GainDecorator, getGainDecorations
GainDecoratorTool = GainDecorator()
@@ -67,10 +67,10 @@ ExtraContainersTruth=["TruthEvents",
"TruthParticles",
"TruthVertices",
"AntiKt4TruthJets",
- "egammaTruthParticles"
+ "egammaTruthParticles"
#,"BTagging_AntiKt4TruthWZ"
#,"AntiKt4TruthWZJets"
- ]
+ ]
ExtraContainersElectrons=["Electrons",
"ForwardElectrons",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM9ExtraContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM9ExtraContent.py
index 35c6d8b288ff654a72a9b3ae088299afbadb3429..41a619906c29c5b3bf026f4db0e0957f362f5852 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM9ExtraContent.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM9ExtraContent.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#Content included in addition to the Smart Slimming Content
@@ -32,8 +32,8 @@ ExtraMuonsTruth=[
ExtraContentPhotons=[
"Photons.DFCommonLoosePrime5",
- ]
-
+ ]
+
ExtraContentPrimaryVertices=["PrimaryVertices.x.y.sumPt2"]
ExtraPhotonsTruth=[
@@ -43,18 +43,18 @@ ExtraPhotonsTruth=[
]
ExtraContentGSFConversionVertices=[
- "GSFConversionVertices.x",
- "GSFConversionVertices.y",
- "GSFConversionVertices.z",
- "GSFConversionVertices.px",
- "GSFConversionVertices.py",
- "GSFConversionVertices.pz",
- "GSFConversionVertices.pt1",
- "GSFConversionVertices.pt2",
- "GSFConversionVertices.etaAtCalo",
- "GSFConversionVertices.phiAtCalo",
- "GSFConversionVertices.trackParticleLinks"
- ]
+ "GSFConversionVertices.x",
+ "GSFConversionVertices.y",
+ "GSFConversionVertices.z",
+ "GSFConversionVertices.px",
+ "GSFConversionVertices.py",
+ "GSFConversionVertices.pz",
+ "GSFConversionVertices.pt1",
+ "GSFConversionVertices.pt2",
+ "GSFConversionVertices.etaAtCalo",
+ "GSFConversionVertices.phiAtCalo",
+ "GSFConversionVertices.trackParticleLinks"
+ ]
#ExtraContentHLTElectrons=[
# "HLT_xAOD__ElectronContainer_egamma_Electrons.e.pt.Rhad.Rhad1.e277.Reta.Rphi.weta2.f1.fracs1.wtots1.weta1.DeltaE.Eratio.caloClusterLinks"
@@ -72,10 +72,10 @@ ExtraContainersTruth=["TruthEvents",
"TruthParticles",
"TruthVertices",
"AntiKt4TruthJets",
- "egammaTruthParticles"
+ "egammaTruthParticles"
#,"BTagging_AntiKt4TruthWZ"
#,"AntiKt4TruthWZJets"
- ]
+ ]
ExtraContainersElectrons=["Electrons",
"GSFTrackParticles",
@@ -89,41 +89,41 @@ ExtraContainersPhotons=["Photons",
# for trigger studies
ExtraContainersTrigger=[
- "HLT_xAOD__ElectronContainer_egamma_Electrons",
- "HLT_xAOD__ElectronContainer_egamma_ElectronsAux.",
- "HLT_xAOD__PhotonContainer_egamma_Photons",
- "HLT_xAOD__PhotonContainer_egamma_PhotonsAux.",
+ "HLT_xAOD__ElectronContainer_egamma_Electrons",
+ "HLT_xAOD__ElectronContainer_egamma_ElectronsAux.",
+ "HLT_xAOD__PhotonContainer_egamma_Photons",
+ "HLT_xAOD__PhotonContainer_egamma_PhotonsAux.",
"HLT_xAOD__PhotonContainer_egamma_Iso_Photons",
"HLT_xAOD__PhotonContainer_egamma_Iso_PhotonsAux.",
- "HLT_xAOD__TrigElectronContainer_L2ElectronFex",
- "HLT_xAOD__TrigElectronContainer_L2ElectronFexAux.",
- "HLT_xAOD__TrigPhotonContainer_L2PhotonFex",
- "HLT_xAOD__TrigPhotonContainer_L2PhotonFexAux.",
- "HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFex",
- "HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFexAux.",
- "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_EFID",
- "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_EFIDAux.",
- "LVL1EmTauRoIs",
- "LVL1EmTauRoIsAux.",
- "HLT_TrigPassBitsCollection_passbits",
- "HLT_TrigPassBitsCollection_passbitsAux.",
- "HLT_TrigPassFlagsCollection_passflags",
- "HLT_TrigPassFlagsCollection_passflagsAux.",
- "HLT_TrigRoiDescriptorCollection_initialRoI",
- "HLT_TrigRoiDescriptorCollection_initialRoIAux."
- ]
+ "HLT_xAOD__TrigElectronContainer_L2ElectronFex",
+ "HLT_xAOD__TrigElectronContainer_L2ElectronFexAux.",
+ "HLT_xAOD__TrigPhotonContainer_L2PhotonFex",
+ "HLT_xAOD__TrigPhotonContainer_L2PhotonFexAux.",
+ "HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFex",
+ "HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFexAux.",
+ "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_EFID",
+ "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_EFIDAux.",
+ "LVL1EmTauRoIs",
+ "LVL1EmTauRoIsAux.",
+ "HLT_TrigPassBitsCollection_passbits",
+ "HLT_TrigPassBitsCollection_passbitsAux.",
+ "HLT_TrigPassFlagsCollection_passflags",
+ "HLT_TrigPassFlagsCollection_passflagsAux.",
+ "HLT_TrigRoiDescriptorCollection_initialRoI",
+ "HLT_TrigRoiDescriptorCollection_initialRoIAux."
+ ]
ExtraContainersTriggerDataOnly=[
- "HLT_xAOD__TrigEMClusterContainer_TrigT2CaloEgamma",
- "HLT_xAOD__TrigEMClusterContainer_TrigT2CaloEgammaAux.",
- "HLT_xAOD__CaloClusterContainer_TrigCaloClusterMaker",
- "HLT_xAOD__CaloClusterContainer_TrigCaloClusterMakerAux.",
- "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_FTF",
- "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_FTFAux.",
- "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_L2ID",
- "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_L2IDAux.",
- "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_IDTrig",
- "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_IDTrigAux."
- ]
+ "HLT_xAOD__TrigEMClusterContainer_TrigT2CaloEgamma",
+ "HLT_xAOD__TrigEMClusterContainer_TrigT2CaloEgammaAux.",
+ "HLT_xAOD__CaloClusterContainer_TrigCaloClusterMaker",
+ "HLT_xAOD__CaloClusterContainer_TrigCaloClusterMakerAux.",
+ "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_FTF",
+ "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_FTFAux.",
+ "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_L2ID",
+ "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_L2IDAux.",
+ "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_IDTrig",
+ "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_IDTrigAux."
+ ]
#should slim electron/fwdelectrons/cluster collections and keep only relevant subset of variables..
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGammaCommon.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGammaCommon.py
index 1dbe056b965c47e9d8caee966c7f4951d507295d..711fa4faa8a6ba2be1e7d88f0bd24ed1b92676ba 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGammaCommon.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGammaCommon.py
@@ -1,13 +1,14 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-from __future__ import print_function
-
#********************************************************************
# EGammaCommon.py
# Schedules all tools needed for e-gamma object selection and writes
# results into SG. These may then be accessed along the train
#********************************************************************
-from DerivationFrameworkCore.DerivationFrameworkMaster import *
+from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkJob, DerivationFrameworkSimBarcodeOffset
+from AthenaCommon import CfgMgr
+from AthenaCommon.GlobalFlags import globalflags
+from AthenaCommon.AppMgr import ToolSvc, ServiceMgr as svcMgr
#====================================================================
# PHOTON ETA (=ETA2), ET (=E/COSH(ETA2))
@@ -178,7 +179,6 @@ ToolSvc += EGAMCOM_caloFillRect711
#====================================================================
# AUGMENTATION TOOLS
#====================================================================
-from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__AsgSelectionToolWrapper
from DerivationFrameworkEGamma.DerivationFrameworkEGammaConf import DerivationFramework__EGSelectionToolWrapper
from DerivationFrameworkEGamma.DerivationFrameworkEGammaConf import DerivationFramework__EGElectronLikelihoodToolWrapper
@@ -188,7 +188,7 @@ ElectronPassLHVeryLoose = DerivationFramework__EGElectronLikelihoodToolWrapper(
EGammaFudgeMCTool = "",
CutType = "",
StoreGateEntryName = "DFCommonElectronsLHVeryLoose",
- ContainerName = "Electrons",
+ ContainerName = "Electrons",
StoreTResult = False)
ToolSvc += ElectronPassLHVeryLoose
print(ElectronPassLHVeryLoose)
@@ -247,7 +247,7 @@ ElectronPassECIDS = DerivationFramework__EGElectronLikelihoodToolWrapper( name =
EGammaFudgeMCTool = "",
CutType = "",
StoreGateEntryName = "DFCommonElectronsECIDS",
- ContainerName = "Electrons",
+ ContainerName = "Electrons",
StoreTResult = True)
ToolSvc += ElectronPassECIDS
print (ElectronPassECIDS)
@@ -455,7 +455,6 @@ if rec.doTruth():
# CREATE THE DERIVATION KERNEL ALGORITHM
#=======================================
-from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramework__CommonAugmentation
DerivationFrameworkJob += CfgMgr.DerivationFramework__CommonAugmentation("EGammaCommonKernel",
AugmentationTools = EGAugmentationTools
)