From 3a366390d12feb2761a9637b0a8d38b859ff10a8 Mon Sep 17 00:00:00 2001
From: Rafal Bielski <rafal.bielski@cern.ch>
Date: Thu, 11 Apr 2019 03:33:47 +0200
Subject: [PATCH] Add ART grid full-menu test
---
.../test/exec_TrigUpgradeTest_art_athenaMT.sh | 4 +++-
.../test/test_full_menu_build.sh | 3 ++-
.../test/test_full_menu_grid.sh | 20 +++++++++++++++++++
3 files changed, 25 insertions(+), 2 deletions(-)
create mode 100755 Trigger/TrigValidation/TrigUpgradeTest/test/test_full_menu_grid.sh
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_athenaMT.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_athenaMT.sh
index 6147d54b9ee..3b1d830b715 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_athenaMT.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_athenaMT.sh
@@ -46,6 +46,8 @@ fi
if [[ $INPUT == "run2data" ]]; then
export DS="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"
+elif [[ $INPUT == "run2dataFTK" ]]; then
+ export DS="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00360026.physics_EnhancedBias.MissingTowers._lb0151._SFO-6._0001.1,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00360026.physics_EnhancedBias.MissingTowers._lb0151._SFO-6._0002.1,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00360026.physics_EnhancedBias.MissingTowers._lb0151._SFO-6._0003.1,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00360026.physics_EnhancedBias.MissingTowers._lb0151._SFO-6._0004.1"
elif [[ $INPUT == "run2mc_ttbar" ]]; then
export DS="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00/RDO.07644622._000001.pool.root.1,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00/RDO.07644622._000002.pool.root.1"
else
@@ -70,7 +72,7 @@ else
${MATHLIBOPT} \
--threads ${THREADS} \
--concurrent-events ${SLOTS} \
- --filesInput ${DS} \
+ --filesInput "${DS}" \
--evtMax ${EVENTS} \
--skipEvents ${SKIPEVENTS} \
-c "${EXTRA}" \
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_full_menu_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_full_menu_build.sh
index 4e88d4e27d8..539b1c7d671 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_full_menu_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_full_menu_build.sh
@@ -3,8 +3,9 @@
# art-type: build
# art-include: master/Athena
# art-output: *.log
+# art-output: *.new
+# art-output: *.txt
# art-output: *.root
-# art-output: *.regtest.new
export NAME="TrigUpgradeTest_full_menu_build"
export SKIPEVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_full_menu_grid.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_full_menu_grid.sh
new file mode 100755
index 00000000000..2111c44519e
--- /dev/null
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_full_menu_grid.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+# art-description: athenaMT trigger test using the full menu from TrigUpgradeTest job options
+# art-type: grid
+# art-include: master/Athena
+# art-output: *.log
+# art-output: *.new
+# art-output: *.txt
+# art-output: *.root
+
+export NAME="TrigUpgradeTest_full_menu_grid"
+export INPUT="run2dataFTK" # FTK doesn't matter here - using this dataset because of larger stats
+export EVENTS=1000
+export THREADS=1
+export SLOTS=1
+export JOBOPTION="TrigUpgradeTest/full_menu.py"
+export REGTESTEXP="TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*"
+
+source exec_TrigUpgradeTest_art_athenaMT.sh
+source exec_TrigUpgradeTest_art_post.sh
+
--
GitLab