diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGammaCommon.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGammaCommon.py index b2f247e0a45fc5d1648c5933cae1ed4084b6f3dc..0c6a19839d012232f26ba15a1a45666bd2d29a5c 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGammaCommon.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGammaCommon.py @@ -82,7 +82,29 @@ ElectronLHSelectorLooseBL = AsgElectronLikelihoodTool("ElectronLHSelectorLooseBL ElectronLHSelectorLooseBL.primaryVertexContainer = "PrimaryVertices" ToolSvc += ElectronLHSelectorLooseBL +#v14 r21 tunes +ElectronLHSelectorVeryLoose_v14 = AsgElectronLikelihoodTool("ElectronLHSelectorVeryLoose_v14", WorkingPoint="VeryLooseLHElectron_v14") +ElectronLHSelectorVeryLoose_v14.primaryVertexContainer = "PrimaryVertices" +ToolSvc += ElectronLHSelectorVeryLoose_v14 +ElectronLHSelectorLoose_v14 = AsgElectronLikelihoodTool("ElectronLHSelectorLoose_v14", WorkingPoint="LooseLHElectron_v14") +ElectronLHSelectorLoose_v14.primaryVertexContainer = "PrimaryVertices" +ToolSvc += ElectronLHSelectorLoose_v14 + +ElectronLHSelectorLooseBL_v14 = AsgElectronLikelihoodTool("ElectronLHSelectorLooseBL_v14", WorkingPoint="LooseBLLHElectron_v14") +ElectronLHSelectorLooseBL_v14.primaryVertexContainer = "PrimaryVertices" +ToolSvc += ElectronLHSelectorLooseBL_v14 + +ElectronLHSelectorMedium_v14 = AsgElectronLikelihoodTool("ElectronLHSelectorMedium_v14", WorkingPoint="MediumLHElectron_v14") +ElectronLHSelectorMedium_v14.primaryVertexContainer = "PrimaryVertices" +ToolSvc += ElectronLHSelectorMedium_v14 + +ElectronLHSelectorTight_v14 = AsgElectronLikelihoodTool("ElectronLHSelectorTight_v14", WorkingPoint="TightLHElectron_v14") +ElectronLHSelectorTight_v14.primaryVertexContainer = "PrimaryVertices" +ToolSvc += ElectronLHSelectorTight_v14 + + +#DNN selectors from ElectronPhotonSelectorTools.ElectronPhotonSelectorToolsConf import AsgElectronSelectorTool ElectronDNNSelectorLoose = AsgElectronSelectorTool("ElectronDNNSelectorLoose", WorkingPoint="LooseDNNElectron") @@ -234,6 +256,56 @@ ElectronPassLHTight = DerivationFramework__EGSelectionToolWrapper( name = "Elect ToolSvc += ElectronPassLHTight print ElectronPassLHTight +# decorate electrons with the output of LH very loose V14 +ElectronPassLHVeryLoose_v14 = DerivationFramework__EGSelectionToolWrapper( name = "ElectronPassLHVeryLoose_v14", + EGammaSelectionTool = ElectronLHSelectorVeryLoose_v14, + EGammaFudgeMCTool = "", + CutType = "", + StoreGateEntryName = "DFCommonElectronsLHVeryLoose_v14", + ContainerName = "Electrons") +ToolSvc += ElectronPassLHVeryLoose_v14 +print ElectronPassLHVeryLoose_v14 + +# decorate electrons with the output of LH loose V14 +ElectronPassLHLoose_v14 = DerivationFramework__EGSelectionToolWrapper( name = "ElectronPassLHLoose_v14", + EGammaSelectionTool = ElectronLHSelectorLoose_v14, + EGammaFudgeMCTool = "", + CutType = "", + StoreGateEntryName = "DFCommonElectronsLHLoose_v14", + ContainerName = "Electrons") +ToolSvc += ElectronPassLHLoose_v14 +print ElectronPassLHLoose_v14 + +# decorate electrons with the output of LH loose+BL V14 +ElectronPassLHLooseBL_v14 = DerivationFramework__EGSelectionToolWrapper( name = "ElectronPassLHLooseBL_v14", + EGammaSelectionTool = ElectronLHSelectorLooseBL_v14, + EGammaFudgeMCTool = "", + CutType = "", + StoreGateEntryName = "DFCommonElectronsLHLooseBL_v14", + ContainerName = "Electrons") +ToolSvc += ElectronPassLHLooseBL_v14 +print ElectronPassLHLooseBL_v14 + +# decorate electrons with the output of LH medium V14 +ElectronPassLHMedium_v14 = DerivationFramework__EGSelectionToolWrapper( name = "ElectronPassLHMedium_v14", + EGammaSelectionTool = ElectronLHSelectorMedium_v14, + EGammaFudgeMCTool = "", + CutType = "", + StoreGateEntryName = "DFCommonElectronsLHMedium_v14", + ContainerName = "Electrons") +ToolSvc += ElectronPassLHMedium_v14 +print ElectronPassLHMedium_v14 + +# decorate electrons with the output of LH tight V14 +ElectronPassLHTight_v14 = DerivationFramework__EGSelectionToolWrapper( name = "ElectronPassLHTight_v14", + EGammaSelectionTool = ElectronLHSelectorTight_v14, + EGammaFudgeMCTool = "", + CutType = "", + StoreGateEntryName = "DFCommonElectronsLHTight_v14", + ContainerName = "Electrons") +ToolSvc += ElectronPassLHTight_v14 +print ElectronPassLHTight_v14 + # decorate electrons with the output of DNN ---------------------------------------------------------------------- ElectronPassDNNLoose = DerivationFramework__EGElectronLikelihoodToolWrapper( name = "ElectronPassDNNLoose", @@ -402,6 +474,7 @@ ToolSvc += ElectronAmbiguity # list of all the decorators so far EGAugmentationTools = [DFCommonPhotonsDirection, ElectronPassLHVeryLoose, ElectronPassLHLoose, ElectronPassLHLooseBL, ElectronPassLHMedium, ElectronPassLHTight, + ElectronPassLHVeryLoose_v14, ElectronPassLHLoose_v14, ElectronPassLHLooseBL_v14, ElectronPassLHMedium_v14, ElectronPassLHTight_v14, ForwardElectronPassLHLoose, ForwardElectronPassLHMedium, ForwardElectronPassLHTight, ElectronPassDNNLoose, ElectronPassDNNMedium, ElectronPassDNNTight, ElectronPassECIDS, PhotonPassIsEMLoose, PhotonPassIsEMTight, diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py index 72c7a88d9c9c99386669e3e8b4bc6ce82013bd20..a2fd19799285df6b21301caa4092a89953deb79d 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py @@ -369,7 +369,7 @@ if DerivationFrameworkHasTruth: PHYSSlimmingHelper.ExtraVariables += ["AntiKt10TruthTrimmedPtFrac5SmallR20Jets.Tau1_wta.Tau2_wta.Tau3_wta.D2.GhostBHadronsFinalCount", "AntiKt10TruthSoftDropBeta100Zcut10Jets.Tau1_wta.Tau2_wta.Tau3_wta.D2.GhostBHadronsFinalCount", - "Electrons.TruthLink", + "Electrons.TruthLink.DFCommonElectronsLHVeryLoose_v14.DFCommonElectronsLHLoose_v14.DFCommonElectronsLHLooseBL_v14.DFCommonElectronsLHMedium_v14.DFCommonElectronsLHTight_v14.DFCommonElectronsLHVeryLoose_v14IsEMValue.DFCommonElectronsLHLoose_v14IsEMValue.DFCommonElectronsLHLooseBL_v14IsEMValue.DFCommonElectronsLHMedium_v14IsEMValue.DFCommonElectronsLHTight_v14IsEMValue", "Muons.TruthLink", "Photons.TruthLink", "AntiKt2PV0TrackJets.pt.eta.phi.m", diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/EGSelectorConfigurationMapping.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/EGSelectorConfigurationMapping.h index 570bc5e9b6cf3f2e584db5f47edde83c44dda314..e44ce453b6c1faa3786d2651e9cdc96f6692d584 100644 --- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/EGSelectorConfigurationMapping.h +++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/EGSelectorConfigurationMapping.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration */ #ifndef __EGSelectorConfigurationMapping__ @@ -19,6 +19,12 @@ namespace EgammaSelectors { {"LooseBLLHElectron" ,"ElectronPhotonSelectorTools/offline/mc16_20170828/ElectronLikelihoodLooseOfflineConfig2017_CutBL_Smooth.conf"}, {"MediumLHElectron" ,"ElectronPhotonSelectorTools/offline/mc16_20170828/ElectronLikelihoodMediumOfflineConfig2017_Smooth.conf"}, {"TightLHElectron" ,"ElectronPhotonSelectorTools/offline/mc16_20170828/ElectronLikelihoodTightOfflineConfig2017_Smooth.conf"}, + // rel 21 v14 tunes + {"VeryLooseLHElectron_v14","ElectronPhotonSelectorTools/offline/mc16_20190911/ElectronLikelihoodVeryLooseOfflineConfig2018_Smooth.conf"}, + {"LooseLHElectron_v14" ,"ElectronPhotonSelectorTools/offline/mc16_20190911/ElectronLikelihoodLooseOfflineConfig2018_Smooth.conf"}, + {"LooseBLLHElectron_v14" ,"ElectronPhotonSelectorTools/offline/mc16_20190911/ElectronLikelihoodLooseOfflineConfig2018_CutBL_Smooth.conf"}, + {"MediumLHElectron_v14" ,"ElectronPhotonSelectorTools/offline/mc16_20190911/ElectronLikelihoodMediumOfflineConfig2018_Smooth.conf"}, + {"TightLHElectron_v14" ,"ElectronPhotonSelectorTools/offline/mc16_20190911/ElectronLikelihoodTightOfflineConfig2018_Smooth.conf"}, // legacy rel 20p7 tunes, to allow usage in rel 20p7 derivations {"VeryLooseLHElectron_Rel20p7","ElectronPhotonSelectorTools/offline/mc15_20160512/ElectronLikelihoodVeryLooseOfflineConfig2016_Smooth.conf"}, {"VeryLooseLHNod0Electron_Rel20p7", "ElectronPhotonSelectorTools/offline/mc15_20160512/ElectronLikelihoodVeryLooseOfflineConfig2016_Smooth_NoD0.conf"},