From 510e87c4dc0fd26bfd36a29dd1b5e45f2ad7840a Mon Sep 17 00:00:00 2001
From: Fernando Monticelli <fernando.monticelli@cern.ch>
Date: Sun, 9 Jun 2019 16:13:23 +0000
Subject: [PATCH] Adding precision Calo for photons
---
.../TrigUpgradeTest/share/full_menu_build.ref | 78 ++++++-------------
.../HLTMenuConfig/Egamma/ElectronDef.py | 12 +--
.../Egamma/ElectronSequenceSetup.py | 6 +-
.../python/HLTMenuConfig/Egamma/PhotonDef.py | 37 ++++++---
.../Egamma/PhotonSequenceSetup.py | 2 +-
5 files changed, 60 insertions(+), 75 deletions(-)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
index 3ad0a321a9d..496ffb264b3 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
@@ -10,9 +10,7 @@ TriggerSummaryStep2 0 0 DEBUG +++ HLT_e5_etcut_L1EM3
TriggerSummaryStep2 0 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep2 0 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
TriggerSummaryStep2 0 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
-TriggerSummaryStep3 0 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
-TriggerSummaryStep3 0 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
-TriggerSummaryStep3 0 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep3 0 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 1 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 1 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 1 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
@@ -26,9 +24,7 @@ TriggerSummaryStep2 1 0 DEBUG +++ HLT_e5_etcut_L1EM3
TriggerSummaryStep2 1 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep2 1 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
TriggerSummaryStep2 1 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
-TriggerSummaryStep3 1 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
-TriggerSummaryStep3 1 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
-TriggerSummaryStep3 1 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep3 1 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 2 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 2 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 2 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
@@ -39,9 +35,7 @@ TriggerSummaryStep2 2 0 DEBUG +++ HLT_e5_etcut_L1EM3
TriggerSummaryStep2 2 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep2 2 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
TriggerSummaryStep2 2 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
-TriggerSummaryStep3 2 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
-TriggerSummaryStep3 2 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
-TriggerSummaryStep3 2 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep3 2 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 3 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 3 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 3 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
@@ -54,9 +48,7 @@ TriggerSummaryStep2 3 0 DEBUG +++ HLT_e5_etcut_L1EM3
TriggerSummaryStep2 3 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep2 3 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
TriggerSummaryStep2 3 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
-TriggerSummaryStep3 3 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
-TriggerSummaryStep3 3 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
-TriggerSummaryStep3 3 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep3 3 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 4 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 4 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 4 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
@@ -67,8 +59,7 @@ TriggerSummaryStep2 4 0 DEBUG +++ HLT_e5_etcut_L1EM3
TriggerSummaryStep2 4 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep2 4 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
TriggerSummaryStep2 4 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
-TriggerSummaryStep3 4 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
-TriggerSummaryStep3 4 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
+TriggerSummaryStep3 4 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 5 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 5 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 5 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
@@ -91,9 +82,7 @@ TriggerSummaryStep2 5 0 DEBUG +++ HLT_e7_etcut_L1EM3
TriggerSummaryStep2 5 0 DEBUG +++ HLT_mu20_ivar_L1MU6 ID#2083734526
TriggerSummaryStep2 5 0 DEBUG +++ HLT_mu6_L1MU6 ID#2560542253
TriggerSummaryStep2 5 0 DEBUG +++ HLT_mu6_msonly_L1MU6 ID#3895421032
-TriggerSummaryStep3 5 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
-TriggerSummaryStep3 5 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
-TriggerSummaryStep3 5 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep3 5 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep3 5 0 DEBUG +++ HLT_mu20_ivar_L1MU6 ID#2083734526
TriggerSummaryStep1 6 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 6 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
@@ -118,8 +107,7 @@ TriggerSummaryStep2 6 0 DEBUG +++ HLT_e7_etcut_L1EM3
TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu20_ivar_L1MU6 ID#2083734526
TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu6_L1MU6 ID#2560542253
TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu6_msonly_L1MU6 ID#3895421032
-TriggerSummaryStep3 6 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
-TriggerSummaryStep3 6 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
+TriggerSummaryStep3 6 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep3 6 0 DEBUG +++ HLT_mu6_ivarmedium_L1MU6 ID#1012713062
TriggerSummaryStep3 6 0 DEBUG +++ HLT_mu20_ivar_L1MU6 ID#2083734526
TriggerSummaryStep3 6 0 DEBUG +++ HLT_mu6_L1MU6 ID#2560542253
@@ -136,9 +124,7 @@ TriggerSummaryStep2 7 0 DEBUG +++ HLT_e5_etcut_L1EM3
TriggerSummaryStep2 7 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep2 7 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
TriggerSummaryStep2 7 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
-TriggerSummaryStep3 7 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
-TriggerSummaryStep3 7 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
-TriggerSummaryStep3 7 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep3 7 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 8 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 8 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 8 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
@@ -150,9 +136,7 @@ TriggerSummaryStep2 8 0 DEBUG +++ HLT_e5_etcut_L1EM3
TriggerSummaryStep2 8 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep2 8 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
TriggerSummaryStep2 8 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
-TriggerSummaryStep3 8 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
-TriggerSummaryStep3 8 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
-TriggerSummaryStep3 8 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep3 8 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 9 0 DEBUG +++ HLT_xe30_cell_L1XE10 ID#1649696554
TriggerSummaryStep1 10 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 10 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
@@ -165,9 +149,7 @@ TriggerSummaryStep2 10 0 DEBUG +++ HLT_e5_etcut_L1EM3
TriggerSummaryStep2 10 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep2 10 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
TriggerSummaryStep2 10 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
-TriggerSummaryStep3 10 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
-TriggerSummaryStep3 10 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
-TriggerSummaryStep3 10 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep3 10 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 11 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 11 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 11 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
@@ -175,8 +157,7 @@ TriggerSummaryStep1 11 0 DEBUG +++ HLT_e3_etcut1step_L
TriggerSummaryStep2 11 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep2 11 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep2 11 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
-TriggerSummaryStep3 11 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
-TriggerSummaryStep3 11 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
+TriggerSummaryStep3 11 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 12 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 12 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 12 0 DEBUG +++ HLT_xe65_cell_L1XE50 ID#531141817
@@ -189,9 +170,7 @@ TriggerSummaryStep2 12 0 DEBUG +++ HLT_e5_etcut_L1EM3
TriggerSummaryStep2 12 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep2 12 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
TriggerSummaryStep2 12 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
-TriggerSummaryStep3 12 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
-TriggerSummaryStep3 12 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
-TriggerSummaryStep3 12 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep3 12 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 13 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 13 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 13 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
@@ -201,9 +180,7 @@ TriggerSummaryStep2 13 0 DEBUG +++ HLT_e5_etcut_L1EM3
TriggerSummaryStep2 13 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep2 13 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
TriggerSummaryStep2 13 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
-TriggerSummaryStep3 13 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
-TriggerSummaryStep3 13 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
-TriggerSummaryStep3 13 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep3 13 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 14 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 14 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 14 0 DEBUG +++ HLT_xe65_cell_L1XE50 ID#531141817
@@ -213,8 +190,7 @@ TriggerSummaryStep1 14 0 DEBUG +++ HLT_xe30_cell_L1XE1
TriggerSummaryStep2 14 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep2 14 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep2 14 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
-TriggerSummaryStep3 14 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
-TriggerSummaryStep3 14 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
+TriggerSummaryStep3 14 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6Comb_L1MU6 ID#996392590
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6_ivarmedium_L1MU6 ID#1012713062
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6noL1_L1MU6 ID#1631468602
@@ -229,7 +205,6 @@ TriggerSummaryStep1 16 0 DEBUG +++ HLT_e3_etcut_L1EM3
TriggerSummaryStep1 16 0 DEBUG +++ HLT_e3_etcut1step_L1EM3 ID#999988353
TriggerSummaryStep1 16 0 DEBUG +++ HLT_xe30_cell_L1XE10 ID#1649696554
TriggerSummaryStep2 16 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
-TriggerSummaryStep3 16 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
TriggerSummaryStep1 17 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 17 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 17 0 DEBUG +++ HLT_xe65_cell_L1XE50 ID#531141817
@@ -242,15 +217,14 @@ TriggerSummaryStep2 17 0 DEBUG +++ HLT_e5_etcut_L1EM3
TriggerSummaryStep2 17 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep2 17 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
TriggerSummaryStep2 17 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
-TriggerSummaryStep3 17 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
-TriggerSummaryStep3 17 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
-TriggerSummaryStep3 17 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep3 17 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 18 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 18 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 18 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
TriggerSummaryStep1 18 0 DEBUG +++ HLT_e3_etcut1step_L1EM3 ID#999988353
TriggerSummaryStep1 18 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
TriggerSummaryStep2 18 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
+TriggerSummaryStep3 18 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 19 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 19 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 19 0 DEBUG +++ HLT_j85_L1J20 ID#510475538
@@ -264,9 +238,7 @@ TriggerSummaryStep2 19 0 DEBUG +++ HLT_e5_etcut_L1EM3
TriggerSummaryStep2 19 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep2 19 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
TriggerSummaryStep2 19 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
-TriggerSummaryStep3 19 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
-TriggerSummaryStep3 19 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
-TriggerSummaryStep3 19 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep3 19 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 20 20 0 0 0 0 0 0
@@ -279,14 +251,14 @@ TrigSignatureMoniMT INFO HLT_e3_etcut1step_L1EM3
TrigSignatureMoniMT INFO HLT_e3_etcut1step_L1EM3 decisions 54 0 0 0 0
TrigSignatureMoniMT INFO HLT_e3_etcut1step_mu6fast_L1EM8I_MU1020 20 10 0 0 0 0 3
TrigSignatureMoniMT INFO HLT_e3_etcut1step_mu6fast_L1EM8I_MU10 decisions 15 0 0 0 0
-TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 20 20 18 17 17 0 0 17
-TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 decisions 54 313 81 0 0
-TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 20 20 17 16 16 0 0 16
-TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 decisions 50 300 47 0 0
-TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 20 20 15 14 12 0 0 12
-TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 decisions 36 238 25 0 0
-TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3 20 20 17 17 0 0 0 17
-TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3 decisions 50 50 0 0 0
+TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 20 20 18 17 0 0 0 0
+TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 decisions 54 313 0 0 0
+TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 20 20 17 16 0 0 0 0
+TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 decisions 50 300 0 0 0
+TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 20 20 15 14 0 0 0 0
+TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 decisions 36 238 0 0 0
+TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3 20 20 17 17 17 0 0 17
+TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3 decisions 50 50 116 0 0
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J2020 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 20 20 0 0 0 0 0 0
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
index 5915722720e..205aa782eb2 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
@@ -10,7 +10,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import ChainStep, RecoFragm
from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import fastCaloMenuSequence
-from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronSequenceSetup import electronMenuSequence
+from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronSequenceSetup import fastElectronMenuSequence
from TrigUpgradeTest.InDetSetup import inDetSetup
from TriggerMenuMT.HLTMenuConfig.Egamma.PrecisionCaloSequenceSetup import precisionCaloMenuSequence
@@ -19,12 +19,12 @@ from TriggerMenuMT.HLTMenuConfig.Egamma.PrecisionCaloSequenceSetup import precis
# so let's make them functions already now
#----------------------------------------------------------------
-def electronFastCaloCfg( flags ):
+def fastCaloSequenceCfg( flags ):
return fastCaloMenuSequence("ElectronFastCalo")
-def electronSequenceCfg( flags ):
+def fastElectronSequenceCfg( flags ):
inDetSetup()
- return electronMenuSequence()
+ return fastElectronMenuSequence()
def precisionCaloSequenceCfg( flags ):
return precisionCaloMenuSequence()
@@ -69,11 +69,11 @@ class ElectronChainConfiguration(ChainConfigurationBase):
def getEtCutStep(self, stepName):
if stepName == "Step1_etcut":
log.debug("Configuring step " + stepName)
- fastCalo = RecoFragmentsPool.retrieve( electronFastCaloCfg, None ) # the None will be used for flags in future
+ fastCalo = RecoFragmentsPool.retrieve( fastCaloSequenceCfg, None ) # the None will be used for flags in future
chainStep =ChainStep(stepName, [fastCalo], self.mult)
elif stepName == "Step2_etcut":
log.debug("Configuring step " + stepName)
- electronReco = RecoFragmentsPool.retrieve( electronSequenceCfg, None )
+ electronReco = RecoFragmentsPool.retrieve( fastElectronSequenceCfg, None )
chainStep=ChainStep(stepName, [electronReco], self.mult)
elif stepName == "Step3_etcut":
log.debug("Configuring step " + stepName)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
index 7ca42dc58aa..788f3048988 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
@@ -11,7 +11,7 @@ from AthenaCommon.CFElements import parOR, seqAND
from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
from TrigEDMConfig.TriggerEDMRun3 import recordable
-def electronSequence(ConfigFlags):
+def fastElectronSequence(ConfigFlags):
""" second step: tracking....."""
from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs
@@ -64,10 +64,10 @@ def electronSequence(ConfigFlags):
return (electronAthSequence, l2ElectronViewsMaker, theElectronFex.ElectronsName)
-def electronMenuSequence():
+def fastElectronMenuSequence():
""" Creates 2nd step Electron MENU sequence"""
# retrievee the reco seuqence+IM
- (electronAthSequence, l2ElectronViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(electronSequence, ConfigFlags)
+ (electronAthSequence, l2ElectronViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(fastElectronSequence, ConfigFlags)
# make the Hypo
from TrigEgammaHypo.TrigEgammaHypoConf import TrigL2ElectronHypoAlgMT
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonDef.py
index b6c8e28638a..12155dc46f5 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonDef.py
@@ -9,17 +9,21 @@ from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigu
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import ChainStep, RecoFragmentsPool
from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import fastCaloMenuSequence
-from TriggerMenuMT.HLTMenuConfig.Egamma.PhotonSequenceSetup import photonMenuSequence
+from TriggerMenuMT.HLTMenuConfig.Egamma.PhotonSequenceSetup import fastPhotonMenuSequence
+from TriggerMenuMT.HLTMenuConfig.Egamma.PrecisionCaloSequenceSetup import precisionCaloMenuSequence
#----------------------------------------------------------------
# fragments generating configuration will be functions in New JO,
# so let's make them functions already now
#----------------------------------------------------------------
-def gammaFastCaloCfg( flags ):
- return fastCaloMenuSequence("GammaFastCalo")
+def fastPhotonCaloSequenceCfg( flags ):
+ return fastCaloMenuSequence("Gamma")
-def photonSequenceCfg( flags ):
- return photonMenuSequence()
+def fastPhotonSequenceCfg( flags ):
+ return fastPhotonMenuSequence()
+
+def precisionCaloSequenceCfg( flags ):
+ return precisionCaloMenuSequence()
#----------------------------------------------------------------
# Class to configure chain
@@ -39,15 +43,18 @@ class PhotonChainConfiguration(ChainConfigurationBase):
# define here the names of the steps and obtain the chainStep configuration
# --------------------
stepDictionary = {
- "": [self.getFastCalo(), self.getPhoton()]
+ "": [self.getFastCalo(), self.getFastPhoton(), self.getPrecisionCaloPhoton()]
}
## This needs to be configured by the Egamma Developer!!
- key = self.chainPart['extra'] + self.chainPart['IDinfo'] + self.chainPart['isoInfo']
+ log.debug('photon chain part = ' + str(self.chainPart))
+ key = self.chainPart['extra'] + self.chainPart['IDinfo'] + self.chainPart['isoInfo']
+ log.debug('photon key = ' + key)
steps=stepDictionary[key]
chainSteps = []
for step in steps:
+ log.debug('Adding photon trigger step ' + str(step))
chainSteps+=[step]
myChain = self.buildChain(chainSteps)
@@ -58,17 +65,23 @@ class PhotonChainConfiguration(ChainConfigurationBase):
# Configuration of steps
# --------------------
def getFastCalo(self):
- stepName = "Step1_g5_etcut"
+ stepName = "PhotonFastCalo"
log.debug("Configuring step " + stepName)
- fastCalo = RecoFragmentsPool.retrieve( gammaFastCaloCfg, None ) # the None will be used for flags in future
+ fastCalo = RecoFragmentsPool.retrieve( fastPhotonCaloSequenceCfg, None ) # the None will be used for flags in future
return ChainStep(stepName, [fastCalo])
- def getPhoton(self):
- stepName = "Step2_g5_etcut"
+ def getFastPhoton(self):
+ stepName = "L2Photon"
log.debug("Configuring step " + stepName)
- photonReco = RecoFragmentsPool.retrieve( photonSequenceCfg, None )
+ photonReco = RecoFragmentsPool.retrieve( fastPhotonSequenceCfg, None )
return ChainStep(stepName, [photonReco])
+ def getPrecisionCaloPhoton(self):
+ stepName = "PhotonPrecisionCalo"
+ log.debug("Configuring step " + stepName)
+ precisionCaloPhoton = RecoFragmentsPool.retrieve( precisionCaloSequenceCfg, None )
+ return ChainStep(stepName, [precisionCaloPhoton])
+
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonSequenceSetup.py
index c25f0145d39..9352e6456e4 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonSequenceSetup.py
@@ -10,7 +10,7 @@ from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
-def photonMenuSequence():
+def fastPhotonMenuSequence():
"""Creates secpond step photon sequence"""
from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import CaloMenuDefs
--
GitLab