diff --git a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt index 4d8de0a33b1122a30af00269bb90a1b3b2922c91..9acc904b0538731ad38f029633f1e437c7b60d80 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 8705ff0039257dfe2ce42935589c9c8263b25061..607cbd29be610bcf8046412af1156e648b56ca55 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 ea29332352d660e999676a2ca4f8b5ac20afc2bb..b045f5aa72b44e863a48e687da589caad470eb17 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