Merge branch 'master-TIDV-art8' into 'master'

Update "art-output" for TIDV art grid tests

See merge request atlas/athena!34965

Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py

@@ -162,6 +162,8 @@ if ( True ) :
 
     "HLT_tau.*_idperf.*:HLT_IDTrack_TauCore_FTF",
     "HLT_tau.*_idperf.*:HLT_IDTrack_TauIso_FTF",
+    "HLT_tau.*_idperf.*:HLT_IDTrack_TauCore_FTF:HLT_Roi_TauCore",
+    "HLT_tau.*_idperf.*:HLT_IDTrack_TauIso_FTF:HLT_Roi_TauIso",
     "HLT_tau.*_idperf.*:HLT_IDTrack_Tau_IDTrig",
     "HLT_tau.*_idperf.*:HLT_IDTrack_Tau_FTF"
 

Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_grid.py

@@ -3,7 +3,6 @@
 # art-description: art job for all_ttbar_pu80_grid
 # art-type: grid
 # art-include: master/Athena
-# art-input: mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7195
 # art-input-nfiles: 3
 # art-athena-mt: 4
 # art-output: *.txt
@@ -16,10 +15,8 @@
 # art-output: *.json
 # art-output: *.root
 # art-output: *.check*
-# art-output: HLTEF-plots
-# art-output: HLTL2-plots
-# art-output: times
-# art-output: times-FTF
+# art-output: HLT*
+# art-output: times*
 # art-output: cost-perCall
 # art-output: cost-perEvent
 # art-output: cost-perCall-chain
@@ -105,11 +102,7 @@ rdo2aod.concurrent_events = 1 # TODO: change to 4
 rdo2aod.perfmon = False
 rdo2aod.timeout = 18*3600
 rdo2aod.args = '--outputAODFile=AOD.pool.root --steering="doRDO_TRIG" '
-if local:
-    rdo2aod.input = 'ttbar_pu80'   ## This isn't the same sample as the grid test but for not lets use it.
-else:
-    rdo2aod.input = ''
-    rdo2aod.args += '--inputRDOFile=$ArtInFile '
+rdo2aod.input = 'ttbar_pu80'   
 
 rdo2aod.args += ' --preExec "RDOtoRDOTrigger:{:s};" "all:{:s};" "RAWtoESD:{:s};" "ESDtoAOD:{:s};"'.format(
     preexec_trig, preexec_all, preexec_reco, preexec_aod)

Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt_grid.py

@@ -3,7 +3,6 @@
 # art-description: art job for all_ttbar_pu80_mp_grid
 # art-type: grid
 # art-include: master/Athena
-# art-input: mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7195
 # art-input-nfiles: 3
 # art-athena-mt: 4
 # art-output: *.txt
@@ -96,11 +95,7 @@ rdo2aod.threads = 1 # TODO: change to 4
 rdo2aod.concurrent_events = 4 
 rdo2aod.perfmon = False
 rdo2aod.args = '--outputAODFile=AOD.pool.root --steering="doRDO_TRIG" '
-if local:
-    rdo2aod.input = 'ttbar_pu80'   ## This isn't the same sample as the grid test but for not lets use it.
-else:
-    rdo2aod.input = ''
-    rdo2aod.args += '--inputRDOFile=$ArtInFile '
+rdo2aod.input = 'ttbar_pu80'   ## This isn't the same sample as the grid test but for not lets use it.
 
 rdo2aod.args += ' --preExec "RDOtoRDOTrigger:{:s};" "all:{:s};" "RAWtoESD:{:s};" "ESDtoAOD:{:s};"'.format(
     preexec_trig, preexec_all, preexec_reco, preexec_aod)

Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_grid.py

@@ -16,10 +16,8 @@
 # art-output: *.json
 # art-output: *.root
 # art-output: *.check*
-# art-output: HLTEF-plots
-# art-output: HLTL2-plots
-# art-output: times
-# art-output: times-FTF
+# art-output: HLT*
+# art-output: times*
 # art-output: cost-perCall
 # art-output: cost-perEvent
 # art-output: cost-perCall-chain