From 2d1716b21e19db2772ea28a378c5ad0a1eef98dc Mon Sep 17 00:00:00 2001
From: Hass AbouZeid <hass.abouzeid@cern.ch>
Date: Thu, 15 Jun 2017 15:37:26 +0000
Subject: [PATCH] Merge branch '21.0-met-monitoring-fix' into '21.0'

HLTmet monitoring update

See merge request !2664
---
 .../config/HLT/HLTmet/collisions_run.config   | 21 +++++++++++++++++++
 .../python/TrigMETMonitCategory.py            |  2 ++
 2 files changed, 23 insertions(+)

diff --git a/DataQuality/DataQualityConfigurations/config/HLT/HLTmet/collisions_run.config b/DataQuality/DataQualityConfigurations/config/HLT/HLTmet/collisions_run.config
index 753d045cee1..3bb619b5c20 100644
--- a/DataQuality/DataQualityConfigurations/config/HLT/HLTmet/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/HLT/HLTmet/collisions_run.config
@@ -105,6 +105,9 @@ dir HLT {
         hist Eff_L1_XE50 {
           algorithm = HLTmet_Histogram_Not_Empty&GatherData
         }
+        hist Eff_L1_XE60 {
+          algorithm = HLTmet_Histogram_Not_Empty&GatherData
+        }
       } #end Shifter/L1
 
       dir HLT {
@@ -161,6 +164,12 @@ dir HLT {
 	hist Eff_HLT_xe110_mht_L1XE50 {
           algorithm = HLTmet_Histogram_Not_Empty&GatherData
 	}
+        hist Eff_HLT_xe110_pufit_L1XE60 {
+          algorithm = HLTmet_Histogram_Not_Empty&GatherData
+        }
+	hist Eff_HLT_xe120_mht_xe80_L1XE60 {
+          algorithm = HLTmet_Histogram_Not_Empty&GatherData
+	}
         hist HLT_MET_e {
           algorithm = HLTmet_Histogram_Not_Empty&GatherData
 	  description = The peak position shlud be shifted toward higher MET compared to nominal MET.
@@ -205,6 +214,12 @@ dir HLT {
 	hist Eff_el_HLT_xe110_mht_L1XE50 {
           algorithm = HLTmet_Histogram_Not_Empty&GatherData
 	}
+	hist Eff_el_HLT_xe110_pufit_L1XE60 {
+          algorithm = HLTmet_Histogram_Not_Empty&GatherData
+	}
+	hist Eff_el_HLT_xe120_mht_xe80_L1XE60 {
+          algorithm = HLTmet_Histogram_Not_Empty&GatherData
+	}
 	hist HLT_MET_mu {
           algorithm = HLTmet_Histogram_Not_Empty&GatherData
           description = The peak position shlud be shifted toward higher MET compared to nominal MET.
@@ -249,6 +264,12 @@ dir HLT {
 	hist Eff_mu_HLT_xe110_mht_L1XE50 {
           algorithm = HLTmet_Histogram_Not_Empty&GatherData
 	}
+	hist Eff_mu_HLT_xe110_pufit_L1XE60 {
+          algorithm = HLTmet_Histogram_Not_Empty&GatherData
+	}
+	hist Eff_mu_HLT_xe120_mht_xe80_L1XE60 {
+          algorithm = HLTmet_Histogram_Not_Empty&GatherData
+	}
 
         dir cell {
           output = HLT/TRMET/Shifter/HLT/cell
diff --git a/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitCategory.py b/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitCategory.py
index 1a28cf6fcac..38bc63e63ac 100644
--- a/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitCategory.py
+++ b/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitCategory.py
@@ -15,6 +15,8 @@ met_triggers_hlt = [
         ##      "HLT_mu30",
         "HLT_xe100_pufit_L1XE50",
         "HLT_xe110_mht_L1XE50",
+        "HLT_xe110_pufit_L1XE60",
+        "HLT_xe120_mht_xe80_L1XE60",
         #"HLT_xs30",    
         #"HLT_xe70_tc_lcw",    
         #"HLT_xe80_tc_lcw_L1XE50",    
-- 
GitLab