Skip to content
Snippets Groups Projects
Commit 1f3c8703 authored by Adam Edward Barton's avatar Adam Edward Barton
Browse files

Merge branch 'monitoring-New-JO' into 'master' 

Update monitroing so that final counts for each trigger is correct

See merge request atlas/athena!14695

Former-commit-id: 28693538
parents eb984ca7 aa63ff57
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 92 additions and 3217 deletions
Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx
+ 12
− 3
View file @ 1f3c8703
......@@ -49,6 +49,10 @@ StatusCode TrigSignatureMoniMT::initialize() {
}
CHECK( initHist() );
for ( auto chainAndKey: m_finalChainStep ) {
m_lastStepsMap[ chainAndKey.second ].insert( HLT::Identifier( chainAndKey.first ).numeric() );
}
return StatusCode::SUCCESS;
}
......@@ -68,7 +72,7 @@ StatusCode TrigSignatureMoniMT::finalize() {
ATH_MSG_INFO("Chain name L1, AfterPS, [... steps ...], Output" );
for ( int bin = 1; bin <= m_outputHistogram->GetXaxis()->GetNbins(); ++bin ) {
const std::string chainName = m_outputHistogram->GetXaxis()->GetBinLabel(bin);
ATH_MSG_DEBUG( chainName << std::string( 30 - chainName.size(), ' ' ) << collToString( bin ) );
ATH_MSG_INFO( chainName << std::string( 30 - chainName.size(), ' ' ) << collToString( bin ) );
}
return StatusCode::SUCCESS;
......@@ -78,7 +82,7 @@ StatusCode TrigSignatureMoniMT::fillChains(const TrigCompositeUtils::DecisionIDC
for ( auto id : dc ) {
auto id2bin = m_chainIDToBinMap.find( id );
if ( id2bin == m_chainIDToBinMap.end() ) {
ATH_MSG_WARNING( "HLT chain " << HLT::Identifier(id) << " not configured to be monitred" );
ATH_MSG_WARNING( "HLT chain " << HLT::Identifier(id) << " not configured to be monitored" );
} else {
m_outputHistogram->Fill( id2bin->second, double(row) );
}
......@@ -129,7 +133,12 @@ StatusCode TrigSignatureMoniMT::execute() {
TrigCompositeUtils::decisionIDs( decisionObj, ids );
sum.insert( ids.begin(), ids.end() ); // merge with so far passing chains
}
ATH_CHECK( fillChains( sum, row ) );
TrigCompositeUtils::DecisionIDContainer final;
std::set_intersection( sum.begin(), sum.end(),
m_lastStepsMap[decisions.key()].begin(), m_lastStepsMap[decisions.key()].end(),
std::inserter( final, final.begin() ) );
ATH_CHECK( fillChains( final, row ) );
anyPassed = anyPassed or ( not sum.empty() );
} else {
ATH_MSG_DEBUG( "Final decision " << d.key() << " absent, possibly early rejected" );
......
Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.h
+ 6
− 5
View file @ 1f3c8703
......@@ -35,14 +35,15 @@ class TrigSignatureMoniMT : public ::AthAlgorithm
TrigSignatureMoniMT();
SG::ReadHandleKey<TrigCompositeUtils::DecisionContainer> m_l1DecisionsKey{ this, "L1Decisions", "HLTChainsResult", "Chains activated after the L1" };
SG::ReadHandleKeyArray<TrigCompositeUtils::DecisionContainer> m_finalDecisionsKey{ this, "FinalDecisions", {}, "Final stage of all decisions" };
// typedef std::map<std::string, std::vector<std::string> > StringToStringVectorMap;
//Gaudi::Property< StringToStringVectorMap > m_steps{ this, "FinalDecisionToStepsMap", {}, "Mapping from each final decision object in FinalDecisions to the decisions at earlier steps" };
Gaudi::Property< std::map<std::string, std::string> > m_finalChainStep{ this, "FinalChainStep", {}, "Mapping from chain name to the decision container having the last step decision for that chain" };
std::map<std::string, std::set<unsigned int>> m_lastStepsMap; //!< a map from the decision container key to the set of chains which have there the last step
Gaudi::Property<std::vector<std::string> > m_allChains{ this, "ChainsList", {}, "List of all configured chains" };
std::map<unsigned int, int> m_chainIDToBinMap;
ServiceHandle<ITHistSvc> m_histSvc{ this, "THistSvc", "THistSvc/THistSvc", "Histogramming svc" };
......
Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
+ 6
− 6
View file @ 1f3c8703
......@@ -74,13 +74,13 @@ file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_photonMenu )
atlas_add_test( photonMenu
SCRIPT test/test_photon_menu.sh
PROPERTIES TIMEOUT 500
EXTRA_PATTERNS "-s TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*"
EXTRA_PATTERNS "-s TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*"
PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_photonMenu )
file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_egammaMenu )
atlas_add_test( egammaMenu
SCRIPT test/test_egamma_menu.sh
EXTRA_PATTERNS "-s TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*"
EXTRA_PATTERNS "-s TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*"
PROPERTIES TIMEOUT 500
PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_egammaMenu
)
......@@ -95,7 +95,7 @@ atlas_add_test( muRunData
file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_muMenu )
atlas_add_test( muMenu
SCRIPT test/test_mu_menu.sh
EXTRA_PATTERNS "-s TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*"
EXTRA_PATTERNS "-s TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*"
PROPERTIES TIMEOUT 500
PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_muMenu
)
......@@ -103,7 +103,7 @@ atlas_add_test( muMenu
file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_fullMenu )
atlas_add_test( fullMenu
SCRIPT test/test_full_menu.sh
EXTRA_PATTERNS "-s TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*"
EXTRA_PATTERNS "-s TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*"
PROPERTIES TIMEOUT 500
PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_fullMenu
)
......@@ -125,14 +125,14 @@ atlas_add_test( EmuL1Decoding
file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_emu_step_processing )
atlas_add_test( EmuStepProcessing
SCRIPT test/test_emu_step_processing.sh
EXTRA_PATTERNS "-s TriggerMonitorFinal"
EXTRA_PATTERNS "-s TrigSignatureMoniMT.*INFO HLT_.*"
PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_emu_step_processing
)
file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_NewJO )
atlas_add_test( NewJO
SCRIPT test/test_newJO.sh
EXTRA_PATTERNS "-s .*ERROR.*|.*newJOtest.pkl.*|TrigSignatureMoniMT .*DEBUG.*"
EXTRA_PATTERNS "-s .*ERROR.*|.*newJOtest.pkl.*|TrigSignatureMoniMT .*INFO.*"
PROPERTIES TIMEOUT 500
PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_NewJO
)
......
Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessing.ref
+ 6
− 3023
View file @ 1f3c8703
source diff could not be displayed: it is too large. Options to address this: view the blob.
Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessingTest.py
+ 2
− 1
View file @ 1f3c8703
......@@ -206,7 +206,8 @@ for unpack in l1Decoder.roiUnpackers:
from AthenaCommon.AlgSequence import AlgSequence, AthSequencer, dumpSequence
topSequence = AlgSequence()
topSequence += L1UnpackingSeq
#topSequence += L1UnpackingSeq
topSequence += l1Decoder
##### Make all HLT #######
makeHLTTree(HLTChains)
......
Trigger/TrigValidation/TrigUpgradeTest/share/NewJO.ref
+ 7
− 150
View file @ 1f3c8703
......@@ -5,153 +5,10 @@ Py:Configurable ERROR attempt to add a duplicate (ServiceManager.ProxyProvid
Py:Configurable ERROR attempt to add a duplicate (ServiceManager.PoolSvc) ... dupe ignored
Storing config in the config newJOtest.pkl
Py:Athena INFO now loading newJOtest.pkl ...
TrigSignatureMoniMT DEBUG Property update for OutputLevel : new value = 2
TrigSignatureMoniMT DEBUG Histogram 6 x 5 bins
TrigSignatureMoniMT DEBUG Registerd under /EXPERT/TrigSteer_HLT/SignatureAcceptance
TrigSignatureMoniMT DEBUG input handles: 1
TrigSignatureMoniMT DEBUG output handles: 0
TrigSignatureMoniMT DEBUG Registering all Tools in ToolHandleArray CollectorTools
TrigSignatureMoniMT DEBUG Adding private ToolHandle tool TrigSignatureMoniMT.DecisionCollectorHLTStep_1 (DecisionCollectorTool) from ToolHandleArray CollectorTools
TrigSignatureMoniMT DEBUG Adding private ToolHandle tool TrigSignatureMoniMT.DecisionCollectorHLTStep_2 (DecisionCollectorTool) from ToolHandleArray CollectorTools
TrigSignatureMoniMT DEBUG Data Deps for TrigSignatureMoniMT
TrigSignatureMoniMT 0 0 DEBUG L1 0 N positive decisions 5
TrigSignatureMoniMT 0 0 DEBUG L1 1 N positive decisions 5
TrigSignatureMoniMT 0 0 DEBUG Step 0 decisions 0
TrigSignatureMoniMT 0 0 DEBUG Step 1 decisions 0
TrigSignatureMoniMT 0 0 DEBUG Final decision Decisions_PhotonFastReco absent, possibly early rejected
TrigSignatureMoniMT 0 0 DEBUG Final decision Decisions_ElectronFastCalo absent, possibly early rejected
TrigSignatureMoniMT 1 0 DEBUG L1 0 N positive decisions 5
TrigSignatureMoniMT 1 0 DEBUG L1 1 N positive decisions 5
TrigSignatureMoniMT 1 0 DEBUG Step 0 decisions 1
TrigSignatureMoniMT 1 0 DEBUG Step 1 decisions 0
TrigSignatureMoniMT 1 0 DEBUG Final decision Decisions_PhotonFastReco absent, possibly early rejected
TrigSignatureMoniMT 1 0 DEBUG Decision for 1 objects available in Decisions_ElectronFastCalo
TrigSignatureMoniMT 1 0 DEBUG Event passsed, filling 5
TrigSignatureMoniMT 2 0 DEBUG L1 0 N positive decisions 5
TrigSignatureMoniMT 2 0 DEBUG L1 1 N positive decisions 5
TrigSignatureMoniMT 2 0 DEBUG Step 0 decisions 2
TrigSignatureMoniMT 2 0 DEBUG Step 1 decisions 0
TrigSignatureMoniMT 2 0 DEBUG Final decision Decisions_PhotonFastReco absent, possibly early rejected
TrigSignatureMoniMT 2 0 DEBUG Decision for 1 objects available in Decisions_ElectronFastCalo
TrigSignatureMoniMT 2 0 DEBUG Event passsed, filling 5
TrigSignatureMoniMT 3 0 DEBUG L1 0 N positive decisions 5
TrigSignatureMoniMT 3 0 DEBUG L1 1 N positive decisions 5
TrigSignatureMoniMT 3 0 DEBUG Step 0 decisions 0
TrigSignatureMoniMT 3 0 DEBUG Step 1 decisions 0
TrigSignatureMoniMT 3 0 DEBUG Final decision Decisions_PhotonFastReco absent, possibly early rejected
TrigSignatureMoniMT 3 0 DEBUG Final decision Decisions_ElectronFastCalo absent, possibly early rejected
TrigSignatureMoniMT 4 0 DEBUG L1 0 N positive decisions 5
TrigSignatureMoniMT 4 0 DEBUG L1 1 N positive decisions 5
TrigSignatureMoniMT 4 0 DEBUG Step 0 decisions 0
TrigSignatureMoniMT 4 0 DEBUG Step 1 decisions 0
TrigSignatureMoniMT 4 0 DEBUG Final decision Decisions_PhotonFastReco absent, possibly early rejected
TrigSignatureMoniMT 4 0 DEBUG Final decision Decisions_ElectronFastCalo absent, possibly early rejected
TrigSignatureMoniMT 5 0 DEBUG L1 0 N positive decisions 5
TrigSignatureMoniMT 5 0 DEBUG L1 1 N positive decisions 5
TrigSignatureMoniMT 5 0 DEBUG Step 0 decisions 5
TrigSignatureMoniMT 5 0 DEBUG Step 1 decisions 2
TrigSignatureMoniMT 5 0 DEBUG Decision for 2 objects available in Decisions_PhotonFastReco
TrigSignatureMoniMT 5 0 DEBUG Decision for 5 objects available in Decisions_ElectronFastCalo
TrigSignatureMoniMT 5 0 DEBUG Event passsed, filling 5
TrigSignatureMoniMT 6 0 DEBUG L1 0 N positive decisions 5
TrigSignatureMoniMT 6 0 DEBUG L1 1 N positive decisions 5
TrigSignatureMoniMT 6 0 DEBUG Step 0 decisions 0
TrigSignatureMoniMT 6 0 DEBUG Step 1 decisions 0
TrigSignatureMoniMT 6 0 DEBUG Final decision Decisions_PhotonFastReco absent, possibly early rejected
TrigSignatureMoniMT 6 0 DEBUG Final decision Decisions_ElectronFastCalo absent, possibly early rejected
TrigSignatureMoniMT 7 0 DEBUG L1 0 N positive decisions 5
TrigSignatureMoniMT 7 0 DEBUG L1 1 N positive decisions 5
TrigSignatureMoniMT 7 0 DEBUG Step 0 decisions 2
TrigSignatureMoniMT 7 0 DEBUG Step 1 decisions 0
TrigSignatureMoniMT 7 0 DEBUG Final decision Decisions_PhotonFastReco absent, possibly early rejected
TrigSignatureMoniMT 7 0 DEBUG Decision for 2 objects available in Decisions_ElectronFastCalo
TrigSignatureMoniMT 7 0 DEBUG Event passsed, filling 5
TrigSignatureMoniMT 8 0 DEBUG L1 0 N positive decisions 5
TrigSignatureMoniMT 8 0 DEBUG L1 1 N positive decisions 5
TrigSignatureMoniMT 8 0 DEBUG Step 0 decisions 5
TrigSignatureMoniMT 8 0 DEBUG Step 1 decisions 2
TrigSignatureMoniMT 8 0 DEBUG Decision for 1 objects available in Decisions_PhotonFastReco
TrigSignatureMoniMT 8 0 DEBUG Decision for 1 objects available in Decisions_ElectronFastCalo
TrigSignatureMoniMT 8 0 DEBUG Event passsed, filling 5
TrigSignatureMoniMT 9 0 DEBUG L1 0 N positive decisions 5
TrigSignatureMoniMT 9 0 DEBUG L1 1 N positive decisions 5
TrigSignatureMoniMT 9 0 DEBUG Step 0 decisions 2
TrigSignatureMoniMT 9 0 DEBUG Step 1 decisions 0
TrigSignatureMoniMT 9 0 DEBUG Final decision Decisions_PhotonFastReco absent, possibly early rejected
TrigSignatureMoniMT 9 0 DEBUG Decision for 5 objects available in Decisions_ElectronFastCalo
TrigSignatureMoniMT 9 0 DEBUG Event passsed, filling 5
TrigSignatureMoniMT 10 0 DEBUG L1 0 N positive decisions 5
TrigSignatureMoniMT 10 0 DEBUG L1 1 N positive decisions 5
TrigSignatureMoniMT 10 0 DEBUG Step 0 decisions 2
TrigSignatureMoniMT 10 0 DEBUG Step 1 decisions 0
TrigSignatureMoniMT 10 0 DEBUG Final decision Decisions_PhotonFastReco absent, possibly early rejected
TrigSignatureMoniMT 10 0 DEBUG Decision for 1 objects available in Decisions_ElectronFastCalo
TrigSignatureMoniMT 10 0 DEBUG Event passsed, filling 5
TrigSignatureMoniMT 11 0 DEBUG L1 0 N positive decisions 5
TrigSignatureMoniMT 11 0 DEBUG L1 1 N positive decisions 5
TrigSignatureMoniMT 11 0 DEBUG Step 0 decisions 5
TrigSignatureMoniMT 11 0 DEBUG Step 1 decisions 2
TrigSignatureMoniMT 11 0 DEBUG Decision for 1 objects available in Decisions_PhotonFastReco
TrigSignatureMoniMT 11 0 DEBUG Decision for 4 objects available in Decisions_ElectronFastCalo
TrigSignatureMoniMT 11 0 DEBUG Event passsed, filling 5
TrigSignatureMoniMT 12 0 DEBUG L1 0 N positive decisions 5
TrigSignatureMoniMT 12 0 DEBUG L1 1 N positive decisions 5
TrigSignatureMoniMT 12 0 DEBUG Step 0 decisions 5
TrigSignatureMoniMT 12 0 DEBUG Step 1 decisions 2
TrigSignatureMoniMT 12 0 DEBUG Decision for 2 objects available in Decisions_PhotonFastReco
TrigSignatureMoniMT 12 0 DEBUG Decision for 6 objects available in Decisions_ElectronFastCalo
TrigSignatureMoniMT 12 0 DEBUG Event passsed, filling 5
TrigSignatureMoniMT 13 0 DEBUG L1 0 N positive decisions 5
TrigSignatureMoniMT 13 0 DEBUG L1 1 N positive decisions 5
TrigSignatureMoniMT 13 0 DEBUG Step 0 decisions 5
TrigSignatureMoniMT 13 0 DEBUG Step 1 decisions 2
TrigSignatureMoniMT 13 0 DEBUG Decision for 1 objects available in Decisions_PhotonFastReco
TrigSignatureMoniMT 13 0 DEBUG Decision for 4 objects available in Decisions_ElectronFastCalo
TrigSignatureMoniMT 13 0 DEBUG Event passsed, filling 5
TrigSignatureMoniMT 14 0 DEBUG L1 0 N positive decisions 5
TrigSignatureMoniMT 14 0 DEBUG L1 1 N positive decisions 5
TrigSignatureMoniMT 14 0 DEBUG Step 0 decisions 2
TrigSignatureMoniMT 14 0 DEBUG Step 1 decisions 0
TrigSignatureMoniMT 14 0 DEBUG Final decision Decisions_PhotonFastReco absent, possibly early rejected
TrigSignatureMoniMT 14 0 DEBUG Decision for 2 objects available in Decisions_ElectronFastCalo
TrigSignatureMoniMT 14 0 DEBUG Event passsed, filling 5
TrigSignatureMoniMT 15 0 DEBUG L1 0 N positive decisions 5
TrigSignatureMoniMT 15 0 DEBUG L1 1 N positive decisions 5
TrigSignatureMoniMT 15 0 DEBUG Step 0 decisions 4
TrigSignatureMoniMT 15 0 DEBUG Step 1 decisions 2
TrigSignatureMoniMT 15 0 DEBUG Decision for 2 objects available in Decisions_PhotonFastReco
TrigSignatureMoniMT 15 0 DEBUG Decision for 7 objects available in Decisions_ElectronFastCalo
TrigSignatureMoniMT 15 0 DEBUG Event passsed, filling 5
TrigSignatureMoniMT 16 0 DEBUG L1 0 N positive decisions 5
TrigSignatureMoniMT 16 0 DEBUG L1 1 N positive decisions 5
TrigSignatureMoniMT 16 0 DEBUG Step 0 decisions 2
TrigSignatureMoniMT 16 0 DEBUG Step 1 decisions 0
TrigSignatureMoniMT 16 0 DEBUG Final decision Decisions_PhotonFastReco absent, possibly early rejected
TrigSignatureMoniMT 16 0 DEBUG Decision for 1 objects available in Decisions_ElectronFastCalo
TrigSignatureMoniMT 16 0 DEBUG Event passsed, filling 5
TrigSignatureMoniMT 17 0 DEBUG L1 0 N positive decisions 5
TrigSignatureMoniMT 17 0 DEBUG L1 1 N positive decisions 5
TrigSignatureMoniMT 17 0 DEBUG Step 0 decisions 4
TrigSignatureMoniMT 17 0 DEBUG Step 1 decisions 2
TrigSignatureMoniMT 17 0 DEBUG Decision for 1 objects available in Decisions_PhotonFastReco
TrigSignatureMoniMT 17 0 DEBUG Decision for 3 objects available in Decisions_ElectronFastCalo
TrigSignatureMoniMT 17 0 DEBUG Event passsed, filling 5
TrigSignatureMoniMT 18 0 DEBUG L1 0 N positive decisions 5
TrigSignatureMoniMT 18 0 DEBUG L1 1 N positive decisions 5
TrigSignatureMoniMT 18 0 DEBUG Step 0 decisions 4
TrigSignatureMoniMT 18 0 DEBUG Step 1 decisions 2
TrigSignatureMoniMT 18 0 DEBUG Decision for 2 objects available in Decisions_PhotonFastReco
TrigSignatureMoniMT 18 0 DEBUG Decision for 2 objects available in Decisions_ElectronFastCalo
TrigSignatureMoniMT 18 0 DEBUG Event passsed, filling 5
TrigSignatureMoniMT 19 0 DEBUG L1 0 N positive decisions 5
TrigSignatureMoniMT 19 0 DEBUG L1 1 N positive decisions 5
TrigSignatureMoniMT 19 0 DEBUG Step 0 decisions 0
TrigSignatureMoniMT 19 0 DEBUG Step 1 decisions 0
TrigSignatureMoniMT 19 0 DEBUG Final decision Decisions_PhotonFastReco absent, possibly early rejected
TrigSignatureMoniMT 19 0 DEBUG Final decision Decisions_ElectronFastCalo absent, possibly early rejected
TrigSignatureMoniMT DEBUG All 20 20 0 0 15
TrigSignatureMoniMT DEBUG HLT_g10_etcut 20 20 8 8 8
TrigSignatureMoniMT DEBUG HLT_g15_etcut 20 20 5 8 8
TrigSignatureMoniMT DEBUG HLT_e3_etcut 20 20 15 0 15
TrigSignatureMoniMT DEBUG HLT_e7_etcut 20 20 8 0 8
TrigSignatureMoniMT DEBUG HLT_e5_etcut 20 20 14 0 14
TrigSignatureMoniMT INFO Chain name L1, AfterPS, [... steps ...], Output
TrigSignatureMoniMT INFO All 20 20 0 0 15
TrigSignatureMoniMT INFO HLT_g10_etcut 20 20 8 8 8
TrigSignatureMoniMT INFO HLT_g15_etcut 20 20 5 8 8
TrigSignatureMoniMT INFO HLT_e3_etcut 20 20 15 0 15
TrigSignatureMoniMT INFO HLT_e7_etcut 20 20 8 0 8
TrigSignatureMoniMT INFO HLT_e5_etcut 20 20 14 0 14
Trigger/TrigValidation/TrigUpgradeTest/share/egammaMenu.ref
+ 4
− 4
View file @ 1f3c8703
......@@ -104,7 +104,7 @@ TriggerSummaryStep1 19 0 DEBUG +++ HLT_e7_etcut ID#243
TriggerSummaryStep2 19 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep2 19 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 19 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerMonitorFinal DEBUG HLT_e3_etcut1step 20 20 18 0 18
TriggerMonitorFinal DEBUG HLT_e3_etcut 20 9 8 16 56
TriggerMonitorFinal DEBUG HLT_e5_etcut 20 20 17 16 65
TriggerMonitorFinal DEBUG HLT_e7_etcut 20 20 15 16 63
TrigSignatureMoniMT INFO HLT_e5_etcut 20 20 17 16 16
TrigSignatureMoniMT INFO HLT_e7_etcut 20 20 15 16 16
TrigSignatureMoniMT INFO HLT_e3_etcut1step 20 20 18 0 18
TrigSignatureMoniMT INFO HLT_e3_etcut 20 9 8 16 16
Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref
+ 9
− 9
View file @ 1f3c8703
......@@ -125,12 +125,12 @@ TriggerSummaryStep1 19 0 DEBUG +++ HLT_e3_etcut ID#271
TriggerSummaryStep2 19 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep2 19 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 19 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerMonitorFinal DEBUG HLT_e3_etcut1step 20 20 18 0 18
TriggerMonitorFinal DEBUG HLT_e3_etcut 20 20 18 17 69
TriggerMonitorFinal DEBUG HLT_e5_etcut 20 20 17 17 68
TriggerMonitorFinal DEBUG HLT_e7_etcut 20 20 15 17 66
TriggerMonitorFinal DEBUG HLT_mu6 20 20 3 0 6
TriggerMonitorFinal DEBUG HLT_2mu6 20 20 0 0 0
TriggerMonitorFinal DEBUG HLT_mu6Comb 20 20 3 2 10
TriggerMonitorFinal DEBUG HLT_2mu6Comb 20 20 0 0 0
TriggerMonitorFinal DEBUG HLT_e3_etcut_mu6 20 20 0 0 0
TrigSignatureMoniMT INFO HLT_e5_etcut 20 20 17 17 17
TrigSignatureMoniMT INFO HLT_mu6 20 20 3 0 3
TrigSignatureMoniMT INFO HLT_e3_etcut 20 20 18 17 17
TrigSignatureMoniMT INFO HLT_2mu6 20 20 0 0 0
TrigSignatureMoniMT INFO HLT_e7_etcut 20 20 15 17 17
TrigSignatureMoniMT INFO HLT_2mu6Comb 20 20 0 0 0
TrigSignatureMoniMT INFO HLT_e3_etcut_mu6 20 20 3 0 0
TrigSignatureMoniMT INFO HLT_e3_etcut1step 20 20 18 0 18
TrigSignatureMoniMT INFO HLT_mu6Comb 20 20 3 2 2
Trigger/TrigValidation/TrigUpgradeTest/share/muMenu.ref
+ 3
− 3
View file @ 1f3c8703
......@@ -5,6 +5,6 @@ TriggerSummaryStep1 2 0 DEBUG +++ HLT_mu6 ID#16721627
TriggerSummaryStep1 2 0 DEBUG +++ HLT_mu6fast ID#2393852230
TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu6 ID#1672162766
TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu6fast ID#2393852230
TriggerMonitorFinal DEBUG HLT_mu6fast 10 10 3 0 0 3
TriggerMonitorFinal DEBUG HLT_mu6 10 10 3 0 0 3
TriggerMonitorFinal DEBUG HLT_2mu6 10 10 1 0 0 1
TrigSignatureMoniMT INFO HLT_2mu6 10 10 1 0 0 0
TrigSignatureMoniMT INFO HLT_mu6fast 10 10 3 0 0 3
TrigSignatureMoniMT INFO HLT_mu6 10 10 3 0 0 0
Trigger/TrigValidation/TrigUpgradeTest/share/photonMenu.ref
+ 1
− 1
View file @ 1f3c8703
......@@ -6,4 +6,4 @@ TriggerSummaryStep1 8 0 DEBUG +++ HLT_g5_etcut ID#140
TriggerSummaryStep2 8 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 9 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 9 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerMonitorFinal DEBUG HLT_g5_etcut 10 10 0 4 4
TrigSignatureMoniMT INFO HLT_g5_etcut 10 10 4 4 4
Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
+ 18
− 8
View file @ 1f3c8703
......@@ -54,19 +54,29 @@ def triggerMonitoringCfg(flags, hypos, l1Decoder):
allChains = {} # collects the last decision obj for each chain
for stepName, stepHypos in sorted( hypos.items() ):
dcTool = DecisionCollectorTool( "DecisionCollector" + stepName )
decisions = []
for hypo in stepHypos:
dcTool.Decisions += [ hypo.HypoOutputDecisions ]
for t in hypo.HypoTools:
allChains[t.name()] = hypo.HypoOutputDecisions
if hypo.getType() == 'ComboHypo':
decisions.append( hypo.HypoOutputDecisions[0] )
for chain, m in hypo.MultiplicitiesMap.iteritems():
allChains[chain] = hypo.HypoOutputDecisions[0]
else: # regular hypos
decisions.append( hypo.HypoOutputDecisions )
for t in hypo.HypoTools:
allChains[t.name()] = hypo.HypoOutputDecisions
dcTool = DecisionCollectorTool( "DecisionCollector" + stepName, Decisions=decisions )
__log.info( "The step monitoring decisions in " + dcTool.name() + " " +str( dcTool.Decisions ) )
mon.CollectorTools += [ dcTool ]
__log.info( "The step monitoring decisions in " + dcTool.name() + str( dcTool.Decisions ) )
mon.FinalChainStep = allChains
mon.FinalDecisions = list( set( allChains.values() ) )
__log.info( "Final decisions to be monitored are "+ str( mon.FinalDecisions ) )
mon.L1Decisions = l1Decoder.getProperties()['Chains'] if l1Decoder.getProperties()['Chains'] != '<no value>' else l1Decoder.getDefaultProperty('Chains')
__log.info( "Final decisions to be monitored are "+ str( mon.FinalDecisions ) )
mon.ChainsList = list( set( allChains.keys() + l1Decoder.ChainToCTPMapping.keys()) )
......
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py
+ 18
− 4
View file @ 1f3c8703
# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
# Classes to configure the CF graph, via Nodes
from AthenaCommon.CFElements import parOR, seqAND, seqOR
from AthenaCommon.Logging import logging
......@@ -173,12 +175,24 @@ def makeHLTTree(HLTChains):
#edmCreator.TrigCompositeContainer = flatDecisions
#summary.OutputTools= [ edmCreator ]
hltTop += summary
hltTop += makeMonitor("TriggerMonitorFinal", finalDecisions, EnabledChainNames)
#hltTop += makeStreamESD("StreamESD", flatDecisions)
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
#hltTop += makeMonitor("TriggerMonitorFinal", finalDecisions, EnabledChainNames)
from TriggerJobOpts.TriggerConfig import collectHypos, triggerMonitoringCfg
from AthenaConfiguration.AllConfigFlags import ConfigFlags
ConfigFlags.lock()
l1decoder = [ d for d in topSequence.getChildren() if d.getType() == "L1Decoder" ]
if len(l1decoder) != 1 :
raise RuntimeError(" Can't find 1 instance of L1Decoder in topSequence, instead found this in topSequence "+str(topSequence.getChildren()) )
monAcc, monAlg = triggerMonitoringCfg( ConfigFlags, collectHypos(steps), l1decoder[0] )
monAcc.appendToGlobals()
hltTop += monAlg
#hltTop += makeStreamESD("StreamESD", flatDecisions)
topSequence += hltTop
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment