From dde34b4078660405eeae8ca54d65ad667e9b0b5c Mon Sep 17 00:00:00 2001 From: James Beacham <j.beacham@cern.ch> Date: Sat, 14 Oct 2017 21:16:06 +0200 Subject: [PATCH] Revert "Merge branch '21.0-missing-ztap-dev' into '21.0'" This reverts commit f246b6e87ee64a1c60a4f66e839907a960e33969 [formerly 8814e168a15d33843fb310fa986fea57431cd236], reversing changes made to 67f0976a0dbdeecf932d0ebe4131fd6476e027e1 [formerly 58d81c0e5af0d90dc2ad03da381c640c14b4c210]. Former-commit-id: 93b85443b3f8a2f9f75b905d88e1e4295a3b7ba1 --- .../TrigMuonMonitoring/python/TrigMuonMonitCategory.py | 4 ++-- Trigger/TrigMonitoring/TrigMuonMonitoring/src/MuZTPMon.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitCategory.py b/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitCategory.py index 7bb3c9a1b322d..1e00d57b424ec 100644 --- a/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitCategory.py +++ b/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitCategory.py @@ -7,9 +7,9 @@ monitoring_muonNonIso_HI = ['HLT_mu15_L1MU10','HLT_mu14']#8TeV monitoring_muonNonIso_pp = ['HLT_mu60'] #monitoring_muonNonIso_pp = ['HLT_mu50'] -monitoring_muonIso = ['HLT_mu26_ivarmedium'] +monitoring_muonIso = ['HLT_mu26_ivarmedium','HLT_mu26_imedium'] monitoring_muonIso_HI = [''] -monitoring_muonIso_pp = ['HLT_mu26_ivarmedium'] +monitoring_muonIso_pp = ['HLT_mu26_ivarmedium','HLT_mu26_imedium'] monitoring_MSonly = ['HLT_mu60_0eta105_msonly'] monitoring_MSonly_HI = ['HLT_mu15_msonly'] diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoring/src/MuZTPMon.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoring/src/MuZTPMon.cxx index 77444cd3d4f7e..fa71177278985 100644 --- a/Trigger/TrigMonitoring/TrigMuonMonitoring/src/MuZTPMon.cxx +++ b/Trigger/TrigMonitoring/TrigMuonMonitoring/src/MuZTPMon.cxx @@ -361,7 +361,7 @@ StatusCode HLTMuonMonTool::fillMuZTPDQA() //LOOP OVER ALL TRIGGER CHAINS for(std::map<std::string, std::string>::iterator itmap=m_ztpmap.begin();itmap!=m_ztpmap.end();++itmap){ - ATH_MSG_DEBUG("Starting chain " << itmap->first << " => " << itmap->second); + ATH_MSG_DEBUG("Starting chain " << itmap->first); std::string histdirmuztp="HLT/MuonMon/MuZTP/"+itmap->second; double ptcut=999999.; -- GitLab