diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2ElectronHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2ElectronHypoTool.py index aa6ec4bee006c880572f4a4acb020ac0290ef874..8c6cec493bf91ce0afae4b1a8a0eddaafb3b88c1 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2ElectronHypoTool.py +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2ElectronHypoTool.py @@ -11,6 +11,7 @@ def TrigL2ElectronHypoToolFromName( name, conf ): from TrigEgammaHypo.TrigEgammaHypoConf import TrigL2ElectronHypoTool tool = TrigL2ElectronHypoTool(name) + tool.RespectPreviousDecision = True tool.MonTool = "" from TriggerJobOpts.TriggerFlags import TriggerFlags if 'Validation' in TriggerFlags.enableMonitoring() or 'Online' in TriggerFlags.enableMonitoring(): diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egammaMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/egammaMenu.ref index 1d2dcb3e5d3c1fc24f607c9cf3dc9aa57bdfcaae..63f0b25a9184ef76b9460a75372197cc72872b59 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/share/egammaMenu.ref +++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egammaMenu.ref @@ -3,25 +3,21 @@ TriggerSummaryStep1 0 0 DEBUG +++ HLT_e3_etcut1step I TriggerSummaryStep1 0 0 DEBUG +++ HLT_e7_etcut ID#2430733989 TriggerSummaryStep2 0 0 DEBUG +++ HLT_e5_etcut ID#607406625 TriggerSummaryStep2 0 0 DEBUG +++ HLT_e7_etcut ID#2430733989 -TriggerSummaryStep2 0 0 DEBUG +++ HLT_e3_etcut ID#2711808158 TriggerSummaryStep1 1 0 DEBUG +++ HLT_e5_etcut ID#607406625 TriggerSummaryStep1 1 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583 TriggerSummaryStep1 1 0 DEBUG +++ HLT_e7_etcut ID#2430733989 TriggerSummaryStep2 1 0 DEBUG +++ HLT_e5_etcut ID#607406625 TriggerSummaryStep2 1 0 DEBUG +++ HLT_e7_etcut ID#2430733989 -TriggerSummaryStep2 1 0 DEBUG +++ HLT_e3_etcut ID#2711808158 TriggerSummaryStep1 2 0 DEBUG +++ HLT_e5_etcut ID#607406625 TriggerSummaryStep1 2 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583 TriggerSummaryStep1 2 0 DEBUG +++ HLT_e7_etcut ID#2430733989 TriggerSummaryStep2 2 0 DEBUG +++ HLT_e5_etcut ID#607406625 TriggerSummaryStep2 2 0 DEBUG +++ HLT_e7_etcut ID#2430733989 -TriggerSummaryStep2 2 0 DEBUG +++ HLT_e3_etcut ID#2711808158 TriggerSummaryStep1 3 0 DEBUG +++ HLT_e5_etcut ID#607406625 TriggerSummaryStep1 3 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583 TriggerSummaryStep1 3 0 DEBUG +++ HLT_e7_etcut ID#2430733989 TriggerSummaryStep2 3 0 DEBUG +++ HLT_e5_etcut ID#607406625 TriggerSummaryStep2 3 0 DEBUG +++ HLT_e7_etcut ID#2430733989 -TriggerSummaryStep2 3 0 DEBUG +++ HLT_e3_etcut ID#2711808158 TriggerSummaryStep1 4 0 DEBUG +++ HLT_e5_etcut ID#607406625 TriggerSummaryStep1 4 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583 TriggerSummaryStep1 4 0 DEBUG +++ HLT_e7_etcut ID#2430733989 @@ -34,7 +30,6 @@ TriggerSummaryStep1 5 0 DEBUG +++ HLT_e3_etcut1step I TriggerSummaryStep1 5 0 DEBUG +++ HLT_e7_etcut ID#2430733989 TriggerSummaryStep2 5 0 DEBUG +++ HLT_e5_etcut ID#607406625 TriggerSummaryStep2 5 0 DEBUG +++ HLT_e7_etcut ID#2430733989 -TriggerSummaryStep2 5 0 DEBUG +++ HLT_e3_etcut ID#2711808158 TriggerSummaryStep1 6 0 DEBUG +++ HLT_e5_etcut ID#607406625 TriggerSummaryStep1 6 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583 TriggerSummaryStep1 6 0 DEBUG +++ HLT_e7_etcut ID#2430733989 @@ -47,13 +42,11 @@ TriggerSummaryStep1 7 0 DEBUG +++ HLT_e3_etcut1step I TriggerSummaryStep1 7 0 DEBUG +++ HLT_e7_etcut ID#2430733989 TriggerSummaryStep2 7 0 DEBUG +++ HLT_e5_etcut ID#607406625 TriggerSummaryStep2 7 0 DEBUG +++ HLT_e7_etcut ID#2430733989 -TriggerSummaryStep2 7 0 DEBUG +++ HLT_e3_etcut ID#2711808158 TriggerSummaryStep1 8 0 DEBUG +++ HLT_e5_etcut ID#607406625 TriggerSummaryStep1 8 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583 TriggerSummaryStep1 8 0 DEBUG +++ HLT_e7_etcut ID#2430733989 TriggerSummaryStep2 8 0 DEBUG +++ HLT_e5_etcut ID#607406625 TriggerSummaryStep2 8 0 DEBUG +++ HLT_e7_etcut ID#2430733989 -TriggerSummaryStep2 8 0 DEBUG +++ HLT_e3_etcut ID#2711808158 TriggerSummaryStep1 10 0 DEBUG +++ HLT_e5_etcut ID#607406625 TriggerSummaryStep1 10 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583 TriggerSummaryStep1 10 0 DEBUG +++ HLT_e7_etcut ID#2430733989 @@ -64,8 +57,6 @@ TriggerSummaryStep2 10 0 DEBUG +++ HLT_e3_etcut ID#271 TriggerSummaryStep1 11 0 DEBUG +++ HLT_e5_etcut ID#607406625 TriggerSummaryStep1 11 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583 TriggerSummaryStep2 11 0 DEBUG +++ HLT_e5_etcut ID#607406625 -TriggerSummaryStep2 11 0 DEBUG +++ HLT_e7_etcut ID#2430733989 -TriggerSummaryStep2 11 0 DEBUG +++ HLT_e3_etcut ID#2711808158 TriggerSummaryStep1 12 0 DEBUG +++ HLT_e5_etcut ID#607406625 TriggerSummaryStep1 12 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583 TriggerSummaryStep1 12 0 DEBUG +++ HLT_e7_etcut ID#2430733989 @@ -84,7 +75,6 @@ TriggerSummaryStep1 14 0 DEBUG +++ HLT_e5_etcut ID#607 TriggerSummaryStep1 14 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583 TriggerSummaryStep1 14 0 DEBUG +++ HLT_e3_etcut ID#2711808158 TriggerSummaryStep2 14 0 DEBUG +++ HLT_e5_etcut ID#607406625 -TriggerSummaryStep2 14 0 DEBUG +++ HLT_e7_etcut ID#2430733989 TriggerSummaryStep2 14 0 DEBUG +++ HLT_e3_etcut ID#2711808158 TriggerSummaryStep1 16 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583 TriggerSummaryStep1 17 0 DEBUG +++ HLT_e5_etcut ID#607406625 @@ -103,8 +93,7 @@ TriggerSummaryStep1 19 0 DEBUG +++ HLT_e3_etcut1step I TriggerSummaryStep1 19 0 DEBUG +++ HLT_e7_etcut ID#2430733989 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 TrigSignatureMoniMT INFO HLT_e5_etcut 20 20 17 16 16 -TrigSignatureMoniMT INFO HLT_e7_etcut 20 20 15 16 16 +TrigSignatureMoniMT INFO HLT_e7_etcut 20 20 15 14 14 TrigSignatureMoniMT INFO HLT_e3_etcut1step 20 20 18 0 18 -TrigSignatureMoniMT INFO HLT_e3_etcut 20 9 8 16 16 +TrigSignatureMoniMT INFO HLT_e3_etcut 20 9 8 7 7 diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref index 62814383b34628ee8a13e637ba833787418fde89..acbda43ff57e04fd575fe5f5649533e792837d5d 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref +++ b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref @@ -78,7 +78,6 @@ TriggerSummaryStep1 11 0 DEBUG +++ HLT_e5_etcut ID#607 TriggerSummaryStep1 11 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583 TriggerSummaryStep1 11 0 DEBUG +++ HLT_e3_etcut ID#2711808158 TriggerSummaryStep2 11 0 DEBUG +++ HLT_e5_etcut ID#607406625 -TriggerSummaryStep2 11 0 DEBUG +++ HLT_e7_etcut ID#2430733989 TriggerSummaryStep2 11 0 DEBUG +++ HLT_e3_etcut ID#2711808158 TriggerSummaryStep1 12 0 DEBUG +++ HLT_e5_etcut ID#607406625 TriggerSummaryStep1 12 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583 @@ -98,14 +97,11 @@ TriggerSummaryStep1 14 0 DEBUG +++ HLT_e5_etcut ID#607 TriggerSummaryStep1 14 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583 TriggerSummaryStep1 14 0 DEBUG +++ HLT_e3_etcut ID#2711808158 TriggerSummaryStep2 14 0 DEBUG +++ HLT_e5_etcut ID#607406625 -TriggerSummaryStep2 14 0 DEBUG +++ HLT_e7_etcut ID#2430733989 TriggerSummaryStep2 14 0 DEBUG +++ HLT_e3_etcut ID#2711808158 TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6Comb ID#393364983 TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6 ID#1672162766 TriggerSummaryStep1 16 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583 TriggerSummaryStep1 16 0 DEBUG +++ HLT_e3_etcut ID#2711808158 -TriggerSummaryStep2 16 0 DEBUG +++ HLT_e5_etcut ID#607406625 -TriggerSummaryStep2 16 0 DEBUG +++ HLT_e7_etcut ID#2430733989 TriggerSummaryStep2 16 0 DEBUG +++ HLT_e3_etcut ID#2711808158 TriggerSummaryStep1 17 0 DEBUG +++ HLT_e5_etcut ID#607406625 TriggerSummaryStep1 17 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583 @@ -125,11 +121,11 @@ 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 -TrigSignatureMoniMT INFO HLT_e5_etcut 20 20 17 17 17 +TrigSignatureMoniMT INFO HLT_e5_etcut 20 20 17 16 16 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_e7_etcut 20 20 15 14 14 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