TCT tests output comparisons: exclude leaves, fix art command with fixed reference

TCT tests output comparisons: exclude leaves, fix art command with fixed reference

Tools/Tier0ChainTests/test/test_bulkProcessing_M11_calib.sh

@@ -28,7 +28,8 @@ then
   ArtPackage=$1
   ArtJobName=$2
   art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
-  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)'
+  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)' \
+  --ignore-leave '(.*)HLTNav_Summary_AODSlimmedAux(.*)' # ATR-25521
   rc2=$?
 fi
 echo  "art-result: ${rc2} Diff"

Tools/Tier0ChainTests/test/test_bulkProcessing_M11_cosmic.sh

@@ -28,7 +28,8 @@ then
   ArtPackage=$1
   ArtJobName=$2
   art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
-  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)'
+  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)' \
+  --ignore-leave '(.*)HLTNav_Summary_AODSlimmedAux(.*)' # ATR-25521
   rc2=$?
 fi
 echo  "art-result: ${rc2} Diff"

Tools/Tier0ChainTests/test/test_bulkProcessing_beamSplashes.sh

@@ -28,7 +28,8 @@ then
   ArtPackage=$1
   ArtJobName=$2
   art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
-  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)'
+  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)' \
+  --ignore-leave '(.*)HLTNav_Summary_AODSlimmedAux(.*)' # ATR-25521
   rc2=$?
 fi
 echo  "art-result: ${rc2} (against previous nightly)"
@@ -36,11 +37,10 @@ echo  "art-result: ${rc2} (against previous nightly)"
 rc3=-9999
 if [ ${rc1} -eq 0 ]
 then
-  ArtPackage=$1
-  ArtJobName=$2
   art.py compare ref . /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3-22.0_references_for_comparison/test_bulkProcessing_beamSplashes_2022-05-23T2101 \
-  --entries 100 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
-  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)'
+  --entries 100 --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
+  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)' \
+  --ignore-leave '(.*)HLTNav_Summary_AODSlimmedAux(.*)' # ATR-25521
   rc3=$?
 fi
 echo  "art-result: ${rc3} (against reference)"

Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh

@@ -28,7 +28,8 @@ then
   ArtPackage=$1
   ArtJobName=$2
   art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
-  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)'
+  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)' \
+  --ignore-leave '(.*)HLTNav_Summary_AODSlimmedAux(.*)' # ATR-25521
   rc2=$?
 fi
 echo  "art-result: ${rc2} (against previous nightly)"
@@ -36,11 +37,10 @@ echo  "art-result: ${rc2} (against previous nightly)"
 rc3=-9999
 if [ ${rc1} -eq 0 ]
 then
-  ArtPackage=$1
-  ArtJobName=$2
   art.py compare ref . /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3-22.0_references_for_comparison/test_bulkProcessing_calib_2022-05-23T2101 \
-  --entries 100 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
-  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)'
+  --entries 100 --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
+  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)' \
+  --ignore-leave '(.*)HLTNav_Summary_AODSlimmedAux(.*)' # ATR-25521
   rc3=$?
 fi
 echo  "art-result: ${rc3} (against reference)"

Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh

@@ -28,7 +28,8 @@ then
   ArtPackage=$1
   ArtJobName=$2
   art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
-  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)'
+  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)' \
+  --ignore-leave '(.*)HLTNav_Summary_AODSlimmedAux(.*)' # ATR-25521
   rc2=$?
 fi
 echo  "art-result: ${rc2} (against previous nightly)"
@@ -36,11 +37,10 @@ echo  "art-result: ${rc2} (against previous nightly)"
 rc3=-9999
 if [ ${rc1} -eq 0 ]
 then
-  ArtPackage=$1
-  ArtJobName=$2
   art.py compare ref . /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3-22.0_references_for_comparison/test_bulkProcessing_cosmic_2022-05-23T2101 \
-  --entries 100 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
-  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)'
+  --entries 100 --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
+  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)' \
+  --ignore-leave '(.*)HLTNav_Summary_AODSlimmedAux(.*)' # ATR-25521
   rc3=$?
 fi
 echo  "art-result: ${rc3} (against reference)"

Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam.sh

@@ -27,7 +27,8 @@ then
   ArtPackage=$1
   ArtJobName=$2
   art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
-  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)'
+  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)' \
+  --ignore-leave '(.*)HLTNav_Summary_AODSlimmedAux(.*)' # ATR-25521
   rc2=$?
 fi
 echo  "art-result: ${rc2} Diff"

Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_collisions.sh

@@ -27,7 +27,8 @@ then
   ArtPackage=$1
   ArtJobName=$2
   art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
-  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)'
+  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)' \
+  --ignore-leave '(.*)HLTNav_Summary_AODSlimmedAux(.*)' # ATR-25521
   rc2=$?
 fi
 echo  "art-result: ${rc2} (against previous nightly)"
@@ -35,11 +36,10 @@ echo  "art-result: ${rc2} (against previous nightly)"
 rc3=-9999
 if [ ${rc1} -eq 0 ]
 then
-  ArtPackage=$1
-  ArtJobName=$2
   art.py compare ref . /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3-22.0_references_for_comparison/test_bulkProcessing_pilotBeam_collisions_2022-05-23T2101 \
-  --entries 100 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
-  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)'
+  --entries 100 --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
+  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)' \
+  --ignore-leave '(.*)HLTNav_Summary_AODSlimmedAux(.*)' # ATR-25521
   rc3=$?
 fi
 echo  "art-result: ${rc3} (against reference)"

Tools/Tier0ChainTests/test/test_expressProcessing_M11_calib.sh

@@ -28,7 +28,8 @@ then
   ArtPackage=$1
   ArtJobName=$2
   art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
-  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)'
+  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)' \
+  --ignore-leave '(.*)HLTNav_Summary_AODSlimmedAux(.*)' # ATR-25521
   rc2=$?
 fi
 echo  "art-result: ${rc2} Diff"

Tools/Tier0ChainTests/test/test_expressProcessing_M11_cosmic.sh

@@ -28,7 +28,8 @@ then
   ArtPackage=$1
   ArtJobName=$2
   art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
-  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)'
+  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)' \
+  --ignore-leave '(.*)HLTNav_Summary_AODSlimmedAux(.*)' # ATR-25521
   rc2=$?
 fi
 echo  "art-result: ${rc2} Diff"

Tools/Tier0ChainTests/test/test_expressProcessing_beamSplashes.sh

@@ -28,7 +28,8 @@ then
   ArtPackage=$1
   ArtJobName=$2
   art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
-  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)'
+  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)' \
+  --ignore-leave '(.*)HLTNav_Summary_AODSlimmedAux(.*)' # ATR-25521
   rc2=$?
 fi
 echo  "art-result: ${rc2} Diff"

Tools/Tier0ChainTests/test/test_expressProcessing_calib.sh

@@ -28,7 +28,8 @@ then
   ArtPackage=$1
   ArtJobName=$2
   art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
-  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)'
+  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)' \
+  --ignore-leave '(.*)HLTNav_Summary_AODSlimmedAux(.*)' # ATR-25521
   rc2=$?
 fi
 echo  "art-result: ${rc2} Diff"

Tools/Tier0ChainTests/test/test_expressProcessing_cosmic.sh

@@ -28,7 +28,8 @@ then
   ArtPackage=$1
   ArtJobName=$2
   art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
-  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)'
+  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)' \
+  --ignore-leave '(.*)HLTNav_Summary_AODSlimmedAux(.*)' # ATR-25521
   rc2=$?
 fi
 echo  "art-result: ${rc2} Diff"

Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam.sh

@@ -28,7 +28,8 @@ then
   ArtPackage=$1
   ArtJobName=$2
   art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
-  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)'
+  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)' \
+  --ignore-leave '(.*)HLTNav_Summary_AODSlimmedAux(.*)' # ATR-25521
   rc2=$?
 fi
 echo  "art-result: ${rc2} Diff"

Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_collisions.sh

@@ -28,7 +28,8 @@ then
   ArtPackage=$1
   ArtJobName=$2
   art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
-  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)'
+  --ignore-leave '(.*)TrigCompositeAuxContainer_v2_HLTNav_Summary_ESDSlimmedAux(.*)' \
+  --ignore-leave '(.*)HLTNav_Summary_AODSlimmedAux(.*)' # ATR-25521
   rc2=$?
 fi
 echo  "art-result: ${rc2} Diff"

Tools/Tier0ChainTests/test/test_reco_mc16e.sh

@@ -61,7 +61,10 @@ then
   ArtPackage=$1
   ArtJobName=$2
   echo "Running art.py command"
-  art.py compare grid --entries 20 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool --ignore-leave 'Token' --ignore-leave 'index_ref' --ignore-leave '(.*)_timings\.(.*)' --ignore-leave '(.*)_mems\.(.*)' --ignore-leave '(.*)TrigCostContainer(.*)' --ignore-leave '(.*)HLTNav_Summary_OnlineSlimmed(.*)'
+  art.py compare grid --entries 20 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
+  --ignore-leave 'Token' --ignore-leave 'index_ref' --ignore-leave '(.*)_timings\.(.*)' --ignore-leave '(.*)_mems\.(.*)' \
+  --ignore-leave '(.*)TrigCostContainer(.*)' --ignore-leave '(.*)HLTNav_Summary_OnlineSlimmed(.*)' \
+  --ignore-leave '(.*)HLTNav_Summary_AODSlimmedAux(.*)' # ATR-25521
   rc2=$?
 fi
 echo  "art-result: ${rc2} Diff"