diff --git a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt index 780abeb96251b3802b161022b4d6105b80a41d49..0e45b08800605b7b193847c20150f74657df2178 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt +++ b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt @@ -132,7 +132,7 @@ atlas_add_test( EmuStepProcessing 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 ) diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/NewJO.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/NewJO.ref index 853f47db4d343fb4e9b3303ac8612433eb1abef6..2f788fc22108769b83a043ffa653c4f81bf1a06c 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/share/NewJO.ref +++ b/Trigger/TrigValidation/TrigUpgradeTest/share/NewJO.ref @@ -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 diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py index b0a51e1955c6136622c983c8f190e1567fa11cdc..0148951b965419a9d192beb25ad9570440d38e9a 100644 --- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py +++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py @@ -75,7 +75,7 @@ def triggerMonitoringCfg(flags, hypos, l1Decoder): mon.FinalChainStep = allChains mon.FinalDecisions = list( set( allChains.values() ) ) - mon.L1Decisions = l1Decoder.Chains + 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()) )