From ba0ad444dadf8122502f077d094a8fb1b12f11ac Mon Sep 17 00:00:00 2001
From: Christian Grefe <christian.grefe@cern.ch>
Date: Sun, 4 Dec 2022 18:20:41 +0100
Subject: [PATCH] TRT HT correction constants for Ar straws
Small modifications to Ar correction constants. The previous version did not account for the outlier hits, which do contribute to particle ID
---
.../InDetRawAlgs/InDetOverlay/InDetOverlay/TRTOverlay.h | 8 ++++----
.../InDetOverlay/python/InDetOverlayConfig.py | 8 ++++----
.../InDetRawAlgs/InDetOverlay/python/TRTOverlayConfig.py | 8 ++++----
Tools/PROCTools/data/q446_AOD_digest.ref | 2 +-
Tools/WorkflowTestRunner/python/References.py | 6 +++---
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/InnerDetector/InDetRawAlgs/InDetOverlay/InDetOverlay/TRTOverlay.h b/InnerDetector/InDetRawAlgs/InDetOverlay/InDetOverlay/TRTOverlay.h
index ac018fa1aab..2921955e43b 100644
--- a/InnerDetector/InDetRawAlgs/InDetOverlay/InDetOverlay/TRTOverlay.h
+++ b/InnerDetector/InDetRawAlgs/InDetOverlay/InDetOverlay/TRTOverlay.h
@@ -68,10 +68,10 @@ private:
Gaudi::Property<double> m_HTOccupancyCorrectionEC{this, "TRT_HT_OccupancyCorrectionEndcap", 0.090, ""};
Gaudi::Property<double> m_HTOccupancyCorrectionB_noE{this, "TRT_HT_OccupancyCorrectionBarrelNoE", 0.060, ""};
Gaudi::Property<double> m_HTOccupancyCorrectionEC_noE{this, "TRT_HT_OccupancyCorrectionEndcapNoE", 0.050, ""};
- Gaudi::Property<double> m_HTOccupancyCorrectionB_Ar{this, "TRT_HT_OccupancyCorrectionBarrelAr", 0.0, ""};
- Gaudi::Property<double> m_HTOccupancyCorrectionEC_Ar{this, "TRT_HT_OccupancyCorrectionEndcapAr", 0.0, ""};
- Gaudi::Property<double> m_HTOccupancyCorrectionB_Ar_noE{this, "TRT_HT_OccupancyCorrectionBarrelArNoE", 0.0, ""};
- Gaudi::Property<double> m_HTOccupancyCorrectionEC_Ar_noE{this, "TRT_HT_OccupancyCorrectionEndcapArNoE", 0.0, ""};
+ Gaudi::Property<double> m_HTOccupancyCorrectionB_Ar{this, "TRT_HT_OccupancyCorrectionBarrelAr", 0.040, ""};
+ Gaudi::Property<double> m_HTOccupancyCorrectionEC_Ar{this, "TRT_HT_OccupancyCorrectionEndcapAr", 0.041, ""};
+ Gaudi::Property<double> m_HTOccupancyCorrectionB_Ar_noE{this, "TRT_HT_OccupancyCorrectionBarrelArNoE", 0.033, ""};
+ Gaudi::Property<double> m_HTOccupancyCorrectionEC_Ar_noE{this, "TRT_HT_OccupancyCorrectionEndcapArNoE", 0.042, ""};
ToolHandle<InDet::ITRT_LocalOccupancy> m_TRT_LocalOccupancyTool{this, "TRT_LocalOccupancyTool", "TRT_LocalOccupancy", ""};
};
diff --git a/InnerDetector/InDetRawAlgs/InDetOverlay/python/InDetOverlayConfig.py b/InnerDetector/InDetRawAlgs/InDetOverlay/python/InDetOverlayConfig.py
index 92aef3c8453..327ec59414a 100644
--- a/InnerDetector/InDetRawAlgs/InDetOverlay/python/InDetOverlayConfig.py
+++ b/InnerDetector/InDetRawAlgs/InDetOverlay/python/InDetOverlayConfig.py
@@ -88,10 +88,10 @@ def getTRTOverlay(name="TRTOverlay", **kwargs):
kwargs.setdefault("TRT_HT_OccupancyCorrectionEndcap", 0.090)
kwargs.setdefault("TRT_HT_OccupancyCorrectionBarrelNoE", 0.060)
kwargs.setdefault("TRT_HT_OccupancyCorrectionEndcapNoE", 0.050)
- kwargs.setdefault("TRT_HT_OccupancyCorrectionBarrelAr", 0.0)
- kwargs.setdefault("TRT_HT_OccupancyCorrectionEndcapAr", 0.0)
- kwargs.setdefault("TRT_HT_OccupancyCorrectionBarrelArNoE", 0.0)
- kwargs.setdefault("TRT_HT_OccupancyCorrectionEndcapArNoE", 0.0)
+ kwargs.setdefault("TRT_HT_OccupancyCorrectionBarrelAr", 0.040)
+ kwargs.setdefault("TRT_HT_OccupancyCorrectionEndcapAr", 0.041)
+ kwargs.setdefault("TRT_HT_OccupancyCorrectionBarrelArNoE", 0.033)
+ kwargs.setdefault("TRT_HT_OccupancyCorrectionEndcapArNoE", 0.042)
return CfgMgr.TRTOverlay(name, **kwargs)
diff --git a/InnerDetector/InDetRawAlgs/InDetOverlay/python/TRTOverlayConfig.py b/InnerDetector/InDetRawAlgs/InDetOverlay/python/TRTOverlayConfig.py
index 345e62190ca..078230883f6 100644
--- a/InnerDetector/InDetRawAlgs/InDetOverlay/python/TRTOverlayConfig.py
+++ b/InnerDetector/InDetRawAlgs/InDetOverlay/python/TRTOverlayConfig.py
@@ -39,10 +39,10 @@ def TRTOverlayAlgCfg(flags, name="TRTOverlay", **kwargs):
kwargs.setdefault("TRT_HT_OccupancyCorrectionEndcap", 0.090)
kwargs.setdefault("TRT_HT_OccupancyCorrectionBarrelNoE", 0.060)
kwargs.setdefault("TRT_HT_OccupancyCorrectionEndcapNoE", 0.050)
- kwargs.setdefault("TRT_HT_OccupancyCorrectionBarrelAr", 0.0)
- kwargs.setdefault("TRT_HT_OccupancyCorrectionEndcapAr", 0.0)
- kwargs.setdefault("TRT_HT_OccupancyCorrectionBarrelArNoE", 0.0)
- kwargs.setdefault("TRT_HT_OccupancyCorrectionEndcapArNoE", 0.0)
+ kwargs.setdefault("TRT_HT_OccupancyCorrectionBarrelAr", 0.040)
+ kwargs.setdefault("TRT_HT_OccupancyCorrectionEndcapAr", 0.041)
+ kwargs.setdefault("TRT_HT_OccupancyCorrectionBarrelArNoE", 0.033)
+ kwargs.setdefault("TRT_HT_OccupancyCorrectionEndcapArNoE", 0.042)
from InDetConfig.TRT_ElectronPidToolsConfig import TRT_OverlayLocalOccupancyCfg
kwargs.setdefault("TRT_LocalOccupancyTool", acc.popToolsAndMerge(TRT_OverlayLocalOccupancyCfg(flags)))
diff --git a/Tools/PROCTools/data/q446_AOD_digest.ref b/Tools/PROCTools/data/q446_AOD_digest.ref
index 57d076c0c33..82310e00381 100644
--- a/Tools/PROCTools/data/q446_AOD_digest.ref
+++ b/Tools/PROCTools/data/q446_AOD_digest.ref
@@ -1,5 +1,5 @@
run event nTopo nIdTracks nTauTracks nTaus nMuons nElec nTrueElec nFakeElec nPhot nTruePhot nFakePhot
- 410000 43250001 249 234 75 10 4 13 1 12 17 8 9
+ 410000 43250001 249 235 76 10 4 13 1 12 17 8 9
410000 43250002 69 66 18 4 0 8 2 6 7 2 5
410000 43250003 61 49 25 4 1 6 0 6 5 3 2
410000 43250004 92 112 36 5 0 7 0 7 12 10 2
diff --git a/Tools/WorkflowTestRunner/python/References.py b/Tools/WorkflowTestRunner/python/References.py
index 1678d473ce9..108db11cd50 100644
--- a/Tools/WorkflowTestRunner/python/References.py
+++ b/Tools/WorkflowTestRunner/python/References.py
@@ -20,9 +20,9 @@ references_map = {
"s4007": "v1",
"s4008": "v1",
# Overlay
- "d1590": "v11",
- "d1726": "v7",
- "d1759": "v13",
+ "d1590": "v12",
+ "d1726": "v8",
+ "d1759": "v14",
# Reco
"q442": "v1",
"q443": "v1",
--
GitLab