diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py index ea582118a42bb7af56d2da79ac9693df055ef556..cdccd5e14d484967ec637fa9e52794fa7246a10f 100644 --- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py +++ b/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" diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_grid.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_grid.py index 88499f733101b676d551cb3dae2cd1cb7de63343..dcbb230d96a5fe191589e8c1e5bb4445b247d7e8 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_grid.py +++ b/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) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt_grid.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt_grid.py index 19ba137045c02c905eac2614fc66a40403af595d..56571d8086a90c9d2b5199e799886458bdb125b0 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt_grid.py +++ b/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) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_grid.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_grid.py index c2e327c3dfa4d54f06a733e08b92a58ee6548a78..f725eeab71541be73fd43b775abc34d48648e5d7 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_grid.py +++ b/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