diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2010_ttbar_no_pileup.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2010_ttbar_no_pileup.sh index b3d133f8d69be918387e5cf54283fb781f448242..81a95418abfcafdec8e32fc8605577ecbef0fe85 100755 --- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2010_ttbar_no_pileup.sh +++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2010_ttbar_no_pileup.sh @@ -37,7 +37,7 @@ echo "Reference set being used: " ${DigitizationTestsVersion} if [ $rc -eq 0 ] then # Do reference comparisons - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName + art.py compare ref --diff-pool $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc1=$? fi echo "art-result: $rc1 diff-pool" @@ -46,7 +46,7 @@ echo "art-result: $rc1 diff-pool" # if [ $rc -eq 0 ] then - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName --diff-type=diff-root --mode=semi-detailed + art.py compare ref --mode=semi-detailed --diff-root $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc2=$? fi echo "art-result: $rc2 diff-root" @@ -66,4 +66,4 @@ then art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed rc4=$? fi -echo "art-result: $rc4 art-compare" +echo "art-result: $rc4 regression" diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2011_ttbar_no_pileup.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2011_ttbar_no_pileup.sh index c2bd92d54c79b2cea7826b1ef04f152046bd64e0..c9d05fe2faee4da272cf607bf9de999e3c84d82a 100755 --- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2011_ttbar_no_pileup.sh +++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2011_ttbar_no_pileup.sh @@ -38,7 +38,7 @@ echo "Reference set being used: " ${DigitizationTestsVersion} if [ $rc -eq 0 ] then # Do reference comparisons - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName + art.py compare ref --diff-pool $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc1=$? fi echo "art-result: $rc1 diff-pool" @@ -47,7 +47,7 @@ echo "art-result: $rc1 diff-pool" # if [ $rc -eq 0 ] then - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName --diff-type=diff-root --mode=semi-detailed + art.py compare ref --mode=semi-detailed --diff-root $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc2=$? fi echo "art-result: $rc2 diff-root" @@ -67,4 +67,4 @@ then art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed rc4=$? fi -echo "art-result: $rc4 art-compare" +echo "art-result: $rc4 regression" diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2012_ttbar_no_pileup.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2012_ttbar_no_pileup.sh index c28c93802da151653d4c17e79f7a736635fbe93e..754d8977a3504a777862a7224902ea336470a735 100755 --- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2012_ttbar_no_pileup.sh +++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2012_ttbar_no_pileup.sh @@ -38,7 +38,7 @@ echo "Reference set being used: " ${DigitizationTestsVersion} if [ $rc -eq 0 ] then # Do reference comparisons - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName + art.py compare ref --diff-pool $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc1=$? fi echo "art-result: $rc1 diff-pool" @@ -47,7 +47,7 @@ echo "art-result: $rc1 diff-pool" # if [ $rc -eq 0 ] then - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName --diff-type=diff-root --mode=semi-detailed + art.py compare ref --mode=semi-detailed --diff-root $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc2=$? fi echo "art-result: $rc2 diff-root" @@ -67,4 +67,4 @@ then art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed rc4=$? fi -echo "art-result: $rc4 art-compare" +echo "art-result: $rc4 regression" diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_cosmics.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_cosmics.sh index 087907d17cdf495ef998b525ae0c27698a5992fb..0b51453156e1cbc8a5efcf9894a4d6d4d1e17f1e 100755 --- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_cosmics.sh +++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_cosmics.sh @@ -36,7 +36,7 @@ echo "Reference set being used: " ${DigitizationTestsVersion} if [ $rc -eq 0 ] then # Do reference comparisons - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName + art.py compare ref --diff-pool $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc1=$? fi echo "art-result: $rc1 diff-pool" @@ -45,7 +45,7 @@ echo "art-result: $rc1 diff-pool" # if [ $rc -eq 0 ] then - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName --diff-type=diff-root --mode=semi-detailed + art.py compare ref --mode=semi-detailed --diff-root $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc2=$? fi echo "art-result: $rc2 diff-root" @@ -65,4 +65,4 @@ then art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed rc4=$? fi -echo "art-result: $rc4 art-compare" +echo "art-result: $rc4 regression" diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_nu_25ns_premixing.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_nu_25ns_premixing.sh index 0f3befa673873b0f45d66eeacfa72c57d84a252b..b2fea2471ca9e4f48bbe53dcc7710fcb75701fac 100755 --- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_nu_25ns_premixing.sh +++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_nu_25ns_premixing.sh @@ -52,7 +52,7 @@ echo "Reference set being used: " ${DigitizationTestsVersion} if [ $rc -eq 0 ] then # Do reference comparisons - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName + art.py compare ref --diff-pool $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc1=$? fi echo "art-result: $rc1 diff-pool" @@ -61,7 +61,7 @@ echo "art-result: $rc1 diff-pool" # if [ $rc -eq 0 ] then - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName --diff-type=diff-root --mode=semi-detailed + art.py compare ref --mode=semi-detailed --diff-root $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc2=$? fi echo "art-result: $rc2 diff-root" @@ -81,4 +81,4 @@ then art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed rc4=$? fi -echo "art-result: $rc4 art-compare" +echo "art-result: $rc4 regression" diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_25ns_algs_pileup.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_25ns_algs_pileup.sh index 4d0006575e88676025efddb6d6b8f830218f19b3..f4a1ea09352a330a7231b0b6f023058926f86d83 100755 --- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_25ns_algs_pileup.sh +++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_25ns_algs_pileup.sh @@ -51,7 +51,7 @@ echo "Reference set being used: " ${DigitizationTestsVersion} if [ $rc -eq 0 ] then # Do reference comparisons - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName + art.py compare ref --diff-pool $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc1=$? fi echo "art-result: $rc1 diff-pool" @@ -60,7 +60,7 @@ echo "art-result: $rc1 diff-pool" # if [ $rc -eq 0 ] then - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName --diff-type=diff-root --mode=semi-detailed + art.py compare ref --mode=semi-detailed --diff-root $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc2=$? fi echo "art-result: $rc2 diff-root" @@ -80,4 +80,4 @@ then art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed rc4=$? fi -echo "art-result: $rc4 art-compare" +echo "art-result: $rc4 regression" diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_25ns_pileup.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_25ns_pileup.sh index f3fbc977ef1bc4c2a5211552aaee6ccb77c91a70..8916c71323630d5b85601ac4ecf68592dd2052f2 100755 --- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_25ns_pileup.sh +++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_25ns_pileup.sh @@ -48,7 +48,7 @@ echo "Reference set being used: " ${DigitizationTestsVersion} if [ $rc -eq 0 ] then # Do reference comparisons - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName + art.py compare ref --diff-pool $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc1=$? fi echo "art-result: $rc1 diff-pool" @@ -57,7 +57,7 @@ echo "art-result: $rc1 diff-pool" # if [ $rc -eq 0 ] then - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName --diff-type=diff-root --mode=semi-detailed + art.py compare ref --mode=semi-detailed --diff-root $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc2=$? fi echo "art-result: $rc2 diff-root" @@ -77,4 +77,4 @@ then art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed rc4=$? fi -echo "art-result: $rc4 art-compare" +echo "art-result: $rc4 regression" diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_25ns_pileup_noNoise.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_25ns_pileup_noNoise.sh index 5577039770c016848386f5583197b251294a304b..41a3755ff45c3d2ce6363d4930401ab3511a9844 100755 --- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_25ns_pileup_noNoise.sh +++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_25ns_pileup_noNoise.sh @@ -50,7 +50,7 @@ echo "Reference set being used: " ${DigitizationTestsVersion} if [ $rc -eq 0 ] then # Do reference comparisons - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName + art.py compare ref --diff-pool $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc1=$? fi echo "art-result: $rc1 diff-pool" @@ -59,7 +59,7 @@ echo "art-result: $rc1 diff-pool" # if [ $rc -eq 0 ] then - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName --diff-type=diff-root --mode=semi-detailed + art.py compare ref --mode=semi-detailed --diff-root $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc2=$? fi echo "art-result: $rc2 diff-root" @@ -79,4 +79,4 @@ then art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed rc4=$? fi -echo "art-result: $rc4 art-compare" +echo "art-result: $rc4 regression" diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_50ns_pileup.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_50ns_pileup.sh index 4c5cee56b5daf7e34b3634995f599c59560a4100..84844a169a553e1a17b5c16aff0da4d34633935e 100755 --- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_50ns_pileup.sh +++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_50ns_pileup.sh @@ -49,7 +49,7 @@ echo "Reference set being used: " ${DigitizationTestsVersion} if [ $rc -eq 0 ] then # Do reference comparisons - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName + art.py compare ref --diff-pool $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc1=$? fi echo "art-result: $rc1 diff-pool" @@ -58,7 +58,7 @@ echo "art-result: $rc1 diff-pool" # if [ $rc -eq 0 ] then - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName --diff-type=diff-root --mode=semi-detailed + art.py compare ref --mode=semi-detailed --diff-root $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc2=$? fi echo "art-result: $rc2 diff-root" @@ -78,4 +78,4 @@ then art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed rc4=$? fi -echo "art-result: $rc4 art-compare" +echo "art-result: $rc4 regression" diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_no_pileup.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_no_pileup.sh index 4a09715a8ed3f0d7376a424a382d3c8c82d5b30c..2577bffb616fe1cfb620f9362bf1b88b87fd288e 100755 --- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_no_pileup.sh +++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_no_pileup.sh @@ -39,7 +39,7 @@ echo "Reference set being used: " ${DigitizationTestsVersion} if [ $rc -eq 0 ] then # Do reference comparisons - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName + art.py compare ref --diff-pool $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc1=$? fi echo "art-result: $rc1 diff-pool" @@ -48,7 +48,7 @@ echo "art-result: $rc1 diff-pool" # if [ $rc -eq 0 ] then - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName --diff-type=diff-root --mode=semi-detailed + art.py compare ref --mode=semi-detailed --diff-root $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc2=$? fi echo "art-result: $rc2 diff-root" @@ -68,4 +68,4 @@ then art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed rc4=$? fi -echo "art-result: $rc4 art-compare" +echo "art-result: $rc4 regression" diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16a_qballs.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16a_qballs.sh index 4ce7e8140e04ee1886146ec94620b0dfc7a77a9b..c921a9a239ce88376c6822b60a646afe8f3fe0b2 100755 --- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16a_qballs.sh +++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16a_qballs.sh @@ -42,4 +42,4 @@ ArtJobName=$2 art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed -echo "art-result: $? art-compare" +echo "art-result: $? regression" diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16a_ttbar.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16a_ttbar.sh index e92b2a25b869f7e364ca99580ef232a70355dbc8..9af380649f491e495983b8ec14051c7a1469a468 100755 --- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16a_ttbar.sh +++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16a_ttbar.sh @@ -49,7 +49,7 @@ echo "Reference set being used: " ${DigitizationTestsVersion} if [ $rc -eq 0 ] then # Do reference comparisons - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName + art.py compare ref --diff-pool $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc1=$? fi echo "art-result: $rc1 diff-pool" @@ -58,7 +58,7 @@ echo "art-result: $rc1 diff-pool" # if [ $rc -eq 0 ] then - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName --diff-type=diff-root --mode=semi-detailed + art.py compare ref --mode=semi-detailed --diff-root $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc2=$? fi echo "art-result: $rc2 diff-root" @@ -78,4 +78,4 @@ then art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed rc4=$? fi -echo "art-result: $rc4 art-compare" +echo "art-result: $rc4 regression" diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_premixing.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_premixing.sh index d4648addc8a0e1673797747b6fdbd26fac5c4d3f..fa896292876eeef91dce7931676aef1a793cb01e 100755 --- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_premixing.sh +++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_premixing.sh @@ -50,7 +50,7 @@ echo "Reference set being used: " ${DigitizationTestsVersion} if [ $rc -eq 0 ] then # Do reference comparisons - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName + art.py compare ref --diff-pool $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc1=$? fi echo "art-result: $rc1 diff-pool" @@ -59,7 +59,7 @@ echo "art-result: $rc1 diff-pool" # if [ $rc -eq 0 ] then - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName --diff-type=diff-root --mode=semi-detailed + art.py compare ref --mode=semi-detailed --diff-root $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc2=$? fi echo "art-result: $rc2 diff-root" @@ -79,4 +79,4 @@ then art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed rc4=$? fi -echo "art-result: $rc4 art-compare" +echo "art-result: $rc4 regression" diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_premixing_for_MT.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_premixing_for_MT.sh index 9ba3b977fb5a4cc115e771c54d8e31a4b6a73b1a..56b985466e63891865932c754a88f363f6d2d473 100755 --- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_premixing_for_MT.sh +++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_premixing_for_MT.sh @@ -50,7 +50,7 @@ echo "Reference set being used: " ${DigitizationTestsVersion} if [ $rc -eq 0 ] then # Do reference comparisons - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName + art.py compare ref --diff-pool $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc1=$? fi echo "art-result: $rc1 diff-pool" @@ -59,7 +59,7 @@ echo "art-result: $rc1 diff-pool" # if [ $rc -eq 0 ] then - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName --diff-type=diff-root --mode=semi-detailed + art.py compare ref --mode=semi-detailed --diff-root $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc2=$? fi echo "art-result: $rc2 diff-root" @@ -79,4 +79,4 @@ then art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed rc4=$? fi -echo "art-result: $rc4 art-compare" +echo "art-result: $rc4 regression" diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_ttbar.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_ttbar.sh index 81c05acab1a2989e0b23f8eb0397ac6bdf5f3d6b..26d54d5b1439d75c49f4fce050d8d94aa4c32496 100755 --- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_ttbar.sh +++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_ttbar.sh @@ -55,7 +55,7 @@ echo "Reference set being used: " ${DigitizationTestsVersion} if [ $rc -eq 0 ] then # Do reference comparisons - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName + art.py compare ref --diff-pool $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc1=$? fi echo "art-result: $rc1 diff-pool" @@ -64,7 +64,7 @@ echo "art-result: $rc1 diff-pool" # if [ $rc -eq 0 ] then - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName --diff-type=diff-root --mode=semi-detailed + art.py compare ref --mode=semi-detailed --diff-root $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc2=$? fi echo "art-result: $rc2 diff-root" @@ -84,4 +84,4 @@ then art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed rc4=$? fi -echo "art-result: $rc4 art-compare" +echo "art-result: $rc4 regression" diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16e_ttbar.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16e_ttbar.sh index 7f7edce02f2f0cdb8695217181001a9753fbe1ef..e01270130e5e8fee704f6aeb272976f450b7a114 100755 --- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16e_ttbar.sh +++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16e_ttbar.sh @@ -55,7 +55,7 @@ echo "Reference set being used: " ${DigitizationTestsVersion} if [ $rc -eq 0 ] then # Do reference comparisons - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName + art.py compare ref --diff-pool $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc1=$? fi echo "art-result: $rc1 diff-pool" @@ -64,7 +64,7 @@ echo "art-result: $rc1 diff-pool" # if [ $rc -eq 0 ] then - art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName --diff-type=diff-root --mode=semi-detailed + art.py compare ref --mode=semi-detailed --diff-root $DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName rc2=$? fi echo "art-result: $rc2 diff-root" @@ -84,4 +84,4 @@ then art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed rc4=$? fi -echo "art-result: $rc4 art-compare" +echo "art-result: $rc4 regression" diff --git a/Simulation/Tests/OverlayTestsMT/test/test_DataOverlay_MT_Zmumu_8threads_NewConfig.sh b/Simulation/Tests/OverlayTestsMT/test/test_DataOverlay_MT_Zmumu_8threads_NewConfig.sh index 3cf75227136a7ca499b04ddbab821e3d08e8f259..d6dae28b7f0957aa6dc01e1f94a82d4d7431ab21 100755 --- a/Simulation/Tests/OverlayTestsMT/test/test_DataOverlay_MT_Zmumu_8threads_NewConfig.sh +++ b/Simulation/Tests/OverlayTestsMT/test/test_DataOverlay_MT_Zmumu_8threads_NewConfig.sh @@ -35,7 +35,7 @@ if [ $rc -eq 0 ] then ArtPackage=$1 ArtJobName=$2 - art.py compare grid --entries 10 "${ArtPackage}" "${ArtJobName}" --mode=semi-detailed --order-trees --diff-root --excluded-vars mc_event_number + art.py compare grid --entries 10 "${ArtPackage}" "${ArtJobName}" --mode=semi-detailed --order-trees --diff-root rc2=$? fi echo "art-result: $rc2 regression" diff --git a/Simulation/Tests/OverlayTestsMT/test/test_DataOverlay_Zmumu_ST_vs_MT.sh b/Simulation/Tests/OverlayTestsMT/test/test_DataOverlay_Zmumu_ST_vs_MT.sh index 1f68c10f82eb731620bd0672727ca6082e69ce4e..1cc409bbd392cf83662c2023b5d44f4dea4482b3 100755 --- a/Simulation/Tests/OverlayTestsMT/test/test_DataOverlay_Zmumu_ST_vs_MT.sh +++ b/Simulation/Tests/OverlayTestsMT/test/test_DataOverlay_Zmumu_ST_vs_MT.sh @@ -66,7 +66,7 @@ if [ $rc2 -eq 0 ] then ArtPackage=$1 ArtJobName=$2 - art.py compare grid --entries 10 "${ArtPackage}" "${ArtJobName}" --mode=semi-detailed --order-trees --diff-root --excluded-vars mc_event_number + art.py compare grid --entries 10 "${ArtPackage}" "${ArtJobName}" --mode=semi-detailed --order-trees --diff-root rc4=$? fi echo "art-result: $rc4 regression" diff --git a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_4threads.sh b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_4threads.sh index dfb82ddfc2e8b43303230c3e954646ecddfc476e..6d84f47cf48a9b822bcde95629b34d9f2c0c7cad 100755 --- a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_4threads.sh +++ b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_4threads.sh @@ -32,7 +32,7 @@ if [ $rc -eq 0 ] then ArtPackage=$1 ArtJobName=$2 - art.py compare grid --entries 10 "${ArtPackage}" "${ArtJobName}" --mode=semi-detailed --order-trees --diff-root --excluded-vars mc_event_number + art.py compare grid --entries 10 "${ArtPackage}" "${ArtJobName}" --mode=semi-detailed --order-trees --diff-root rc2=$? fi echo "art-result: $rc2 regression" diff --git a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_8threads_NewConfig.sh b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_8threads_NewConfig.sh index 4cdf44b15b7aebfaf1235f8744e2b1525530d3c8..fb5cc58db0f0ff9b3149187131e7fb08bdcee994 100755 --- a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_8threads_NewConfig.sh +++ b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_8threads_NewConfig.sh @@ -36,7 +36,7 @@ if [ $rc -eq 0 ] then ArtPackage=$1 ArtJobName=$2 - art.py compare grid --entries 10 "${ArtPackage}" "${ArtJobName}" --mode=semi-detailed --order-trees --diff-root --excluded-vars mc_event_number + art.py compare grid --entries 10 "${ArtPackage}" "${ArtJobName}" --mode=semi-detailed --order-trees --diff-root rc2=$? fi echo "art-result: $rc2 regression" diff --git a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT.sh b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT.sh index 68fcff8b11bfbb255b34d335f0f4c7fad2bb1804..0d08ec5a84fe7b79cef8e59ab4f47fe0144ff183 100755 --- a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT.sh +++ b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT.sh @@ -60,7 +60,7 @@ if [ $rc2 -eq 0 ] then ArtPackage=$1 ArtJobName=$2 - art.py compare grid --entries 10 "${ArtPackage}" "${ArtJobName}" --mode=semi-detailed --order-trees --diff-root --excluded-vars mc_event_number + art.py compare grid --entries 10 "${ArtPackage}" "${ArtJobName}" --mode=semi-detailed --order-trees --diff-root rc4=$? fi echo "art-result: $rc4 regression" diff --git a/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_CalibationHits_pions_MT.sh b/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_CalibationHits_pions_MT.sh index 0c7a6c982c2152389a59d9ae50e6c88e917add08..9d3b3572539006f08c3200284bc4ddb11c474bbb 100755 --- a/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_CalibationHits_pions_MT.sh +++ b/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_CalibationHits_pions_MT.sh @@ -33,7 +33,7 @@ if [ $rc -eq 0 ] then ArtPackage=$1 ArtJobName=$2 - art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --excluded-vars mc_event_number + art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees rc2=$? fi echo "art-result: $rc2 regression" diff --git a/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_TTbarSim_MT.sh b/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_TTbarSim_MT.sh index a480b9c70bf61e389d8660e5cb9f31153a1adab6..22b66dc5abaf7d42ede9039d2bcbfb696ca76654 100755 --- a/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_TTbarSim_MT.sh +++ b/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_TTbarSim_MT.sh @@ -32,7 +32,7 @@ if [ $rc -eq 0 ] then ArtPackage=$1 ArtJobName=$2 - art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --excluded-vars mc_event_number + art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees rc2=$? fi echo "art-result: $rc2 regression"