diff --git a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitCategory.py b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitCategory.py
index f9f5c2309dd236af69176a235353ec6ecf1a82dd..2af9a0eb8b0408094971683d92c9f3a02da76c3b 100644
--- a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitCategory.py
+++ b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitCategory.py
@@ -36,9 +36,19 @@ monitoring_jet = ['j25',
'j85_cleanL',
'j85_cleanT',
'j0_1i2c300m500TLA',
- 'j0_0i1c500m900TLA']
-
-
+ 'j0_0i1c500m900TLA',
+ 'j15',
+ 'j45',
+ 'j175',
+ 'j420',
+ 'j260_nojcalib',
+ 'j260_320eta490',
+ 'j260_320eta490_nojcalib',
+ 'j460_a10_lcw_subjes_L1J100',
+ 'j460_a10r_L1J100',
+ '4j120',
+ '6j70',
+ '6j55_0eta240_L14J15']
@@ -76,7 +86,19 @@ primary_jet = ['j25',
'j85_cleanL',
'j85_cleanT',
'j0_1i2c300m500TLA',
- 'j0_0i1c500m900TLA']
+ 'j0_0i1c500m900TLA',
+ 'j15',
+ 'j45',
+ 'j175',
+ 'j420',
+ 'j260_nojcalib',
+ 'j260_320eta490',
+ 'j260_320eta490_nojcalib',
+ 'j460_a10_lcw_subjes_L1J100',
+ 'j460_a10r_L1J100',
+ '4j120',
+ '6j70',
+ '6j55_0eta240_L14J15']
@@ -116,10 +138,19 @@ monitoring_jet_pp = ['j25',
'j85_cleanL',
'j85_cleanT',
'j0_1i2c300m500TLA',
- 'j0_0i1c500m900TLA']
-
-
-
+ 'j0_0i1c500m900TLA',
+ 'j15',
+ 'j45',
+ 'j175',
+ 'j420',
+ 'j260_nojcalib',
+ 'j260_320eta490',
+ 'j260_320eta490_nojcalib',
+ 'j460_a10_lcw_subjes_L1J100',
+ 'j460_a10r_L1J100',
+ '4j120',
+ '6j70',
+ '6j55_0eta240_L14J15']
@@ -156,7 +187,19 @@ primary_jet_pp = ['j25',
'j85_cleanL',
'j85_cleanT',
'j0_1i2c300m500TLA',
- 'j0_0i1c500m900TLA']
+ 'j0_0i1c500m900TLA',
+ 'j15',
+ 'j45',
+ 'j175',
+ 'j420',
+ 'j260_nojcalib',
+ 'j260_320eta490',
+ 'j260_320eta490_nojcalib',
+ 'j460_a10_lcw_subjes_L1J100',
+ 'j460_a10r_L1J100',
+ '4j120',
+ '6j70',
+ '6j55_0eta240_L14J15']
########################## validation Config ###############################################
@@ -195,7 +238,20 @@ monitoring_jet_validation = ['j25',
'j85_cleanL',
'j85_cleanT',
'j0_1i2c300m500TLA',
- 'j0_0i1c500m900TLA']
+ 'j0_0i1c500m900TLA',
+ 'j15',
+ 'j45',
+ 'j175',
+ 'j420',
+ 'j260_nojcalib',
+ 'j260_320eta490',
+ 'j260_320eta490_nojcalib',
+ 'j460_a10_lcw_subjes_L1J100',
+ 'j460_a10r_L1J100',
+ '4j120',
+ '6j70',
+ '6j55_0eta240_L14J15']
+
@@ -235,7 +291,20 @@ primary_jet_validation = ['j25',
'j85_cleanL',
'j85_cleanT',
'j0_1i2c300m500TLA',
- 'j0_0i1c500m900TLA']
+ 'j0_0i1c500m900TLA',
+ 'j15',
+ 'j45',
+ 'j175',
+ 'j420',
+ 'j260_nojcalib',
+ 'j260_320eta490',
+ 'j260_320eta490_nojcalib',
+ 'j460_a10_lcw_subjes_L1J100',
+ 'j460_a10r_L1J100',
+ '4j120',
+ '6j70',
+ '6j55_0eta240_L14J15']
+
diff --git a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig.py b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig.py
index 78b3633c0722a67eca6f7d7eadcb2dec5bbc8b8b..b25f13745315ae4622b5e66beae3d174760c6d46 100644
--- a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig.py
@@ -137,7 +137,8 @@ if (pp) or (mc):
"a4tcemsubjesISFS" : "HLT_xAOD__JetContainer_a4tcemsubjesISFS",
"a4tclcwjesFS" : "HLT_xAOD__JetContainer_a4tclcwjesFS",
"a4GSC" : "HLT_xAOD__JetContainer_GSCJet",
- #"a10rtcemsubjesFS" : "HLT_xAOD__JetContainer_a10r_tcemsubjesFS",
+ "a10r_tcemsubjesISFS": "HLT_xAOD__JetContainer_a10r_tcemsubjesISFS",
+ "a4tcemnojcalibFS": "HLT_xAOD__JetContainer_a4tcemnojcalibFS",
"a10tclcwsubjesFS" : "HLT_xAOD__JetContainer_a10tclcwsubjesFS",
"a10ttclcwjesFS" : "HLT_xAOD__JetContainer_a10ttclcwjesFS",
"a4tcemsubjesISFSftk" : "HLT_xAOD__JetContainer_a4tcemsubjesISFSftk",
@@ -208,7 +209,20 @@ if (pp) or (mc):
'4j45':20.,
'6j45':20.,
'6j45_0eta240':20.,
- '10j40_L14J20':0.}
+ '10j40_L14J20':0.,
+ 'j15':0.,
+ 'j45':20.,
+ 'j175':100.,
+ 'j420':200.,
+ 'j260_nojcalib':100.,
+ 'j260_320eta490':100.,
+ 'j260_320eta490_nojcalib':100.,
+ 'j460_a10_lcw_subjes_L1J100':200.,
+ 'j460_a10r_L1J100':200.,
+ '4j120':20.,
+ '6j70':20.,
+ '6j55_0eta240_L14J15':20.}
+
hlt_hltEtaHighThresholds = { 'j0_perf_L1RD0FILLED': 2.5,
'j0_perf_ftk_L1RD0FILLED': 2.5,
@@ -239,7 +253,22 @@ if (pp) or (mc):
'4j45':3.2,
'6j45':3.2,
'6j45_0eta240':2.4,
- '10j40_L14J20':3.2}
+ '10j40_L14J20':3.2,
+ 'j15':3.2,
+ 'j45':3.2,
+ 'j175':3.2,
+ 'j420':3.2,
+ 'j260_nojcalib':3.2,
+ 'j260_320eta490':4.9,
+ 'j260_320eta490_nojcalib':4.9,
+ 'j460_a10_lcw_subjes_L1J100':3.2,
+ 'j460_a10r_L1J100':3.2,
+ '4j120':3.2,
+ '6j70':3.2,
+ '6j55_0eta240_L14J15':2.4}
+
+
+
hlt_hltEtaLowThresholds = { 'j0_perf_L1RD0FILLED': 0.,
'j0_perf_ftk_L1RD0FILLED': 0.,
@@ -273,7 +302,20 @@ if (pp) or (mc):
'4j45':0.0,
'6j45':0.0,
'6j45_0eta240':0.0,
- '10j40_L14J20':0.0}
+ '10j40_L14J20':0.0,
+ 'j15':0.0,
+ 'j45':0.0,
+ 'j175':0.0,
+ 'j420':0.0,
+ 'j260_nojcalib':0.0,
+ 'j260_320eta490':3.2,
+ 'j260_320eta490_nojcalib':3.2,
+ 'j460_a10_lcw_subjes_L1J100':0.0,
+ 'j460_a10r_L1J100':0.0,
+ '4j120':0.0,
+ '6j70':0.0,
+ '6j55_0eta240_L14J15':0.0}
+
hlt_hltJetn = { 'j0_perf_L1RD0FILLED': 1,
@@ -305,7 +347,20 @@ if (pp) or (mc):
'4j45':4,
'6j45':6,
'6j45_0eta240':6,
- '10j40_L14J20':10}
+ '10j40_L14J20':10,
+ 'j15':1,
+ 'j45':1,
+ 'j175':1,
+ 'j420':1,
+ 'j260_nojcalib':1,
+ 'j260_320eta490':1,
+ 'j260_320eta490_nojcalib':1,
+ 'j460_a10_lcw_subjes_L1J100':1,
+ 'j460_a10r_L1J100':1,
+ '4j120':4,
+ '6j70':6,
+ '6j55_0eta240_L14J15':6}
+
hlt_hltContainers = { 'j0_perf_L1RD0FILLED':'a4tcemsubjesISFS',
@@ -341,8 +396,20 @@ if (pp) or (mc):
'4j45':'a4tcemsubjesISFS',
'6j45':'a4tcemsubjesISFS',
'6j45_0eta240':'a4tcemsubjesISFS',
- '10j40_L14J20':'a4tcemsubjesISFS'
- }
+ '10j40_L14J20':'a4tcemsubjesISFS',
+ 'j15':'a4tcemsubjesISFS',
+ 'j45':'a4tcemsubjesISFS',
+ 'j175':'a4tcemsubjesISFS',
+ 'j420':'a4tcemsubjesISFS',
+ 'j260_nojcalib':'a4tcemnojcalibFS',
+ 'j260_320eta490':'a4tcemsubjesISFS',
+ 'j260_320eta490_nojcalib':'a4tcemnojcalibFS',
+ 'j460_a10_lcw_subjes_L1J100':'a10tclcwsubjesFS',
+ 'j460_a10r_L1J100':'a10r_tcemsubjesISFS',
+ '4j120':'a4tcemsubjesISFS',
+ '6j70':'a4tcemsubjesISFS',
+ '6j55_0eta240_L14J15':'a4tcemsubjesISFS'}
+
# Offline
hlt_offlineEtThresholds = { 'j0_perf_L1RD0FILLED': 0.,
@@ -384,7 +451,21 @@ if (pp) or (mc):
'j85_cleanL':30,
'j85_cleanT':30,
'j0_1i2c300m500TLA':0.,
- 'j0_0i1c500m900TLA':0.}
+ 'j0_0i1c500m900TLA':0.,
+ 'j15':0.,
+ 'j45':20.,
+ 'j175':100.,
+ 'j420':200.,
+ 'j260_nojcalib':100.,
+ 'j260_320eta490':100.,
+ 'j260_320eta490_nojcalib':100.,
+ 'j460_a10_lcw_subjes_L1J100':200.,
+ 'j460_a10r_L1J100':200.,
+ '4j120':20.,
+ '6j70':20.,
+ '6j55_0eta240_L14J15':20.}
+
+
#Dijet chains
l1_DijetChains = ['L1_J400']