Merge branch 'master-TAT-fixregtest' into 'master'

Fixes and tidy up for TrigAnalysisTest in master

See merge request atlas/athena!21850

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoesdaod_build.sh

@@ -20,7 +20,7 @@
 # art-output: ntuple.pmon.gz
 # art-output: *perfmon*
 # art-output: TotalEventsProcessed.txt
-# art-output: *.regtest
+# art-output: *.regtest.new
 
 export NAME="mc_pp_v7_ftk_rdotoesdaod_build"
 export INPUT="ftk"

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoesdaod_grid.sh

@@ -4,10 +4,8 @@
 # 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
@@ -22,7 +20,7 @@
 # art-output: TotalEventsProcessed.txt
 # art-output: AOD.pool.root.checkFile0
 # art-output: AOD.pool.root.checkFiletrigSize.txt
-# art-output: *.regtest
+# art-output: *.regtest.new
 
 
 export NAME="mc_pp_v7_ftk_rdotoesdaod_grid"

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaod_build.sh

@@ -4,10 +4,8 @@
 # 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

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaod_grid.sh

@@ -3,10 +3,9 @@
 # art-description: Trigger MC pp v7 RDO to AOD test
 # art-type: grid
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/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
@@ -21,6 +20,7 @@
 # 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"

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaodslim_build.sh

@@ -3,10 +3,9 @@
 # art-description: Trigger MC pp v7 RDO to AODSLIM
 # art-type: build
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/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
@@ -19,6 +18,7 @@
 # art-output: ntuple.pmon.gz
 # art-output: *perfmon*
 # art-output: TotalEventsProcessed.txt
+# art-output: *.regtest.new
 
 export NAME="mc_pp_v7_rdotoaodslim_build"
 export COST_MONITORING="False"

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotobstoesd_build.sh

@@ -3,10 +3,9 @@
 # art-description: Trigger MC pp v7 RDO to BS and BS to ESD test
 # art-type: build
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/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
@@ -19,6 +18,7 @@
 # art-output: ntuple.pmon.gz
 # art-output: *perfmon*
 # art-output: TotalEventsProcessed.txt
+# art-output: *.regtest.new
 
 export NAME="mc_pp_v7_rdotobstoesd_build"
 export COST_MONITORING="False"

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoesdaod_build.sh

@@ -3,10 +3,9 @@
 # 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.0-TrigMC/Athena
+# art-include: 21.3/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
@@ -19,6 +18,7 @@
 # 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"

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoesdaod_grid.sh

@@ -3,10 +3,9 @@
 # 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.0-TrigMC/Athena
+# art-include: 21.3/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
@@ -21,6 +20,7 @@
 # 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"

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigdecisiontool_grid.sh

@@ -3,13 +3,9 @@
 # art-description: Trigger Decision Tool test on AOD
 # 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: 21.3/Athena
 # art-include: master/Athena
-# art-include: master/AthenaP1
-# art-include: 21.1/AthenaP1
-# art-include: 21.1-dev/AthenaP1
 # art-output: *check*
 # art-output: HLTChain.txt
 # art-output: HLTTE.txt
@@ -22,6 +18,7 @@
 # art-output: ntuple.pmon.gz
 # art-output: *perfmon*
 # art-output: TotalEventsProcessed.txt
+# art-output: *.regtest.new
 
 export NAME="mc_pp_v7_trigdecisiontool_grid"
 export JOB_LOG="athena.log"

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigedm_grid.sh

@@ -3,13 +3,9 @@
 # art-description: Trigger Event Data Model test on AOD
 # 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: 21.3/Athena
 # art-include: master/Athena
-# art-include: master/AthenaP1
-# art-include: 21.1/AthenaP1
-# art-include: 21.1-dev/AthenaP1
 # art-output: *check*
 # art-output: HLTChain.txt
 # art-output: HLTTE.txt
@@ -22,6 +18,7 @@
 # art-output: ntuple.pmon.gz
 # art-output: *perfmon*
 # art-output: TotalEventsProcessed.txt
+# art-output: *.regtest.new
 
 export NAME="mc_pp_v7_trigedm_grid"
 export JOB_LOG="athena.log"

Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoaod_grid.sh

@@ -3,10 +3,9 @@
 # art-description: Trigger Physics pp v7 RDO to AOD test
 # art-type: grid
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/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
@@ -21,6 +20,7 @@
 # art-output: TotalEventsProcessed.txt
 # art-output: AOD.pool.root.checkFile0
 # art-output: AOD.pool.root.checkFiletrigSize.txt
+# art-output: *.regtest.new
 
 export NAME="physics_pp_v7_rdotoaod_grid"
 export COST_MONITORING="False"

Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotobstoesd_build.sh

@@ -3,10 +3,9 @@
 # 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.0-TrigMC/Athena
+# art-include: 21.3/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
@@ -19,6 +18,7 @@
 # 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"

Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoesdaod_build.sh

@@ -3,10 +3,9 @@
 # art-description: Trigger Physics 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.0-TrigMC/Athena
+# art-include: 21.3/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
@@ -19,6 +18,7 @@
 # art-output: ntuple.pmon.gz
 # art-output: *perfmon*
 # art-output: TotalEventsProcessed.txt
+# art-output: *.regtest.new
 
 export NAME="physics_pp_v7_rdotoesdaod_build"
 export COST_MONITORING="False"

Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoesdaod_grid.sh

@@ -3,10 +3,9 @@
 # art-description: Trigger Physics 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.0-TrigMC/Athena
+# art-include: 21.3/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
@@ -21,6 +20,7 @@
 # art-output: TotalEventsProcessed.txt
 # art-output: AOD.pool.root.checkFile0
 # art-output: AOD.pool.root.checkFiletrigSize.txt
+# art-output: *.regtest.new
 
 export NAME="physics_pp_v7_rdotoesdaod_grid"
 export COST_MONITORING="False"