From c40c61560301867fa7f0008eaa0a85df75bf9e24 Mon Sep 17 00:00:00 2001
From: Antonio De Maria <antonio.de.maria@cern.ch>
Date: Fri, 4 Dec 2020 12:11:28 +0000
Subject: [PATCH] adding HLT_tau160 chains with "tracktwoMVABDT" selection to
 the LS2_v1 menu and in Tau monitoring trigger list

---
 .../python/TrigTauMonitCategory.py            |  6 +++
 .../python/TrigTauMonitoringConfigMT.py       |  3 ++
 .../share/ref_RDOtoRDOTrig_v1Dev_build.ref    | 48 +++----------------
 .../share/ref_data_v1Dev_build.ref            |  6 +++
 .../python/HLTMenuConfig/Menu/LS2_v1.py       |  5 ++
 5 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py
index 238d43b46d9..3ae80989970 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py
@@ -53,6 +53,9 @@ monitoring_tau_pp = [
     'tau160_medium1_tracktwoEF_L1TAU100',
     'tau200_medium1_tracktwoEF_L1TAU100',
     'tau200_mediumRNN_tracktwoMVA_L1TAU100',
+    'tau160_perf_tracktwoMVABDT_L1TAU100',
+    'tau160_idperf_tracktwoMVABDT_L1TAU100',
+    'tau160_mediumRNN_tracktwoMVABDT_L1TAU100',
     # Will keep this commented out for now
     #'tau80_mediumRNN_tracktwoMVA_tau60_mediumRNN_tracktwoMVA_L1TAU60_2TAU40',
     #'tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_L1TAU60_DR-TAU20ITAU12I',
@@ -98,6 +101,9 @@ monitoring_tau_validation = [
         'tau25_looseRNN_tracktwoMVABDT_L1TAU12IM',
         'tau25_mediumRNN_tracktwoMVABDT_L1TAU12IM',
         'tau25_tightRNN_tracktwoMVABDT_L1TAU12IM',
+        'tau160_perf_tracktwoMVABDT_L1TAU100',
+        'tau160_idperf_tracktwoMVABDT_L1TAU100',
+        'tau160_mediumRNN_tracktwoMVABDT_L1TAU100',
 ]
 
 monitoring_tau_cosmic = [
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfigMT.py b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfigMT.py
index 178fdc3687e..32ff494856a 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfigMT.py
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfigMT.py
@@ -162,6 +162,9 @@ class TrigTauMonAlgBuilder:
     'HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100',
     'HLT_tau160_medium1_tracktwo_L1TAU100',
     'HLT_tau160_medium1_tracktwoEF_L1TAU100',
+    'HLT_tau160_perf_tracktwoMVABDT_L1TAU100',
+    'HLT_tau160_idperf_tracktwoMVABDT_L1TAU100',
+    'HLT_tau160_mediumRNN_tracktwoMVABDT_L1TAU100',
     'HLT_tau200_medium1_tracktwoEF_L1TAU100',
     'HLT_tau200_mediumRNN_tracktwoMVA_L1TAU100',
     'HLT_tau80_mediumRNN_tracktwoMVA_tau60_mediumRNN_tracktwoMVA_L1TAU60_2TAU40',
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 1e095131bea..d2968682c82 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -2404,6 +2404,8 @@ HLT_tau0_perf_ptonly_L1TAU60:
     3: 3
 HLT_tau160_idperf_track_L1TAU100:
   eventCount: 0
+HLT_tau160_idperf_tracktwoMVABDT_L1TAU100:
+  eventCount: 0
 HLT_tau160_idperf_tracktwoMVA_L1TAU100:
   eventCount: 0
 HLT_tau160_idperf_tracktwo_L1TAU100:
@@ -2412,8 +2414,12 @@ HLT_tau160_medium1_tracktwoEF_L1TAU100:
   eventCount: 0
 HLT_tau160_medium1_tracktwo_L1TAU100:
   eventCount: 0
+HLT_tau160_mediumRNN_tracktwoMVABDT_L1TAU100:
+  eventCount: 0
 HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100:
   eventCount: 0
+HLT_tau160_perf_tracktwoMVABDT_L1TAU100:
+  eventCount: 0
 HLT_tau160_perf_tracktwoMVA_L1TAU100:
   eventCount: 0
 HLT_tau160_perf_tracktwo_L1TAU100:
@@ -2494,20 +2500,6 @@ HLT_tau25_looseRNN_tracktwoMVABDT_L1TAU12IM:
     2: 13
     3: 13
     4: 12
-HLT_tau25_looseRNN_tracktwoMVA_L1TAU12IM:
-  eventCount: 8
-  stepCounts:
-    0: 12
-    1: 11
-    2: 10
-    3: 9
-    4: 8
-  stepFeatures:
-    0: 22
-    1: 15
-    2: 13
-    3: 12
-    4: 9
 HLT_tau25_looseRNN_tracktwoMVA_L1TAU12IM:
   eventCount: 9
   stepCounts:
@@ -2592,20 +2584,6 @@ HLT_tau25_mediumRNN_tracktwoMVABDT_L1TAU12IM:
     2: 13
     3: 13
     4: 9
-HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM:
-  eventCount: 5
-  stepCounts:
-    0: 12
-    1: 11
-    2: 10
-    3: 9
-    4: 5
-  stepFeatures:
-    0: 22
-    1: 15
-    2: 13
-    3: 12
-    4: 5
 HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM:
   eventCount: 8
   stepCounts:
@@ -2688,20 +2666,6 @@ HLT_tau25_tightRNN_tracktwoMVABDT_L1TAU12IM:
     2: 13
     3: 13
     4: 7
-HLT_tau25_tightRNN_tracktwoMVA_L1TAU12IM:
-  eventCount: 4
-  stepCounts:
-    0: 12
-    1: 11
-    2: 10
-    3: 9
-    4: 4
-  stepFeatures:
-    0: 22
-    1: 15
-    2: 13
-    3: 12
-    4: 4
 HLT_tau25_tightRNN_tracktwoMVA_L1TAU12IM:
   eventCount: 7
   stepCounts:
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index d13160e0eca..43324bfa7bd 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -1346,6 +1346,8 @@ HLT_tau0_perf_ptonly_L1TAU60:
   eventCount: 0
 HLT_tau160_idperf_track_L1TAU100:
   eventCount: 0
+HLT_tau160_idperf_tracktwoMVABDT_L1TAU100:
+  eventCount: 0
 HLT_tau160_idperf_tracktwoMVA_L1TAU100:
   eventCount: 0
 HLT_tau160_idperf_tracktwo_L1TAU100:
@@ -1354,8 +1356,12 @@ HLT_tau160_medium1_tracktwoEF_L1TAU100:
   eventCount: 0
 HLT_tau160_medium1_tracktwo_L1TAU100:
   eventCount: 0
+HLT_tau160_mediumRNN_tracktwoMVABDT_L1TAU100:
+  eventCount: 0
 HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100:
   eventCount: 0
+HLT_tau160_perf_tracktwoMVABDT_L1TAU100:
+  eventCount: 0
 HLT_tau160_perf_tracktwoMVA_L1TAU100:
   eventCount: 0
 HLT_tau160_perf_tracktwo_L1TAU100:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index e3c862c8302..57ebd11ef65 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -357,6 +357,7 @@ def setupMenu():
         ChainProp(name="HLT_tau160_medium1_tracktwoEF_L1TAU100",groups=SingleTauGroup),
         ChainProp(name="HLT_tau200_medium1_tracktwoEF_L1TAU100",groups=SingleTauGroup),
         ChainProp(name="HLT_tau200_mediumRNN_tracktwoMVA_L1TAU100",groups=SingleTauGroup),
+        #ATR-18804
         ChainProp(name="HLT_tau25_idperf_tracktwoMVABDT_L1TAU12IM",groups=SingleTauGroup),
         ChainProp(name="HLT_tau25_perf_tracktwoMVABDT_L1TAU12IM",groups=SingleTauGroup),
         ChainProp(name="HLT_tau25_medium1_tracktwoMVABDT_L1TAU12IM",groups=SingleTauGroup),
@@ -364,6 +365,10 @@ def setupMenu():
         ChainProp(name="HLT_tau25_looseRNN_tracktwoMVABDT_L1TAU12IM",groups=SingleTauGroup),
         ChainProp(name="HLT_tau25_mediumRNN_tracktwoMVABDT_L1TAU12IM",groups=SingleTauGroup),
         ChainProp(name="HLT_tau25_tightRNN_tracktwoMVABDT_L1TAU12IM",groups=SingleTauGroup),
+        ChainProp(name="HLT_tau160_perf_tracktwoMVABDT_L1TAU100",groups=SingleTauGroup),
+        ChainProp(name="HLT_tau160_idperf_tracktwoMVABDT_L1TAU100",groups=SingleTauGroup),
+        ChainProp(name="HLT_tau160_mediumRNN_tracktwoMVABDT_L1TAU100",groups=SingleTauGroup),  
+
         # ATR-21797
         # the following 3 chains were in serial mode in Run-2
         ChainProp(name="HLT_tau80_mediumRNN_tracktwoMVA_tau60_mediumRNN_tracktwoMVA_L1TAU60_2TAU40",         l1SeedThresholds=['TAU60','TAU40'],     groups=MultiTauGroup),
-- 
GitLab