diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py b/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py index 2d0c41d64a0698ca0348ab6f450f3e40257a2545..b9b828cecc8e399fcda815ea6f84cc13d2aa9a3f 100755 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py @@ -252,10 +252,7 @@ def TrigMufastHypoToolFromDict( chainDict ): def TrigMufastHypoToolwORFromDict( chainDict ): - if 'lateMu' in chainDict['chainParts'][0]['chainPartName']: - thresholds = ['passthrough'] - else: - thresholds = getThresholdsFromDict( chainDict ) + thresholds = getThresholdsFromDict( chainDict ) config = TrigMufastHypoConfig() tool = config.ConfigurationHypoTool( chainDict['chainName'], thresholds ) # Setup MonTool for monitored variables in AthenaMonitoring package @@ -354,7 +351,7 @@ class TrigMufastHypoConfig(object): def TrigmuCombHypoToolFromDict( chainDict ): - if 'idperf' in chainDict['chainParts'][0]['chainPartName'] or 'lateMu' in chainDict['chainParts'][0]['chainPartName']: + if 'idperf' in chainDict['chainParts'][0]['chainPartName']: thresholds = ['passthrough'] else: thresholds = getThresholdsFromDict( chainDict ) @@ -386,8 +383,6 @@ def TrigmuCombHypoToolwORFromDict( chainDict ): tight = False # can be probably decoded from some of the proprties of the chain, expert work acceptAll = False - if chainDict['chainParts'][0]['signature'] == 'Bphysics': - acceptAll = True tool=config.ConfigurationHypoTool( chainDict['chainName'], thresholds, tight, acceptAll ) diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx index 8d471f39ff40d2d1731891ec3240180c09a8eab2..14f92b3b1bb668573efe9083ea9c89b3fe4c9335 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx @@ -80,7 +80,7 @@ StatusCode TrigMufastHypoTool::initialize() if( m_requireDR ) { ATH_MSG_DEBUG( "+ dR cut:" ); if( (m_etaBinsEC.size()-1) != m_dRThresEC.size() ) { - ATH_MSG_DEBUG( "bad thresholds setup .... exiting!" ); + ATH_MSG_ERROR( "bad thresholds setup .... exiting!" ); return StatusCode::FAILURE; } ATH_MSG_DEBUG( " B-B : dR < " << m_dRThresBB ); @@ -94,7 +94,7 @@ StatusCode TrigMufastHypoTool::initialize() if( m_requireMass ) { ATH_MSG_DEBUG( "+ Mass cut:" ); if( (m_etaBinsEC.size()-1) != m_massThresEC.size() ) { - ATH_MSG_DEBUG( "bad thresholds setup .... exiting!" ); + ATH_MSG_ERROR( "bad thresholds setup .... exiting!" ); return StatusCode::FAILURE; } ATH_MSG_DEBUG( " B-B : Mass < " << m_massThresBB ); diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx index 35771e66fe60b1b7cf2f6301592d6e234a046ef0..68d5e2bf4f8e0b2e5f513844538449c7614318ea 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx @@ -64,7 +64,7 @@ StatusCode TrigmuCombHypoTool::initialize() if( m_requireDR ) { ATH_MSG_DEBUG( "+ dR cut:" ); if( (m_etaBins.size()-1) != m_dRThres.size() ) { - ATH_MSG_DEBUG( "bad thresholds setup .... exiting!" ); + ATH_MSG_ERROR( "bad thresholds setup .... exiting!" ); return StatusCode::FAILURE; } for(unsigned int i=0; i<m_dRThres.size(); i++) { @@ -75,7 +75,7 @@ StatusCode TrigmuCombHypoTool::initialize() if( m_requireMufastDR ) { ATH_MSG_DEBUG( "+ dr(by mF) cut:" ); if( (m_etaBins.size()-1) != m_mufastDRThres.size() ) { - ATH_MSG_DEBUG( "bad thresholds setup .... exiting!" ); + ATH_MSG_ERROR( "bad thresholds setup .... exiting!" ); return StatusCode::FAILURE; } for(unsigned int i=0; i<m_mufastDRThres.size(); i++) { @@ -86,7 +86,7 @@ StatusCode TrigmuCombHypoTool::initialize() if( m_requireMass ) { ATH_MSG_DEBUG( "+ Mass cut:" ); if( (m_etaBins.size()-1) != m_massThres.size() ) { - ATH_MSG_DEBUG( "bad thresholds setup .... exiting!" ); + ATH_MSG_ERROR( "bad thresholds setup .... exiting!" ); return StatusCode::FAILURE; } for(unsigned int i=0; i<m_massThres.size(); i++) { @@ -354,11 +354,11 @@ StatusCode TrigmuCombHypoTool::applyOverlapRemoval(std::vector<TrigmuCombHypoToo size_t numMuon = input.size(); + auto mucombNrAllEVs = Monitored::Scalar("NrAllEVs", -9999.); + auto mucombNrActiveEVs = Monitored::Scalar("NrActiveEVs", -9999.); + auto monitorIt = Monitored::Group(m_monTool, mucombNrAllEVs, mucombNrActiveEVs); if ( numMuon == 0) { ATH_MSG_DEBUG( "No positive previous hypo decision. Not need overlap removal." ); - auto mucombNrAllEVs = Monitored::Scalar("NrAllEVs", -9999.); - auto mucombNrActiveEVs = Monitored::Scalar("NrActiveEVs", -9999.); - auto monitorIt = Monitored::Group(m_monTool, mucombNrAllEVs, mucombNrActiveEVs); mucombNrActiveEVs = numMuon; mucombNrAllEVs = numMuon; return StatusCode::SUCCESS; @@ -366,16 +366,11 @@ StatusCode TrigmuCombHypoTool::applyOverlapRemoval(std::vector<TrigmuCombHypoToo else if ( numMuon == 1 ) { ATH_MSG_DEBUG("Number of muon event = " << numMuon ); ATH_MSG_DEBUG("no overlap Removal necessary. exitting with all EventViews active." ); - auto mucombNrAllEVs = Monitored::Scalar("NrAllEVs", -9999.); - auto mucombNrActiveEVs = Monitored::Scalar("NrActiveEVs", -9999.); - auto monitorIt = Monitored::Group(m_monTool, mucombNrAllEVs, mucombNrActiveEVs); mucombNrActiveEVs = numMuon; mucombNrAllEVs = numMuon; return StatusCode::SUCCESS; } else { ATH_MSG_DEBUG("Number of muon event = " << numMuon ); - auto mucombNrAllEVs = Monitored::Scalar("NrAllEVs", -9999.); - auto monitorIt = Monitored::Group(m_monTool, mucombNrAllEVs); mucombNrAllEVs = numMuon; ATH_CHECK(checkOverlap(input)); return StatusCode::SUCCESS;