Merge branch 'cherry-pick-4ce0f29a' into '21.0'

Merge branch 'HLTegamma_Restore_13TeV' into '21.0' -- restore in 21.0

See merge request atlas/athena!7869

Former-commit-id: 149865623e3feed2119180a47843334970c4344c

Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitCategory.py

@@ -2,11 +2,11 @@
 
 #Categories currently used by offline Egamma TO monitoring tool
 #Important to keep lists updated
-primary_single_ele = ['HLT_e24_lhtight_nod0','HLT_e26_lhtight_nod0','HLT_e60_lhmedium_nod0_L1EM24VHI','HLT_e140_lhloose_nod0_L1EM24VHI','HLT_e15_lhloose_L1EM12','HLT_e17_lhloose_nod0']
+primary_single_ele = ['HLT_e24_lhtight_nod0','HLT_e26_lhtight_nod0','HLT_e60_lhmedium_nod0_L1EM24VHI','HLT_e140_lhloose_nod0_L1EM24VHI']
 primary_single_ele_iso =['HLT_e24_lhtight_nod0_ivarloose','HLT_e26_lhtight_nod0_ivarloose','HLT_e28_lhtight_nod0_ivarloose']
 monitoring_Zee = ['HLT_e28_lhtight_nod0_e15_etcut_L1EM7_Zee']
 monitoring_Jpsiee = ['HLT_e5_lhtight_nod0_e4_etcut','HLT_e5_lhtight_nod0_e4_etcut_Jpsiee']
-primary_single_pho = ['HLT_g140_tight','HLT_g200_loose','g25_loose_L1EM15']
+primary_single_pho = ['HLT_g140_tight','HLT_g200_loose']
 
 # primary_single_ele = ['HLT_e24_lhtight_nod0','HLT_e26_lhtight_nod0','HLT_e60_lhmedium_nod0','HLT_e120_lhloose_nod0','HLT_e140_lhloose_nod0']
 # primary_single_ele_iso =['HLT_e24_lhtight_nod0_ivarloose','HLT_e26_lhtight_nod0_ivarloose','HLT_e28_lhtight_nod0_ivarloose']
@@ -47,8 +47,7 @@ plots_resolution = ["res_et","res_Rphi","res_Reta","res_Rhad","res_ptvarcone20",
 # Define triggers for tagging 
 monitoring_tags = ['HLT_e24_lhtight_nod0_ivarloose',
                    'HLT_e26_lhtight_nod0_ivarloose',
-                   'HLT_e28_lhtight_nod0_ivarloose',
-                   'HLT_e15_lhloose_L1EM12']
+                   'HLT_e28_lhtight_nod0_ivarloose']
 
 monitoring_jpsitags = [
     'HLT_e5_lhtight_nod0_e4_etcut',
@@ -75,7 +74,8 @@ monitoring_L1Calo = []
 commission_electron = ['HLT_e60_lhmedium_nod0_ringer_L1EM24VHI',
                        'HLT_e140_lhloose_nod0_ringer_L1EM24VHI'
                        ]
-monitoring_electron = ['HLT_e15_lhloose_nod0_L1EM12',
+monitoring_electron = ['HLT_e60_lhmedium_nod0_L1EM24VHI',
+                       'HLT_e140_lhloose_nod0_L1EM24VHI'
                        ]
 # monitoring_electron += commission_electron
 
@@ -88,22 +88,21 @@ commissionTP_electron = ['HLT_e17_lhvloose_nod0_ringer_L1EM15VHI',
                          'HLT_e26_lhtight_nod0_ivarloose_L1EM22VHIM',
                          'HLT_e28_lhtight_nod0_ivarloose_L1EM24VHIM',
                          ]
-monitoringTP_electron = ['HLT_e13_etcut_L1EM12',
-                         'HLT_e15_lhloose_L1EM12',
-                         'HLT_e17_lhloose_nod0',
+monitoringTP_electron = ['HLT_e17_lhvloose_nod0_L1EM15VHI',
+                         'HLT_e28_lhtight_nod0_ivarloose',
+                         'HLT_e28_lhtight_nod0_noringer_ivarloose'
                          ]
 # monitoringTP_electron += commissionTP_electron
 
 monitoringTP_Jpsiee = ["HLT_e5_lhtight_nod0"]    
 
-monitoring_photon = ['HLT_g10_loose',
-                     'g23_etcut_L1EM15',
-                     'HLT_g25_loose_L1EM15',
+monitoring_photon = ['HLT_g25_medium_L1EM20VH',
+                     'HLT_g200_loose',
                      ]
 #Add the Menu-Aware monitoring; maps a trigger to a category
-monitoring_mam = {'primary_single_ele_iso':'HLT_e15_lhloose_L1EM12',
-                  'primary_double_pho':'HLT_g10_loose',
-                  'primary_single_pho':'HLT_g25_loose_L1EM15',
+monitoring_mam = {'primary_single_ele_iso':'HLT_e28_lhtight_nod0_ivarloose',
+                  'primary_double_pho':'HLT_g25_medium_L1EM20VH',
+                  'primary_single_pho':'HLT_g200_loose',
                   'monitoring_Jpsiee' :'HLT_e5_lhtight_nod0'}
 
 # Cosmic items