From aa84304f7ab853fb9f7a9ac2f9f2cc4b7756a646 Mon Sep 17 00:00:00 2001
From: Tomasz Bold <tomasz.bold@gmail.com>
Date: Tue, 29 Jan 2019 09:40:35 +0100
Subject: [PATCH] fixed decode BS test
---
Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt | 6 +++---
.../TrigValidation/TrigUpgradeTest/share/decodeBS.py | 2 +-
.../TrigUpgradeTest/test/test_decodeBS.sh | 11 +++++++++++
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
index 4d8de0a33b1..9acc904b053 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
@@ -72,12 +72,12 @@ atlas_add_test( egammaRunData
PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_egammaRunData
)
-
+file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_decodeBS )
atlas_add_test( decodeBS
SCRIPT test/test_decodeBS.sh
PROPERTIES TIMEOUT 1000
- EXTRA_PATTERNS "-s .*absent.*|.*present.*|.*fragment: clid, type, key.*"
- PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_egammaRunData
+ EXTRA_PATTERNS "-s FillMissingEDM.*(present|absent)"
+ PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_decodeBS
DEPENDS egammaRunData
)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/decodeBS.py b/Trigger/TrigValidation/TrigUpgradeTest/share/decodeBS.py
index 8705ff00392..607cbd29be6 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/decodeBS.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/decodeBS.py
@@ -14,7 +14,7 @@ topSequence += decoder
from TrigOutputHandling.TrigOutputHandlingConf import TriggerEDMDeserialiserAlg
-deserialiser = TriggerEDMDeserialiserAlg()
+deserialiser = TriggerEDMDeserialiserAlg("TrigDeserialiser")
deserialiser.OutputLevel=DEBUG
topSequence += deserialiser
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_decodeBS.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_decodeBS.sh
index ea29332352d..b045f5aa72b 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_decodeBS.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_decodeBS.sh
@@ -3,6 +3,17 @@
# art-include: master/Athena
#
+
+#!/bin/sh
+# art-type: build
+# art-include: master/Athena
+
+#clear BS from previous runs
+rm -rf data_test.*.data
+athena --threads=1 --skipEvents=10 --evtMax=20 --filesInput="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1" TrigUpgradeTest/egamma.withViews.py
+
+
+
FNAME=data_test.00327265.Single_Stream.daq.RAW._lb0100._Athena._0000.data
if [ -f ${FNAME} ]
then
--
GitLab