From 96d0010830767c9af4b45cf2b3cc8a862f41fe2c Mon Sep 17 00:00:00 2001
From: Artem Basalaev <artem.basalaev@cern.ch>
Date: Wed, 25 Nov 2020 15:20:20 +0000
Subject: [PATCH] Compatibility fixes in art-tests scripts SimCoreTestsMT,
OverlayTestsMT, DigitizationTests
---
.../test/test_Digi_tf_mc15_2010_ttbar_no_pileup.sh | 6 +++---
.../test/test_Digi_tf_mc15_2011_ttbar_no_pileup.sh | 6 +++---
.../test/test_Digi_tf_mc15_2012_ttbar_no_pileup.sh | 6 +++---
.../test/test_Digi_tf_mc15_2015_cosmics.sh | 6 +++---
.../test/test_Digi_tf_mc15_2015_nu_25ns_premixing.sh | 6 +++---
.../test/test_Digi_tf_mc15_2015_ttbar_25ns_algs_pileup.sh | 6 +++---
.../test/test_Digi_tf_mc15_2015_ttbar_25ns_pileup.sh | 6 +++---
.../test_Digi_tf_mc15_2015_ttbar_25ns_pileup_noNoise.sh | 6 +++---
.../test/test_Digi_tf_mc15_2015_ttbar_50ns_pileup.sh | 6 +++---
.../test/test_Digi_tf_mc15_2015_ttbar_no_pileup.sh | 6 +++---
.../DigitizationTests/test/test_Digi_tf_mc16a_qballs.sh | 2 +-
.../DigitizationTests/test/test_Digi_tf_mc16a_ttbar.sh | 6 +++---
.../DigitizationTests/test/test_Digi_tf_mc16d_premixing.sh | 6 +++---
.../test/test_Digi_tf_mc16d_premixing_for_MT.sh | 6 +++---
.../DigitizationTests/test/test_Digi_tf_mc16d_ttbar.sh | 6 +++---
.../DigitizationTests/test/test_Digi_tf_mc16e_ttbar.sh | 6 +++---
.../test/test_DataOverlay_MT_Zmumu_8threads_NewConfig.sh | 2 +-
.../OverlayTestsMT/test/test_DataOverlay_Zmumu_ST_vs_MT.sh | 2 +-
.../OverlayTestsMT/test/test_MCOverlay_MT_ttbar_4threads.sh | 2 +-
.../test/test_MCOverlay_MT_ttbar_8threads_NewConfig.sh | 2 +-
.../OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT.sh | 2 +-
.../test/test_AtlasG4_CalibationHits_pions_MT.sh | 2 +-
.../Tests/SimCoreTestsMT/test/test_AtlasG4_TTbarSim_MT.sh | 2 +-
23 files changed, 53 insertions(+), 53 deletions(-)
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 b3d133f8d69..81a95418abf 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 c2bd92d54c7..c9d05fe2fae 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 c28c93802da..754d8977a35 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 087907d17cd..0b51453156e 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 0f3befa6738..b2fea2471ca 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 4d0006575e8..f4a1ea09352 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 f3fbc977ef1..8916c713236 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 5577039770c..41a3755ff45 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 4c5cee56b5d..84844a169a5 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 4a09715a8ed..2577bffb616 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 4ce7e8140e0..c921a9a239c 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 e92b2a25b86..9af380649f4 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 d4648addc8a..fa896292876 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 9ba3b977fb5..56b985466e6 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 81c05acab1a..26d54d5b143 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 7f7edce02f2..e01270130e5 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 3cf75227136..d6dae28b7f0 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 1f68c10f82e..1cc409bbd39 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 dfb82ddfc2e..6d84f47cf48 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 4cdf44b15b7..fb5cc58db0f 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 68fcff8b11b..0d08ec5a84f 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 0c7a6c982c2..9d3b3572539 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 a480b9c70bf..22b66dc5aba 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"
--
GitLab