From c041709c14e6ac74f1af65264f39e533fdfe606c Mon Sep 17 00:00:00 2001
From: Simone Francescato <simone.francescato@cern.ch>
Date: Mon, 24 Mar 2025 22:12:13 +0100
Subject: [PATCH 1/3] Update to Run3 ONNX
---
.../LeptonTaggers/python/LeptonTaggersConfig.py | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/PhysicsAnalysis/AnalysisCommon/LeptonTaggers/python/LeptonTaggersConfig.py b/PhysicsAnalysis/AnalysisCommon/LeptonTaggers/python/LeptonTaggersConfig.py
index 753fdaa9fced..1eb8a63370f3 100644
--- a/PhysicsAnalysis/AnalysisCommon/LeptonTaggers/python/LeptonTaggersConfig.py
+++ b/PhysicsAnalysis/AnalysisCommon/LeptonTaggers/python/LeptonTaggersConfig.py
@@ -299,20 +299,21 @@ def DecoratePLITCfg(
# path on calib area (found by path resolver
# /cvmfs/atlas.cern.ch/repo/sw/database/GroupData/
- # Note: Run3 config is not available yet, so we use the Run2 config for now
-
- kwargs.setdefault("ConfigPath", "IsolationSelection/PLIT/2025-02-24/")
if lepton_name == 'Electrons':
if isRun3:
- kwargs.setdefault("ConfigFileVersion", 'network_electrons_barrel_run2.onnx')
- kwargs.setdefault("ConfigFileVersion_endcap", 'network_electrons_endcap_run2.onnx')
+ kwargs.setdefault("ConfigPath", "IsolationSelection/PLIT/2025-03-24/")
+ kwargs.setdefault("ConfigFileVersion", 'network_electrons_barrel_run3.onnx')
+ kwargs.setdefault("ConfigFileVersion_endcap", 'network_electrons_endcap_run3.onnx')
else:
+ kwargs.setdefault("ConfigPath", "IsolationSelection/PLIT/2025-02-24/")
kwargs.setdefault("ConfigFileVersion", 'network_electrons_barrel_run2.onnx')
kwargs.setdefault("ConfigFileVersion_endcap", 'network_electrons_endcap_run2.onnx')
elif lepton_name == 'Muons':
if isRun3:
- kwargs.setdefault("ConfigFileVersion", 'network_muons_run2.onnx')
+ kwargs.setdefault("ConfigPath", "IsolationSelection/PLIT/2025-03-24/")
+ kwargs.setdefault("ConfigFileVersion", 'network_muons_run3.onnx')
else:
+ kwargs.setdefault("ConfigPath", "IsolationSelection/PLIT/2025-02-24/")
kwargs.setdefault("ConfigFileVersion", 'network_muons_run2.onnx')
else:
raise ValueError(f'Decorate{Tagger_name} - unknown lepton type: "{lepton_name}"')
--
GitLab
From 39cc4f9ec9f49c92d5ddb2759f6217d1dcc69d9e Mon Sep 17 00:00:00 2001
From: Simone Francescato <simone.francescato@cern.ch>
Date: Mon, 24 Mar 2025 22:12:44 +0100
Subject: [PATCH 2/3] Add PLIT to PHYS
---
.../DerivationFrameworkPhys/python/PHYS.py | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py
index e1664e220fc1..50ed3d984295 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py
@@ -80,6 +80,10 @@ def PHYSCoreCfg(flags, name_tag='PHYS', StreamName='StreamDAOD_PHYS', TriggerLis
from IsolationSelection.IsolationSelectionConfig import IsoCloseByAlgsCfg
acc.merge(IsoCloseByAlgsCfg(flags, isPhysLite = False, stream_name = StreamName))
+ ## IFF augmentation - Adding Lepton Taggers
+ from LeptonTaggers.LeptonTaggersConfig import DecoratePLITAlgsCfg
+ acc.merge(DecoratePLITAlgsCfg(flags))
+
#===================================================
# HEAVY FLAVOR CLASSIFICATION FOR ttbar+jets EVENTS
#===================================================
@@ -147,6 +151,10 @@ def PHYSCoreCfg(flags, name_tag='PHYS', StreamName='StreamDAOD_PHYS', TriggerLis
extraList.append(f"{tagger}_{score}")
PHYSSlimmingHelper.ExtraVariables += ["AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets." + ".".join(extraList)]
+ # IFF extra content
+ from LeptonTaggers.LeptonTaggersConfig import GetExtraPLITVariablesForDxAOD
+ PHYSSlimmingHelper.ExtraVariables += GetExtraPLITVariablesForDxAOD()
+
# Truth extra content
if flags.Input.isMC:
--
GitLab
From e88c240353dac4a9f0ee72a170f0602aea970de0 Mon Sep 17 00:00:00 2001
From: Adam Edward Barton <adam.edward.barton@cern.ch>
Date: Mon, 31 Mar 2025 10:26:39 +0200
Subject: [PATCH 3/3] Update references
---
Tools/WorkflowTestRunner/python/References.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Tools/WorkflowTestRunner/python/References.py b/Tools/WorkflowTestRunner/python/References.py
index 42b0c0c54b7d..c43fdd118997 100644
--- a/Tools/WorkflowTestRunner/python/References.py
+++ b/Tools/WorkflowTestRunner/python/References.py
@@ -30,16 +30,16 @@ references_map = {
"q452": "v35",
"q454": "v51",
# Derivations
- "data_PHYS_Run2": "v46",
+ "data_PHYS_Run2": "v47",
"data_PHYSLITE_Run2": "v26",
- "data_PHYS_Run3": "v47",
+ "data_PHYS_Run3": "v48",
"data_PHYSLITE_Run3": "v28",
- "mc_PHYS_Run2": "v58",
+ "mc_PHYS_Run2": "v59",
"mc_PHYSLITE_Run2": "v30",
- "mc_PHYS_Run3": "v62",
+ "mc_PHYS_Run3": "v63",
"mc_PHYSLITE_Run3": "v34",
- "af3_PHYS_Run2": "v8",
+ "af3_PHYS_Run2": "v9",
"af3_PHYSLITE_Run2": "v7",
- "af3_PHYS_Run3": "v43",
+ "af3_PHYS_Run3": "v44",
"af3_PHYSLITE_Run3": "v35",
}
--
GitLab