Merge branch 'NewMetMonitoring21.0' into '21.0'

updating MET code

See merge request !3866

Trigger/TrigMonitoring/TrigHLTMonitoring/python/HLTMonTriggerList.py

@@ -53,7 +53,8 @@ class HLTMonTriggerList:
 	monitoring_jet = []
 	primary_l1jet = []
 	primary_jet = []
-	monitoring_met = []
+	monitoring_met_shifter = []
+	monitoring_met_expert = []
 	monitoring_minbias = []
 	monitoring_muonNonIso = []
 	monitoring_muonIso = []
@@ -159,7 +160,8 @@ class HLTMonTriggerList:
 		self.primary_jet = jets.primary_jet
 
 		# set the met triggers to the default values
-		self.monitoring_met = met.monitoring_met
+		self.monitoring_met_shifter = met.monitoring_met_shifter
+		self.monitoring_met_expert = met.monitoring_met_expert
 
 		# set the minbias triggers to the default values
 		self.monitoring_minbias = minbias.monitoring_minbias
@@ -188,7 +190,8 @@ class HLTMonTriggerList:
 		self.primary_l1jet = jets.primary_l1jet_pp
 		self.primary_jet = jets.primary_jet_pp
 
-		self.monitoring_met = met.monitoring_met_pp
+		self.monitoring_met_shifter = met.monitoring_met_shifter_pp
+		self.monitoring_met_expert = met.monitoring_met_expert_pp
 
 		self.monitoring_muonNonIso = muon.monitoring_muonNonIso_pp
 		self.monitoring_muonIso = muon.monitoring_muonIso_pp
@@ -209,7 +212,8 @@ class HLTMonTriggerList:
 		self.primary_l1jet = jets.primary_l1jet_hi
 		self.primary_jet = jets.primary_jet_hi
 
-		self.monitoring_met = []
+		self.monitoring_met_shifter = []
+		self.monitoring_met_expert = []
 
 		self.monitoring_muonNonIso = muon.monitoring_muonNonIso_HI
 		self.monitoring_muonIso = muon.monitoring_muonIso_HI
@@ -225,7 +229,8 @@ class HLTMonTriggerList:
 		self.primary_l1jet = jets.primary_l1jet_cosmic
 		self.primary_jet = jets.primary_jet_cosmic
 
-		self.monitoring_met = met.monitoring_met_cosmic
+		self.monitoring_met_shifter = met.monitoring_met_shifter_cosmic
+		self.monitoring_met_expert = met.monitoring_met_expert_cosmic
 
 		self.monitoring_tau = tau.monitoring_tau_cosmic
 		self.monitoring_singleTau = tau.monitoring_singleTau_cosmic

Trigger/TrigMonitoring/TrigMETMonitoring/TrigMETMonitoring/HLTMETMonTool.h

@@ -21,6 +21,8 @@
 #include "xAODEgamma/ElectronContainer.h"
 #include "xAODEgamma/Electron.h"
 
+#include "TLorentzVector.h"
+
 #include <string>
 #include <vector>
 
@@ -77,13 +79,17 @@ private:
   bool m_debuglevel; //!< private member to control debug messages
   
   std::vector<std::string> m_primary_met;
-  std::vector<std::string> m_monitoring_met;
+  std::vector<std::string> m_monitoring_met_shifter;
+  std::vector<std::string> m_monitoring_met_expert;
   std::vector<std::string> m_monitoring_alg;
   std::vector<std::string> m_prescaled_met;
   
-  std::vector<std::string> m_met_triggers_l1, m_met_triggers_hlt;
-  std::map<std::string, int> m_l1_met_signatures_tolook;
-  std::map<std::string, int> m_hlt_met_signatures_tolook;
+  std::vector<std::string> m_met_triggers_l1_expert, m_met_triggers_hlt_expert;
+  std::vector<std::string> m_met_triggers_l1_shifter, m_met_triggers_hlt_shifter;
+  std::map<std::string, int> m_l1_met_signatures_tolook_shifter;
+  std::map<std::string, int> m_hlt_met_signatures_tolook_shifter;
+  std::map<std::string, int> m_l1_met_signatures_tolook_expert;
+  std::map<std::string, int> m_hlt_met_signatures_tolook_expert;
   
   bool m_print_met_trig_stats; 
   bool m_make_expert_histograms;

Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitCategory.py

@@ -2,21 +2,24 @@
 
 # l1 trigger to monitor: 
 # the first one is the denominator for all efficiencies
-met_triggers_l1 = [
-        "L1_XE50", 
-        #"L1_XS30", 
-        "L1_XE60",
-        #"L1_XE70",
+
+met_triggers_l1_expert = [
+    "L1_XE50",
+    ]
+met_triggers_hlt_expert = []
+
+met_triggers_l1_shifter = [
+    "L1_XE55",
+    "L1_XE60",
 ]
 
 # hlt triggers to monitor
 # 
-met_triggers_hlt = [
-        ##      "HLT_mu30",
-        "HLT_xe100_pufit_L1XE50",
-        "HLT_xe110_mht_L1XE50",
-        "HLT_xe110_pufit_L1XE60",
-        "HLT_xe120_mht_xe80_L1XE60",
+met_triggers_hlt_shifter = [
+    "HLT_xe100_pufit_L1XE55",
+    "HLT_xe110_pufit_L1XE60",
+    "HLT_xe120_mht_xe80_L1XE55",
+        #"HLT_mu30",
         #"HLT_xs30",    
         #"HLT_xe70_tc_lcw",    
         #"HLT_xe80_tc_lcw_L1XE50",    
@@ -34,7 +37,16 @@ met_triggers_hlt = [
         #"HLT_xe35_xeNOcut_mht",
 ] 
 
-monitoring_met = met_triggers_l1 + met_triggers_hlt
-monitoring_met_pp = met_triggers_l1 + met_triggers_hlt
-monitoring_met_cosmic = met_triggers_l1 + met_triggers_hlt
+monitoring_met_shifter = met_triggers_l1_shifter + met_triggers_hlt_shifter
+monitoring_met_expert = met_triggers_l1_expert + met_triggers_hlt_expert
+
+monitoring_met_shifter_pp = met_triggers_l1_shifter + met_triggers_hlt_shifter
+monitoring_met_expert_pp = met_triggers_l1_expert + met_triggers_hlt_expert
+
+monitoring_met_shifter_cosmic = met_triggers_l1_shifter + met_triggers_hlt_shifter
+monitoring_met_expert_cosmic = met_triggers_l1_expert + met_triggers_hlt_expert
+
+monitoring_met = monitoring_met_shifter
+monitoring_met_pp = monitoring_met_shifter_pp
+monitoring_met_cosmic = monitoring_met_shifter_cosmic
 

Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitoringConfig.py

@@ -75,12 +75,15 @@ met_alt_algorithms = [
 def HLTMETMonitoringTool():
 	from TrigMETMonitoring.TrigMETMonitoringConf import HLTMETMonTool
 	from TrigHLTMonitoring.HLTMonTriggerList import hltmonList # access to central tool
+	print "shifter list " 
+	print hltmonList.monitoring_met_shifter
 	HLTMETMon = HLTMETMonTool(name          = 'HLTMETMon',
                                   histoPathBase = "/Trigger/HLT", 
                                   MonPathBase   = "/HLT/METMon",
                                   comp_names   = compNames_all,
                                   bit_names    = bitNames_allHLT,
-                                  monitoring_met         = hltmonList.monitoring_met,
+				  monitoring_met_shifter         = hltmonList.monitoring_met_shifter,
+				  monitoring_met_expert          = [],
                                   monitoring_alg         = met_alt_algorithms,
 				  muon_base              = "HLT_mu26",
                                   muon_pt_thresh         = 18,