diff --git a/Control/AthenaMonitoring/test/test_run3dq_r21_aod.sh b/Control/AthenaMonitoring/test/test_run3dq_r21_aod.sh index d85aa08aa6d01d7dff79258e03fadaaa426d49cc..f47143ea2aa75c1b3f1aed5b0f9f8375d027009d 100755 --- a/Control/AthenaMonitoring/test/test_run3dq_r21_aod.sh +++ b/Control/AthenaMonitoring/test/test_run3dq_r21_aod.sh @@ -12,5 +12,6 @@ echo "art-result: $? HIST_Creation" ArtPackage=$1 ArtJobName=$2 art.py download ${ArtPackage} ${ArtJobName} -hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i > log.HIST_Diff 2>&1 +REFFILE=(./ref-*/ExampleMonitorOutput.root) +hist_diff.sh ExampleMonitorOutput.root $REFFILE -x TIME_execute -i > log.HIST_Diff 2>&1 echo "art-result: $? HIST_Diff" diff --git a/Control/AthenaMonitoring/test/test_run3dq_r21_aod_mt_t8.sh b/Control/AthenaMonitoring/test/test_run3dq_r21_aod_mt_t8.sh index 7588819e0ce3e194d2837bcc929144fe3b3b584d..25c9c06b64b4242ae80054fb7221254ea97960ff 100755 --- a/Control/AthenaMonitoring/test/test_run3dq_r21_aod_mt_t8.sh +++ b/Control/AthenaMonitoring/test/test_run3dq_r21_aod_mt_t8.sh @@ -13,9 +13,10 @@ echo "art-result: $? HIST_Creation" ArtPackage=$1 ArtJobName=$2 art.py download ${ArtPackage} ${ArtJobName} -hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i -t > log.HIST_Diff 2>&1 +REFFILE=(./ref-*/ExampleMonitorOutput.root) +hist_diff.sh ExampleMonitorOutput.root $REFFILE -x TIME_execute -i -t > log.HIST_Diff 2>&1 echo "art-result: $? HIST_Diff" art.py download AthenaMonitoring test_run3dq_r21_aod.sh -hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i -t > log.HIST_Diff_Serial 2>&1 +hist_diff.sh ExampleMonitorOutput.root $REFFILE -x TIME_execute -i -t > log.HIST_Diff_Serial 2>&1 echo "art-result: $? HIST_Diff_Serial" diff --git a/Control/AthenaMonitoring/test/test_run3dq_r21_esd.sh b/Control/AthenaMonitoring/test/test_run3dq_r21_esd.sh index a16a1f49214c4f18eb341c9948a5fb3a0aac6948..e169d04cb2a02138aa1697f414cc415b18d14947 100755 --- a/Control/AthenaMonitoring/test/test_run3dq_r21_esd.sh +++ b/Control/AthenaMonitoring/test/test_run3dq_r21_esd.sh @@ -12,5 +12,6 @@ echo "art-result: $? HIST_Creation" ArtPackage=$1 ArtJobName=$2 art.py download ${ArtPackage} ${ArtJobName} -hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i > log.HIST_Diff 2>&1 +REFFILE=(./ref-*/ExampleMonitorOutput.root) +hist_diff.sh ExampleMonitorOutput.root $REFFILE -x TIME_execute -i > log.HIST_Diff 2>&1 echo "art-result: $? HIST_Diff" diff --git a/Control/AthenaMonitoring/test/test_run3dq_r21_esd_mc.sh b/Control/AthenaMonitoring/test/test_run3dq_r21_esd_mc.sh index 810e377c3065210941df0f025b383d4fddcaeba2..10bf62a18ea4d05d1e730ff21c5f6e8437b8f06e 100755 --- a/Control/AthenaMonitoring/test/test_run3dq_r21_esd_mc.sh +++ b/Control/AthenaMonitoring/test/test_run3dq_r21_esd_mc.sh @@ -12,5 +12,6 @@ echo "art-result: $? HIST_Creation" ArtPackage=$1 ArtJobName=$2 art.py download ${ArtPackage} ${ArtJobName} -hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i > log.HIST_Diff 2>&1 +REFFILE=(./ref-*/ExampleMonitorOutput.root) +hist_diff.sh ExampleMonitorOutput.root $REFFILE -x TIME_execute -i > log.HIST_Diff 2>&1 echo "art-result: $? HIST_Diff" diff --git a/Control/AthenaMonitoring/test/test_run3dq_r21_esd_mt.sh b/Control/AthenaMonitoring/test/test_run3dq_r21_esd_mt.sh index c6547c305df3a1fc023b3870152f47c5d37c506b..b758be28ca0ffbf347a409ef355c81f9b2336ac9 100755 --- a/Control/AthenaMonitoring/test/test_run3dq_r21_esd_mt.sh +++ b/Control/AthenaMonitoring/test/test_run3dq_r21_esd_mt.sh @@ -12,11 +12,12 @@ echo "art-result: $? HIST_Creation" ArtPackage=$1 ArtJobName=$2 art.py download ${ArtPackage} ${ArtJobName} -hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i > log.HIST_Diff 2>&1 +REFFILE=(./ref-*/ExampleMonitorOutput.root) +hist_diff.sh ExampleMonitorOutput.root $REFFILE -x TIME_execute -i > log.HIST_Diff 2>&1 echo "art-result: $? HIST_Diff" rm -rf ref-* art.py download AthenaMonitoring test_run3dq_r21_esd.sh -hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i > log.HIST_Diff_Serial 2>&1 +hist_diff.sh ExampleMonitorOutput.root $REFFILE -x TIME_execute -i > log.HIST_Diff_Serial 2>&1 echo "art-result: $? HIST_Diff_Serial" diff --git a/Control/AthenaMonitoring/test/test_run3dq_r22_aod.sh b/Control/AthenaMonitoring/test/test_run3dq_r22_aod.sh index 139fd1bc6fc1d58202de0e8e5c8e42e193f9f303..c02c8b00a59ae33dd5efaf61d2725d08c52b8b45 100755 --- a/Control/AthenaMonitoring/test/test_run3dq_r22_aod.sh +++ b/Control/AthenaMonitoring/test/test_run3dq_r22_aod.sh @@ -15,5 +15,6 @@ rm -rf ref-* ArtPackage=$1 ArtJobName=$2 art.py download ${ArtPackage} ${ArtJobName} -hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i > log.HIST_Diff 2>&1 +REFFILE=(./ref-*/ExampleMonitorOutput.root) +hist_diff.sh ExampleMonitorOutput.root $REFFILE -x TIME_execute -i > log.HIST_Diff 2>&1 echo "art-result: $? HIST_Diff" diff --git a/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger.sh b/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger.sh index fa4c0d4fc608986f4e2f7fa4f6e1e51292549d75..eab4b4943d7a86c858a74bee2fb07031a227d688 100755 --- a/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger.sh +++ b/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger.sh @@ -15,5 +15,6 @@ rm -rf ref-* ArtPackage=$1 ArtJobName=$2 art.py download ${ArtPackage} ${ArtJobName} -hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -i > log.HIST_Diff 2>&1 +REFFILE=(./ref-*/ExampleMonitorOutput.root) +hist_diff.sh ExampleMonitorOutput.root $REFFILE -i > log.HIST_Diff 2>&1 echo "art-result: $? HIST_Diff" diff --git a/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger_mt.sh b/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger_mt.sh index 3d7a0243c4d7a0494f94620572980bbf0cf4351a..0d24b33513d4bdc491a491625de9a6bb5089d8d9 100755 --- a/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger_mt.sh +++ b/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger_mt.sh @@ -15,9 +15,10 @@ rm -rf ref-* ArtPackage=$1 ArtJobName=$2 art.py download ${ArtPackage} ${ArtJobName} -hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -i > log.HIST_Diff 2>&1 +REFFILE=(./ref-*/ExampleMonitorOutput.root) +hist_diff.sh ExampleMonitorOutput.root $REFFILE -i > log.HIST_Diff 2>&1 echo "art-result: $? HIST_Diff" art.py download AthenaMonitoring test_run3dq_r22_aod_trigger.sh -hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -i > log.HIST_Diff_Serial 2>&1 +hist_diff.sh ExampleMonitorOutput.root $REFFILE -i > log.HIST_Diff_Serial 2>&1 echo "art-result: $? HIST_Diff_Serial" diff --git a/Control/AthenaMonitoring/test/test_run3dq_r22_esd.sh b/Control/AthenaMonitoring/test/test_run3dq_r22_esd.sh index 805b63b6136462e6002b0e187a7b72aa515a1e44..6d4175434fd1aa027802aef1bbcbc0c248ded9cd 100755 --- a/Control/AthenaMonitoring/test/test_run3dq_r22_esd.sh +++ b/Control/AthenaMonitoring/test/test_run3dq_r22_esd.sh @@ -15,5 +15,6 @@ rm -rf ref-* ArtPackage=$1 ArtJobName=$2 art.py download ${ArtPackage} ${ArtJobName} -hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i > log.HIST_Diff 2>&1 +REFFILE=(./ref-*/ExampleMonitorOutput.root) +hist_diff.sh ExampleMonitorOutput.root $REFFILE -x TIME_execute -i > log.HIST_Diff 2>&1 echo "art-result: $? HIST_Diff"