diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitCategory.py b/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitCategory.py index 833f45cf4ff325e90e14c0db497f024d3460aacf..3453179231bb3b5831af571d4171f276c863f24a 100644 --- a/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitCategory.py +++ b/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitCategory.py @@ -1,7 +1,7 @@ # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration monitoring_muonNonIso = ['HLT_mu50'] -monitoring_muonNonIso_HI = ['HLT_10','HLT_14'] +monitoring_muonNonIso_HI = ['HLT_mu10','HLT_mu14'] monitoring_muonNonIso_pp = ['HLT_mu50'] monitoring_muonIso = ['HLT_mu24_imedium','HLT_mu26_imedium'] @@ -12,9 +12,9 @@ monitoring_MSonly = ['HLT_mu60_0eta105_msonly'] monitoring_MSonly_HI = ['HLT_mu15_msonly'] monitoring_MSonly_pp = ['HLT_mu60_0eta105_msonly'] -monitoring_muonEFFS = ['HLT_mu18_mu8noL1'] +monitoring_muonEFFS = ['HLT_mu20_mu8noL1'] monitoring_muonEFFS_HI = ['HLT_mu4_mu4noL1'] -monitoring_muonEFFS_pp = ['HLT_mu18_mu8noL1'] +monitoring_muonEFFS_pp = ['HLT_mu20_mu8noL1'] monitoring_muon_Support = ['HLT_mu6_idperf','HLT_mu20_idperf'] monitoring_muon_Support_HI = ['HLT_noalg_L1MU4','HLT_noalg_L1MU6'] diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoring/src/CommonMon.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoring/src/CommonMon.cxx index 44a42b2287588d992b87f191da90f4f1184f5ab6..c06cb0fdae96111f3a1553e061f97b69fd856af4 100644 --- a/Trigger/TrigMonitoring/TrigMuonMonitoring/src/CommonMon.cxx +++ b/Trigger/TrigMonitoring/TrigMuonMonitoring/src/CommonMon.cxx @@ -112,6 +112,7 @@ StatusCode HLTMuonMonTool::bookCommonDQA() ATH_MSG_INFO("start booking Common histograms for newRun"); addHistogram( new TH1F("HI_PP_Flag", "HI_PP_Flag",4,0,4), m_histdir); + addHistogram( new TH1F("Monitoring_Chain", "Monitoring_Chain",20,0,20), m_histdir); addHistogram( new TH1F("Common_Counter", "Event Counter", 30, 0., 30.), m_histdir ); hist("Common_Counter", m_histdir)->GetXaxis()->SetBinLabel(EVENT+1,"Event"); hist("Common_Counter", m_histdir)->GetXaxis()->SetBinLabel(MUFAST+1,"muFast"); diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoring/src/HLTMuonMonTool.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoring/src/HLTMuonMonTool.cxx index f78563d883b54f84d3732121d5943d0c05782acc..4d00b71f234efb2bfc1b84d69d4ac0870303d2e3 100755 --- a/Trigger/TrigMonitoring/TrigMuonMonitoring/src/HLTMuonMonTool.cxx +++ b/Trigger/TrigMonitoring/TrigMuonMonitoring/src/HLTMuonMonTool.cxx @@ -739,7 +739,29 @@ StatusCode HLTMuonMonTool::fill() } hist("Common_Counter", m_histdir )->Fill((float)EVENT); if(m_HI_pp_mode)hist("HI_PP_Flag", m_histdir)->Fill(1); - + + /* + auto chainGroup = getTDT()->getChainGroup("HLT_mu.*"); + for(auto &trig : chainGroup->getListOfTriggers()) { + auto cg = getTDT()->getChainGroup(trig); + std::string thisTrig = trig; + std::cout<<"testchenyhlt chainlist "<<thisTrig.c_str()<<std::endl; + }*/ + std::vector<std::string>::const_iterator it; + int itr; + for(it=m_chainsEFiso.begin(), itr=0; it != m_chainsEFiso.end() ; it++, itr++ ){ + if(getTDT()->isPassed(*it))hist("Monitoring_Chain", m_histdir )->Fill((*it).c_str(),1); + } + for(it=m_chainsMSonly.begin(), itr=0; it != m_chainsMSonly.end() ; it++, itr++ ){ + if(getTDT()->isPassed(*it))hist("Monitoring_Chain", m_histdir )->Fill((*it).c_str(),1); + } + for(it=m_chainsEFFS.begin(), itr=0; it != m_chainsEFFS.end() ; it++, itr++ ){ + if(getTDT()->isPassed(*it))hist("Monitoring_Chain", m_histdir )->Fill((*it).c_str(),1); + } + for(it=m_chainsGeneric.begin(), itr=0; it != m_chainsGeneric.end() ; it++, itr++ ){ + if(getTDT()->isPassed(*it))hist("Monitoring_Chain", m_histdir )->Fill((*it).c_str(),1); + } + // chain StatusCode scChain; try {