Merge branch 'revert_revert_of_MR_12_of_12' into '21.0'

Revert "Revert "Merge branch '21.0-missing-ztap-dev' into '21.0'""

See merge request !5449

Former-commit-id: 995887638d4b84610435b724d70fe5950c7b474e

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','HLT_mu26_imedium']
+monitoring_muonIso = ['HLT_mu26_ivarmedium']
 monitoring_muonIso_HI = ['']
-monitoring_muonIso_pp = ['HLT_mu26_ivarmedium','HLT_mu26_imedium']
+monitoring_muonIso_pp = ['HLT_mu26_ivarmedium']
 
 monitoring_MSonly = ['HLT_mu60_0eta105_msonly']
 monitoring_MSonly_HI = ['HLT_mu15_msonly']

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);  
+    ATH_MSG_DEBUG("Starting chain " << itmap->first << " => " << itmap->second);
 
     std::string histdirmuztp="HLT/MuonMon/MuZTP/"+itmap->second;
     double ptcut=999999.;