From 83ee1aa1c888f5ab93a4aa17dbb22e51d3704a91 Mon Sep 17 00:00:00 2001
From: Tim Martin <Tim.Martin@cern.ch>
Date: Thu, 10 May 2018 19:14:43 +0200
Subject: [PATCH] May 2018 updates to Trigger ART tests and framework
Former-commit-id: 304068cda45e80a6d1d6c514013f7af97011186a
---
.../test/exec_art_triganalysistest_post.sh | 25 ++++---
.../test/test_mc_pp_v7_rdotoaod_grid.sh | 2 -
.../test/test_mc_pp_v7_rdotoaodslim_build.sh | 2 -
.../test/test_mc_pp_v7_rdotobstoesd_build.sh | 2 -
.../test/test_mc_pp_v7_rdotoesdaod_build.sh | 2 -
.../test/test_mc_pp_v7_rdotoesdaod_grid.sh | 2 -
.../test_mc_pp_v7_trigdecisiontool_grid.sh | 1 +
.../test/test_mc_pp_v7_trigedm_grid.sh | 1 +
.../test/test_physics_pp_v7_rdotoaod_grid.sh | 2 -
.../test_physics_pp_v7_rdotobstoesd_build.sh | 2 -
.../test_physics_pp_v7_rdotoesdaod_build.sh | 2 -
.../test_physics_pp_v7_rdotoesdaod_grid.sh | 2 -
.../TrigP1Test/Testing/TrigP1Test.conf | 68 -------------------
.../TrigP1Test/Testing/TrigP1Test_ART.conf | 2 +-
.../TrigP1Test/share/trigp1test_athenaHLT.py | 8 ++-
.../test/exec_art_trigp1test_post.sh | 9 ++-
.../exec_athenaHLT_art_trigger_validation.sh | 13 ++--
.../test/test_AthenaP1RDOtoBS_build.sh | 1 +
.../test_AthenaTrigBS_L2EFMerging_build.sh | 1 +
.../TrigP1Test/test/test_HLT_HIV4_build.sh | 1 +
.../TrigP1Test/test/test_HLT_mcV7_build.sh | 1 +
.../test/test_HLT_mcV7_menu_build.sh | 1 +
.../test/test_HLT_physicsV7_AFP_build.sh | 1 +
.../test/test_HLT_physicsV7_ALFAMon_build.sh | 1 +
...t_HLT_physicsV7_COS_2016IDCOSMICS_build.sh | 1 +
.../test_HLT_physicsV7_COS_2016MUONS_build.sh | 1 +
.../test/test_HLT_physicsV7_COS_build.sh | 1 +
.../test_HLT_physicsV7_DataScouting_build.sh | 1 +
.../test/test_HLT_physicsV7_FTK_build.sh | 1 +
.../test_HLT_physicsV7_L1Topo_data_build.sh | 1 +
...T_physicsV7_ROBprefetching_off_on_build.sh | 1 +
.../test/test_HLT_physicsV7_beamspot_build.sh | 1 +
.../test/test_HLT_physicsV7_build.sh | 1 +
..._HLT_physicsV7_magField_on_off_on_build.sh | 1 +
.../test/test_HLT_physicsV7_menu_build.sh | 4 --
.../test_HLT_physicsV7_rerunLVL1_build.sh | 1 +
.../test_HLT_physicsV7_run_stop_run_build.sh | 1 +
.../test/test_HelloWorldHLT_build.sh | 1 +
.../test_HelloWorldHLT_run_stop_run_build.sh | 1 +
...S_AthenaP1BS_standalone_physicsV7_build.sh | 1 +
...test_Trigreco_physicsV7_currentT0_build.sh | 2 +-
...athenaHLT_CostMonitoring_PhysicsV7_grid.sh | 1 +
.../test_athenaHLT_LatestRun_MCV7_build.sh | 1 +
.../test_athenaHLT_on_data_leakCheck_grid.sh | 6 +-
.../test/test_pureSteering_build.sh | 1 +
.../test/test_pureSteering_ecodes_build.sh | 1 +
.../test_pureSteering_prescaling_build.sh | 2 +-
.../test/exec_art_triggertest_post.sh | 8 ++-
.../exec_athena_art_trigger_validation.sh | 8 ++-
.../test/test_mc_hi_v3_tight_grid.sh | 1 +
.../TriggerTest/test/test_mc_hi_v4_grid.sh | 1 +
.../TriggerTest/test/test_mc_pp_v7_build.sh | 1 +
.../TriggerTest/test/test_mc_pp_v7_grid.sh | 1 +
.../test/test_mc_pp_v7_loose_grid.sh | 1 +
.../test/test_mc_pp_v7_nops_aod_ftk_build.sh | 1 +
.../test/test_mc_pp_v7_nops_aod_ftk_grid.sh | 1 +
.../test/test_mc_pp_v7_tight_grid.sh | 1 +
.../test/test_physics_hi_v3_build.sh | 1 +
.../test/test_physics_hi_v3_grid.sh | 1 +
.../test/test_physics_hi_v4_build.sh | 1 +
.../test/test_physics_hi_v4_grid.sh | 1 +
.../test/test_physics_pp_v7_aod_grid.sh | 1 +
.../test/test_physics_pp_v7_build.sh | 1 +
.../test_physics_pp_v7_chainorder_build.sh | 3 +-
.../test/test_physics_pp_v7_grid.sh | 1 +
.../test/test_physics_pp_v7_tight_grid.sh | 1 +
.../TriggerTest/test/test_slice_bjet_build.sh | 1 +
.../TriggerTest/test/test_slice_bjet_grid.sh | 1 +
.../test/test_slice_bphysics_aod_grid.sh | 1 +
.../test/test_slice_bphysics_build.sh | 1 +
.../test/test_slice_bphysics_grid.sh | 1 +
.../test/test_slice_bphysicsexo_aod_grid.sh | 1 +
.../test/test_slice_electron_build.sh | 1 +
.../test/test_slice_electron_grid.sh | 1 +
.../TriggerTest/test/test_slice_id_build.sh | 1 +
.../TriggerTest/test/test_slice_jet_build.sh | 1 +
.../TriggerTest/test/test_slice_jet_grid.sh | 1 +
.../TriggerTest/test/test_slice_l1_build.sh | 1 +
.../TriggerTest/test/test_slice_l1_grid.sh | 1 +
.../TriggerTest/test/test_slice_met_build.sh | 1 +
.../TriggerTest/test/test_slice_met_grid.sh | 1 +
.../test/test_slice_minbias_build.sh | 1 +
.../test/test_slice_minbias_grid.sh | 1 +
.../test/test_slice_minbias_hmt_grid.sh | 1 +
.../TriggerTest/test/test_slice_muon_build.sh | 1 +
.../TriggerTest/test/test_slice_muon_grid.sh | 1 +
.../TriggerTest/test/test_slice_tau_build.sh | 1 +
.../TriggerTest/test/test_slice_tau_grid.sh | 1 +
88 files changed, 119 insertions(+), 123 deletions(-)
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/exec_art_triganalysistest_post.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/exec_art_triganalysistest_post.sh
index 5efa042cb440..5f619100a644 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/exec_art_triganalysistest_post.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/exec_art_triganalysistest_post.sh
@@ -24,7 +24,7 @@ athena.py -c 'fileList=["AOD.pool.root"]' -b TrigAnalysisTest/testAthenaTrigAOD_
echo "art-result: ${PIPESTATUS[0]} ${TDT_LOG%.*}"
echo $(date "+%FT%H:%M %Z")" Running checklog"
timeout 1m check_log.pl --config checklogTriggerTest.conf --showexcludestats ${TDT_LOG} | tee checklog.TrigDecTool.log
-echo "art-result: ${PIPESTATUS[0]} ${TDT_LOG%.*}.CheckLog"
+echo "art-result: ${PIPESTATUS[0]} CheckLog.TrigDecTool"
echo "##############################"
echo $(date "+%FT%H:%M %Z")" Test AthenaTrigAOD_TrigEDMCheck"
@@ -33,7 +33,7 @@ athena.py -c 'fileList=["AOD.pool.root"]' -b TrigAnalysisTest/testAthenaTrigAOD_
echo "art-result: ${PIPESTATUS[0]} ${EDM_LOG%.*}"
echo $(date "+%FT%H:%M %Z")" Running checklog"
timeout 1m check_log.pl --config checklogTriggerTest.conf --showexcludestats ${EDM_LOG} | tee checklog.TrigEDMCheck.log
-echo "art-result: ${PIPESTATUS[0]} ${EDM_LOG%.*}.CheckLog"
+echo "art-result: ${PIPESTATUS[0]} CheckLog.TrigEDMCheck"
echo "##############################"
echo $(date "+%FT%H:%M %Z")" Test AthenaTrigAOD_TrigEDMAuxCheck"
@@ -42,7 +42,7 @@ athena.py -c 'fileList=["AOD.pool.root"]' -b TrigAnalysisTest/testAthenaTrigAOD_
echo "art-result: ${PIPESTATUS[0]} ${EDMAUX_LOG%.*}"
echo $(date "+%FT%H:%M %Z")" Running checklog"
timeout 1m check_log.pl --config checklogTriggerTest.conf --showexcludestats ${EDMAUX_LOG} | tee checklog.TrigEDMAuxCheck.log
-echo "art-result: ${PIPESTATUS[0]} ${EDMAUX_LOG%.*}.CheckLog"
+echo "art-result: ${PIPESTATUS[0]} CheckLog.TrigEDMAuxCheck"
echo "################################"
echo $(date "+%FT%H:%M %Z")" Test AthenaTrigAOD_TrigHLTMon"
@@ -51,7 +51,7 @@ TrigHLTMon_tf.py --inputAODFile AOD.pool.root --outputHISTFile myHIST.root | te
echo "art-result: ${PIPESTATUS[0]} ${TRIGHLTMON_LOG%.*}"
echo $(date "+%FT%H:%M %Z")" Running checklog"
timeout 1m check_log.pl --config checklogTriggerTest.conf --showexcludestats ${TRIGHLTMON_LOG} | tee checklog.TrigHLTMon.log
-echo "art-result: ${PIPESTATUS[0]} ${TRIGHLTMON_LOG%.*}.CheckLog"
+echo "art-result: ${PIPESTATUS[0]} CheckLog.TrigHLTMon"
echo "################################"
echo $(date "+%FT%H:%M %Z")" Test AthenaTrigESD_HLTMonitoring"
@@ -60,12 +60,12 @@ athena.py -c 'fileList=["ESD.pool.root"]' -b TrigAnalysisTest/testAthenaTrigESD_
echo "art-result: ${PIPESTATUS[0]} ${HLTMON_LOG%.*}"
echo $(date "+%FT%H:%M %Z")" Running checklog"
timeout 1m check_log.pl --config checklogTriggerTest.conf --showexcludestats ${HLTMON_LOG} | tee checklog.HLTMonitoring.log
-echo "art-result: ${PIPESTATUS[0]} ${HLTMON_LOG%.*}.CheckLog"
+echo "art-result: ${PIPESTATUS[0]} CheckLog.HLTMonitoring"
mv histo.root expert-monitoring.root
if [ -f ${REF_FOLDER}/expert-monitoring.root ]; then
echo $(date "+%FT%H:%M %Z")" Running rootcomp"
timeout 10m rootcomp.py ${REF_FOLDER}/expert-monitoring.root | tee rootcompout.HLTMonitoring.log
- echo "art-result: ${PIPESTATUS[0]} ${HLTMON_LOG%.*}.RootComp"
+ echo "art-result: ${PIPESTATUS[0]} RootComp.HLTMonitoring"
else
echo $(date "+%FT%H:%M %Z")" No reference expert-monitoring.root found in ${REF_FOLDER}"
fi
@@ -77,14 +77,14 @@ athena.py -c 'TestType="RSegamma";useCONDBR2=False;' -b TrigAnalysisTest/testAth
echo "art-result: ${PIPESTATUS[0]} ${SLIM_LOG%.*}"
echo $(date "+%FT%H:%M %Z")" Running checklog"
timeout 1m check_log.pl --config checklogTriggerTest.conf --showexcludestats ${SLIM_LOG} | tee checklog.TrigNavSlimming.log
-echo "art-result: ${PIPESTATUS[0]} ${SLIM_LOG%.*}.CheckLog"
+echo "art-result: ${PIPESTATUS[0]} CheckLog.TrigNavSlimming"
if [ -f AOD.pool.root ]; then
echo $(date "+%FT%H:%M %Z")" Running CheckFile on AOD"
- timeout 10m checkFile.py AOD.pool.root | tee .pool.root.checkFile
- echo "art-result: ${PIPESTATUS[0]} ${SLIM_LOG%.*}.CheckFileAOD"
+ timeout 10m checkFile.py AOD.pool.root | tee AOD.pool.root.checkFile
+ echo "art-result: ${PIPESTATUS[0]} CheckFileAOD.TrigNavSlimming"
echo $(date "+%FT%H:%M %Z")" Running CheckxAOD AOD"
timeout 10m checkxAOD.py AOD.pool.root | tee AOD.pool.root.checkxAODFile
- echo "art-result: ${PIPESTATUS[0]} ${SLIM_LOG%.*}.CheckXAOD"
+ echo "art-result: ${PIPESTATUS[0]} CheckFileXAOD.TrigNavSlimming"
else
echo $(date "+%FT%H:%M %Z")" No AOD.pool.root to check"
fi
@@ -94,10 +94,13 @@ if [ -f AOD.pool.root ]; then
echo $(date "+%FT%H:%M %Z")" Test checkFileTrigSize_RTT"
export TRIGSIZE_LOG=${JOB_LOG%%.*}.TrigEDMSize.${JOB_LOG#*.}
timeout 10m checkFileTrigSize_RTT.py | tee ${TRIGSIZE_LOG}
- echo "art-result: ${PIPESTATUS[0]} ${TRIGSIZE_LOG%.*}"
+ echo "art-result: ${PIPESTATUS[0]} TrigEDMSize"
else
echo $(date "+%FT%H:%M %Z")" No AOD.pool.root to check with checkFileTrigSize_RTT"
fi
+echo $(date "+%FT%H:%M %Z")" Files in directory:"
+ls -lh
+
echo $(date "+%FT%H:%M %Z")" Done executing TrigAnalysisTest post processing for test ${NAME}"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaod_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaod_grid.sh
index 1e31c2b32813..03e934ceb038 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaod_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaod_grid.sh
@@ -2,8 +2,6 @@
# art-description: Trigger MC pp v7 RDO to AOD test
# art-type: grid
-# art-include: 21.1/AthenaP1
-# art-include: 21.1-dev/AthenaP1
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaodslim_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaodslim_build.sh
index 6cd25b109122..d095c1c58ae3 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaodslim_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaodslim_build.sh
@@ -2,8 +2,6 @@
# art-description: Trigger MC pp v7 RDO to AODSLIM
# art-type: build
-# art-include: 21.1/AthenaP1
-# art-include: 21.1-dev/AthenaP1
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotobstoesd_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotobstoesd_build.sh
index 00c7300eeb73..70aa0a294bf9 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotobstoesd_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotobstoesd_build.sh
@@ -2,8 +2,6 @@
# art-description: Trigger MC pp v7 RDO to BS and BS to ESD test
# art-type: build
-# art-include: 21.1/AthenaP1
-# art-include: 21.1-dev/AthenaP1
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoesdaod_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoesdaod_build.sh
index 6c89537a5639..0a20e05efb69 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoesdaod_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoesdaod_build.sh
@@ -2,8 +2,6 @@
# art-description: Trigger MC pp v7 RDO to ESD and AOD test, plus extra tests using these files
# art-type: build
-# art-include: 21.1/AthenaP1
-# art-include: 21.1-dev/AthenaP1
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoesdaod_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoesdaod_grid.sh
index 54f6dcac798f..32091ad868c4 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoesdaod_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoesdaod_grid.sh
@@ -2,8 +2,6 @@
# art-description: Trigger MC pp v7 RDO to ESD and AOD test, plus extra tests using these files
# art-type: grid
-# art-include: 21.1/AthenaP1
-# art-include: 21.1-dev/AthenaP1
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigdecisiontool_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigdecisiontool_grid.sh
index e2a22838a92a..cea5a76519a0 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigdecisiontool_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigdecisiontool_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigedm_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigedm_grid.sh
index 524f34878cc8..33e5bcd52459 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigedm_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigedm_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoaod_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoaod_grid.sh
index 2ff6e2df7d1a..00af7dd5ff88 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoaod_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoaod_grid.sh
@@ -2,8 +2,6 @@
# art-description: Trigger Physics pp v7 RDO to AOD test
# art-type: grid
-# art-include: 21.1/AthenaP1
-# art-include: 21.1-dev/AthenaP1
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotobstoesd_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotobstoesd_build.sh
index d6edb83d38b1..441d00c36338 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotobstoesd_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotobstoesd_build.sh
@@ -2,8 +2,6 @@
# art-description: Trigger Physics pp v7 RDO to BS and BS to AOD test
# art-type: build
-# art-include: 21.1/AthenaP1
-# art-include: 21.1-dev/AthenaP1
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoesdaod_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoesdaod_build.sh
index e6b9e15efa73..0e8b784b5e27 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoesdaod_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoesdaod_build.sh
@@ -2,8 +2,6 @@
# art-description: Trigger Physics pp v7 RDO to ESD and AOD test, plus extra tests using these files
# art-type: build
-# art-include: 21.1/AthenaP1
-# art-include: 21.1-dev/AthenaP1
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoesdaod_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoesdaod_grid.sh
index d27ddc09dd8a..fc681bc988df 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoesdaod_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoesdaod_grid.sh
@@ -2,8 +2,6 @@
# art-description: Trigger Physics pp v7 RDO to ESD and AOD test, plus extra tests using these files
# art-type: grid
-# art-include: 21.1/AthenaP1
-# art-include: 21.1-dev/AthenaP1
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
diff --git a/Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test.conf b/Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test.conf
index fc8bac6e5d9c..073bb25be852 100644
--- a/Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test.conf
+++ b/Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test.conf
@@ -378,21 +378,11 @@ test 61
checklog --config checklogTrigP1Test.conf --showexcludestats
athena_cmd athenaHLT.py -M -n 75 -f /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/atn-test/data17_13TeV.00327265.physics_eb_zmm_egz.merged.RAW.selected._0001.data -o HLT_physicsV7_menu -c 'testPhysicsV7=True;trigBase="Default";doDBConfig=True;fpeAuditor=True' TriggerRelease/runHLT_standalone.py
-test 62
- name UploadMenuKeys
- doc Generates and uploads SMKs created from the HLT first and compares after rerun jobs from DB.
- pre_condition test -e ../HLT_physicsV7_menu/ef_Default_setup.txt
- pre_condition test -e ../HLT_physicsV7_menu/ef_Default_setup_setup.txt
- pre_condition test -e ../HLT_physicsV7_menu/outputHLT*xml
- athena_cmd testUploadMenuKeys.sh --menu HLT_physicsV7
-
-
test 63
name HLT_physicsV7_rerun
doc Recreate trigger configuration and compare with configuration from HLT_physicsV7_menu
athena_cmd athenaHLT.py -M -n 75 -f /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/atn-test/data17_13TeV.00327265.physics_eb_zmm_egz.merged.RAW.selected._0001.data -o HLT_physicsV7_rerun -c 'testPhysicsV7=True;trigBase="Default";doDBConfig=True;fpeAuditor=True' TriggerRelease/runHLT_standalone.py
-
test 64
name CheckKeysV7
doc compare the SMK created from the HLT_physicsV7 first and rerun jobs
@@ -406,35 +396,6 @@ test 64
athena_cmd testCheckKeys.sh --menu HLT_physicsV7
-
-test 65
- name HLT_physicsV7_menu_rerundb
- doc athenaHLT from DB, use HLT_physicsV7 as reference
- checklog --config checklogTrigP1Test.conf --showexcludestats
- rootcomp ../HLT_physicsV7_menu/r0000000000_part_athenaHLT_mon_HLT-Histogramming.root r0000000000_part_athenaHLT_mon_HLT-Histogramming.root
- extra_failure_codes ROOTCOMP_MISMATCH
- pre_condition test -e ../UploadMenuKeys/exportMenuKeys.sh
- athena_cmd unset FRONTIER_SERVER; source ../UploadMenuKeys/exportMenuKeys.sh; athenaHLT.py -M -n 75 -f /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/atn-test/data17_13TeV.00327265.physics_eb_zmm_egz.merged.RAW.selected._0001.data -oHLT_physicsV7_menu_rerundb -J TrigConf::HLTJobOptionsSvc --use-database --db-type "Coral" --db-server "TRIGGERDBATN" --db-smkey ${smk} --db-hltpskey ${hltpsk} --db-extra "{'lvl1key': ${l1psk}}"
- post_command chainDump.py -n -S
- post_test RunMsg check_msg_stat.py --showignored --config checkMsgStat_TrigP1Test.conf $logfile
-
-test 66
- name HLT_physicsV6_prescaleChange
- doc Test of HLT prescale change
- checklog --config checklogTrigP1Test.conf --showexcludestats
- pre_condition test -e ../UploadMenuKeys/exportMenuKeys.sh
- pre_condition test -e ../UploadMenuKeys/prescales.txt
- pre_command ln -sf ../UploadMenuKeys/prescales.txt
- pre_command get_files -jo testPrescaleChange_postconfig.py
- athena_cmd source ../UploadMenuKeys/exportMenuKeys.sh; athenaHLT.py -Z TrigP1Test.PrescaleChange -C 'include("testPrescaleChange_postconfig.py");fpeAuditor=True' -f root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/data17_13TeV.00327265.physics_eb_zmm_egz.merged.RAW.selected._0001.data -J TrigConf::HLTJobOptionsSvc --use-database "DBServer=TRIGGERDBATN:Instance=L2:DBSMKey=${smk}:DBHLTPSKey=${hltpsk}:DBLVL1PSKey=${l1psk}"
-
-test 67
- name TriggerDBAccessTest
- doc Access TriggerDB using Oracle and Frontier and compare
-# pre_condition test -e ../UploadMenuKeys/exportMenuKeys.sh
- athena_cmd testAccessDBAndCompare.sh
-
-
## Compare JO vs DB also with rerunLvl1 to test the reprocessing on run1 data
test 71
@@ -443,26 +404,6 @@ test 71
checklog --config checklogTrigP1Test.conf --showexcludestats
athena_cmd athenaHLT.py -M -n 25 -f /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/atn-test/data17_13TeV.00327265.physics_eb_zmm_egz.merged.RAW.selected._0001.data -o HLT_physicsV7_rerunLVL1_menu -c 'doDBConfig=True;testPhysicsV7=True;rerunLVL1=True;trigBase="Default";enableCostForCAF=True;fpeAuditor=True' TriggerRelease/runHLT_standalone.py
-test 72
- name UploadMenuKeys_rerunLVL1
- doc Generates and uploads SMKs created from the HLT first and compares after rerun jobs from DB.
- pre_condition test -e ../HLT_physicsV7_rerunLVL1_menu/ef_Default_setup.txt
- pre_condition test -e ../HLT_physicsV7_rerunLVL1_menu/ef_Default_setup_setup.txt
- pre_condition test -e ../HLT_physicsV7_rerunLVL1_menu/outputHLT*xml
- athena_cmd testUploadMenuKeys.sh --menu HLT_physicsV7_rerunLVL1
-
-
-test 73
- name HLT_physicsV7_rerunLVL1_menu_rerundb
- doc athenaHLT from DB, use HLT_physicsV7 as reference
- checklog --config checklogTrigP1Test.conf --showexcludestats
- rootcomp ../HLT_physicsV7_rerunLVL1_menu/r0000000000_part_athenaHLT_mon_HLT-Histogramming.root r0000000000_part_athenaHLT_mon_HLT-Histogramming.root
- extra_failure_codes ROOTCOMP_MISMATCH
- pre_condition test -e ../UploadMenuKeys_rerunLVL1/exportMenuKeys.sh
- athena_cmd unset FRONTIER_SERVER; source ../UploadMenuKeys_rerunLVL1/exportMenuKeys.sh; athenaHLT.py -M -n 25 -f /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/atn-test/data17_13TeV.00327265.physics_eb_zmm_egz.merged.RAW.selected._0001.data -oHLT_physicsV7_rerunLVL1_menu_rerundb -J TrigConf::HLTJobOptionsSvc --use-database --db-type "Coral" --db-server "TRIGGERDBATN" --db-smkey ${smk} --db-hltpskey ${hltpsk} --db-extra "{'lvl1key': ${l1psk}}"
- post_command chainDump.py -n -S
- post_test RunMsg check_msg_stat.py --showignored --config checkMsgStat_TrigP1Test.conf $logfile
-
#############################################################################################
## Transform tests on BS from main HLT_physicsV7 test
@@ -563,15 +504,6 @@ test 114
checkcount ../HLT_physicsV6/expert-monitoring.root 0 HLT
athena_cmd athenaHLT.py -f root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/data12_8TeV.00212967.physics_eb_zee_zmumu_cc._0001.data -oHLT_physicsV6_nocache -c 'testPhysicsV6=True;noCaching=True;HLTOutputLevel=INFO;doValidation=True;useCONDBR2=False;setGlobalTag="COMCOND-HLTP-004-03-VAL-01";setDetDescr="ATLAS-R1-2012-02-00-00";fpeAuditor=True' TriggerRelease/runHLT_standalone.py
-test 115
- name tfTestPPV6
- doc Check tf for menu PP V6 data
- pre_command xrdcp root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/data12_8TeV.00212967.physics_eb_zee_zmumu_cc._0001.data .
- pre_condition test -e ../UploadMenuKeys/exportMenuKeys.sh
- checklog --config checklogTrigP1Test.conf --showexcludestats
- athena_cmd source ../UploadMenuKeys/exportMenuKeys.sh; BatchHLTTrf_wrap.py inputBSFile=data12_8TeV.00212967.physics_eb_zee_zmumu_cc._0001.data outputRAWFile=RAW.999999._000001.data.1 doStreaming=True filters="express" stream_out=debug connection=TRIGGERDBATN smk=${smk} lvl1ps=${l1psk} hltps=${hltpsk} outputNTUP_TRIGCOSTEFFile=NTUP_TRIGCOSTEF.root outputNTUP_TRIGCOSTL2File=NTUP_TRIGCOSTL2.root outputNTUP_TRIGRATEEFFile=NTUP_TRIGRATEEF.root outputNTUP_TRIGRATEL2File=NTUP_TRIGRATEL2.root outputHIST_HLTMONEFFile=HIST_HLTMONEF.root outputHIST_HLTMONL2File=HIST_HLTMONL2.root max_events=10
-
-
################################################################################
# Test of ALFA
diff --git a/Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test_ART.conf b/Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test_ART.conf
index 83c2f0fdc17d..ee797ae133f2 100644
--- a/Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test_ART.conf
+++ b/Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test_ART.conf
@@ -863,5 +863,5 @@ test 182
fullregtest REGTEST /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7_FTK/trigp1test_HLT_physicsV7_FTK.reference
rootcomp /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7_FTK/trigp1test_HLT_physicsV7_FTK.root
checkcount /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7_FTK/trigp1test_HLT_physicsV7_FTK.root 1 HLT
- athena_cmd athenaHLT.py -o HLT_physicsV7_FTK -n 75 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/RAW_FTK.pool.root -c 'testPhysicsV7=True;HLTOutputLevel=INFO;doValidation=True;fpeAuditor=True;from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.doFTK=True' TriggerRelease/runHLT_standalone.py
+ athena_cmd athenaHLT.py -o HLT_physicsV7_FTK -n 30 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/RAW_FTK.pool.root -c 'testPhysicsV7=True;HLTOutputLevel=INFO;doValidation=True;fpeAuditor=True;from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.doFTK=True' TriggerRelease/runHLT_standalone.py
post_command chainDump.py -n -S
diff --git a/Trigger/TrigValidation/TrigP1Test/share/trigp1test_athenaHLT.py b/Trigger/TrigValidation/TrigP1Test/share/trigp1test_athenaHLT.py
index 4d1fb8adffda..c16c2c70b436 100755
--- a/Trigger/TrigValidation/TrigP1Test/share/trigp1test_athenaHLT.py
+++ b/Trigger/TrigValidation/TrigP1Test/share/trigp1test_athenaHLT.py
@@ -32,7 +32,11 @@ def get_file_list( DATAPATH ) :
else :
new_paths = [ path+'/'+directory for path in paths ]
paths = new_paths
- # for path in paths : print "PathExpander INFO Found file at '{0}'".format( path )
+ for i,path in enumerate(paths):
+ print "PathExpander INFO Found file at '{0}'".format( path )
+ if i > 5:
+ break
+
#return [ 'root://eosatlas//'+path for path in paths ]
return paths
return sorted( glob(DATAPATH + '*') )
@@ -54,7 +58,7 @@ def main():
last_run_files = get_file_list(runs[-1] + "/*/")
subset = []
for i in range(0,opts.nfiles):
- subset.append('root://eosatlas//' + last_run_files[i])
+ subset.append('root://eosatlas/' + last_run_files[i])
print subset
trigCmd = "athenaHLT.py -n " + str(opts.nevents) + " -f \"" + str(subset) + "\" -c \"" + opts.modifiers + "\" TriggerRelease/runHLT_standalone.py"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/exec_art_trigp1test_post.sh b/Trigger/TrigValidation/TrigP1Test/test/exec_art_trigp1test_post.sh
index 0e1d7efe9382..36ea0828da22 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/exec_art_trigp1test_post.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/exec_art_trigp1test_post.sh
@@ -27,9 +27,9 @@ echo "art-result: ${PIPESTATUS[0]} CheckLog"
# add check_statuscode.py ${JOB_LOG}
# RunMsgFinder
-# TODO
-# this is RTT and will need some moving
-# timeout 1m PerfMonRunner.py --fileName=ntuple.pmon.gz --options="-f 0.90"
+# Run perfmon
+timeout 1m perfmon.py -f 0.90 ntuple.pmon.gz
+timeout 1m convert -density 300 -trim ntuple.perfmon.pdf -quality 100 -resize 50% ntuple.perfmon.png
echo $(date "+%FT%H:%M %Z")" Running chainDump"
timeout 1m chainDump.py -S --rootFile=expert-monitoring.root
@@ -100,6 +100,9 @@ else
echo $(date "+%FT%H:%M %Z")" No AOD.pool.root to check"
fi
+echo $(date "+%FT%H:%M %Z")" Files in directory:"
+ls -lh
+
echo $(date "+%FT%H:%M %Z")" Finished TrigP1Test post processing"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/exec_athenaHLT_art_trigger_validation.sh b/Trigger/TrigValidation/TrigP1Test/test/exec_athenaHLT_art_trigger_validation.sh
index b966b170c68b..835e77fa6348 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/exec_athenaHLT_art_trigger_validation.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/exec_athenaHLT_art_trigger_validation.sh
@@ -29,11 +29,11 @@ if [ -z ${TESTOPTION} ]; then
fi
if [ -z ${ATHENAHLTOPT} ]; then
-export ATHENAHLTOPT=""
+ export ATHENAHLTOPT=""
fi
if [ -z ${ATHENAHLTCMD} ]; then
-export ATHENAHLTCMD="athenaHLT.py"
+ export ATHENAHLTCMD="athenaHLT.py"
fi
######################################
@@ -42,12 +42,13 @@ ${ATHENAHLTCMD} ${ATHENAHLTOPT} \
-n ${EVENTS} \
-f "${FILE}" \
-c "${TESTOPTION}" \
-${JOBOPTION} | tee ${JOB_LOG}
+${JOBOPTION} &> ${JOB_LOG}
######################################
-COMMAND=$PREVIOUS_COMMAND
-ATH_RETURN=${PIPESTATUS[0]}
-echo "Command to reproduce: ${COMMAND}"
+COMMAND=$PREVIOUS_COMMAND ATH_RETURN=$?
+echo ${COMMAND} > command.txt
+echo "Command to reproduce:"
+envsubst < command.txt
echo "art-result: ${ATH_RETURN} ${JOB_LOG%%.*}"
echo $(date "+%FT%H:%M %Z")" Done executing AthenaHLT test ${NAME}"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_AthenaP1RDOtoBS_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_AthenaP1RDOtoBS_build.sh
index ab8e2d8c41ab..a0a287e7bac6 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_AthenaP1RDOtoBS_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_AthenaP1RDOtoBS_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_AthenaTrigBS_L2EFMerging_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_AthenaTrigBS_L2EFMerging_build.sh
index 3d8963fdd260..44c5def2c080 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_AthenaTrigBS_L2EFMerging_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_AthenaTrigBS_L2EFMerging_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_HIV4_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_HIV4_build.sh
index 6fcac31ad757..a1ce8900c9c9 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_HIV4_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_HIV4_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_mcV7_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_mcV7_build.sh
index 980812a5ad86..a92d2b247de4 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_mcV7_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_mcV7_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_mcV7_menu_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_mcV7_menu_build.sh
index 7ea2476e21f2..c0f661d6dd78 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_mcV7_menu_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_mcV7_menu_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_AFP_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_AFP_build.sh
index df181714dbc7..c0f5a7f61bca 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_AFP_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_AFP_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_ALFAMon_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_ALFAMon_build.sh
index 338d34ba7b3a..fddceb9e9770 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_ALFAMon_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_ALFAMon_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_COS_2016IDCOSMICS_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_COS_2016IDCOSMICS_build.sh
index a15160d6b9ba..653f81a96971 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_COS_2016IDCOSMICS_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_COS_2016IDCOSMICS_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_COS_2016MUONS_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_COS_2016MUONS_build.sh
index a049e487c82b..4c945600e6fc 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_COS_2016MUONS_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_COS_2016MUONS_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_COS_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_COS_build.sh
index a27187553413..5717732534f5 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_COS_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_COS_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_DataScouting_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_DataScouting_build.sh
index e51c10b3cc43..9b89fbd63527 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_DataScouting_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_DataScouting_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_FTK_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_FTK_build.sh
index 7eda30a8bab6..c4c75abafdf2 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_FTK_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_FTK_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_L1Topo_data_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_L1Topo_data_build.sh
index 9d8287b53812..1a160048b47f 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_L1Topo_data_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_L1Topo_data_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_ROBprefetching_off_on_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_ROBprefetching_off_on_build.sh
index 069c3703be85..9c09117f70ab 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_ROBprefetching_off_on_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_ROBprefetching_off_on_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_beamspot_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_beamspot_build.sh
index 3484afafe95b..f171ead29cf9 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_beamspot_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_beamspot_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_build.sh
index cea40d507442..f2fc61d5bc9c 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_magField_on_off_on_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_magField_on_off_on_build.sh
index 2b092a2b9ad1..e22383f9b64e 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_magField_on_off_on_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_magField_on_off_on_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_menu_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_menu_build.sh
index cb984e4bbb8d..81fafcd1f94b 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_menu_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_menu_build.sh
@@ -3,10 +3,6 @@
# art-description: Run athenaHLT on all events to create trigger configuration, generates and uploads SMKs created from the HLT first and compares after rerun jobs from DB, then compare the SMK created from the HLT_physicsV7 first and rerun jobs
# art-type: build
# art-include: 21.1/AthenaP1
-# art-include: 21.1-dev/AthenaP1
-# art-include: 21.0/AthenaP1
-# art-include: 21.0-TrigMC/AthenaP1
-# art-include: master/AthenaP1
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_rerunLVL1_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_rerunLVL1_build.sh
index 789f5a8c67fe..f8babde177be 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_rerunLVL1_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_rerunLVL1_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_run_stop_run_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_run_stop_run_build.sh
index 0d714a0166dc..5de52c70f3b2 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_run_stop_run_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_run_stop_run_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_build.sh
index ce09fb46fd73..5ab9627071de 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_run_stop_run_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_run_stop_run_build.sh
index fd7ca31e5d64..6568630e4831 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_run_stop_run_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_run_stop_run_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_Reco_tf_physicsV7_savedBS_AthenaP1BS_standalone_physicsV7_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_Reco_tf_physicsV7_savedBS_AthenaP1BS_standalone_physicsV7_build.sh
index 11acae381139..ef333345d570 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_Reco_tf_physicsV7_savedBS_AthenaP1BS_standalone_physicsV7_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_Reco_tf_physicsV7_savedBS_AthenaP1BS_standalone_physicsV7_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_Trigreco_physicsV7_currentT0_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_Trigreco_physicsV7_currentT0_build.sh
index 7ed0681bf1c3..ac18fb3b1198 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_Trigreco_physicsV7_currentT0_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_Trigreco_physicsV7_currentT0_build.sh
@@ -7,7 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
-
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_CostMonitoring_PhysicsV7_grid.sh b/Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_CostMonitoring_PhysicsV7_grid.sh
index 8f3252b454dc..fcf3881283f5 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_CostMonitoring_PhysicsV7_grid.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_CostMonitoring_PhysicsV7_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_LatestRun_MCV7_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_LatestRun_MCV7_build.sh
index e4418913eab7..57256e037893 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_LatestRun_MCV7_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_LatestRun_MCV7_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
export NAME="athenaHLT_LatestRun_MCV7_build"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_on_data_leakCheck_grid.sh b/Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_on_data_leakCheck_grid.sh
index a79bde79195f..774cfb088930 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_on_data_leakCheck_grid.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_on_data_leakCheck_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
@@ -26,12 +27,13 @@ export JOB_LOG="${NAME}.log"
export LD_PRELOAD=/cvmfs/sft.cern.ch/lcg/releases/libunwind/5c2cade-76996/$CMTCONFIG/lib/libunwind.so
-athenaHLT.py --stdcmalloc --leak-check-execute -o HLT_physicsV7 -n 500 -f "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00339070.physics_EnhancedBias.merge.RAW._lb0101._SFO-1._0001.1" -c "setMenu='Physics_pp_v7_tight_physics_prescale';setLVL1XML='TriggerMenuXML/LVL1config_Physics_pp_v7.xml';setL1TopoXML=setLVL1XML.replace('/LVL1','/L1Topo');HLTOutputLevel=WARNING;doValidation=True;rerunLVL1=True;" TrigP1Test/runHLT_standaloneRTT_leakCheck.py | tee ${JOB_LOG}
+athenaHLT.py --stdcmalloc --leak-check-execute -o HLT_physicsV7 -n 500 -f "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00339070.physics_EnhancedBias.merge.RAW._lb0101._SFO-1._0001.1" -c "setMenu='Physics_pp_v7_tight_physics_prescale';setLVL1XML='TriggerMenuXML/LVL1config_Physics_pp_v7.xml';setL1TopoXML=setLVL1XML.replace('/LVL1','/L1Topo');HLTOutputLevel=WARNING;doValidation=True;rerunLVL1=True;" TrigP1Test/runHLT_standaloneRTT_leakCheck.py &> ${JOB_LOG}
ATH_RETURN=${PIPESTATUS[0]}
-echo "art-result: ${ATH_RETURN} ${NAME}"
+echo "art-result: ${ATH_RETURN} athena"
source exec_art_trigp1test_post.sh
+still
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_pureSteering_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_pureSteering_build.sh
index 7c30368beb22..c9471407c4b5 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_pureSteering_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_pureSteering_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_pureSteering_ecodes_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_pureSteering_ecodes_build.sh
index e9353e5345a6..fdcac9ffe658 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_pureSteering_ecodes_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_pureSteering_ecodes_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_pureSteering_prescaling_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_pureSteering_prescaling_build.sh
index 157c45839c7d..7b7d79aa64f8 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_pureSteering_prescaling_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_pureSteering_prescaling_build.sh
@@ -7,7 +7,7 @@
# art-include: 21.0/AthenaP1
# art-include: 21.0-TrigMC/AthenaP1
# art-include: master/AthenaP1
-
+# art-include: master/Athena
if [ -z ${TEST} ]; then
export TEST="TrigP1Test"
diff --git a/Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh b/Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh
index 4749aa6b550a..c27a4b22db50 100755
--- a/Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh
@@ -23,8 +23,9 @@ timeout 1m check_log.pl --config checklogTriggerTest.conf --showexcludestats ${J
echo "art-result: ${PIPESTATUS[0]} CheckLog"
-# this is RTT and will need some moving
-#timeout 1m PerfMonRunner.py --fileName=ntuple.pmon.gz --options="-f 0.90"
+# Run perfmon
+timeout 1m perfmon.py -f 0.90 ntuple.pmon.gz
+timeout 1m convert -density 300 -trim ntuple.perfmon.pdf -quality 100 -resize 50% ntuple.perfmon.png
echo $(date "+%FT%H:%M %Z")" Running chainDump"
timeout 1m chainDump.py -S --rootFile=expert-monitoring.root
@@ -95,4 +96,7 @@ else
echo $(date "+%FT%H:%M %Z")" No AOD.pool.root to check"
fi
+echo $(date "+%FT%H:%M %Z")" Files in directory:"
+ls -lh
+
echo $(date "+%FT%H:%M %Z")" Finished TriggerTest post processing for test ${NAME}"
diff --git a/Trigger/TrigValidation/TriggerTest/test/exec_athena_art_trigger_validation.sh b/Trigger/TrigValidation/TriggerTest/test/exec_athena_art_trigger_validation.sh
index 31276b5cf75c..f241b22485f2 100755
--- a/Trigger/TrigValidation/TriggerTest/test/exec_athena_art_trigger_validation.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/exec_athena_art_trigger_validation.sh
@@ -65,11 +65,13 @@ jp.Rec.OutputLevel=WARNING;\
${EXTRA}\
LVL1OutputLevel=WARNING;\
HLTOutputLevel=WARNING;" \
-${JOBOPTION} | tee ${JOB_LOG}
+${JOBOPTION} &> ${JOB_LOG}
######################################
-COMMAND=$PREVIOUS_COMMAND ATH_RETURN=${PIPESTATUS[0]}
-echo "Command to reproduce: ${COMMAND}"
+COMMAND=$PREVIOUS_COMMAND ATH_RETURN=$?
+echo ${COMMAND} > command.txt
+echo "Command to reproduce:"
+envsubst < command.txt
echo "art-result: ${ATH_RETURN} ${JOB_LOG%%.*}"
echo $(date "+%FT%H:%M %Z")" Done executing Athena test ${NAME}"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v3_tight_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v3_tight_grid.sh
index fe05006261b6..b197e89d75a6 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v3_tight_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v3_tight_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v4_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v4_grid.sh
index 432fc6867728..ac6b462f60cb 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v4_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v4_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_build.sh
index 7cbe48b72b88..44a3d363e7ce 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_grid.sh
index 088a357f7e9a..a08f198e72a3 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_grid.sh
@@ -8,6 +8,7 @@
# art-include: 21.3/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_loose_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_loose_grid.sh
index 933ede164707..c9c7cf4a36e8 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_loose_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_loose_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_nops_aod_ftk_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_nops_aod_ftk_build.sh
index beff1dfb056a..82ba75aab8b9 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_nops_aod_ftk_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_nops_aod_ftk_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_nops_aod_ftk_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_nops_aod_ftk_grid.sh
index d337938c87f7..ade2e2a57d41 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_nops_aod_ftk_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_nops_aod_ftk_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_tight_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_tight_grid.sh
index 6cfca82b0e01..5497bc02ed73 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_tight_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_tight_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v3_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v3_build.sh
index 5b38d55d786c..bd892dc7d2bd 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v3_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v3_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v3_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v3_grid.sh
index 7dc7b8bdc7c7..8199cb3546e7 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v3_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v3_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_build.sh
index bba618be3083..cf24779c9bea 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_grid.sh
index a6f63552f136..894ab2a48089 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_aod_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_aod_grid.sh
index d5be90ac7684..5a5a71f3934c 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_aod_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_aod_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_build.sh
index 52c70a3d5890..1a94c97b5eb2 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_chainorder_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_chainorder_build.sh
index 20bc16db3090..fbcdab08397d 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_chainorder_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_chainorder_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
@@ -40,5 +41,5 @@ source exec_athena_art_trigger_validation.sh
timeout 10m rootcomp.py expert-monitoring-ascend.root expert-monitoring.root | tee rootcompout.log
echo "art-result: ${PIPESTATUS[0]} RootComp"
-trigtest_checkcounts.sh expert-monitoring-ascend.root 0 BOTH | tee checkcountout.log
+trigtest_checkcounts.sh 0 expert-monitoring-ascend.root HLT | tee checkcountout.log
echo "art-result: ${PIPESTATUS[0]} CheckCounts"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_grid.sh
index f7bd8aa0c558..edce3c6cc2b4 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_grid.sh
@@ -8,6 +8,7 @@
# art-include: 21.3/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_tight_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_tight_grid.sh
index 90b3e1f6a880..d313447a8d0b 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_tight_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_tight_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_build.sh
index 48f7c9b30089..91c9b48c4d22 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_grid.sh
index d453b781920e..f6845600f513 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_aod_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_aod_grid.sh
index 968114094c28..f72d360519c9 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_aod_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_aod_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_build.sh
index 5a9580850a66..8d4c3c342282 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_grid.sh
index c6ebf660a3f9..1c8e105b1b50 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysicsexo_aod_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysicsexo_aod_grid.sh
index 2f8e7862e40c..4d84e74c0c9f 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysicsexo_aod_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysicsexo_aod_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_build.sh
index c04be9ed712f..38f86e3dc550 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_grid.sh
index 10d0d89dcb3a..c09f70306341 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_id_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_id_build.sh
index 80673fe23625..92023fd8aef4 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_id_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_id_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_build.sh
index 31065600562c..e5d08da24f72 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_grid.sh
index 00e11d12edd0..4520102479c9 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_build.sh
index bd0b97dc6d5e..a2f17fba182e 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_grid.sh
index 26dc93f0c3aa..27cf358ba9e0 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_met_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_met_build.sh
index a3a4ec28d67b..d281dd3e1e15 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_met_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_met_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_met_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_met_grid.sh
index d1a8ae477b96..0fc58c96e916 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_met_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_met_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_build.sh
index a11c6ee2f341..2884934e5291 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_grid.sh
index ebf8e17eca4f..39486bde6935 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_grid.sh
index 4cec6774bfe0..ad0491c3eedf 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_build.sh
index 0f1c0f101c98..eb749ea51a17 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_grid.sh
index 6fd4a966ea28..353f627d3265 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_build.sh
index d65a3d80a8fd..f9731ad143ca 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_build.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/Athena
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_grid.sh
index 82fc79249e56..153bd8357ef7 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_grid.sh
@@ -7,6 +7,7 @@
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
# art-include: master/Athena
+# art-include: master/AthenaP1
# art-output: HLTChain.txt
# art-output: HLTTE.txt
# art-output: L1AV.txt
--
GitLab