From 676bb6e87f45d2c47a90300b9fd0a5e0034543bb Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Sat, 13 Feb 2021 23:09:11 +0100
Subject: [PATCH 1/2] IsolationSelection: Restore FixedCutTight/FixedCutLoose.
Restore FixedCutTight and FixedCutLoose for electrons.
These are needed by egammaValidation.
---
.../IsolationSelection/Root/IsolationSelectionTool.cxx | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationSelectionTool.cxx b/PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationSelectionTool.cxx
index d0bc43403a31..4af1ca374800 100644
--- a/PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationSelectionTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationSelectionTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include <xAODPrimitives/IsolationType.h>
@@ -290,8 +290,14 @@ namespace CP {
addCutToWP(wp, m_elWPKey, xAOD::Iso::ptvarcone20, "0.057*x+95.57");
addCutToWP(wp, m_elWPKey, xAOD::Iso::topoetcone20, "0.057*x+95.57");
// Using fixed cuts
+ } else if (elWPname == "FixedCutTight") {
+ wp->addCut(new IsolationConditionFormula("ptvarcone20R0p06", xAOD::Iso::ptvarcone20, "0.06*x"));
+ wp->addCut(new IsolationConditionFormula("topoetcone20R0p06", xAOD::Iso::topoetcone20, "0.06*x"));
} else if (elWPname == "FixedCutTightTrackOnly") {
wp->addCut(new IsolationConditionFormula("ptvarcone20R0p06", xAOD::Iso::ptvarcone20, "0.06*x"));
+ } else if (elWPname == "FixedCutLoose") {
+ wp->addCut(new IsolationConditionFormula("FixedCutLoose_track", xAOD::Iso::ptvarcone20, "0.15*x"));
+ wp->addCut(new IsolationConditionFormula("FixedCutLoose_calo", xAOD::Iso::topoetcone20, "0.20*x"));
}else if(elWPname == "FCHighPtCaloOnly" || elWPname == "HighPtCaloOnly"){
wp->addCut(new IsolationConditionFormula("FCHighPtCaloOnly_calo", xAOD::Iso::topoetcone20, "std::max(0.015*x,3.5E3)")); //units are MeV!
}else if(elWPname == "TightTrackCone40"){
--
GitLab
From b6c5863ea9b4f112910e5c9f489b15d8d096e079 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Sat, 13 Feb 2021 22:40:37 +0100
Subject: [PATCH 2/2] IsolationSelection: Fix linking in dbg build.
The dependency of the library on ROOT_LIBRARIES needs to be public.
Fixes link failure in dbg build.
---
.../AnalysisCommon/IsolationSelection/CMakeLists.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/PhysicsAnalysis/AnalysisCommon/IsolationSelection/CMakeLists.txt b/PhysicsAnalysis/AnalysisCommon/IsolationSelection/CMakeLists.txt
index 26a5f2b88b4e..028f59e96b0b 100644
--- a/PhysicsAnalysis/AnalysisCommon/IsolationSelection/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisCommon/IsolationSelection/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( IsolationSelection )
@@ -18,7 +18,8 @@ atlas_add_library( IsolationSelectionLib
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES AthContainers AsgTools xAODBase xAODEgamma xAODMuon xAODEventInfo ${extra_libs}
xAODPrimitives PATCoreLib PATInterfaces InDetTrackSelectionToolLib xAODTracking
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} PathResolver FourMomUtils TrackVertexAssociationToolLib InDetTrackSelectionToolLib )
+ ${ROOT_LIBRARIES}
+ PRIVATE_LINK_LIBRARIES PathResolver FourMomUtils TrackVertexAssociationToolLib InDetTrackSelectionToolLib )
if( NOT XAOD_STANDALONE )
atlas_add_component( IsolationSelection
--
GitLab