diff --git a/Trigger/TrigValidation/TrigInDetValidation/scripts-art/makeart b/Trigger/TrigValidation/TrigInDetValidation/scripts-art/makeart
index 2fd5f20b70f83b38c2aa01a2b6caa561f1e8bc3c..c175e1507f7f4fc13d80eba4712cb5bb1d62fcf9 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/scripts-art/makeart
+++ b/Trigger/TrigValidation/TrigInDetValidation/scripts-art/makeart
@@ -19,9 +19,11 @@ for job in $(grep include ../TIDAbuild/TrigInDetValidation_TestConfiguration_ma
../utils/mkart ../TIDAbuild/$job -d $DATASET -o .
- chmod 755 $(basename $job .xml).sh
- mv $(basename $job .xml).sh ../test
- ls -ld ../test/$(basename $job .xml).sh
+ _job=test_$(echo $(basename $job .xml) | tr '[:upper:]' '[:lower:]' )
+
+ chmod 755 $_job.sh
+ mv $_job.sh ../test
+ ls -ld ../test/$_job.sh
done
diff --git a/Trigger/TrigValidation/TrigInDetValidation/scripts-art/makefile b/Trigger/TrigValidation/TrigInDetValidation/scripts-art/makefile
new file mode 100755
index 0000000000000000000000000000000000000000..c026ed7a8c8f0f751b100101e668041cf8db95ef
--- /dev/null
+++ b/Trigger/TrigValidation/TrigInDetValidation/scripts-art/makefile
@@ -0,0 +1,40 @@
+
+
+
+# get the list of jobs from the main RTT configuration job
+
+JOBS = $(shell grep include ../TIDAbuild/TrigInDetValidation_TestConfiguration_main.xml | grep -v "<\!-" | sed 's|.* \"||g' | sed 's|\".*||g' )
+
+# generate the target files with the tedious, pointless and arbitrary "only lower case" naming convention
+
+TARGETS=$(shell echo $(JOBS) | tr '[:upper:]' '[:lower:]' | sed 's|trigindet|../test/test_trigindet|g' | sed 's|\.xml|\.sh|g')
+
+# default target
+
+all : $(TARGETS)
+
+# allow remapping of the proper job names to the lower case names
+# NB: extraction of the data set now done in the mkart script
+
+define MAPPER
+../test/test_$(2) : ../TIDAbuild/$(1)
+ ../utils/mkart $$< -o .
+ cp test_$(2) $$@
+ chmod 755 $$@
+endef
+
+
+# actually make all the make rules
+
+$(foreach i,$(JOBS),$(eval $(call MAPPER,$(i),$(shell echo $(i) | tr '[:upper:]' '[:lower:]' | sed 's|\.xml|\.sh|g'))))
+
+
+clean:
+ rm -f ../test/test_*
+
+test:
+ echo $(TARGETS)
+
+
+
+
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_all_ttbar_pu40.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_all_ttbar_pu40.sh
similarity index 94%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_all_ttbar_pu40.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_all_ttbar_pu40.sh
index e4b5a89ed98e62b1ae7d9d046a0e189ad0d15d20..eb12ef50df91cd481a08a89e27a456dc1b0beaa8 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_all_ttbar_pu40.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_all_ttbar_pu40.sh
@@ -26,44 +26,64 @@ export RTTJOBNAME=TrigInDetValidation_all_ttbar_pu40
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_AllSlices.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1"]; EventMax=1000;runMergedChain=True;doIDNewTracking=True;rec.doFloatingPointException.set_Value_and_Lock(False)' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_AllSlices.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -r Offline -f data-all.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-all.root data-all_ttbar_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-electron
+JOBSTATUS_2=$?
TIDArun-art.sh data-all.root data-all_ttbar_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-electron
+JOBSTATUS_3=$?
TIDArun-art.sh data-all.root data-all_ttbar_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-electron-lowpt
+JOBSTATUS_4=$?
TIDArun-art.sh data-all.root data-all_ttbar_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-electron-lowpt
+JOBSTATUS_5=$?
TIDArun-art.sh data-all.root data-all_ttbar_pu40-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots-muon
+JOBSTATUS_6=$?
TIDArun-art.sh data-all.root data-all_ttbar_pu40-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-plots-muon
+JOBSTATUS_7=$?
TIDArun-art.sh data-all.root data-all_ttbar_pu40-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 -d HLTEF-plots-tau
+JOBSTATUS_8=$?
TIDArun-art.sh data-all.root data-all_ttbar_pu40-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 -d HLTL2-plots-tau
+JOBSTATUS_9=$?
TIDArun-art.sh data-all.root data-all_ttbar_pu40-reference.root HLT_j55_boffperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots-bjet
+JOBSTATUS_10=$?
TIDArun-art.sh data-all.root data-all_ttbar_pu40-reference.root HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_boffperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots-bjet
+JOBSTATUS_11=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_12=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_13=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_14=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_15=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_16=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_17=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_18=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_all_ttbar_pu80.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_all_ttbar_pu80.sh
similarity index 94%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_all_ttbar_pu80.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_all_ttbar_pu80.sh
index 4b76a2a31455e3cda03f2c51139d283968ffe2af..2666464f8f82d6dfff727bca5ce6adff9d2d1a0d 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_all_ttbar_pu80.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_all_ttbar_pu80.sh
@@ -25,44 +25,64 @@ export RTTJOBNAME=TrigInDetValidation_all_ttbar_pu80
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_AllSlices.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7195/RDO.06752780._000001.pool.root.1"]; EventMax=1000;runMergedChain=True;doIDNewTracking=True;rec.doFloatingPointException.set_Value_and_Lock(False)' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_AllSlices.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -r Offline -f data-all.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-all.root data-all_ttbar_pu80-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-electron
+JOBSTATUS_2=$?
TIDArun-art.sh data-all.root data-all_ttbar_pu80-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-electron
+JOBSTATUS_3=$?
TIDArun-art.sh data-all.root data-all_ttbar_pu80-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-electron-lowpt
+JOBSTATUS_4=$?
TIDArun-art.sh data-all.root data-all_ttbar_pu80-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-electron-lowpt
+JOBSTATUS_5=$?
TIDArun-art.sh data-all.root data-all_ttbar_pu80-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots-muon
+JOBSTATUS_6=$?
TIDArun-art.sh data-all.root data-all_ttbar_pu80-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-plots-muon
+JOBSTATUS_7=$?
TIDArun-art.sh data-all.root data-all_ttbar_pu80-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 -d HLTEF-plots-tau
+JOBSTATUS_8=$?
TIDArun-art.sh data-all.root data-all_ttbar_pu80-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3-d HLTL2-plots-tau
+JOBSTATUS_9=$?
TIDArun-art.sh data-all.root data-all_ttbar_pu80-reference.root HLT_j55_boffperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots-bjet
+JOBSTATUS_10=$?
TIDArun-art.sh data-all.root data-all_ttbar_pu80-reference.root HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_boffperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots-bjet
+JOBSTATUS_11=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_12=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_13=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_14=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_15=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_16=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_17=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_18=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_beamspot_ttbar_pu40.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_beamspot_ttbar_pu40.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_beamspot_ttbar_pu40.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_beamspot_ttbar_pu40.sh
index 854b21b7ca69f1b7fb9cdfee32fd5a35bf7229b9..f5392678d75f12e73d4902f51643de06125257bb 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_beamspot_ttbar_pu40.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_beamspot_ttbar_pu40.sh
@@ -17,26 +17,37 @@ export RTTJOBNAME=TrigInDetValidation_beamspot_ttbar_pu40
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BeamspotSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1"]; EventMax=1000;runMergedChain=True;rec.doFloatingPointException.set_Value_and_Lock(False)' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BeamspotSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -f data-all.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-all.root data-beamspot_ttbar_pu40-reference.root HLT_beamspot_allTE_trkfast_InDetTrigTrackingxAODCnv_BeamSpot_FTF -d HLTL2-test-plots
+JOBSTATUS_2=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_4=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_5=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_6=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_9=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_beamspot_ttbar_pu40_zfinder.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_beamspot_ttbar_pu40_zfinder.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_beamspot_ttbar_pu40_zfinder.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_beamspot_ttbar_pu40_zfinder.sh
index decd58bdc90c898030317c25a5a2f9a6f35e37cb..866d65107ff2944fc5a2d3097be90717cd5e9ed2 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_beamspot_ttbar_pu40_zfinder.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_beamspot_ttbar_pu40_zfinder.sh
@@ -17,26 +17,37 @@ export RTTJOBNAME=TrigInDetValidation_beamspot_ttbar_pu40_zfinder
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BeamspotSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1"]; EventMax=1000;runMergedChain=True;fastZFinder=True;rec.doFloatingPointException.set_Value_and_Lock(False)' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BeamspotSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -f data-all.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-all.root data-beamspot_ttbar_pu40_zfinder-reference.root HLT_beamspot_allTE_trkfast_InDetTrigTrackingxAODCnv_BeamSpot_FTF -d HLTL2-test-plots
+JOBSTATUS_2=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_4=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_5=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_6=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_9=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_beamspot_ttbar_pu80_zfinder.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_beamspot_ttbar_pu80_zfinder.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_beamspot_ttbar_pu80_zfinder.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_beamspot_ttbar_pu80_zfinder.sh
index 3a2a08a62768bbc14d850d918bbc45e0f5509196..dea8ea75b5c99636715e107e0774cbf1bcfbc93f 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_beamspot_ttbar_pu80_zfinder.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_beamspot_ttbar_pu80_zfinder.sh
@@ -17,26 +17,37 @@ export RTTJOBNAME=TrigInDetValidation_beamspot_ttbar_pu80_zfinder
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BeamspotSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7195/RDO.06752780._000001.pool.root.1"]; EventMax=1000;runMergedChain=True;fastZFinder=True;rec.doFloatingPointException.set_Value_and_Lock(False)' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BeamspotSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -f data-all.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-all.root data-beamspot_ttbar_pu80_zfinder-reference.root HLT_beamspot_allTE_trkfast_InDetTrigTrackingxAODCnv_BeamSpot_FTF -d HLTL2-test-plots
+JOBSTATUS_2=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_4=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_5=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_6=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_9=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_bjet_IBL_pu40.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40.sh
similarity index 94%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_bjet_IBL_pu40.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40.sh
index 0c449bd2b51e2bcd6ef261c012d9aed482db61ef..78efc052b93ac66d176d342d4176fc0262903ed3 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_bjet_IBL_pu40.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40.sh
@@ -20,32 +20,46 @@ export RTTJOBNAME=TrigInDetValidation_bjet_IBL_pu40
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1"]; EventMax=900;runMergedChain=True;doBperf=True;globalTag="OFLCOND-RUN12-SDR-17"' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -f data-bjet-pileup-merging.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_boffperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_boffperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots
+JOBSTATUS_3=$?
TIDArun-art.sh data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_boffperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID -d HLTEF-plots-comp
+JOBSTATUS_4=$?
TIDArun-art.sh data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots-comp
+JOBSTATUS_5=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_6=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_7=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_11=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_12=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_bjet_IBL_pu40_2016config.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40_2016config.sh
similarity index 94%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_bjet_IBL_pu40_2016config.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40_2016config.sh
index b35b04892dc157bf22ce3776f49dc05cf6895407..75e4c34ee520732f3210ec19094e1ba7a5771e28 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_bjet_IBL_pu40_2016config.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40_2016config.sh
@@ -18,28 +18,40 @@ export RTTJOBNAME=TrigInDetValidation_bjet_IBL_pu40_2016config
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1"]; EventMax=900;runMergedChain=True;minVtxTrackpT=1000;bjetEtaHalfWidth=0.2;bjetPhiHalfWidth=0.2;splitZHalfWidth=20;globalTag="OFLCOND-RUN12-SDR-17"' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -f data-bjet-pileup-merging.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-bjet-pileup-merging.root data-bjet_IBL_pu40_2016config-reference.root HLT_j55_boffperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-bjet-pileup-merging.root data-bjet_IBL_pu40_2016config-reference.root HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_boffperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_4=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_5=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_6=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_bjet_IBL_pu40_offline.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40_offline.sh
similarity index 94%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_bjet_IBL_pu40_offline.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40_offline.sh
index faeaac15f4b5f9e4ca7741e840c1d9d64f0fcdac..23169182b622378c1d6729bea33a37d0a9f1570f 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_bjet_IBL_pu40_offline.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40_offline.sh
@@ -19,30 +19,43 @@ export RTTJOBNAME=TrigInDetValidation_bjet_IBL_pu40_offline
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1"]; EventMax=900;doIDNewTracking=True;runMergedChain=True;globalTag="OFLCOND-RUN12-SDR-17"' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt-offline.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt-offline.dat -f data-bjet-pileup.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-bjet-pileup.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_boffperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-bjet-pileup.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_boffperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi_xPrimVx -d HLTL2-plots
+JOBSTATUS_3=$?
TIDArun-art.sh data-bjet-pileup.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi_xPrimVx/xPrimVx HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi_EFHistoVtx/EFHistoVtx -c TIDAvertex.dat -d HLTL2-vtx
+JOBSTATUS_4=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_5=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_6=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_10=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_11=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_bjet_IBL_pu40_offline_2016config.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40_offline_2016config.sh
similarity index 94%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_bjet_IBL_pu40_offline_2016config.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40_offline_2016config.sh
index a9301b842c18a12b795ba98ac85ef3dc1c752027..19931939d8071a393ab0fece272cc9bdcb56b1b0 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_bjet_IBL_pu40_offline_2016config.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40_offline_2016config.sh
@@ -18,28 +18,40 @@ export RTTJOBNAME=TrigInDetValidation_bjet_IBL_pu40_offline_2016config
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1"]; EventMax=900;doIDNewTracking=True;runMergedChain=True;minVtxTrackpT=1000;bjetEtaHalfWidth=0.2;bjetPhiHalfWidth=0.2;splitZHalfWidth=20;globalTag="OFLCOND-RUN12-SDR-17"' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt-offline.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt-offline.dat -f data-bjet-pileup-merging.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-bjet-pileup-merging.root data-bjet_IBL_pu40_offline_2016config-reference.root HLT_j55_boffperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-bjet-pileup-merging.root data-bjet_IBL_pu40_offline_2016config-reference.root HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_boffperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi_xPrimVx -d HLTL2-plots
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_4=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_5=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_6=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_bjet_IBL_pu80.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu80.sh
similarity index 94%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_bjet_IBL_pu80.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu80.sh
index 74812a6e2720b58742906e29505b3991ec19ec3c..132d8cdd3477d280eb128b860944e9966f7933a5 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_bjet_IBL_pu80.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu80.sh
@@ -18,28 +18,40 @@ export RTTJOBNAME=TrigInDetValidation_bjet_IBL_pu80
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7195/RDO.06752780._000001.pool.root.1"]; EventMax=900;runMergedChain=True;globalTag="OFLCOND-RUN12-SDR-17"' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -f data-bjet-pileup-merging.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-bjet-pileup-merging.root data-bjet_IBL_pu80-reference.root HLT_j55_boffperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-bjet-pileup-merging.root data-bjet_IBL_pu80-reference.root HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_boffperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_4=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_5=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_6=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_cosmic.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_cosmic.sh
similarity index 85%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_cosmic.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_cosmic.sh
index 6110c8bb61eef79a4d01444b1ba789f2793eaa03..62c051ed90cfb0ce91a492d73678a88513d6659c 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_cosmic.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_cosmic.sh
@@ -17,22 +17,35 @@ export RTTJOBNAME=TrigInDetValidation_cosmic
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_CosmicSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000892.pool.root.1"]; EventMax=5000;' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_CosmicSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAcosmic-rtt.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAcosmic-rtt.dat -f data-cosmic.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-cosmic.root data-cosmic-reference.root HLT_id_cosmic_InDetTrigTrackingxAODCnvIOTRT_CosmicsN_EFID -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_4=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_5=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_6=$?
+
+TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_7=$?
-TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent" costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_9=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_Jpsiee_pu40.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_jpsiee_pu40.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_Jpsiee_pu40.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_jpsiee_pu40.sh
index 8bb5220a2cfcc6d950a6b9048f9e65ad8026eb80..2bb6fad73de4d68cacf8ea5d90c03cfff9e61c21 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_Jpsiee_pu40.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_jpsiee_pu40.sh
@@ -18,28 +18,40 @@ export RTTJOBNAME=TrigInDetValidation_el_Jpsiee_pu40
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042/RDO.06758877._000006.pool.root.1"]; EventMax=10000;runMergedChain=True' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -f data-electron-merge.root -p 11 -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-electron-merge.root data-el_Jpsiee_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-electron-merge.root data-el_Jpsiee_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_4=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_5=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_6=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_single_e_7-80_IBL.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_ibl.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_single_e_7-80_IBL.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_ibl.sh
index cbb9c3ebf4307a01072b4be8409b9749843cc971..0dc068cd78cfecd6e9b04ab4821c3085bf2f947a 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_single_e_7-80_IBL.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_ibl.sh
@@ -20,32 +20,46 @@ export RTTJOBNAME=TrigInDetValidation_el_single_e_7-80_IBL
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728/RDO.10240159._000001.pool.root.1"]; EventMax=15000;runMergedChain=True' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -f data-electron-IBL.root -p 11 -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-electron-IBL.root data-el_single_e_7-80_IBL-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-electron-IBL.root data-el_single_e_7-80_IBL-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt
+JOBSTATUS_3=$?
TIDArun-art.sh data-electron-IBL.root data-el_single_e_7-80_IBL-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots
+JOBSTATUS_4=$?
TIDArun-art.sh data-electron-IBL.root data-el_single_e_7-80_IBL-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt
+JOBSTATUS_5=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_6=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_7=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_11=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_12=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_single_e_7-80_IBL_pu40.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_ibl_pu40.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_single_e_7-80_IBL_pu40.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_ibl_pu40.sh
index 57f1a0b697176c714ab01f0f3e80475f5d5ad948..fd3221191e8dbb91b7a8cbfa3bfb85c9ece668b5 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_single_e_7-80_IBL_pu40.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_ibl_pu40.sh
@@ -20,32 +20,46 @@ export RTTJOBNAME=TrigInDetValidation_el_single_e_7-80_IBL_pu40
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772/RDO.09929877._000001.pool.root.1"]; EventMax=15000;runMergedChain=True' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -f data-electron-IBL.root -p 11 -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-electron-IBL.root data-el_single_e_7-80_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-electron-IBL.root data-el_single_e_7-80_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt
+JOBSTATUS_3=$?
TIDArun-art.sh data-electron-IBL.root data-el_single_e_7-80_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots
+JOBSTATUS_4=$?
TIDArun-art.sh data-electron-IBL.root data-el_single_e_7-80_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt
+JOBSTATUS_5=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_6=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_7=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_11=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_12=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_single_e_7-80_larged0.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_larged0.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_single_e_7-80_larged0.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_larged0.sh
index 952b29ad54b60abab6af535881373f7193002eb1..3de099bb33133c64f93b323a818f1acbfb69ece6 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_single_e_7-80_larged0.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_larged0.sh
@@ -20,32 +20,46 @@ export RTTJOBNAME=TrigInDetValidation_el_single_e_7-80_larged0
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240167._000001.pool.root.1"]; EventMax=15000;runMergedChain=True' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt-larged0-el.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin_larged0.dat
TIDArdict.exe TIDAdata11-rtt-larged0-el.dat -f data-electron-IBL.root -p 11 -b Test_bin_larged0.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-electron-IBL.root data-el_single_e_7-80_larged0-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-electron-IBL.root data-el_single_e_7-80_larged0-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt
+JOBSTATUS_3=$?
TIDArun-art.sh data-electron-IBL.root data-el_single_e_7-80_larged0-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots
+JOBSTATUS_4=$?
TIDArun-art.sh data-electron-IBL.root data-el_single_e_7-80_larged0-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt
+JOBSTATUS_5=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_6=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_7=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_11=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_12=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_single_e_7-80_larged0_PU.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_larged0_pu.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_single_e_7-80_larged0_PU.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_larged0_pu.sh
index c86fad6dab2eb2103df917f70b05e2ca6498a517..eee852a5e094ca5c2ded4ed47a801c8384418443 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_single_e_7-80_larged0_PU.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_larged0_pu.sh
@@ -20,32 +20,46 @@ export RTTJOBNAME=TrigInDetValidation_el_single_e_7-80_larged0_PU
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945414._000001.pool.root.1"]; EventMax=15000;runMergedChain=True' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt-larged0-el.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin_larged0.dat
TIDArdict.exe TIDAdata11-rtt-larged0-el.dat -f data-electron-IBL.root -p 11 -b Test_bin_larged0.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-electron-IBL.root data-el_single_e_7-80_larged0_PU-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-electron-IBL.root data-el_single_e_7-80_larged0_PU-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt
+JOBSTATUS_3=$?
TIDArun-art.sh data-electron-IBL.root data-el_single_e_7-80_larged0_PU-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots
+JOBSTATUS_4=$?
TIDArun-art.sh data-electron-IBL.root data-el_single_e_7-80_larged0_PU-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt
+JOBSTATUS_5=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_6=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_7=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_11=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_12=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_ttbar_pu40.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_ttbar_pu40.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_ttbar_pu40.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_ttbar_pu40.sh
index b6ed8ba0fc2d608ed264435760ed8b19068d5d79..b10ac91121679a3fa463b21620ca811388252046 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_ttbar_pu40.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_ttbar_pu40.sh
@@ -20,32 +20,46 @@ export RTTJOBNAME=TrigInDetValidation_el_ttbar_pu40
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1"]; EventMax=8000;runMergedChain=True' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -f data-electron-merge.root -p 11 -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-electron-merge.root data-el_ttbar_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-electron-merge.root data-el_ttbar_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots
+JOBSTATUS_3=$?
TIDArun-art.sh data-electron-merge.root data-el_ttbar_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt
+JOBSTATUS_4=$?
TIDArun-art.sh data-electron-merge.root data-el_ttbar_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt
+JOBSTATUS_5=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_6=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_7=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_11=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_12=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_ttbar_pu80.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_ttbar_pu80.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_ttbar_pu80.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_ttbar_pu80.sh
index ecf5419f53771fb10d1f8acac3f28e48f290baf9..6c79767fd344230242990720a60ef18a981d79b6 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_ttbar_pu80.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_ttbar_pu80.sh
@@ -20,32 +20,46 @@ export RTTJOBNAME=TrigInDetValidation_el_ttbar_pu80
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7195/RDO.06752780._000001.pool.root.1"]; EventMax=4000;runMergedChain=True' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -f data-electron-merge.root -p 11 -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-electron-merge.root data-el_ttbar_pu80-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-electron-merge.root data-el_ttbar_pu80-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots
+JOBSTATUS_3=$?
TIDArun-art.sh data-electron-merge.root data-el_ttbar_pu80-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt
+JOBSTATUS_4=$?
TIDArun-art.sh data-electron-merge.root data-el_ttbar_pu80-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt
+JOBSTATUS_5=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_6=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_7=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_11=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_12=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_Zee_IBL_pu40.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_Zee_IBL_pu40.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40.sh
index 1b07f258d4d2870905aa76d6a8ef47a6aaeb44c7..28d967982df6f23c627510b0a95c4ff0d825586a 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_Zee_IBL_pu40.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40.sh
@@ -20,32 +20,46 @@ export RTTJOBNAME=TrigInDetValidation_el_Zee_IBL_pu40
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000001.pool.root.1"]; EventMax=5000;runMergedChain=True' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -f data-electron-merge.root -p 11 -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots
+JOBSTATUS_3=$?
TIDArun-art.sh data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt
+JOBSTATUS_4=$?
TIDArun-art.sh data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt
+JOBSTATUS_5=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_6=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_7=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_11=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_12=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_Zee_IBL_pu40_offline.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40_offline.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_Zee_IBL_pu40_offline.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40_offline.sh
index bb0ddcfbeb39822f041dca62319ac611923cc5ed..5bf67f8544400f6e070d59273199654847760059 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_Zee_IBL_pu40_offline.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40_offline.sh
@@ -20,32 +20,46 @@ export RTTJOBNAME=TrigInDetValidation_el_Zee_IBL_pu40_offline
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000001.pool.root.1"]; EventMax=2500;runMergedChain=True;doIDNewTracking=True;PdgId=11' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt-offline.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt-offline.dat -f data-electron-merge.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-electron-merge.root data-el_Zee_IBL_pu40_offline-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-electron-merge.root data-el_Zee_IBL_pu40_offline-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots
+JOBSTATUS_3=$?
TIDArun-art.sh data-electron-merge.root data-el_Zee_IBL_pu40_offline-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt
+JOBSTATUS_4=$?
TIDArun-art.sh data-electron-merge.root data-el_Zee_IBL_pu40_offline-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt
+JOBSTATUS_5=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_6=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_7=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_11=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_12=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_Zee_IBL_pu40_offline_rzMatcher.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40_offline_rzmatcher.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_Zee_IBL_pu40_offline_rzMatcher.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40_offline_rzmatcher.sh
index 69e90aedcba9f321dd17a1acb12d63c1e3b93523..98cb136d9dd1c587303483150e21eb275b5e4f89 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_Zee_IBL_pu40_offline_rzMatcher.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40_offline_rzmatcher.sh
@@ -20,32 +20,46 @@ export RTTJOBNAME=TrigInDetValidation_el_Zee_IBL_pu40_offline_rzMatcher
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000001.pool.root.1"]; EventMax=2500;runMergedChain=True;doIDNewTracking=True;PdgId=11' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt-offline-rzMatcher.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt-offline-rzMatcher.dat -f data-electron-merge.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-electron-merge.root data-el_Zee_IBL_pu40_offline_rzMatcher-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-electron-merge.root data-el_Zee_IBL_pu40_offline_rzMatcher-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots
+JOBSTATUS_3=$?
TIDArun-art.sh data-electron-merge.root data-el_Zee_IBL_pu40_offline_rzMatcher-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt
+JOBSTATUS_4=$?
TIDArun-art.sh data-electron-merge.root data-el_Zee_IBL_pu40_offline_rzMatcher-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt
+JOBSTATUS_5=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_6=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_7=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_11=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_12=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_Zee_IBL_pu40_rzMatcher.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40_rzmatcher.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_Zee_IBL_pu40_rzMatcher.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40_rzmatcher.sh
index 02d6fa80ff7da97f072402454567706ecf9ef2d7..092de08615c169ba9580bb3943b4920177458c30 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_el_Zee_IBL_pu40_rzMatcher.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40_rzmatcher.sh
@@ -20,32 +20,46 @@ export RTTJOBNAME=TrigInDetValidation_el_Zee_IBL_pu40_rzMatcher
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000001.pool.root.1"]; EventMax=5000;runMergedChain=True;PdgId=11' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt-rzMatcher.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt-rzMatcher.dat -f data-electron-merge.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-electron-merge.root data-el_Zee_IBL_pu40_rzMatcher-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-electron-merge.root data-el_Zee_IBL_pu40_rzMatcher-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots
+JOBSTATUS_3=$?
TIDArun-art.sh data-electron-merge.root data-el_Zee_IBL_pu40_rzMatcher-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt
+JOBSTATUS_4=$?
TIDArun-art.sh data-electron-merge.root data-el_Zee_IBL_pu40_rzMatcher-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt
+JOBSTATUS_5=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_6=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_7=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_11=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_12=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_FTK_beamspot_ttbar.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_beamspot_ttbar.sh
similarity index 94%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_FTK_beamspot_ttbar.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_beamspot_ttbar.sh
index db64b6f861f12c98db41645628c352a986971d99..d33bc59a2d20dfa40bab9c97e18b4d243d15c7be 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_FTK_beamspot_ttbar.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_beamspot_ttbar.sh
@@ -17,26 +17,37 @@ export RTTJOBNAME=TrigInDetValidation_FTK_beamspot_ttbar
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BeamspotSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.digit.RDO_FTK.e4993_s2887_r8937_r9119/RDO_FTK.10733709._000015.pool.root.1"]; EventMax=1000;runMergedChain=True;doFTK=True;rec.doFloatingPointException.set_Value_and_Lock(False)' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BeamspotSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -f data-beamspot-FTK.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-beamspot-FTK.root data-FTK_beamspot_ttbar-reference.root HLT_beamspot_allTE_trkfast_InDetTrigTrackingxAODCnv_BeamSpot_FTF HLT_beamspot_idperf_FTK_InDetTrigTrackingxAODCnv_BeamSpot_FTKMon HLT_beamspot_allTE_FTKRefit_InDetTrigTrackingxAODCnv_BeamSpot_FTKRefit -d HLTL2-plots
+JOBSTATUS_2=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_4=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_5=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_6=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_9=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_FTK_bjet_ttbar.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_bjet_ttbar.sh
similarity index 94%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_FTK_bjet_ttbar.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_bjet_ttbar.sh
index 2d68426fccf85a0848490694505868e0532f5cbc..f447477edfc81d78cdf86adc3e70f58a6db81bf4 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_FTK_bjet_ttbar.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_bjet_ttbar.sh
@@ -18,28 +18,40 @@ export RTTJOBNAME=TrigInDetValidation_FTK_bjet_ttbar
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.digit.RDO_FTK.e4993_s2887_r8937_r9119/RDO_FTK.10733709._000015.pool.root.1"]; EventMax=500;runMergedChain=True;doFTK=True' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -f data-bjet-FTK.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-bjet-FTK.root data-FTK_bjet_ttbar-reference.root HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_boffperf_split_FTKVtx_InDetTrigTrackingxAODCnv_Bjet_FTF HLT_j55_boffperf_split_FTK_InDetTrigTrackingxAODCnv_Bjet_FTK HLT_j55_boffperf_split_FTKRefit_InDetTrigTrackingxAODCnv_Bjet_FTKRefit -d HLTL2-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-bjet-FTK.root data-FTK_bjet_ttbar-reference.root HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_boffperf_split_FTKVtx_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_boffperf_split_FTK_InDetTrigTrackingxAODCnv_Bjet_FTK_IDTrig HLT_j55_boffperf_split_FTKRefit_InDetTrigTrackingxAODCnv_Bjet_FTKRefit_IDTrig -d HLTEF-plots
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_4=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_5=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_6=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_FTK_bjet_ttbar_offline.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_bjet_ttbar_offline.sh
similarity index 94%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_FTK_bjet_ttbar_offline.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_bjet_ttbar_offline.sh
index a0903f58a4e4e23b7ccc85b16576559c0787e143..c2269d5e2a1ad3fc50e926c6ff5a08d2d08413ad 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_FTK_bjet_ttbar_offline.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_bjet_ttbar_offline.sh
@@ -18,28 +18,40 @@ export RTTJOBNAME=TrigInDetValidation_FTK_bjet_ttbar_offline
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.digit.RDO_FTK.e4993_s2887_r8937_r9119/RDO_FTK.10733709._000015.pool.root.1"]; EventMax=500;doIDNewTracking=True;runMergedChain=True;doFTK=True' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt-offline.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt-offline.dat -f data-bjet-FTK.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-bjet-FTK.root data-FTK_bjet_ttbar_offline-reference.root HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_boffperf_split_FTKVtx_InDetTrigTrackingxAODCnv_Bjet_FTF HLT_j55_boffperf_split_FTK_InDetTrigTrackingxAODCnv_Bjet_FTK HLT_j55_boffperf_split_FTKRefit_InDetTrigTrackingxAODCnv_Bjet_FTKRefit -d HLTL2-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-bjet-FTK.root data-FTK_bjet_ttbar_offline-reference.root HLT_j55_boffperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_boffperf_split_FTKVtx_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_boffperf_split_FTK_InDetTrigTrackingxAODCnv_Bjet_FTK_IDTrig HLT_j55_boffperf_split_FTKRefit_InDetTrigTrackingxAODCnv_Bjet_FTKRefit_IDTrig -d HLTEF-plots
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_4=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_5=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_6=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_FTK_mu_ttbar.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_mu_ttbar.sh
similarity index 94%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_FTK_mu_ttbar.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_mu_ttbar.sh
index 18c08a1097e5505d829754845735436b50753ed5..cbcf66b2f57aa7f70f483f0fec73d9a557731b0b 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_FTK_mu_ttbar.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_mu_ttbar.sh
@@ -20,32 +20,46 @@ export RTTJOBNAME=TrigInDetValidation_FTK_mu_ttbar
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_MuonSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.digit.RDO_FTK.e4993_s2887_r8937_r9119/RDO_FTK.10733709._000015.pool.root.1"]; EventMax=5000;runMergedChain=True;doFTK=True' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_MuonSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -f data-muon-FTK.root -p 13 -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-muon-FTK.root data-FTK_mu_ttbar-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_FTK_idperf_InDetTrigTrackingxAODCnv_Muon_FTK HLT_mu24_FTKRefit_idperf_InDetTrigTrackingxAODCnv_Muon_FTKRefit -d HLTL2-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-muon-FTK.root data-FTK_mu_ttbar-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig HLT_mu24_FTK_idperf_InDetTrigTrackingxAODCnv_Muon_FTK_IDTrig HLT_mu24_FTKRefit_idperf_InDetTrigTrackingxAODCnv_Muon_FTKRefit_IDTrig -d HLTEF-plots
+JOBSTATUS_3=$?
TIDArun-art.sh data-muon-FTK.root data-FTK_mu_ttbar-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_FTK_idperf_InDetTrigTrackingxAODCnv_Muon_FTK HLT_mu6_FTKRefit_idperf_InDetTrigTrackingxAODCnv_Muon_FTKRefit -d HLTL2-plots-lowpt
+JOBSTATUS_4=$?
TIDArun-art.sh data-muon-FTK.root data-FTK_mu_ttbar-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig HLT_mu6_FTK_idperf_InDetTrigTrackingxAODCnv_Muon_FTK_IDTrig HLT_mu6_FTKRefit_idperf_InDetTrigTrackingxAODCnv_Muon_FTKRefit_IDTrig -d HLTEF-plots-lowpt
+JOBSTATUS_5=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_6=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_7=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_11=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_12=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_FTK_mu_ttbar_offline.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_mu_ttbar_offline.sh
similarity index 94%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_FTK_mu_ttbar_offline.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_mu_ttbar_offline.sh
index 03f6a2d18b6f569b65ed419196f9a3133e5412d5..13cfede3b392b491dd16c2c10f26ffa2aa5f66b9 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_FTK_mu_ttbar_offline.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_mu_ttbar_offline.sh
@@ -20,32 +20,46 @@ export RTTJOBNAME=TrigInDetValidation_FTK_mu_ttbar_offline
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_MuonSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.digit.RDO_FTK.e4993_s2887_r8937_r9119/RDO_FTK.10733709._000015.pool.root.1"]; EventMax=5000;doIDNewTracking=True;runMergedChain=True;doFTK=True' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_MuonSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt-offline.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt-offline.dat -f data-muon-FTK.root -p 13 -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-muon-FTK.root data-FTK_mu_ttbar_offline-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_FTK_idperf_InDetTrigTrackingxAODCnv_Muon_FTK HLT_mu24_FTKRefit_idperf_InDetTrigTrackingxAODCnv_Muon_FTKRefit -d HLTL2-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-muon-FTK.root data-FTK_mu_ttbar_offline-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig HLT_mu24_FTK_idperf_InDetTrigTrackingxAODCnv_Muon_FTK_IDTrig HLT_mu24_FTKRefit_idperf_InDetTrigTrackingxAODCnv_Muon_FTKRefit_IDTrig -d HLTEF-plots
+JOBSTATUS_3=$?
TIDArun-art.sh data-muon-FTK.root data-FTK_mu_ttbar_offline-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_FTK_idperf_InDetTrigTrackingxAODCnv_Muon_FTK HLT_mu6_FTKRefit_idperf_InDetTrigTrackingxAODCnv_Muon_FTKRefit -d HLTL2-plots-lowpt
+JOBSTATUS_4=$?
TIDArun-art.sh data-muon-FTK.root data-FTK_mu_ttbar_offline-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig HLT_mu6_FTK_idperf_InDetTrigTrackingxAODCnv_Muon_FTK_IDTrig HLT_mu6_FTKRefit_idperf_InDetTrigTrackingxAODCnv_Muon_FTKRefit_IDTrig -d HLTEF-plots-lowpt
+JOBSTATUS_5=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_6=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_7=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_11=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_12=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_FTK_tau_tautau.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_tau_tautau.sh
similarity index 94%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_FTK_tau_tautau.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_tau_tautau.sh
index 22d0698340e330036a30eb53bd8da49001232c4c..fd45dc42b3802ceb0e26f5490257d02629f365c9 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_FTK_tau_tautau.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_tau_tautau.sh
@@ -18,28 +18,40 @@ export RTTJOBNAME=TrigInDetValidation_FTK_tau_tautau
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_TauSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.147408.PowhegPythia8_AZNLO_Ztautau.recon.RDO.e3099_s2578_r7611.beamspotJohn.v6_EXT2/user.jahreda.8926715.EXT2._000002.RDO_FTK_ttbar.root"]; EventMax=5000;runMergedChain=True;doFTK=True' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_TauSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -f data-tau-FTK.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-tau-FTK.root data-FTK_tau_tautau-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_FTK:InDetTrigTrackingxAODCnv_Tau_FTK HLT_tau25_idperf_FTKRefit:InDetTrigTrackingxAODCnv_Tau_FTKRefit -d HLTL2-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-tau-FTK.root data-FTK_tau_tautau-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_FTK:InDetTrigTrackingxAODCnv_Tau_FTK_IDTrig HLT_tau25_idperf_FTKRefit:InDetTrigTrackingxAODCnv_Tau_FTKRefit_IDTrig -d HLTEF-plots
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_4=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_5=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_6=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_minBias.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_minbias.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_minBias.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_minbias.sh
index 663a6ec09a4fe5a2fe8d6ae536b2f58efdc43de8..8b8c3df0a45776ac2093cc01838d6f965f5d0b13 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_minBias.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_minbias.sh
@@ -17,26 +17,37 @@ export RTTJOBNAME=TrigInDetValidation_minBias
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_MonitorSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361036.Pythia8_A2MSTW2008LO_minbias_inelastic.recon.RDO.e3580_s2726_r7011/RDO.07344311._000057.pool.root.1"]; EventMax=1000;' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_MonitorSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -f data-monitor.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-monitor.root data-minBias-reference.root HLT_mb_idperf_L1MBTS_2_InDetTrigTrackingxAODCnv_minBias_EFID -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_4=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_5=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_6=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_9=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_minBias_offline.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_minbias_offline.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_minBias_offline.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_minbias_offline.sh
index eed74f155f659b6a2a757d257cec275ff6687da6..a2a8f76792263fb799667a7d28dd8402f5a6348c 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_minBias_offline.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_minbias_offline.sh
@@ -17,26 +17,37 @@ export RTTJOBNAME=TrigInDetValidation_minBias_offline
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_MonitorSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361036.Pythia8_A2MSTW2008LO_minbias_inelastic.recon.RDO.e3580_s2726_r7011/RDO.07344311._000057.pool.root.1"]; EventMax=1000;doIDNewTracking=True' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_MonitorSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt-offline.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt-offline.dat -f data-minBias.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-minBias.root data-minBias_offline-reference.root HLT_mb_idperf_L1MBTS_2_InDetTrigTrackingxAODCnv_minBias_EFID -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_4=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_5=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_6=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_9=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_mu_bphys_IBL.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_bphys_ibl.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_mu_bphys_IBL.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_bphys_ibl.sh
index e9c7389ab41d44486101fdcd78123213ae9e7fb9..41bc96d5d4e509597a6e3a9e8ad5aec362c84601 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_mu_bphys_IBL.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_bphys_ibl.sh
@@ -18,28 +18,40 @@ export RTTJOBNAME=TrigInDetValidation_mu_bphys_IBL
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_MuonSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.300401.Pythia8BPhotospp_A14_CTEQ6L1_Bs_Jpsimu3p5mu3p5_phi.recon.RDO.e4397_s2608_r6869/RDO.06461186._000001.pool.root.1"]; EventMax=5000;runMergedChain=True' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_MuonSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -f data-muon-bphys-merge.root -p 13 -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-muon-bphys-merge.root data-mu_bphys_IBL-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-muon-bphys-merge.root data-mu_bphys_IBL-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_4=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_5=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_6=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_mu_single_mu_larged0.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_single_mu_larged0.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_mu_single_mu_larged0.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_single_mu_larged0.sh
index 0440aae5cdf8e6bc45007b7ada37fd397693868f..80500c35213fd69f55d2f64da9c6b67de3a0b50e 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_mu_single_mu_larged0.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_single_mu_larged0.sh
@@ -18,28 +18,40 @@ export RTTJOBNAME=TrigInDetValidation_mu_single_mu_larged0
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_MuonSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.107237.ParticleGenerator_mu_Pt4to100_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240174._000001.pool.root.1"]; EventMax=15000;runMergedChain=True' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_MuonSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt-larged0.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin_larged0.dat
TIDArdict.exe TIDAdata11-rtt-larged0.dat -f data-muon.root -p 13 -b Test_bin_larged0.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-muon.root data-mu_single_mu_larged0-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-muon.root data-mu_single_mu_larged0-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-plots
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_4=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_5=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_6=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_mu_single_mu_larged0_PU.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_single_mu_larged0_pu.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_mu_single_mu_larged0_PU.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_single_mu_larged0_pu.sh
index da52079199db3b83b6d5800a2f910084a94ab69d..a510cf10656be5f79893623d9143433472db2573 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_mu_single_mu_larged0_PU.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_single_mu_larged0_pu.sh
@@ -18,28 +18,40 @@ export RTTJOBNAME=TrigInDetValidation_mu_single_mu_larged0_PU
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_MuonSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.107237.ParticleGenerator_mu_Pt4to100_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945423._000001.pool.root.1"]; EventMax=15000;runMergedChain=True' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_MuonSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt-larged0.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin_larged0.dat
TIDArdict.exe TIDAdata11-rtt-larged0.dat -f data-muon.root -p 13 -b Test_bin_larged0.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-muon.root data-mu_single_mu_larged0_PU-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-muon.root data-mu_single_mu_larged0_PU-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-plots
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_4=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_5=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_6=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_mu_Zmumu_IBL_pu40.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_mu_Zmumu_IBL_pu40.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40.sh
index 399ace79ae203270706af1112a2719f2ca5295a1..82ec5b954145a7b93d1386506dc87eb2d982b764 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_mu_Zmumu_IBL_pu40.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40.sh
@@ -18,28 +18,40 @@ export RTTJOBNAME=TrigInDetValidation_mu_Zmumu_IBL_pu40
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_MuonSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.recon.RDO.e3601_s2576_s2132_r7143/RDO.06718162._000013.pool.root.1"]; EventMax=2500;runMergedChain=True' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_MuonSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -f data-muon-pileup-merge.root -p 13 -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_4=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_5=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_6=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_mu_Zmumu_IBL_pu40_offline.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40_offline.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_mu_Zmumu_IBL_pu40_offline.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40_offline.sh
index c8bcb647538031ba230b43fbae63e88c67c8bb45..45b13d4ed500be70c34b9a66afd5ff1cf30fcc6d 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_mu_Zmumu_IBL_pu40_offline.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40_offline.sh
@@ -18,28 +18,40 @@ export RTTJOBNAME=TrigInDetValidation_mu_Zmumu_IBL_pu40_offline
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_MuonSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.recon.RDO.e3601_s2576_s2132_r7143/RDO.06718162._000013.pool.root.1"]; EventMax=2000;runMergedChain=True;doIDNewTracking=True;PdgId=13' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_MuonSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt-offline.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt-offline.dat -f data-muon-pileup-merge.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40_offline-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40_offline-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_4=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_5=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_6=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_mu_Zmumu_IBL_pu40_offline_rzMatcher.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40_offline_rzmatcher.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_mu_Zmumu_IBL_pu40_offline_rzMatcher.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40_offline_rzmatcher.sh
index e19128d14bce3df9b80b5b4ca961608773647c7c..ca5af0f7bb15e2f0f125eb6500292c9a546c0373 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_mu_Zmumu_IBL_pu40_offline_rzMatcher.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40_offline_rzmatcher.sh
@@ -18,28 +18,40 @@ export RTTJOBNAME=TrigInDetValidation_mu_Zmumu_IBL_pu40_offline_rzMatcher
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_MuonSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.recon.RDO.e3601_s2576_s2132_r7143/RDO.06718162._000013.pool.root.1"]; EventMax=2000;runMergedChain=True;doIDNewTracking=True;PdgId=13' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_MuonSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt-offline-rzMatcher.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt-offline-rzMatcher.dat -f data-muon-pileup-merge.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40_offline_rzMatcher-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40_offline_rzMatcher-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_4=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_5=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_6=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_mu_Zmumu_IBL_pu40_rzMatcher.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40_rzmatcher.sh
similarity index 93%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_mu_Zmumu_IBL_pu40_rzMatcher.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40_rzmatcher.sh
index 6977c813ffa559c54a82b473677ccd31e4947a6b..77c46802d179e8322a158da5293fa5ba30b38651 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_mu_Zmumu_IBL_pu40_rzMatcher.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40_rzmatcher.sh
@@ -18,28 +18,40 @@ export RTTJOBNAME=TrigInDetValidation_mu_Zmumu_IBL_pu40_rzMatcher
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_MuonSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.recon.RDO.e3601_s2576_s2132_r7143/RDO.06718162._000013.pool.root.1"]; EventMax=2500;runMergedChain=True;PdgId=13' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_MuonSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt-rzMatcher.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt-rzMatcher.dat -f data-muon-pileup-merge.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40_rzMatcher-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40_rzMatcher-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_4=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_5=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_6=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_tau_IBL_pu46.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46.sh
similarity index 94%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_tau_IBL_pu46.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46.sh
index 50a3dc658db881d5e7d06c1fbd7c560f1192f0e0..9e9cf73271eb4853a5f2223b60c2307abea04176 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_tau_IBL_pu46.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46.sh
@@ -18,28 +18,40 @@ export RTTJOBNAME=TrigInDetValidation_tau_IBL_pu46
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_TauSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.recon.RDO.e3601_s2757_r7245/RDO.06885566._001556.pool.root.1"]; EventMax=4000;runMergedChain=True' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_TauSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -f data-tau-IBL.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-tau-IBL.root data-tau_IBL_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-tau-IBL.root data-tau_IBL_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 -d HLTL2-plots
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_4=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_5=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_6=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_tau_IBL_pu46_offline.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_offline.sh
similarity index 94%
rename from Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_tau_IBL_pu46_offline.sh
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_offline.sh
index b9c44c280bf4032ee37624f4bf9252c1aa9c5891..6a1dcc28d32b98662eb9ee90215cb3238e5a4706 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_tau_IBL_pu46_offline.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_offline.sh
@@ -18,28 +18,40 @@ export RTTJOBNAME=TrigInDetValidation_tau_IBL_pu46_offline
get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_TauSlice.py
athena.py -c 'ARTConfig=["/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.recon.RDO.e3601_s2757_r7245/RDO.06885566._001556.pool.root.1"]; EventMax=2000;runMergedChain=True;doIDNewTracking=True;PdgId=15' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_TauSlice.py
+JOBSTATUS_0=$?
+
get_files -data TIDAdata11-rtt-offline.dat
get_files -data TIDAdata_cuts.dat
get_files -data TIDAdata_chains.dat
get_files -data TIDAbeam.dat
get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt-offline.dat -f data-tau-IBL.root -b Test_bin.dat
+JOBSTATUS_1=$?
TIDArun-art.sh data-tau-IBL.root data-tau_IBL_pu46_offline-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 -d HLTEF-plots
+JOBSTATUS_2=$?
TIDArun-art.sh data-tau-IBL.root data-tau_IBL_pu46_offline-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 -d HLTL2-plots
+JOBSTATUS_3=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -o times
+JOBSTATUS_4=$?
TIDArun-art.sh expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF
+JOBSTATUS_5=$?
RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --costMode --linkOutputDir
+JOBSTATUS_6=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
+JOBSTATUS_7=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
+JOBSTATUS_8=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
+JOBSTATUS_9=$?
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent"
+JOBSTATUS_10=$?
diff --git a/Trigger/TrigValidation/TrigInDetValidation/utils/mkart b/Trigger/TrigValidation/TrigInDetValidation/utils/mkart
index 8e1babf163be518538740ba911a0bd36f357bab5..b74a9bbad15c23284af187b515580c762a72fda4 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/utils/mkart
+++ b/Trigger/TrigValidation/TrigInDetValidation/utils/mkart
@@ -56,15 +56,24 @@ done
echo "FILES: $FILES"
echo "OUTDIR: $OUTDIR"
+COUNTER=0
for xmlfile in $FILES; do
- _file=$(basename $xmlfile .xml)
+ _file=$(basename $xmlfile .xml)
+
+ file=test_$(echo $_file | tr '[:upper:]' '[:lower:]' )
-# echo "xmlfile $xmlfile $_file"
- outfile="$OUTDIR/$_file.sh"
+ outfile="$OUTDIR/$file.sh"
+
+ if [ -z $DATASET ]; then
+ SAMPLE=$(grep include $xmlfile | grep sample | grep -v "<\!-" | head -1 | sed 's|.* \"||g' | sed 's|\".*||g')
+ DATASET=$(grep dataset ../TIDAbuild/$SAMPLE | grep -v "<\!-" | head -1 | sed 's|.*<dataset>||g' | sed 's|</dataset>.*||g' )
+ fi
+
+
if [ -e $outfile ]; then
if [ $NOGLOB -eq 0 ]; then
echo "file $outfile already exists, moving to " $outfile.bak
@@ -83,7 +92,6 @@ for xmlfile in $FILES; do
duff=$(grep dataset /tmp/$_file.xml)
-
[ "x$duff" != "x" ] || continue
file=$(echo $_file | $SED 's/\.xml//g')
@@ -97,7 +105,7 @@ for xmlfile in $FILES; do
echo "# art-output: *.root" >> $outfile
echo "# art-output: *.log" >> $outfile
echo "" >> $outfile
- echo "export RTTJOBNAME=$(basename $outfile .sh)" >> $outfile
+ echo "export RTTJOBNAME=$(basename $_file .sh)" >> $outfile
chmod u+x $outfile
@@ -127,7 +135,13 @@ for xmlfile in $FILES; do
# DATASET=$(dirname $DATASET)
# echo "athena.py -c 'import glob;from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;athenaCommonFlags.FilesInput=glob.glob(\"$DATASET/*\");$cmdlineflags' $joboptions.py" >> $outfile
- echo "athena.py -c 'ARTConfig=[\"$DATASET\"];$cmdlineflags' $joboptions.py" >> $outfile
+ echo "athena.py -c 'ARTConfig=[\"$DATASET\"];$cmdlineflags' $joboptions.py" >> $outfile
+
+ echo "JOBSTATUS_$COUNTER=\$?" >> $outfile
+ echo "" >> $outfile
+
+ ((COUNTER++))
+
fi
@@ -164,8 +178,10 @@ for xmlfile in $FILES; do
"$arg" == "RunTrigCostD3PDe" ]; then
if [ "$command" != "" ]; then
- echo "$command" >> $outfile
- echo "" >> $outfile
+ echo "$command" >> $outfile
+ echo "JOBSTATUS_$COUNTER=\$?" >> $outfile
+ echo "" >> $outfile
+ ((COUNTER++))
fi
command="$arg"
@@ -195,10 +211,10 @@ for xmlfile in $FILES; do
if [ "$command" != "TIDArun.sh" -a "$command" != "TIDArun" -a "$command" != "TIDArun-art.sh" ]; then
$(echo $ffile | grep -q "\*") || echo "get_files -data $ffile" >> $outfile
if [ "$ext" == "dat" ]; then
- get_files -data $ffile
+ [ -e $ffile ] || get_files -data $ffile
for DATFILE in $(grep "^# *include" $ffile | sed 's|.*include ||g' | sed 's|\"||g' ); do
echo "get_files -data $DATFILE" >> $outfile
- get_files -data $DATFILE
+ [ -e $DATFILE ] || get_files -data $DATFILE
for EXTRAFILE in $(grep "^# *include" $DATFILE | sed 's|.*include ||g' | sed 's|\"||g' ); do
echo "get_files -data $EXTRAFILE" >> $outfile
done
@@ -216,8 +232,10 @@ for xmlfile in $FILES; do
done
if [ "$command" != "" ]; then
- echo "$command" >> $outfile
- echo "" >> $outfile
+ echo "$command" >> $outfile
+ echo "JOBSTATUS_$COUNTER=\$?" >> $outfile
+ echo "" >> $outfile
+ ((COUNTER++))
fi
if [ -e $outfile ]; then