From 1ff993859432ded5fcebd33cc8d557d0d49ea3f6 Mon Sep 17 00:00:00 2001
From: Rafal Bielski <rafal.bielski@cern.ch>
Date: Thu, 18 Apr 2019 18:55:46 +0200
Subject: [PATCH] clean up TrigAnalysisTest

---
 .../test/test_mc_pp_v7_rdotoaod_grid.sh       | 33 -----------------
 .../test/test_mc_pp_v7_rdotoesdaod_build.sh   | 32 -----------------
 .../test/test_mc_pp_v7_rdotoesdaod_grid.sh    | 35 ------------------
 ...ics_pp_v7_primaries_ftk_rdotoaod_build.sh} | 11 ++----
 ...sics_pp_v7_primaries_ftk_rdotoaod_grid.sh} | 11 ++----
 ..._pp_v7_primaries_ftk_rdotoesdaod_build.sh} | 11 ++----
 ...s_pp_v7_primaries_ftk_rdotoesdaod_grid.sh} |  9 ++---
 ...physics_pp_v7_primaries_rdotoaod_build.sh} |  9 ++---
 ..._physics_pp_v7_primaries_rdotoaod_grid.sh} |  7 ++--
 ...ics_pp_v7_primaries_rdotoaodslim_build.sh} |  9 ++---
 ...ics_pp_v7_primaries_rdotobstoesd_build.sh} | 11 +++---
 ...sics_pp_v7_primaries_rdotoesdaod_build.sh} |  7 ++--
 ...ysics_pp_v7_primaries_rdotoesdaod_grid.sh} |  8 ++---
 .../test_physics_pp_v7_rdotobstoesd_build.sh  | 36 -------------------
 14 files changed, 29 insertions(+), 200 deletions(-)
 delete mode 100755 Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaod_grid.sh
 delete mode 100755 Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoesdaod_build.sh
 delete mode 100755 Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoesdaod_grid.sh
 rename Trigger/TrigValidation/TrigAnalysisTest/test/{test_mc_pp_v7_ftk_rdotoaod_build.sh => test_physics_pp_v7_primaries_ftk_rdotoaod_build.sh} (76%)
 rename Trigger/TrigValidation/TrigAnalysisTest/test/{test_mc_pp_v7_ftk_rdotoaod_grid.sh => test_physics_pp_v7_primaries_ftk_rdotoaod_grid.sh} (76%)
 rename Trigger/TrigValidation/TrigAnalysisTest/test/{test_mc_pp_v7_ftk_rdotoesdaod_build.sh => test_physics_pp_v7_primaries_ftk_rdotoesdaod_build.sh} (72%)
 rename Trigger/TrigValidation/TrigAnalysisTest/test/{test_mc_pp_v7_ftk_rdotoesdaod_grid.sh => test_physics_pp_v7_primaries_ftk_rdotoesdaod_grid.sh} (78%)
 rename Trigger/TrigValidation/TrigAnalysisTest/test/{test_mc_pp_v7_rdotoaod_build.sh => test_physics_pp_v7_primaries_rdotoaod_build.sh} (78%)
 rename Trigger/TrigValidation/TrigAnalysisTest/test/{test_physics_pp_v7_rdotoaod_grid.sh => test_physics_pp_v7_primaries_rdotoaod_grid.sh} (80%)
 rename Trigger/TrigValidation/TrigAnalysisTest/test/{test_mc_pp_v7_rdotoaodslim_build.sh => test_physics_pp_v7_primaries_rdotoaodslim_build.sh} (76%)
 rename Trigger/TrigValidation/TrigAnalysisTest/test/{test_mc_pp_v7_rdotobstoesd_build.sh => test_physics_pp_v7_primaries_rdotobstoesd_build.sh} (74%)
 rename Trigger/TrigValidation/TrigAnalysisTest/test/{test_physics_pp_v7_rdotoesdaod_build.sh => test_physics_pp_v7_primaries_rdotoesdaod_build.sh} (75%)
 rename Trigger/TrigValidation/TrigAnalysisTest/test/{test_physics_pp_v7_rdotoesdaod_grid.sh => test_physics_pp_v7_primaries_rdotoesdaod_grid.sh} (77%)
 delete mode 100755 Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotobstoesd_build.sh

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
deleted file mode 100755
index 9d14548fac1..00000000000
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaod_grid.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-# art-description: Trigger MC pp v7 RDO to AOD test
-# art-type: grid
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
-# art-include: master/Athena
-# art-include: 21.1/AthenaP1
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: AOD.pool.root.checkFile0
-# art-output: AOD.pool.root.checkFiletrigSize.txt
-# art-output: *.regtest.new
-
-export NAME="mc_pp_v7_rdotoaod_grid"
-export COST_MONITORING="False"
-export TEST="TrigAnalysisTest"
-export MENU="MC_pp_v7"
-export EVENTS="100"
-export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoAOD.py"
-
-source exec_athena_art_trigger_validation.sh
-source exec_art_triggertest_post.sh
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
deleted file mode 100755
index 1c7ba8a7adb..00000000000
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoesdaod_build.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# art-description: Trigger MC pp v7 RDO to ESD and AOD test, plus extra tests using these files
-# art-type: build
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
-# art-include: master/Athena
-# art-include: 21.1/AthenaP1
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
-
-export NAME="mc_pp_v7_rdotoesdaod_build"
-export COST_MONITORING="False"
-export TEST="TrigAnalysisTest"
-export MENU="MC_pp_v7"
-export EVENTS="3"
-export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoESDAOD.py"
-
-source exec_athena_art_trigger_validation.sh
-source exec_art_triggertest_post.sh
-source exec_art_triganalysistest_post.sh
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
deleted file mode 100755
index 892f6ea67c8..00000000000
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoesdaod_grid.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# art-description: Trigger MC pp v7 RDO to ESD and AOD test, plus extra tests using these files
-# art-type: grid
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
-# art-include: master/Athena
-# art-include: 21.1/AthenaP1
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: AOD.pool.root.checkFile0
-# art-output: AOD.pool.root.checkFiletrigSize.txt
-# art-output: *.regtest.new
-
-
-export NAME="mc_pp_v7_rdotoesdaod_grid"
-export COST_MONITORING="False"
-export TEST="TrigAnalysisTest"
-export MENU="MC_pp_v7"
-export EVENTS="100"
-export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoESDAOD.py"
-
-source exec_athena_art_trigger_validation.sh
-source exec_art_triggertest_post.sh
-source exec_art_triganalysistest_post.sh
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoaod_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoaod_build.sh
similarity index 76%
rename from Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoaod_build.sh
rename to Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoaod_build.sh
index 43aa8952a3c..9c766012018 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoaod_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoaod_build.sh
@@ -1,13 +1,8 @@
 #!/bin/bash
 
-# art-description: Trigger MC pp v7 RDO to AOD test FTK
+# art-description: Trigger v7 primaries RDO to AOD test FTK
 # art-type: build
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
-# art-include: 21.0-TrigMC/Athena
 # art-include: master/Athena
-# art-include: 21.1/AthenaP1
-# art-include: 21.1-dev/AthenaP1
 # art-output: *check*
 # art-output: HLTChain.txt
 # art-output: HLTTE.txt
@@ -24,11 +19,11 @@
 # art-output: AOD.pool.root.checkFiletrigSize.txt
 # art-output: *.regtest.new
 
-export NAME="mc_pp_v7_ftk_rdotoaod_build"
+export NAME="physics_pp_v7_primaries_ftk_rdotoaod_build"
 export INPUT="ftk"
 export COST_MONITORING="False"
 export TEST="TrigAnalysisTest"
-export MENU="MC_pp_v7"
+export MENU="Physics_pp_v7_primaries"
 export EVENTS="3"
 export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoAOD.py"
 export EXTRA="from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.doFTK=True;from RecExConfig.RecFlags import rec;rec.doFTK.set_Value_and_Lock(True);"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoaod_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoaod_grid.sh
similarity index 76%
rename from Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoaod_grid.sh
rename to Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoaod_grid.sh
index 6f3d1c4d16d..e1d16809aad 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoaod_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoaod_grid.sh
@@ -1,13 +1,8 @@
 #!/bin/bash
 
-# art-description: Trigger MC pp v7 RDO to AOD test with FTK
+# art-description: Trigger v7 primaries RDO to AOD test with FTK
 # art-type: grid
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
-# art-include: 21.0-TrigMC/Athena
 # art-include: master/Athena
-# art-include: 21.1/AthenaP1
-# art-include: 21.1-dev/AthenaP1
 # art-output: *check*
 # art-output: HLTChain.txt
 # art-output: HLTTE.txt
@@ -24,11 +19,11 @@
 # art-output: AOD.pool.root.checkFiletrigSize.txt
 # art-output: *.regtest.new
 
-export NAME="mc_pp_v7_ftk_rdotoaod_grid"
+export NAME="physics_pp_v7_primaries_ftk_rdotoaod_grid"
 export INPUT="ftk"
 export COST_MONITORING="False"
 export TEST="TrigAnalysisTest"
-export MENU="MC_pp_v7"
+export MENU="Physics_pp_v7_primaries"
 export EVENTS="100"
 export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoAOD.py"
 export EXTRA="from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.doFTK=True;from RecExConfig.RecFlags import rec;rec.doFTK.set_Value_and_Lock(True);"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoesdaod_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoesdaod_build.sh
similarity index 72%
rename from Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoesdaod_build.sh
rename to Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoesdaod_build.sh
index 0fdd410b925..227d06c03eb 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoesdaod_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoesdaod_build.sh
@@ -1,13 +1,8 @@
 #!/bin/bash
 
-# art-description: Trigger MC pp v7 RDO to ESD and AOD test, plus extra tests using these files. With FTK
+# art-description: Trigger v7 primaries RDO to ESD and AOD test, plus extra tests using these files. With FTK
 # art-type: build
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
-# art-include: 21.0-TrigMC/Athena
 # art-include: master/Athena
-# art-include: 21.1/AthenaP1
-# art-include: 21.1-dev/AthenaP1
 # art-output: *check*
 # art-output: HLTChain.txt
 # art-output: HLTTE.txt
@@ -22,11 +17,11 @@
 # art-output: TotalEventsProcessed.txt
 # art-output: *.regtest.new
 
-export NAME="mc_pp_v7_ftk_rdotoesdaod_build"
+export NAME="physics_pp_v7_primaries_ftk_rdotoesdaod_build"
 export INPUT="ftk"
 export COST_MONITORING="False"
 export TEST="TrigAnalysisTest"
-export MENU="MC_pp_v7"
+export MENU="Physics_pp_v7_primaries"
 export EVENTS="3"
 export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoESDAOD.py"
 export EXTRA="from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.doFTK=True;from RecExConfig.RecFlags import rec;rec.doFTK.set_Value_and_Lock(True);"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoesdaod_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoesdaod_grid.sh
similarity index 78%
rename from Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoesdaod_grid.sh
rename to Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoesdaod_grid.sh
index cbf91c60e7e..c938457e844 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoesdaod_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoesdaod_grid.sh
@@ -1,11 +1,8 @@
 #!/bin/bash
 
-# art-description: Trigger MC pp v7 RDO to ESD and AOD test, plus extra tests using these files. With FTK
+# art-description: Trigger v7 primaries RDO to ESD and AOD test, plus extra tests using these files. With FTK
 # art-type: grid
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-include: 21.1/AthenaP1
 # art-output: *check*
 # art-output: HLTChain.txt
 # art-output: HLTTE.txt
@@ -23,11 +20,11 @@
 # art-output: *.regtest.new
 
 
-export NAME="mc_pp_v7_ftk_rdotoesdaod_grid"
+export NAME="physics_pp_v7_primaries_ftk_rdotoesdaod_grid"
 export INPUT="ftk"
 export COST_MONITORING="False"
 export TEST="TrigAnalysisTest"
-export MENU="MC_pp_v7"
+export MENU="Physics_pp_v7_primaries"
 export EVENTS="100"
 export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoESDAOD.py"
 export EXTRA="from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.doFTK=True;from RecExConfig.RecFlags import rec;rec.doFTK.set_Value_and_Lock(True);"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaod_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaod_build.sh
similarity index 78%
rename from Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaod_build.sh
rename to Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaod_build.sh
index 7dd0408b280..ea1b9566ded 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaod_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaod_build.sh
@@ -1,11 +1,8 @@
 #!/bin/bash
 
-# art-description: Trigger MC pp v7 RDO to AOD test
+# art-description: Trigger v7 primaries RDO to AOD test
 # art-type: build
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-include: 21.1/AthenaP1
 # art-output: *check*
 # art-output: HLTChain.txt
 # art-output: HLTTE.txt
@@ -22,10 +19,10 @@
 # art-output: AOD.pool.root.checkFiletrigSize.txt
 # art-output: *.regtest.new
 
-export NAME="mc_pp_v7_rdotoaod_build"
+export NAME="physics_pp_v7_primaries_rdotoaod_build"
 export COST_MONITORING="False"
 export TEST="TrigAnalysisTest"
-export MENU="MC_pp_v7"
+export MENU="Physics_pp_v7_primaries"
 export EVENTS="3"
 export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoAOD.py"
 
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoaod_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaod_grid.sh
similarity index 80%
rename from Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoaod_grid.sh
rename to Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaod_grid.sh
index f42e1c4b2e1..b9264d1cec8 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoaod_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaod_grid.sh
@@ -1,11 +1,8 @@
 #!/bin/bash
 
-# art-description: Trigger Physics pp v7 RDO to AOD test
+# art-description: Trigger v7 primaries RDO to AOD test
 # art-type: grid
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-include: 21.1/AthenaP1
 # art-output: *check*
 # art-output: HLTChain.txt
 # art-output: HLTTE.txt
@@ -22,7 +19,7 @@
 # art-output: AOD.pool.root.checkFiletrigSize.txt
 # art-output: *.regtest.new
 
-export NAME="physics_pp_v7_rdotoaod_grid"
+export NAME="physics_pp_v7_primaries_rdotoaod_grid"
 export COST_MONITORING="False"
 export TEST="TrigAnalysisTest"
 export MENU="Physics_pp_v7_primaries"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaodslim_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaodslim_build.sh
similarity index 76%
rename from Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaodslim_build.sh
rename to Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaodslim_build.sh
index 1f45f9e87c0..8c72593f377 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaodslim_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaodslim_build.sh
@@ -1,11 +1,8 @@
 #!/bin/bash
 
-# art-description: Trigger MC pp v7 RDO to AODSLIM
+# art-description: Trigger v7 primaries RDO to AODSLIM
 # art-type: build
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-include: 21.1/AthenaP1
 # art-output: *check*
 # art-output: HLTChain.txt
 # art-output: HLTTE.txt
@@ -20,10 +17,10 @@
 # art-output: TotalEventsProcessed.txt
 # art-output: *.regtest.new
 
-export NAME="mc_pp_v7_rdotoaodslim_build"
+export NAME="physics_pp_v7_primaries_rdotoaodslim_build"
 export COST_MONITORING="False"
 export TEST="TrigAnalysisTest"
-export MENU="MC_pp_v7"
+export MENU="Physics_pp_v7_primaries"
 export EVENTS="3"
 export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoAODSLIM.py"
 
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotobstoesd_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotobstoesd_build.sh
similarity index 74%
rename from Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotobstoesd_build.sh
rename to Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotobstoesd_build.sh
index 2e97fafe16d..e14fb4f931f 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotobstoesd_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotobstoesd_build.sh
@@ -1,11 +1,8 @@
 #!/bin/bash
 
-# art-description: Trigger MC pp v7 RDO to BS and BS to ESD test
+# art-description: Trigger v7 primaries RDO to BS and BS to ESD test
 # art-type: build
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-include: 21.1/AthenaP1
 # art-output: *check*
 # art-output: HLTChain.txt
 # art-output: HLTTE.txt
@@ -20,15 +17,15 @@
 # art-output: TotalEventsProcessed.txt
 # art-output: *.regtest.new
 
-export NAME="mc_pp_v7_rdotobstoesd_build"
+export NAME="physics_pp_v7_primaries_rdotobstoesd_build"
 export COST_MONITORING="False"
 export TEST="TrigAnalysisTest"
-export MENU="MC_pp_v7"
+export MENU="Physics_pp_v7_primaries"
 export EVENTS="3"
 export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoBS.py"
 
 source exec_athena_art_trigger_validation.sh
 athena.py -c "jp.AthenaCommonFlags.BSRDOInput=['raw.data']" TrigAnalysisTest/testAthenaTrigBStoESD.py | tee ${JOB_LOG%%.*}.BStoESD.${JOB_LOG#*.}
-echo "art-result: ${PIPESTATUS[0]} athena.BStoESD"
+echo "art-result: ${PIPESTATUS[0]} ${JOB_LOG%%.*}BStoESD"
 
 source exec_art_triggertest_post.sh
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoesdaod_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoesdaod_build.sh
similarity index 75%
rename from Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoesdaod_build.sh
rename to Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoesdaod_build.sh
index 8c6a483d769..5319932951a 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoesdaod_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoesdaod_build.sh
@@ -1,11 +1,8 @@
 #!/bin/bash
 
-# art-description: Trigger Physics pp v7 RDO to ESD and AOD test, plus extra tests using these files
+# art-description: Trigger v7 primaries RDO to ESD and AOD test, plus extra tests using these files
 # art-type: build
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-include: 21.1/AthenaP1
 # art-output: *check*
 # art-output: HLTChain.txt
 # art-output: HLTTE.txt
@@ -20,7 +17,7 @@
 # art-output: TotalEventsProcessed.txt
 # art-output: *.regtest.new
 
-export NAME="physics_pp_v7_rdotoesdaod_build"
+export NAME="physics_pp_v7_primaries_rdotoesdaod_build"
 export COST_MONITORING="False"
 export TEST="TrigAnalysisTest"
 export MENU="Physics_pp_v7_primaries"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoesdaod_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoesdaod_grid.sh
similarity index 77%
rename from Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoesdaod_grid.sh
rename to Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoesdaod_grid.sh
index 6532b427227..092df0cf318 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoesdaod_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoesdaod_grid.sh
@@ -1,11 +1,8 @@
 #!/bin/bash
 
-# art-description: Trigger Physics pp v7 RDO to ESD and AOD test, plus extra tests using these files
+# art-description: Trigger v7 primaries RDO to ESD and AOD test, plus extra tests using these files
 # art-type: grid
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-include: 21.1/AthenaP1
 # art-output: *check*
 # art-output: HLTChain.txt
 # art-output: HLTTE.txt
@@ -22,7 +19,8 @@
 # art-output: AOD.pool.root.checkFiletrigSize.txt
 # art-output: *.regtest.new
 
-export NAME="physics_pp_v7_rdotoesdaod_grid"
+
+export NAME="physics_pp_v7_primaries_rdotoesdaod_grid"
 export COST_MONITORING="False"
 export TEST="TrigAnalysisTest"
 export MENU="Physics_pp_v7_primaries"
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
deleted file mode 100755
index 4cba6c7df59..00000000000
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotobstoesd_build.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# art-description: Trigger Physics pp v7 RDO to BS and BS to AOD test
-# art-type: build
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
-# art-include: master/Athena
-# art-include: 21.1/AthenaP1
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
-
-export NAME="physics_pp_v7_rdotobstoesd_build"
-export COST_MONITORING="False"
-export TEST="TrigAnalysisTest"
-export MENU="Physics_pp_v7_primaries"
-export EVENTS="3"
-export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoBS.py"
-
-source exec_athena_art_trigger_validation.sh
-athena.py -c "jp.AthenaCommonFlags.BSRDOInput=['raw.data']" TrigAnalysisTest/testAthenaTrigBStoESD.py | tee ${JOB_LOG%%.*}2.${JOB_LOG#*.}
-echo "art-result: ${PIPESTATUS[0]} ${JOB_LOG%%.*}2"
-
-source exec_art_triggertest_post.sh
-
-
-- 
GitLab