diff --git a/Database/AthenaRoot/AthenaRootComps/share/test_athena_ntuple_dumper_varhandles.ref b/Database/AthenaRoot/AthenaRootComps/share/test_athena_ntuple_dumper_varhandles.ref old mode 100755 new mode 100644 diff --git a/Database/AthenaRoot/AthenaRootComps/share/test_athena_ntuple_dumper_varhandles_nooutput.ref b/Database/AthenaRoot/AthenaRootComps/share/test_athena_ntuple_dumper_varhandles_nooutput.ref old mode 100644 new mode 100755 diff --git a/Database/AthenaRoot/AthenaRootComps/share/test_athena_variable_shape1.ref b/Database/AthenaRoot/AthenaRootComps/share/test_athena_variable_shape1.ref old mode 100644 new mode 100755 diff --git a/Database/AthenaRoot/AthenaRootComps/share/test_athena_variable_shape2.ref b/Database/AthenaRoot/AthenaRootComps/share/test_athena_variable_shape2.ref old mode 100644 new mode 100755 diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root old mode 100644 new mode 100755 diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_IBL_pu46.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_IBL_pu46.xml index 5d448db269be7c191697de069a26458ae1327de9..17be979317beecde02e5e6eb7e60579bfafc3f62 100644 --- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_IBL_pu46.xml +++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_IBL_pu46.xml @@ -7,7 +7,7 @@ <group>TrigInDetValidation</group> <queue>long</queue> -# include "samples/TrigInDetValidation_tau_sample0.xml" +# include "samples/TrigInDetValidation_tau_sample3.xml" diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_IBL_pu46_offline.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_IBL_pu46_offline.xml index 1c2281f646cb9565c7c75b1451bff0d3c38a6b63..a9dc4fb0914014c158971ab4e9056ddd19dde3ad 100644 --- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_IBL_pu46_offline.xml +++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_IBL_pu46_offline.xml @@ -7,7 +7,7 @@ <group>TrigInDetValidation</group> <queue>long</queue> -# include "samples/TrigInDetValidation_tau_sample0.xml" +# include "samples/TrigInDetValidation_tau_sample3.xml" diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/makefile b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/makefile index 99b5de515c236935e78b6fb37008cf30f2d47f33..21ea5f772dcc8b77d69d57eb7f585386a8d0a38d 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/makefile +++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/makefile @@ -13,6 +13,7 @@ # ######################################################################### +SHELL = /bin/bash @@ -72,7 +73,7 @@ move : mv ../test/$(XMLFILE) ../test/$(XMLFILE).bak mv $(XMLFILE) ../test -all: $(XMLFILE) +all: $(XMLFILE) artfiles $(FILES) : $(JOBS) @@ -89,6 +90,8 @@ scripts : $(patsubst %.xml,$(SCRIPTDIR)/%.sh,$(JOBS)) $(SCRIPTDIR)/%.sh : %.xml ../utils/mkargs -o $(SCRIPTDIR) $< +artfiles : + ../utils/mkartlist duff: echo $(patsubst %.xml,../scripts/%.sh,$(JOBS)) diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/samples/TrigInDetValidation_FTK_Ztautau_sample3.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/samples/TrigInDetValidation_FTK_Ztautau_sample3.xml index 495f20ecee37293eeeba0f093b9c043429705081..ada0d109a417dd3b41c9cb4cfffa261659e7c000 100644 --- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/samples/TrigInDetValidation_FTK_Ztautau_sample3.xml +++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/samples/TrigInDetValidation_FTK_Ztautau_sample3.xml @@ -5,13 +5,3 @@ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc16_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.digit.RDO_FTK.e3601_s3126_d1455_d1457/RDO_FTK.12996772._000013.pool.root.1</dataset> -<!--- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc16_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.digit.RDO_FTK.e3601_s3126_d1455_d1457/mc16_13TeV:RDO_FTK.12996772._000003.pool.root.1</dataset> - <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc16_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.digit.RDO_FTK.e3601_s3126_d1455_d1457/mc16_13TeV:RDO_FTK.12996772._000004.pool.root.1</dataset> - <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc16_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.digit.RDO_FTK.e3601_s3126_d1455_d1457/mc16_13TeV:RDO_FTK.12996772._000005.pool.root.1</dataset> - <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc16_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.digit.RDO_FTK.e3601_s3126_d1455_d1457/mc16_13TeV:RDO_FTK.12996772._000009.pool.root.1</dataset> - <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc16_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.digit.RDO_FTK.e3601_s3126_d1455_d1457/mc16_13TeV:RDO_FTK.12996772._000010.pool.root.1</dataset> - <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc16_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.digit.RDO_FTK.e3601_s3126_d1455_d1457/mc16_13TeV:RDO_FTK.12996772._000011.pool.root.1</dataset> - <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc16_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.digit.RDO_FTK.e3601_s3126_d1455_d1457/mc16_13TeV:RDO_FTK.12996772._000012.pool.root.1</dataset> - <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc16_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.digit.RDO_FTK.e3601_s3126_d1455_d1457/mc16_13TeV:RDO_FTK.12996772._000013.pool.root.1</dataset> ----> - diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/samples/TrigInDetValidation_tau_sample3.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/samples/TrigInDetValidation_tau_sample3.xml new file mode 100644 index 0000000000000000000000000000000000000000..5e93a854debffbf544cf68334bdb59f0c4f5041b --- /dev/null +++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/samples/TrigInDetValidation_tau_sample3.xml @@ -0,0 +1,3 @@ + <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc16_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.recon.RDO.e3601_s3126_r9546/RDO.11373415._000001.pool.root.1</dataset> + <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc16_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.recon.RDO.e3601_s3126_r9546/RDO.11373415._000002.pool.root.1</dataset> + <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc16_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.recon.RDO.e3601_s3126_r9546/RDO.11373415._000003.pool.root.1</dataset> diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46.sh index cdb08bdd3419729b29004151892854a79b291842..d739579737967ecf29bd4089cad7fe707e038c65 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46.sh +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46.sh @@ -9,7 +9,7 @@ # art-output: cost-perEvent # art-output: cost-perCall-chain # art-output: cost-perEvent-chain -# art-input: mc15_13TeV:mc15_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.recon.RDO.e3601_s2576_s2132_r8012 +# art-input: mc16_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.recon.RDO.e3601_s3126_r9546 # art-output: *.dat # art-output: *.root # art-output: *.log @@ -62,4 +62,3 @@ echo "art-result: $? TIDAcpucost_9" TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent" echo "art-result: $? TIDAcpucost_10" - diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_offline.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_offline.sh index 91d6bdda8d764b08f18d82bddf72b159c453465c..32db53d3ef86df29708c224f5f0eb8013fbe2071 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_offline.sh +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_offline.sh @@ -9,7 +9,7 @@ # art-output: cost-perEvent # art-output: cost-perCall-chain # art-output: cost-perEvent-chain -# art-input: mc15_13TeV:mc15_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.recon.RDO.e3601_s2576_s2132_r8012 +# art-input: mc16_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.recon.RDO.e3601_s3126_r9546 # art-output: *.dat # art-output: *.root # art-output: *.log diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/trigindetvalidation_cosmic.sh b/Trigger/TrigValidation/TrigInDetValidation/test/trigindetvalidation_cosmic.sh index cb29f37a977bc7d6b2ca951e4b3581ebfab5a657..a7da16e625193935d1150e6d3e521ce1af5fcc03 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/trigindetvalidation_cosmic.sh +++ b/Trigger/TrigValidation/TrigInDetValidation/test/trigindetvalidation_cosmic.sh @@ -14,8 +14,6 @@ # art-output: *.log # art-input-nfiles: 10 - - export RTTJOBNAME=TrigInDetValidation_cosmic diff --git a/Trigger/TrigValidation/TrigInDetValidation/utils/mkart b/Trigger/TrigValidation/TrigInDetValidation/utils/mkart index c3c4885cbe2781a6a5b3eb6612b903c68962eeaf..f689059837f308d25ac01da5c45812175c52c598 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/utils/mkart +++ b/Trigger/TrigValidation/TrigInDetValidation/utils/mkart @@ -324,3 +324,4 @@ done + diff --git a/Trigger/TrigValidation/TrigInDetValidation/utils/mkartlist b/Trigger/TrigValidation/TrigInDetValidation/utils/mkartlist new file mode 100755 index 0000000000000000000000000000000000000000..129332b956c311ba42531d84311ea2d3797fc57e --- /dev/null +++ b/Trigger/TrigValidation/TrigInDetValidation/utils/mkartlist @@ -0,0 +1,45 @@ +#!/bin/bash + +cd .. + +files= + +i=0 + +for job in $(grep include TIDAbuild/TrigInDetValidation_TestConfiguration_main.xml | grep -v \! | awk '{print $3}' | sed 's|\"||g') ; do + + file=$(echo $job | tr '[:upper:]' '[:lower:]' | sed 's|\.xml|\.sh|g') + + BUILD=0 + + [ -e test/$file ] && continue + + file=test_$file + + if [ -e test/$file ]; then + [ TIDAbuild/$job -nt test/$file ] && BUILD=1 && files="$files $job" + else + BUILD=1 + files="$files $job" + fi + + if [ $BUILD -eq 1 ]; then + echo "will build: TIDAbuild/$job -> test/$file" + utils/mkart -c TIDAbuild/$job -o test +# ls -l TIDAbuild/$job test/$file +# echo + fi + + ((i++)) + +done + +[ -z "$files" ] && exit + + +echo +echo "rebuilt art scripts:" +echo $files + + +