diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoni.cxx similarity index 87% rename from Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx rename to Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoni.cxx index dca1c14278a365870de67d12fc04f912c15bfcfc..5beb1c1adc629d84dd35f39ef82be50b0565f5fc 100644 --- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx +++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoni.cxx @@ -10,13 +10,13 @@ #include "Gaudi/Property.h" #include "AthenaInterprocess/Incidents.h" #include "TrigCompositeUtils/HLTIdentifier.h" -#include "TrigSignatureMoniMT.h" +#include "TrigSignatureMoni.h" -TrigSignatureMoniMT::TrigSignatureMoniMT(const std::string& name, ISvcLocator* pSvcLocator) +TrigSignatureMoni::TrigSignatureMoni(const std::string& name, ISvcLocator* pSvcLocator) : base_class(name, pSvcLocator) {} -StatusCode TrigSignatureMoniMT::initialize() { +StatusCode TrigSignatureMoni::initialize() { ATH_CHECK(m_l1DecisionsKey.initialize()); ATH_CHECK(m_finalDecisionKey.initialize()); ATH_CHECK(m_HLTMenuKey.initialize()); @@ -31,7 +31,7 @@ StatusCode TrigSignatureMoniMT::initialize() { return StatusCode::SUCCESS; } -StatusCode TrigSignatureMoniMT::start() { +StatusCode TrigSignatureMoni::start() { SG::ReadHandle<TrigConf::L1Menu> l1MenuHandle = SG::makeHandle(m_L1MenuKey); SG::ReadHandle<TrigConf::HLTMenu> hltMenuHandle = SG::makeHandle(m_HLTMenuKey); ATH_CHECK(hltMenuHandle.isValid()); @@ -154,7 +154,7 @@ StatusCode TrigSignatureMoniMT::start() { return StatusCode::SUCCESS; } -StatusCode TrigSignatureMoniMT::stop() { +StatusCode TrigSignatureMoni::stop() { m_rateHistogram.stopTimer(); m_bcidHistogram.stopTimer(); m_sequenceHistogram.stopTimer(); @@ -188,7 +188,7 @@ StatusCode TrigSignatureMoniMT::stop() { if ("Step" + std::to_string(nstep) == stepName) { chainToStepsId[chain.name()].insert(nstep); } else { - ATH_MSG_INFO("Missing step" << nstep << " in chain " << chain.name()); + ATH_MSG_DEBUG("Missing counts for step" << nstep << " in chain " << chain.name()); } nstep++; } @@ -247,7 +247,7 @@ StatusCode TrigSignatureMoniMT::stop() { return StatusCode::SUCCESS; } -StatusCode TrigSignatureMoniMT::fillHistogram(const TrigCompositeUtils::DecisionIDContainer& dc, int row, LockedHandle<TH2>& histogram) const { +StatusCode TrigSignatureMoni::fillHistogram(const TrigCompositeUtils::DecisionIDContainer& dc, int row, LockedHandle<TH2>& histogram) const { for (TrigCompositeUtils::DecisionID id : dc) { auto id2bin = m_chainIDToBinMap.find( id ); if ( id2bin == m_chainIDToBinMap.end() && HLT::Identifier(id).name().find("leg") != 0 ) { @@ -259,15 +259,15 @@ StatusCode TrigSignatureMoniMT::fillHistogram(const TrigCompositeUtils::Decision return StatusCode::SUCCESS; } -StatusCode TrigSignatureMoniMT::fillRate(const TrigCompositeUtils::DecisionIDContainer& dc, int row) const { +StatusCode TrigSignatureMoni::fillRate(const TrigCompositeUtils::DecisionIDContainer& dc, int row) const { return fillHistogram(dc, row, m_rateHistogram.getBuffer()); } -StatusCode TrigSignatureMoniMT::fillPassEvents(const TrigCompositeUtils::DecisionIDContainer& dc, int row) const { +StatusCode TrigSignatureMoni::fillPassEvents(const TrigCompositeUtils::DecisionIDContainer& dc, int row) const { return fillHistogram(dc, row, m_passHistogram); } -StatusCode TrigSignatureMoniMT::fillDecisionCount(const std::vector<TrigCompositeUtils::DecisionID>& dc, int row) const { +StatusCode TrigSignatureMoni::fillDecisionCount(const std::vector<TrigCompositeUtils::DecisionID>& dc, int row) const { for (TrigCompositeUtils::DecisionID id : dc) { TrigCompositeUtils::DecisionID chain = id; if (TrigCompositeUtils::isLegId(HLT::Identifier(id)) ) chain = TrigCompositeUtils::getIDFromLeg(id); @@ -283,7 +283,7 @@ StatusCode TrigSignatureMoniMT::fillDecisionCount(const std::vector<TrigComposit } -StatusCode TrigSignatureMoniMT::fillBunchGroups(const TrigCompositeUtils::DecisionIDContainer& dc ) const { +StatusCode TrigSignatureMoni::fillBunchGroups(const TrigCompositeUtils::DecisionIDContainer& dc ) const { for (TrigCompositeUtils::DecisionID id : dc) { auto id2bin = m_chainIDToBinMap.find(id); auto bunchGroups = m_chainIDToBunchMap.find(id); @@ -297,7 +297,7 @@ StatusCode TrigSignatureMoniMT::fillBunchGroups(const TrigCompositeUtils::Decisi return StatusCode::SUCCESS; } -StatusCode TrigSignatureMoniMT::fillBCID(const TrigCompositeUtils::DecisionIDContainer& dc , int bcid) const { +StatusCode TrigSignatureMoni::fillBCID(const TrigCompositeUtils::DecisionIDContainer& dc , int bcid) const { if (nBCIDchains() > 0){ for (TrigCompositeUtils::DecisionID id : dc) { auto id2bin = m_BCIDchainIDToBinMap.find(id); @@ -309,7 +309,7 @@ StatusCode TrigSignatureMoniMT::fillBCID(const TrigCompositeUtils::DecisionIDCon return StatusCode::SUCCESS; } -StatusCode TrigSignatureMoniMT::fillSequences(const std::set<std::string>& sequences) const { +StatusCode TrigSignatureMoni::fillSequences(const std::set<std::string>& sequences) const { for (const std::string& seq : sequences) { m_sequenceHistogram.fill(m_sequenceToBinMap.at(seq), 1); } @@ -317,7 +317,7 @@ StatusCode TrigSignatureMoniMT::fillSequences(const std::set<std::string>& seque return StatusCode::SUCCESS; } -StatusCode TrigSignatureMoniMT::fillStreamsAndGroups(const std::map<std::string, TrigCompositeUtils::DecisionIDContainer>& nameToChainsMap, const TrigCompositeUtils::DecisionIDContainer& dc) const { +StatusCode TrigSignatureMoni::fillStreamsAndGroups(const std::map<std::string, TrigCompositeUtils::DecisionIDContainer>& nameToChainsMap, const TrigCompositeUtils::DecisionIDContainer& dc) const { // Fill just the last row of the histograms const double row = nSteps(); const double rateRow = nBaseSteps(); @@ -335,7 +335,7 @@ StatusCode TrigSignatureMoniMT::fillStreamsAndGroups(const std::map<std::string, return StatusCode::SUCCESS; } -void TrigSignatureMoniMT::handle( const Incident& incident ) { +void TrigSignatureMoni::handle( const Incident& incident ) { // Create and start timer after fork if (incident.type() == AthenaInterprocess::UpdateAfterFork::type()) { if (m_rateHistogram.getTimer() || m_sequenceHistogram.getTimer() || m_bcidHistogram.getTimer()) { @@ -360,7 +360,7 @@ void TrigSignatureMoniMT::handle( const Incident& incident ) { } } -StatusCode TrigSignatureMoniMT::execute( const EventContext& context ) const { +StatusCode TrigSignatureMoni::execute( const EventContext& context ) const { SG::ReadHandle<TrigCompositeUtils::DecisionContainer> l1Decisions = SG::makeHandle(m_l1DecisionsKey, context); @@ -449,43 +449,43 @@ StatusCode TrigSignatureMoniMT::execute( const EventContext& context ) const { return StatusCode::SUCCESS; } -int TrigSignatureMoniMT::nBinsX(SG::ReadHandle<TrigConf::HLTMenu>& hltMenuHandle) const { +int TrigSignatureMoni::nBinsX(SG::ReadHandle<TrigConf::HLTMenu>& hltMenuHandle) const { return nChains(hltMenuHandle) + m_groupToChainMap.size() + m_streamToChainMap.size(); } -int TrigSignatureMoniMT::nBinsX() const { +int TrigSignatureMoni::nBinsX() const { return m_chainIDToBinMap.size() + m_groupToChainMap.size() + m_streamToChainMap.size() + 1; } -int TrigSignatureMoniMT::nChains(SG::ReadHandle<TrigConf::HLTMenu>& hltMenuHandle) const { +int TrigSignatureMoni::nChains(SG::ReadHandle<TrigConf::HLTMenu>& hltMenuHandle) const { return hltMenuHandle->size() + 1; // Chains + "All" } -int TrigSignatureMoniMT::nBCIDs() const { +int TrigSignatureMoni::nBCIDs() const { return m_bcidNumber + 1; } -int TrigSignatureMoniMT::nSequenceBins() const { +int TrigSignatureMoni::nSequenceBins() const { return m_sequenceToBinMap.size(); } -int TrigSignatureMoniMT::nSteps() const { +int TrigSignatureMoni::nSteps() const { return m_decisionCollectorTools.size() + nBaseSteps(); } -int TrigSignatureMoniMT::nBaseSteps() const { +int TrigSignatureMoni::nBaseSteps() const { return 3; // in, after ps, out } -int TrigSignatureMoniMT::nBCIDchains() const { +int TrigSignatureMoni::nBCIDchains() const { return m_BCIDchainIDToBinMap.size(); } -int TrigSignatureMoniMT::nBunchGroups(SG::ReadHandle<TrigConf::L1Menu>& l1MenuHandle) const { +int TrigSignatureMoni::nBunchGroups(SG::ReadHandle<TrigConf::L1Menu>& l1MenuHandle) const { return l1MenuHandle.isValid() ? (l1MenuHandle->getObject("bunchGroups").getKeys().size() - 1) : 16; } -StatusCode TrigSignatureMoniMT::initHist(LockedHandle<TH2>& hist, SG::ReadHandle<TrigConf::HLTMenu>& hltMenuHandle, bool steps) { +StatusCode TrigSignatureMoni::initHist(LockedHandle<TH2>& hist, SG::ReadHandle<TrigConf::HLTMenu>& hltMenuHandle, bool steps) { TAxis* x = hist->GetXaxis(); x->SetBinLabel(1, "All"); int bin = 2; // 1 is for total count, (remember bins numbering in ROOT start from 1) @@ -527,7 +527,7 @@ StatusCode TrigSignatureMoniMT::initHist(LockedHandle<TH2>& hist, SG::ReadHandle return StatusCode::SUCCESS; } -StatusCode TrigSignatureMoniMT::initSeqHist(LockedHandle<TH2>& hist, std::set<std::string>& sequenceSet) { +StatusCode TrigSignatureMoni::initSeqHist(LockedHandle<TH2>& hist, std::set<std::string>& sequenceSet) { TAxis* x = hist->GetXaxis(); int bin = 1; @@ -544,7 +544,7 @@ StatusCode TrigSignatureMoniMT::initSeqHist(LockedHandle<TH2>& hist, std::set<st return StatusCode::SUCCESS; } -StatusCode TrigSignatureMoniMT::initBCIDhist(LockedHandle<TH2>& hist, const std::vector<std::string>& chainNames){ +StatusCode TrigSignatureMoni::initBCIDhist(LockedHandle<TH2>& hist, const std::vector<std::string>& chainNames){ std::vector<std::string> sortedChainNames(chainNames); std::sort( sortedChainNames.begin(), sortedChainNames.end() ); @@ -560,7 +560,7 @@ StatusCode TrigSignatureMoniMT::initBCIDhist(LockedHandle<TH2>& hist, const std: return StatusCode::SUCCESS; } -StatusCode TrigSignatureMoniMT::initBunchHist(LockedHandle<TH2>& hist, SG::ReadHandle<TrigConf::HLTMenu>& hltMenuHandle, SG::ReadHandle<TrigConf::L1Menu>& l1MenuHandle) { +StatusCode TrigSignatureMoni::initBunchHist(LockedHandle<TH2>& hist, SG::ReadHandle<TrigConf::HLTMenu>& hltMenuHandle, SG::ReadHandle<TrigConf::L1Menu>& l1MenuHandle) { bool gotL1Menu = l1MenuHandle.isValid() && l1MenuHandle->isInitialized(); @@ -602,11 +602,11 @@ StatusCode TrigSignatureMoniMT::initBunchHist(LockedHandle<TH2>& hist, SG::ReadH return StatusCode::SUCCESS; } -TrigSignatureMoniMT::RateHistogram::~RateHistogram(){ +TrigSignatureMoni::RateHistogram::~RateHistogram(){ delete m_bufferHistogram.get(); } -StatusCode TrigSignatureMoniMT::RateHistogram::init( const std::string& histoName, const std::string& histoTitle, +StatusCode TrigSignatureMoni::RateHistogram::init( const std::string& histoName, const std::string& histoTitle, const int x, const int y, const std::string& registerPath, ServiceHandle<ITHistSvc> histSvc ){ std::unique_ptr<TH2> h = std::make_unique<TH2F>(histoName.c_str(), histoTitle.c_str(), x, 1, x + 1, y, 1, y + 1); ATH_CHECK( histSvc->regShared( registerPath.c_str(), std::move(h), m_histogram)); @@ -618,29 +618,29 @@ StatusCode TrigSignatureMoniMT::RateHistogram::init( const std::string& histoNam return StatusCode::SUCCESS; } -LockedHandle<TH2> & TrigSignatureMoniMT::RateHistogram::getHistogram() const { +LockedHandle<TH2> & TrigSignatureMoni::RateHistogram::getHistogram() const { return m_histogram; } -LockedHandle<TH2> & TrigSignatureMoniMT::RateHistogram::getBuffer() const { +LockedHandle<TH2> & TrigSignatureMoni::RateHistogram::getBuffer() const { return m_bufferHistogram; } -std::unique_ptr<Athena::AlgorithmTimer> & TrigSignatureMoniMT::RateHistogram::getTimer() { +std::unique_ptr<Athena::AlgorithmTimer> & TrigSignatureMoni::RateHistogram::getTimer() { return m_timer; } -void TrigSignatureMoniMT::RateHistogram::fill(const double x, const double y) const { +void TrigSignatureMoni::RateHistogram::fill(const double x, const double y) const { m_bufferHistogram->Fill(x, y); } -void TrigSignatureMoniMT::RateHistogram::startTimer(unsigned int duration, unsigned int intervals) { +void TrigSignatureMoni::RateHistogram::startTimer(unsigned int duration, unsigned int intervals) { m_duration = duration; m_timeDivider = std::make_unique<TimeDivider>(intervals, duration, TimeDivider::seconds); m_timer = std::make_unique<Athena::AlgorithmTimer>(duration*50, boost::bind(&RateHistogram::callback, this), Athena::AlgorithmTimer::DELIVERYBYTHREAD); } -void TrigSignatureMoniMT::RateHistogram::stopTimer() { +void TrigSignatureMoni::RateHistogram::stopTimer() { if (m_timer) { m_timer.reset(); time_t t = time(0); @@ -651,14 +651,14 @@ void TrigSignatureMoniMT::RateHistogram::stopTimer() { } -void TrigSignatureMoniMT::RateHistogram::updatePublished(unsigned int duration) const { +void TrigSignatureMoni::RateHistogram::updatePublished(unsigned int duration) const { m_histogram->Reset("ICES"); m_histogram->Add(m_bufferHistogram.get(), 1./duration); m_bufferHistogram->Reset("ICES"); } -void TrigSignatureMoniMT::RateHistogram::callback() const { +void TrigSignatureMoni::RateHistogram::callback() const { // Ask time divider if we need to switch to new interval time_t t = time(0); unsigned int newinterval; diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.h b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoni.h similarity index 95% rename from Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.h rename to Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoni.h index fa1ff9fad0adb5ea1bb70a1f2568b6036cdccd6f..786ec831eb3c88e7b60489a06a63d974fcaae50c 100644 --- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.h +++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoni.h @@ -1,8 +1,8 @@ /* Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#ifndef TRIGSTEERMONITOR_TRIGSIGNATUREMONIMT_H -#define TRIGSTEERMONITOR_TRIGSIGNATUREMONIMT_H 1 +#ifndef TRIGSTEERMONITOR_TRIGSIGNATUREMONI_H +#define TRIGSTEERMONITOR_TRIGSIGNATUREMONI_H 1 #include <string> #include <mutex> @@ -32,11 +32,11 @@ class IIncidentSvc; * @class TrigSignatureMoniMT * @brief Algorithm implementing monitoring of the HLT decision in the MT framework **/ -class TrigSignatureMoniMT : public extends<AthReentrantAlgorithm, IIncidentListener> +class TrigSignatureMoni : public extends<AthReentrantAlgorithm, IIncidentListener> { public: - TrigSignatureMoniMT( const std::string& name, ISvcLocator* pSvcLocator ); + TrigSignatureMoni( const std::string& name, ISvcLocator* pSvcLocator ); virtual StatusCode initialize() override; virtual StatusCode start() override; @@ -165,4 +165,4 @@ class TrigSignatureMoniMT : public extends<AthReentrantAlgorithm, IIncidentListe StatusCode fillStreamsAndGroups(const std::map<std::string, TrigCompositeUtils::DecisionIDContainer>&, const TrigCompositeUtils::DecisionIDContainer&) const; }; -#endif //> !TRIGSTEERMONITOR_TRIGSIGNATUREMONIMT_H +#endif //> !TRIGSTEERMONITOR_TRIGSIGNATUREMONI_H diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/components/TrigSteerMonitor_entries.cxx b/Trigger/TrigMonitoring/TrigSteerMonitor/src/components/TrigSteerMonitor_entries.cxx index f3feaf1b8b59f069b1235b5337419f289b4a9211..f85302286cbc8718cd7e29e10603ab88311d6cae 100644 --- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/components/TrigSteerMonitor_entries.cxx +++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/components/TrigSteerMonitor_entries.cxx @@ -1,9 +1,9 @@ -#include "../TrigSignatureMoniMT.h" +#include "../TrigSignatureMoni.h" #include "../DecisionCollectorTool.h" #include "../SchedulerMonSvc.h" #include "../TrigErrorMonTool.h" -DECLARE_COMPONENT( TrigSignatureMoniMT ) +DECLARE_COMPONENT( TrigSignatureMoni ) DECLARE_COMPONENT( DecisionCollectorTool ) DECLARE_COMPONENT( SchedulerMonSvc ) DECLARE_COMPONENT( TrigErrorMonTool ) diff --git a/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt b/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt index df1e4db654b140bdc1f0c3d7bc3595f5fd30dca1..feda1c938e7074208940fbc6fce62a8dc900a201 100644 --- a/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt +++ b/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt @@ -43,7 +43,7 @@ foreach(test emu_step_processing emu_step_menu_processing) file( MAKE_DIRECTORY ${rundir} ) atlas_add_test( ${test} SCRIPT test/test_${test}.sh - LOG_SELECT_PATTERN "TrigSignatureMoniMT.*INFO HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*|TriggerSummaryStep.* chains passed:|TriggerSummaryStep.*+++ HLT_.*|TriggerSummaryStep.*+++ leg.*" + LOG_SELECT_PATTERN "TrigSignatureMoni.*INFO HLT_.*|TrigSignatureMoni.*-- #[0-9]+ (Events|Features).*|TriggerSummaryStep.* chains passed:|TriggerSummaryStep.*+++ HLT_.*|TriggerSummaryStep.*+++ leg.*" PROPERTIES WORKING_DIRECTORY ${rundir} ) endforeach() diff --git a/Trigger/TrigSteer/DecisionHandling/share/emu_step_menu_processing.ref b/Trigger/TrigSteer/DecisionHandling/share/emu_step_menu_processing.ref index 2a3a06e754a2b732b783a52bc24f7f787838d97a..6c67387d2dfc189483d2b48eb1eb0795c785bf09 100644 --- a/Trigger/TrigSteer/DecisionHandling/share/emu_step_menu_processing.ref +++ b/Trigger/TrigSteer/DecisionHandling/share/emu_step_menu_processing.ref @@ -109,63 +109,63 @@ TriggerSummaryStep3 3 0 DEBUG +++ leg0 TriggerSummaryStep4 3 0 DEBUG In summary 2 chains passed: TriggerSummaryStep4 3 0 DEBUG +++ HLT_TestChain20_muv1_L1MU10 ID#356594709 TriggerSummaryStep4 3 0 DEBUG +++ HLT_TestChain8_muv1_L1MU10 ID#2288364952 -TrigSignatureMoniMT INFO HLT_2TestChain4_muv1dr_L12MU6 #3176095517 -TrigSignatureMoniMT INFO -- #3176095517 Events 0 0 0 0 0 0 0 -TrigSignatureMoniMT INFO -- #3176095517 Features 0 0 0 0 -TrigSignatureMoniMT INFO HLT_2TestChain6_muEmpty1_L12MU6 #2176116418 -TrigSignatureMoniMT INFO -- #2176116418 Events 1 1 - 1 - - 1 -TrigSignatureMoniMT INFO -- #2176116418 Features - 3 - - -TrigSignatureMoniMT INFO HLT_2TestChain6_muv1_L12MU6 #1408409992 -TrigSignatureMoniMT INFO -- #1408409992 Events 2 2 1 1 1 1 1 -TrigSignatureMoniMT INFO -- #1408409992 Features 3 3 3 3 -TrigSignatureMoniMT INFO HLT_3TestChain6_muv1_L12MU6 #2217088100 -TrigSignatureMoniMT INFO -- #2217088100 Events 0 0 0 0 0 0 0 -TrigSignatureMoniMT INFO -- #2217088100 Features 0 0 0 0 -TrigSignatureMoniMT INFO HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 #2764921170 -TrigSignatureMoniMT INFO -- #2764921170 Events 1 1 - 1 - - 1 -TrigSignatureMoniMT INFO -- #2764921170 Features - 4 - - -TrigSignatureMoniMT INFO HLT_TestChain10_muv2_L1MU10 #3482819675 -TrigSignatureMoniMT INFO -- #3482819675 Events 2 2 1 0 0 - 0 -TrigSignatureMoniMT INFO -- #3482819675 Features 1 0 0 - -TrigSignatureMoniMT INFO HLT_TestChain20_muv1_L1MU10 #356594709 -TrigSignatureMoniMT INFO -- #356594709 Events 1 1 1 1 1 1 1 -TrigSignatureMoniMT INFO -- #356594709 Features 1 1 1 1 -TrigSignatureMoniMT INFO HLT_TestChain5_ev1_L1EM3 #1756953305 -TrigSignatureMoniMT INFO -- #1756953305 Events 3 3 2 2 2 - 2 -TrigSignatureMoniMT INFO -- #1756953305 Features 4 4 4 - -TrigSignatureMoniMT INFO HLT_TestChain5_ev1_TestChain8_ev1_L12EM3 #2709794009 -TrigSignatureMoniMT INFO -- #2709794009 Events 1 1 1 1 1 - 1 -TrigSignatureMoniMT INFO -- #2709794009 Features 4 4 4 - -TrigSignatureMoniMT INFO HLT_TestChain5_ev2_L1EM7 #1760405581 -TrigSignatureMoniMT INFO -- #1760405581 Events 0 0 0 0 - - 0 -TrigSignatureMoniMT INFO -- #1760405581 Features 0 0 - - -TrigSignatureMoniMT INFO HLT_TestChain5_ev3_L1EM7 #2336588294 -TrigSignatureMoniMT INFO -- #2336588294 Events 1 1 1 1 - - 1 -TrigSignatureMoniMT INFO -- #2336588294 Features 2 2 - - -TrigSignatureMoniMT INFO HLT_TestChain5_gv1_L1EM7 #3893303900 -TrigSignatureMoniMT INFO -- #3893303900 Events 1 1 1 - - - 1 -TrigSignatureMoniMT INFO -- #3893303900 Features 2 - - - -TrigSignatureMoniMT INFO HLT_TestChain6_muEmpty2_L1MU6 #2511524900 -TrigSignatureMoniMT INFO -- #2511524900 Events 1 1 1 - 1 1 1 -TrigSignatureMoniMT INFO -- #2511524900 Features 3 - 3 3 -TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 #64374772 -TrigSignatureMoniMT INFO -- #64374772 Events 2 2 1 1 1 1 1 -TrigSignatureMoniMT INFO -- #64374772 Features 6 5 5 3 -TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 #3196402061 -TrigSignatureMoniMT INFO -- #3196402061 Events 2 2 1 0 0 0 0 -TrigSignatureMoniMT INFO -- #3196402061 Features 4 3 0 0 -TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain5_ev1dr_L1MU6_EM5 #1237112870 -TrigSignatureMoniMT INFO -- #1237112870 Events 0 0 0 0 0 0 0 -TrigSignatureMoniMT INFO -- #1237112870 Features 0 0 0 0 -TrigSignatureMoniMT INFO HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 #3476793373 -TrigSignatureMoniMT INFO -- #3476793373 Events 2 2 2 2 2 - 2 -TrigSignatureMoniMT INFO -- #3476793373 Features 7 7 4 - -TrigSignatureMoniMT INFO HLT_TestChain8_ev1_L1EM5 #1677577445 -TrigSignatureMoniMT INFO -- #1677577445 Events 4 4 3 3 3 - 3 -TrigSignatureMoniMT INFO -- #1677577445 Features 4 4 4 - -TrigSignatureMoniMT INFO HLT_TestChain8_muv1_L1MU10 #2288364952 -TrigSignatureMoniMT INFO -- #2288364952 Events 2 2 2 1 1 1 1 -TrigSignatureMoniMT INFO -- #2288364952 Features 2 1 1 1 -TrigSignatureMoniMT INFO HLT_TestChain8_muv1step_L1MU6 #3588359947 -TrigSignatureMoniMT INFO -- #3588359947 Events 2 2 2 - - - 2 -TrigSignatureMoniMT INFO -- #3588359947 Features 3 - - - +TrigSignatureMoni INFO HLT_2TestChain4_muv1dr_L12MU6 #3176095517 +TrigSignatureMoni INFO -- #3176095517 Events 0 0 0 0 0 0 0 +TrigSignatureMoni INFO -- #3176095517 Features 0 0 0 0 +TrigSignatureMoni INFO HLT_2TestChain6_muEmpty1_L12MU6 #2176116418 +TrigSignatureMoni INFO -- #2176116418 Events 1 1 - 1 - - 1 +TrigSignatureMoni INFO -- #2176116418 Features - 3 - - +TrigSignatureMoni INFO HLT_2TestChain6_muv1_L12MU6 #1408409992 +TrigSignatureMoni INFO -- #1408409992 Events 2 2 1 1 1 1 1 +TrigSignatureMoni INFO -- #1408409992 Features 3 3 3 3 +TrigSignatureMoni INFO HLT_3TestChain6_muv1_L12MU6 #2217088100 +TrigSignatureMoni INFO -- #2217088100 Events 0 0 0 0 0 0 0 +TrigSignatureMoni INFO -- #2217088100 Features 0 0 0 0 +TrigSignatureMoni INFO HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 #2764921170 +TrigSignatureMoni INFO -- #2764921170 Events 1 1 - 1 - - 1 +TrigSignatureMoni INFO -- #2764921170 Features - 4 - - +TrigSignatureMoni INFO HLT_TestChain10_muv2_L1MU10 #3482819675 +TrigSignatureMoni INFO -- #3482819675 Events 2 2 1 0 0 - 0 +TrigSignatureMoni INFO -- #3482819675 Features 1 0 0 - +TrigSignatureMoni INFO HLT_TestChain20_muv1_L1MU10 #356594709 +TrigSignatureMoni INFO -- #356594709 Events 1 1 1 1 1 1 1 +TrigSignatureMoni INFO -- #356594709 Features 1 1 1 1 +TrigSignatureMoni INFO HLT_TestChain5_ev1_L1EM3 #1756953305 +TrigSignatureMoni INFO -- #1756953305 Events 3 3 2 2 2 - 2 +TrigSignatureMoni INFO -- #1756953305 Features 4 4 4 - +TrigSignatureMoni INFO HLT_TestChain5_ev1_TestChain8_ev1_L12EM3 #2709794009 +TrigSignatureMoni INFO -- #2709794009 Events 1 1 1 1 1 - 1 +TrigSignatureMoni INFO -- #2709794009 Features 4 4 4 - +TrigSignatureMoni INFO HLT_TestChain5_ev2_L1EM7 #1760405581 +TrigSignatureMoni INFO -- #1760405581 Events 0 0 0 0 - - 0 +TrigSignatureMoni INFO -- #1760405581 Features 0 0 - - +TrigSignatureMoni INFO HLT_TestChain5_ev3_L1EM7 #2336588294 +TrigSignatureMoni INFO -- #2336588294 Events 1 1 1 1 - - 1 +TrigSignatureMoni INFO -- #2336588294 Features 2 2 - - +TrigSignatureMoni INFO HLT_TestChain5_gv1_L1EM7 #3893303900 +TrigSignatureMoni INFO -- #3893303900 Events 1 1 1 - - - 1 +TrigSignatureMoni INFO -- #3893303900 Features 2 - - - +TrigSignatureMoni INFO HLT_TestChain6_muEmpty2_L1MU6 #2511524900 +TrigSignatureMoni INFO -- #2511524900 Events 1 1 1 - 1 1 1 +TrigSignatureMoni INFO -- #2511524900 Features 3 - 3 3 +TrigSignatureMoni INFO HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 #64374772 +TrigSignatureMoni INFO -- #64374772 Events 2 2 1 1 1 1 1 +TrigSignatureMoni INFO -- #64374772 Features 6 5 5 3 +TrigSignatureMoni INFO HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 #3196402061 +TrigSignatureMoni INFO -- #3196402061 Events 2 2 1 0 0 0 0 +TrigSignatureMoni INFO -- #3196402061 Features 4 3 0 0 +TrigSignatureMoni INFO HLT_TestChain6_muv1_TestChain5_ev1dr_L1MU6_EM5 #1237112870 +TrigSignatureMoni INFO -- #1237112870 Events 0 0 0 0 0 0 0 +TrigSignatureMoni INFO -- #1237112870 Features 0 0 0 0 +TrigSignatureMoni INFO HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 #3476793373 +TrigSignatureMoni INFO -- #3476793373 Events 2 2 2 2 2 - 2 +TrigSignatureMoni INFO -- #3476793373 Features 7 7 4 - +TrigSignatureMoni INFO HLT_TestChain8_ev1_L1EM5 #1677577445 +TrigSignatureMoni INFO -- #1677577445 Events 4 4 3 3 3 - 3 +TrigSignatureMoni INFO -- #1677577445 Features 4 4 4 - +TrigSignatureMoni INFO HLT_TestChain8_muv1_L1MU10 #2288364952 +TrigSignatureMoni INFO -- #2288364952 Events 2 2 2 1 1 1 1 +TrigSignatureMoni INFO -- #2288364952 Features 2 1 1 1 +TrigSignatureMoni INFO HLT_TestChain8_muv1step_L1MU6 #3588359947 +TrigSignatureMoni INFO -- #3588359947 Events 2 2 2 - - - 2 +TrigSignatureMoni INFO -- #3588359947 Features 3 - - - diff --git a/Trigger/TrigSteer/DecisionHandling/share/emu_step_processing.ref b/Trigger/TrigSteer/DecisionHandling/share/emu_step_processing.ref index a1ce972a20d162c68ba94adaac34e2800a27d463..29d871177bbe8798b61f9d8add6c33b63a27c508 100644 --- a/Trigger/TrigSteer/DecisionHandling/share/emu_step_processing.ref +++ b/Trigger/TrigSteer/DecisionHandling/share/emu_step_processing.ref @@ -108,66 +108,66 @@ TriggerSummaryStep3 3 0 DEBUG +++ HLT_ TriggerSummaryStep4 3 0 DEBUG In summary 2 chains passed: TriggerSummaryStep4 3 0 DEBUG +++ HLT_TestChain20_muv1_L1MU10 ID#356594709 TriggerSummaryStep4 3 0 DEBUG +++ HLT_TestChain8_muv1_L1MU10 ID#2288364952 -TrigSignatureMoniMT INFO HLT_2TestChain4_muv1dr_L12MU6 #3176095517 -TrigSignatureMoniMT INFO -- #3176095517 Events 0 0 0 0 - - 0 -TrigSignatureMoniMT INFO -- #3176095517 Features 0 0 - - -TrigSignatureMoniMT INFO HLT_2TestChain6_muEmpty1_L12MU6 #2176116418 -TrigSignatureMoniMT INFO -- #2176116418 Events 1 1 - 1 - - 1 -TrigSignatureMoniMT INFO -- #2176116418 Features - 3 - - -TrigSignatureMoniMT INFO HLT_2TestChain6_muv1_L12MU6 #1408409992 -TrigSignatureMoniMT INFO -- #1408409992 Events 2 2 1 1 - - 1 -TrigSignatureMoniMT INFO -- #1408409992 Features 3 3 - - -TrigSignatureMoniMT INFO HLT_3TestChain6_muv1_L12MU6 #2217088100 -TrigSignatureMoniMT INFO -- #2217088100 Events 0 0 0 0 - - 0 -TrigSignatureMoniMT INFO -- #2217088100 Features 0 0 - - -TrigSignatureMoniMT INFO HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 #2764921170 -TrigSignatureMoniMT INFO -- #2764921170 Events 1 1 - 1 - - 1 -TrigSignatureMoniMT INFO -- #2764921170 Features - 4 - - -TrigSignatureMoniMT INFO HLT_TestChain10_muv2_L1MU10 #3482819675 -TrigSignatureMoniMT INFO -- #3482819675 Events 2 2 1 0 0 - 0 -TrigSignatureMoniMT INFO -- #3482819675 Features 1 0 0 - -TrigSignatureMoniMT INFO HLT_TestChain20_muv1_L1MU10 #356594709 -TrigSignatureMoniMT INFO -- #356594709 Events 1 1 1 1 1 1 1 -TrigSignatureMoniMT INFO -- #356594709 Features 1 1 1 1 -TrigSignatureMoniMT INFO HLT_TestChain5_ev1_L1EM3 #1756953305 -TrigSignatureMoniMT INFO -- #1756953305 Events 3 3 2 2 2 - 2 -TrigSignatureMoniMT INFO -- #1756953305 Features 4 4 4 - -TrigSignatureMoniMT INFO HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 #1820214917 -TrigSignatureMoniMT INFO -- #1820214917 Events 1 1 1 1 - - 1 -TrigSignatureMoniMT INFO -- #1820214917 Features 7 7 - - -TrigSignatureMoniMT INFO HLT_TestChain5_ev1_TestChain8_ev1_L12EM3 #2709794009 -TrigSignatureMoniMT INFO -- #2709794009 Events 1 1 1 1 - - 1 -TrigSignatureMoniMT INFO -- #2709794009 Features 4 4 - - -TrigSignatureMoniMT INFO HLT_TestChain5_ev2_L1EM7 #1760405581 -TrigSignatureMoniMT INFO -- #1760405581 Events 0 0 0 0 - - 0 -TrigSignatureMoniMT INFO -- #1760405581 Features 0 0 - - -TrigSignatureMoniMT INFO HLT_TestChain5_ev3_L1EM7 #2336588294 -TrigSignatureMoniMT INFO -- #2336588294 Events 1 1 1 1 - - 1 -TrigSignatureMoniMT INFO -- #2336588294 Features 2 2 - - -TrigSignatureMoniMT INFO HLT_TestChain5_gv1_L1EM7 #3893303900 -TrigSignatureMoniMT INFO -- #3893303900 Events 1 1 1 - - - 1 -TrigSignatureMoniMT INFO -- #3893303900 Features 2 - - - -TrigSignatureMoniMT INFO HLT_TestChain6_muEmpty2_L1MU6 #2511524900 -TrigSignatureMoniMT INFO -- #2511524900 Events 1 1 1 - 1 1 1 -TrigSignatureMoniMT INFO -- #2511524900 Features 3 - 3 3 -TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 #64374772 -TrigSignatureMoniMT INFO -- #64374772 Events 2 2 2 1 - 1 1 -TrigSignatureMoniMT INFO -- #64374772 Features 4 2 - 5 -TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 #3196402061 -TrigSignatureMoniMT INFO -- #3196402061 Events 2 2 1 0 - - 0 -TrigSignatureMoniMT INFO -- #3196402061 Features 4 3 - - -TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain5_ev1dr_L12MU6 #3205587050 -TrigSignatureMoniMT INFO -- #3205587050 Events 0 0 0 0 - - 0 -TrigSignatureMoniMT INFO -- #3205587050 Features 0 0 - - -TrigSignatureMoniMT INFO HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 #3476793373 -TrigSignatureMoniMT INFO -- #3476793373 Events 2 2 2 2 - - 2 -TrigSignatureMoniMT INFO -- #3476793373 Features 7 7 - - -TrigSignatureMoniMT INFO HLT_TestChain8_ev1_L1EM5 #1677577445 -TrigSignatureMoniMT INFO -- #1677577445 Events 4 4 3 3 3 - 3 -TrigSignatureMoniMT INFO -- #1677577445 Features 4 4 4 - -TrigSignatureMoniMT INFO HLT_TestChain8_muv1_L1MU10 #2288364952 -TrigSignatureMoniMT INFO -- #2288364952 Events 2 2 2 1 1 1 1 -TrigSignatureMoniMT INFO -- #2288364952 Features 2 1 1 1 -TrigSignatureMoniMT INFO HLT_TestChain8_muv1step_L1MU6 #3588359947 -TrigSignatureMoniMT INFO -- #3588359947 Events 2 2 2 - - - 2 -TrigSignatureMoniMT INFO -- #3588359947 Features 3 - - - +TrigSignatureMoni INFO HLT_2TestChain4_muv1dr_L12MU6 #3176095517 +TrigSignatureMoni INFO -- #3176095517 Events 0 0 0 0 - - 0 +TrigSignatureMoni INFO -- #3176095517 Features 0 0 - - +TrigSignatureMoni INFO HLT_2TestChain6_muEmpty1_L12MU6 #2176116418 +TrigSignatureMoni INFO -- #2176116418 Events 1 1 - 1 - - 1 +TrigSignatureMoni INFO -- #2176116418 Features - 3 - - +TrigSignatureMoni INFO HLT_2TestChain6_muv1_L12MU6 #1408409992 +TrigSignatureMoni INFO -- #1408409992 Events 2 2 1 1 - - 1 +TrigSignatureMoni INFO -- #1408409992 Features 3 3 - - +TrigSignatureMoni INFO HLT_3TestChain6_muv1_L12MU6 #2217088100 +TrigSignatureMoni INFO -- #2217088100 Events 0 0 0 0 - - 0 +TrigSignatureMoni INFO -- #2217088100 Features 0 0 - - +TrigSignatureMoni INFO HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 #2764921170 +TrigSignatureMoni INFO -- #2764921170 Events 1 1 - 1 - - 1 +TrigSignatureMoni INFO -- #2764921170 Features - 4 - - +TrigSignatureMoni INFO HLT_TestChain10_muv2_L1MU10 #3482819675 +TrigSignatureMoni INFO -- #3482819675 Events 2 2 1 0 0 - 0 +TrigSignatureMoni INFO -- #3482819675 Features 1 0 0 - +TrigSignatureMoni INFO HLT_TestChain20_muv1_L1MU10 #356594709 +TrigSignatureMoni INFO -- #356594709 Events 1 1 1 1 1 1 1 +TrigSignatureMoni INFO -- #356594709 Features 1 1 1 1 +TrigSignatureMoni INFO HLT_TestChain5_ev1_L1EM3 #1756953305 +TrigSignatureMoni INFO -- #1756953305 Events 3 3 2 2 2 - 2 +TrigSignatureMoni INFO -- #1756953305 Features 4 4 4 - +TrigSignatureMoni INFO HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 #1820214917 +TrigSignatureMoni INFO -- #1820214917 Events 1 1 1 1 - - 1 +TrigSignatureMoni INFO -- #1820214917 Features 7 7 - - +TrigSignatureMoni INFO HLT_TestChain5_ev1_TestChain8_ev1_L12EM3 #2709794009 +TrigSignatureMoni INFO -- #2709794009 Events 1 1 1 1 - - 1 +TrigSignatureMoni INFO -- #2709794009 Features 4 4 - - +TrigSignatureMoni INFO HLT_TestChain5_ev2_L1EM7 #1760405581 +TrigSignatureMoni INFO -- #1760405581 Events 0 0 0 0 - - 0 +TrigSignatureMoni INFO -- #1760405581 Features 0 0 - - +TrigSignatureMoni INFO HLT_TestChain5_ev3_L1EM7 #2336588294 +TrigSignatureMoni INFO -- #2336588294 Events 1 1 1 1 - - 1 +TrigSignatureMoni INFO -- #2336588294 Features 2 2 - - +TrigSignatureMoni INFO HLT_TestChain5_gv1_L1EM7 #3893303900 +TrigSignatureMoni INFO -- #3893303900 Events 1 1 1 - - - 1 +TrigSignatureMoni INFO -- #3893303900 Features 2 - - - +TrigSignatureMoni INFO HLT_TestChain6_muEmpty2_L1MU6 #2511524900 +TrigSignatureMoni INFO -- #2511524900 Events 1 1 1 - 1 1 1 +TrigSignatureMoni INFO -- #2511524900 Features 3 - 3 3 +TrigSignatureMoni INFO HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 #64374772 +TrigSignatureMoni INFO -- #64374772 Events 2 2 2 1 - 1 1 +TrigSignatureMoni INFO -- #64374772 Features 4 2 - 5 +TrigSignatureMoni INFO HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 #3196402061 +TrigSignatureMoni INFO -- #3196402061 Events 2 2 1 0 - - 0 +TrigSignatureMoni INFO -- #3196402061 Features 4 3 - - +TrigSignatureMoni INFO HLT_TestChain6_muv1_TestChain5_ev1dr_L12MU6 #3205587050 +TrigSignatureMoni INFO -- #3205587050 Events 0 0 0 0 - - 0 +TrigSignatureMoni INFO -- #3205587050 Features 0 0 - - +TrigSignatureMoni INFO HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 #3476793373 +TrigSignatureMoni INFO -- #3476793373 Events 2 2 2 2 - - 2 +TrigSignatureMoni INFO -- #3476793373 Features 7 7 - - +TrigSignatureMoni INFO HLT_TestChain8_ev1_L1EM5 #1677577445 +TrigSignatureMoni INFO -- #1677577445 Events 4 4 3 3 3 - 3 +TrigSignatureMoni INFO -- #1677577445 Features 4 4 4 - +TrigSignatureMoni INFO HLT_TestChain8_muv1_L1MU10 #2288364952 +TrigSignatureMoni INFO -- #2288364952 Events 2 2 2 1 1 1 1 +TrigSignatureMoni INFO -- #2288364952 Features 2 1 1 1 +TrigSignatureMoni INFO HLT_TestChain8_muv1step_L1MU6 #3588359947 +TrigSignatureMoni INFO -- #3588359947 Events 2 2 2 - - - 2 +TrigSignatureMoni INFO -- #3588359947 Features 3 - - - diff --git a/Trigger/TrigValidation/TrigValTools/bin/chainDump.py b/Trigger/TrigValidation/TrigValTools/bin/chainDump.py index 4d8c5f03442950634ec1ce4541eac1a0797f04db..24030378c38f78a8e976621fc2b993b1926ded11 100755 --- a/Trigger/TrigValidation/TrigValTools/bin/chainDump.py +++ b/Trigger/TrigValidation/TrigValTools/bin/chainDump.py @@ -69,11 +69,11 @@ def get_parser(): metavar='HISTS', nargs='+', default=[ - 'HLTFramework/TrigSignatureMoniMT/SignatureAcceptance', - 'HLTFramework/../HLTFramework/TrigSignatureMoniMT/SignatureAcceptance', + 'HLTFramework/TrigSignatureMoni/SignatureAcceptance', + 'HLTFramework/../HLTFramework/TrigSignatureMoni/SignatureAcceptance', 'TrigSteer_HLT/ChainAcceptance', 'TrigSteer_HLT/NumberOfActiveTEs', - 'HLTFramework/TrigSignatureMoniMT/DecisionCount', + 'HLTFramework/TrigSignatureMoni/DecisionCount', 'CTPSimulation/L1ItemsAV', 'L1/CTPSimulation/output/tavByName'], help='Histograms to use for counts dump. All existing ' @@ -90,11 +90,11 @@ def get_parser(): metavar='DICT', nargs='+', default=[ - 'HLTFramework/TrigSignatureMoniMT/SignatureAcceptance:HLTChain', - 'HLTFramework/../HLTFramework/TrigSignatureMoniMT/SignatureAcceptance:HLTStep', + 'HLTFramework/TrigSignatureMoni/SignatureAcceptance:HLTChain', + 'HLTFramework/../HLTFramework/TrigSignatureMoni/SignatureAcceptance:HLTStep', 'TrigSteer_HLT/ChainAcceptance:HLTChain', 'TrigSteer_HLT/NumberOfActiveTEs:HLTTE', - 'HLTFramework/TrigSignatureMoniMT/DecisionCount:HLTDecision', + 'HLTFramework/TrigSignatureMoni/DecisionCount:HLTDecision', 'CTPSimulation/L1ItemsAV:L1AV', 'L1/CTPSimulation/output/tavByName:L1AV'], help='Dictionary defining names of output text files for each ' diff --git a/Trigger/TrigValidation/TrigValTools/bin/rootcomp.py b/Trigger/TrigValidation/TrigValTools/bin/rootcomp.py index d343a95a01c39992bf9580e69e9de98b2a9f6f18..557767ed2f01c90bb2f811c9ea2909765037ce88 100755 --- a/Trigger/TrigValidation/TrigValTools/bin/rootcomp.py +++ b/Trigger/TrigValidation/TrigValTools/bin/rootcomp.py @@ -114,7 +114,7 @@ def main(): opts.skip += ["GeneralOpInfo"] # release number, etc. opts.skip += ["MessageSvc/MessageCount"] # MessageSvc opts.skip += ["TrigSteer_.*/Rate"] # Rate monitoring - opts.skip += ["TrigSignatureMoniMT/.*Rate"] # Rate monitoring + opts.skip += ["TrigSignatureMoni/.*Rate"] # Rate monitoring opts.skip += ["IOVDbRunRange","IOVDbBytesRead"] # conditions data IOVs and size opts.skip += ["TrigOpMonitor/.*BytesRead"] # conditions data size opts.skip += ["/ROBMonitor/DataVolumeFractionForSD"] # Volume data fraction profile diff diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py index 6318f33173515c9ea6552d91b2fd19a7624c5c36..5b9bbc3f3d83a4dca394d2384e136e3863bbd6b4 100644 --- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py +++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py @@ -230,8 +230,8 @@ def triggerMonitoringCfg(flags, hypos, filters, l1Decoder): Configures components needed for monitoring chains """ acc = ComponentAccumulator() - TrigSignatureMoniMT, DecisionCollectorTool=CompFactory.getComps("TrigSignatureMoniMT","DecisionCollectorTool",) - mon = TrigSignatureMoniMT() + TrigSignatureMoni, DecisionCollectorTool=CompFactory.getComps("TrigSignatureMoni","DecisionCollectorTool",) + mon = TrigSignatureMoni() mon.L1Decisions = "L1DecoderSummary" mon.FinalDecisionKey = "HLTNav_Summary" # Input if len(hypos) == 0: diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_newJO.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_newJO.py index ff79f4ab2b7ae43c6d09bfc01b881128924e65d7..05d845409c89949acb9c279984ed4f485330c22c 100644 --- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_newJO.py +++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_newJO.py @@ -92,7 +92,7 @@ from TrigConfigSvc.TrigConfigSvcCfg import createL1PrescalesFileFromMenu createL1PrescalesFileFromMenu(flags) -acc.getEventAlgo("TrigSignatureMoniMT").OutputLevel = INFO +acc.getEventAlgo("TrigSignatureMoni").OutputLevel = INFO acc.getEventAlgo("L1Decoder").ctpUnpacker.UseTBPBits = True # test setup