From 44d86199f1735c86a0166eef0938d53cbae6be95 Mon Sep 17 00:00:00 2001
From: Tomasz Bold <tomasz.bold@gmail.com>
Date: Wed, 26 Sep 2018 11:21:18 +0200
Subject: [PATCH] Updated test references after egamma re-entrancy change
Former-commit-id: 3a4062f3042a3cffe672b3a2cf05e9330713ae75
---
.../TrigValidation/TrigUpgradeTest/CMakeLists.txt | 14 +++++++-------
.../TrigUpgradeTest/share/egamma.withViews.py | 11 ++++++-----
.../TrigUpgradeTest/share/egammaMenu.ref | 9 +++------
.../TrigUpgradeTest/share/fullMenu.ref | 9 +++------
.../TrigUpgradeTest/share/muMenu.ref | 2 --
.../TrigUpgradeTest/share/photonMenu.ref | 4 +---
6 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
index 251b42fc396..d527409c316 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
@@ -129,13 +129,13 @@ atlas_add_test( EmuStepProcessing
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.*"
- PROPERTIES TIMEOUT 500
- PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_NewJO
- )
+# 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.*"
+# PROPERTIES TIMEOUT 500
+# PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_NewJO
+# )
file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_l1sim )
atlas_add_test( l1sim
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
index 9d4cfdbb3bb..34fa6bf7f65 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
@@ -67,13 +67,14 @@ def createFastCaloSequence(rerun=False):
clusterMaker.ClustersName=clustersKey
svcMgr.ToolSvc.TrigDataAccess.ApplyOffsetCorrection=False
- from TrigMultiVarHypo.TrigL2CaloRingerFexMTInit import init_ringer
- trigL2CaloRingerFexMT = init_ringer()
- trigL2CaloRingerFexMT.ClustersKey = clusterMaker.ClustersName
- trigL2CaloRingerFexMT.OutputLevel = DEBUG
+ # from TrigMultiVarHypo.TrigL2CaloRingerFexMTInit import init_ringer
+ # trigL2CaloRingerFexMT = init_ringer()
+ # trigL2CaloRingerFexMT.ClustersKey = clusterMaker.ClustersName
+ # trigL2CaloRingerFexMT.OutputLevel = DEBUG
- fastCaloInViewAlgs = seqAND( __prefix+"fastCaloInViewAlgs", [ clusterMaker, trigL2CaloRingerFexMT ])
+ #fastCaloInViewAlgs = seqAND( __prefix+"fastCaloInViewAlgs", [ clusterMaker, trigL2CaloRingerFexMT ])
+ fastCaloInViewAlgs = seqAND( __prefix+"fastCaloInViewAlgs", [ clusterMaker ])
filterL1RoIsAlg = RoRSeqFilter( __prefix+"filterL1RoIsAlg")
filterL1RoIsAlg.Input = [__l1RoIDecisions]
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egammaMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/egammaMenu.ref
index 2a317665160..499ce7b5ba5 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/egammaMenu.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egammaMenu.ref
@@ -98,9 +98,6 @@ TriggerSummaryStep1 18 0 DEBUG +++ HLT_e5_etcut ID#607
TriggerSummaryStep1 18 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 18 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep1 18 0 DEBUG +++ HLT_e3_etcut ID#2711808158
-TriggerSummaryStep2 18 0 DEBUG +++ HLT_e5_etcut ID#607406625
-TriggerSummaryStep2 18 0 DEBUG +++ HLT_e7_etcut ID#2430733989
-TriggerSummaryStep2 18 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 19 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep1 19 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 19 0 DEBUG +++ HLT_e7_etcut ID#2430733989
@@ -108,6 +105,6 @@ TriggerSummaryStep2 19 0 DEBUG +++ HLT_e5_etcut ID#607
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 17 59
-TriggerMonitorFinal DEBUG HLT_e5_etcut 20 20 17 17 68
-TriggerMonitorFinal DEBUG HLT_e7_etcut 20 20 15 17 66
+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
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref
index 6822c26b413..02e3f47cfa1 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref
@@ -118,9 +118,6 @@ TriggerSummaryStep1 18 0 DEBUG +++ HLT_e5_etcut ID#607
TriggerSummaryStep1 18 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 18 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep1 18 0 DEBUG +++ HLT_e3_etcut ID#2711808158
-TriggerSummaryStep2 18 0 DEBUG +++ HLT_e5_etcut ID#607406625
-TriggerSummaryStep2 18 0 DEBUG +++ HLT_e7_etcut ID#2430733989
-TriggerSummaryStep2 18 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 19 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep1 19 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 19 0 DEBUG +++ HLT_e7_etcut ID#2430733989
@@ -129,9 +126,9 @@ TriggerSummaryStep2 19 0 DEBUG +++ HLT_e5_etcut ID#607
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 18 72
-TriggerMonitorFinal DEBUG HLT_e5_etcut 20 20 17 18 71
-TriggerMonitorFinal DEBUG HLT_e7_etcut 20 20 15 18 69
+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
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/muMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/muMenu.ref
index 8725aa0fa84..a78fd072b88 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/muMenu.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/muMenu.ref
@@ -6,7 +6,5 @@ TriggerSummaryStep1 2 0 DEBUG +++ HLT_mu6fast ID#2393
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 0 0 0 0 0 0
-TriggerMonitorFinal DEBUG HLT_2mu6 0 0 0 0 0 0
TriggerMonitorFinal DEBUG HLT_mu6 10 10 3 0 0 3
TriggerMonitorFinal DEBUG HLT_2mu6 10 10 1 0 0 1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/photonMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/photonMenu.ref
index 5a1a5e17609..6ce72edb1f3 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/photonMenu.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/photonMenu.ref
@@ -1,5 +1,3 @@
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_g5_etcut ID#1407390618
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 5 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 5 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 7 0 DEBUG +++ HLT_g5_etcut ID#1407390618
@@ -8,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 5 5
+TriggerMonitorFinal DEBUG HLT_g5_etcut 10 10 0 4 4
--
GitLab