TCT: Updated output comparison steps and removing old tests

TCT: Updated output comparison steps and removing old tests

Tools/Tier0ChainTests/test/test_bulkProcessing_13600collisions_SB.sh

@@ -6,18 +6,17 @@
 # art-include: 22.0/Athena
 # art-athena-mt: 8
 
-# Not doing diff-root comparison for DAOD_IDTIDE nor DESDM_MCP for the moment. To enable comparisons, change the extensions of the corresponding output files to .pool.root
-
 Reco_tf.py  \
---AMI f1258  \
+--AMI f1259  \
 --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_13p6TeV.00429782.physics_Main.daq.RAW._lb0562._SFO-11._0001.data" \
 --outputAODFile="AOD.pool.root" \
 --outputESDFile="ESD.pool.root" \
 --outputHISTFile="HIST.root" \
---outputDAOD_IDTIDEFile="DAOD_IDTIDE.root" \
+--outputDAOD_IDTIDEFile="DAOD_IDTIDE.pool.root" \
 --outputDRAW_ZMUMUFile="myDRAW_ZMUMU.data" \
---outputDESDM_MCPFile="myDESDM_MCP.root" \
+--outputDESDM_MCPFile="myDESDM_MCP.pool.root" \
 --outputDRAW_EGZFile="myDRAW_EGZ.data" \
+--outputDAOD_L1CALO5File="myDAOD_L1CALO5.pool.root" \
 --imf False
 
 

Tools/Tier0ChainTests/test/test_bulkProcessing_900collisions_SB.sh → Tools/Tier0ChainTests/test/test_bulkProcessing_13600collisions_SB_reduced.sh

@@ -6,19 +6,16 @@
 # art-include: 22.0/Athena
 # art-athena-mt: 8
 
-# Not doing diff-root comparison for DAOD_IDTIDE at the moment (because 0 events are selected). To enable comparison for DAOD_IDTIDE, rename the output to DAOD_IDTIDE.pool.root
-
 Reco_tf.py  \
---AMI f1218  \
---inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_900GeV.00423110.express_express.merge.RAW._lb0100._SFO-ALL._0001.1" \
+--AMI f1259  \
+--inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_13p6TeV.00429782.physics_Main.daq.RAW._lb0562._SFO-11._0001.data" \
+--maxEvents=300 \
 --outputAODFile="AOD.pool.root" \
 --outputESDFile="ESD.pool.root" \
---outputDAOD_L1CALO2File="L1CALO2.pool.root" \
 --outputHISTFile="HIST.root" \
---outputDAOD_IDTIDEFile="DAOD_IDTIDE.root" \
---outputDRAW_ZMUMUFile="myDRAW_ZMUMU.data" \
 --imf False
 
+
 rc1=$?
 echo "art-result: $rc1 Reco"
 
@@ -27,7 +24,7 @@ if [ ${rc1} -eq 0 ]
 then
   ArtPackage=$1
   ArtJobName=$2
-  art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool
+  art.py compare grid --entries 200 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool
   rc2=$?
 fi
 echo  "art-result: ${rc2} (against previous nightly)"
@@ -35,9 +32,7 @@ echo  "art-result: ${rc2} (against previous nightly)"
 rc3=-9999
 if [ ${rc1} -eq 0 ]
 then
-  ArtRef=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3-22.0_references_for_comparison/test_bulkProcessing_900collisions_SB
-  cat $ArtRef/version.txt
-  art.py compare ref . $ArtRef \
+  art.py compare ref . /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3-22.0_references_for_comparison/test_bulkProcessing_13600collisions_SB_reduced \
   --entries 100 --mode=semi-detailed --order-trees --ignore-exit-code diff-pool
   rc3=$?
 fi

Tools/Tier0ChainTests/test/test_bulkProcessing_13600collisions_UB.sh

@@ -9,7 +9,7 @@
 # Not doing diff-root comparison for DAOD_IDTIDE at the moment (because 0 events are selected). To enable comparison for DAOD_IDTIDE, rename the output to DAOD_IDTIDE.pool.root
 
 Reco_tf.py  \
---AMI f1218  \
+--AMI f1259  \
 --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_13p6TeV.00423433.express_express.merge.RAW._lb0300._SFO-ALL._0001.1" \
 --outputAODFile="AOD.pool.root" \
 --outputESDFile="ESD.pool.root" \

Tools/Tier0ChainTests/test/test_expressProcessing_13600collisions_SB.sh

@@ -7,8 +7,8 @@
 # art-athena-mt: 8
 
 Reco_tf.py  \
---AMI x675  \
---inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_900GeV.00424070.express_express.merge.RAW._lb0100._SFO-ALL._0001.1" \
+--AMI x681  \
+--inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_13p6TeV.00428353.express_express.merge.RAW._lb0800._SFO-ALL._0001.1" \
 --outputAODFile="AOD.pool.root" \
 --outputESDFile="ESD.pool.root" \
 --outputHISTFile="HIST.root" \
@@ -22,7 +22,7 @@ if [ ${rc1} -eq 0 ]
 then
   ArtPackage=$1
   ArtJobName=$2
-  art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool
+  art.py compare grid --entries 50 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool
   rc2=$?
 fi
 echo  "art-result: ${rc2} Diff"

Tools/Tier0ChainTests/test/test_expressProcessing_13600collisions_UB.sh

@@ -9,7 +9,7 @@
 # Not doing diff-root comparison for DAOD_IDTIDE at the moment (because 0 events are selected). To enable comparison for DAOD_IDTIDE, rename the output to DAOD_IDTIDE.pool.root
 
 Reco_tf.py  \
---AMI x654  \
+--AMI x681  \
 --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_13p6TeV.00423433.express_express.merge.RAW._lb0300._SFO-ALL._0001.1" \
 --outputAODFile="AOD.pool.root" \
 --outputESDFile="ESD.pool.root" \

Tools/Tier0ChainTests/test/test_expressProcessing_900collisions_SB.sh

-#!/bin/sh
-#
-# art-description: Express processing at Tier0
-# art-type: grid
-# art-include: master/Athena
-# art-include: 22.0/Athena
-# art-athena-mt: 8
-
-# Not doing diff-root comparison for DAOD_IDTIDE at the moment (because 0 events are selected). To enable comparison for DAOD_IDTIDE, rename the output to DAOD_IDTIDE.pool.root
-
-Reco_tf.py  \
---AMI x654  \
---inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_900GeV.00423110.express_express.merge.RAW._lb0100._SFO-ALL._0001.1" \
---outputAODFile="AOD.pool.root" \
---outputESDFile="ESD.pool.root" \
---outputDAOD_L1CALO2File="L1CALO2.pool.root" \
---outputHISTFile="HIST.root" \
---outputDAOD_IDTIDEFile="DAOD_IDTIDE.root" \
---outputDRAW_ZMUMUFile="myDRAW_ZMUMU.data" \
---imf False
-
-rc1=$?
-echo "art-result: $rc1 Reco"
-
-rc2=-9999
-if [ ${rc1} -eq 0 ]
-then
-  ArtPackage=$1
-  ArtJobName=$2
-  art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool
-  rc2=$?
-fi
-echo  "art-result: ${rc2} Diff"
-

Tools/Tier0ChainTests/test/test_expressstream_collisions_2.sh

-#!/bin/sh
-#
-# art-description: RecoTrf
-# art-type: grid
-# art-include: master/Athena
-# art-include: 22.0/Athena
-# art-include: 22.0-mc20/Athena
-# art-athena-mt: 8                                                                                                                                    
-
-Reco_tf.py \
---AMI=f628 \
---athenaopts="--threads=8" \
---maxEvents=50 \
---ignoreErrors=False \
---inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/expressstream_input_data18/data18_13TeV.00357750.express_express.merge.RAW._lb0091._SFO-ALL._0001.1 \
---conditionsTag='CONDBR2-BLKPA-RUN2-09' \
---geometryVersion='ATLAS-R2-2016-01-00-01' \
---outputESDFile=myESD_express_0.pool.root --outputAODFile=myAOD_express_0.AOD.pool.root --outputHISTFile=myMergedMonitoring_express_0.root --imf False
-
-
-rc1=$?
-echo "art-result: $rc1 Reco"
-
-rc2=-9999
-if [ ${rc1} -eq 0 ]
-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(.*)'
-  rc2=$?
-fi
-echo  "art-result: ${rc2} Diff"
-

Tools/Tier0ChainTests/test/test_expressstream_collisions_3.sh

-#!/bin/sh
-#
-# art-description: RecoTrf
-# art-type: grid
-# art-include: master/Athena
-# art-include: 22.0/Athena
-# art-include: 22.0-mc20/Athena
-# art-athena-mt: 8                                                                                                                                    
-
-Reco_tf.py \
---AMI=f628 \
---athenaopts="--threads=8" \
---maxEvents=300 \
---ignoreErrors=False \
---inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/expressstream_input_data18/data18_13TeV.00357750.express_express.merge.RAW._lb0093._SFO-ALL._0001.1 \
---conditionsTag='CONDBR2-BLKPA-RUN2-09' \
---geometryVersion='ATLAS-R2-2016-01-00-01' \
---outputESDFile=myESD_express_0.pool.root --outputAODFile=myAOD_express_0.AOD.pool.root --outputHISTFile=myMergedMonitoring_express_0.root --imf False
-
-
-rc1=$?
-echo "art-result: $rc1 Reco"
-
-rc2=-9999
-if [ ${rc1} -eq 0 ]
-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(.*)'
-  rc2=$?
-fi
-echo  "art-result: ${rc2} Diff"
-

Tools/Tier0ChainTests/test/test_expressstream_collisions_4.sh

-#!/bin/sh
-#
-# art-description: RecoTrf
-# art-type: grid
-# art-include: master/Athena
-# art-include: 22.0/Athena
-# art-include: 22.0-mc20/Athena
-# art-athena-mt: 8                                                                                                                                    
-
-Reco_tf.py \
---AMI=f628 \
---athenaopts="--threads=8" \
---maxEvents=300 \
---ignoreErrors=False \
---inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/expressstream_input_data18/data18_13TeV.00357750.express_express.merge.RAW._lb0095._SFO-ALL._0001.1 \
---conditionsTag='CONDBR2-BLKPA-RUN2-09' \
---geometryVersion='ATLAS-R2-2016-01-00-01' \
---outputESDFile=myESD_express_0.pool.root --outputAODFile=myAOD_express_0.AOD.pool.root --outputHISTFile=myMergedMonitoring_express_0.root --imf False
-
-rc1=$?
-echo "art-result: $rc1 Reco"
-
-rc2=-9999
-if [ ${rc1} -eq 0 ]
-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(.*)'
-  rc2=$?
-fi
-echo  "art-result: ${rc2} Diff"
-

Tools/Tier0ChainTests/test/test_mainstream_run357750_collisions_withouthist.sh

-#!/bin/sh
-#
-# art-description: RecoTrf
-# art-type: grid
-# art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
-# art-include: master/Athena
-# art-include: 22.0/Athena
-# art-include: 22.0-mc20/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-# art-athena-mt: 8                                                  
-
-Reco_tf.py \
---AMI=f741 \
---athenaopts='--threads=8' \
---maxEvents=400 \
---ignoreErrors=False \
---inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data18_13TeV.00357750.physics_Main.daq.RAW/data18_13TeV.00357750.physics_Main.daq.RAW._lb0114._SFO-5._0003.data \
---conditionsTag='CONDBR2-BLKPA-RUN2-09' \
---geometryVersion='ATLAS-R2-2016-01-00-01' \
---outputESDFile=myESD_Main_0.pool.root --outputAODFile=myAOD_Main_0.AOD.pool.root --imf False
-
-rc1=$?
-echo "art-result: $rc1 Reco"
-
-rc2=-9999
-if [ ${rc1} -eq 0 ]
-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(.*)'
-  rc2=$?
-fi
-echo  "art-result: ${rc2} Diff"
-

Tools/Tier0ChainTests/test/test_q431.sh

-#!/bin/sh
-#
-# art-description: RecoTrf
-# art-type: grid
-# art-include: master/Athena
-# art-include: 22.0/Athena
-# art-include: 22.0-mc20/Athena
-# art-athena-mt: 8                                                                                                                                     
-
-Reco_tf.py \
---AMI=q431 \
---athenaopts='--threads=8' \
---maxEvents=500 \
---steering doRAWtoALL \
---conditionsTag 'all:CONDBR2-BLKPA-RUN2-09' \
---outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --imf False
-
-rc1=$?
-echo "art-result: $rc1 Reco"
-
-rc2=-9999
-if [ ${rc1} -eq 0 ]
-then
-  ArtPackage=$1
-  ArtJobName=$2
-  art.py compare grid --entries 20 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool
-  rc2=$?
-fi
-echo  "art-result: ${rc2} Diff"
-
-

Tools/Tier0ChainTests/test/test_q431_mp.sh

-#!/bin/sh
-#
-# art-description: RecoTrf
-# art-type: grid
-# art-include: master/Athena
-# art-include: 22.0/Athena
-# art-include: 22.0-mc20/Athena
-# art-athena-mt: 8
-
-Reco_tf.py \
---AMI=q431 \
---athenaopts='--nprocs=2' \
---maxEvents=500 \
---steering doRAWtoALL \
---conditionsTag 'all:CONDBR2-BLKPA-RUN2-09' \
---outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --imf False
-
-rc1=$?
-echo "art-result: $rc1 Reco"
-
-rc2=-9999
-if [ ${rc1} -eq 0 ]
-then
-  ArtPackage=$1
-  ArtJobName=$2
-  art.py compare grid --entries 20 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool
-  rc2=$?
-fi
-echo  "art-result: ${rc2} Diff"
-
-
-

Tools/Tier0ChainTests/test/test_q431_mt1.sh

-#!/bin/sh
-#
-# art-description: RecoTrf
-# art-type: grid
-
-Reco_tf.py \
---AMI=q431 \
---athenaopts='--threads=1' \
---conditionsTag 'all:CONDBR2-BLKPA-RUN2-09' \
---maxEvents=100 \
---outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --imf False
-
-echo "art-result: $? Reco"
-
-ArtPackage=$1
-ArtJobName=$2
-art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool
-echo "art-result: $? Diff"

Tools/Tier0ChainTests/test/test_q442.sh

@@ -20,7 +20,7 @@ echo "art-result: $rc1 Reco"
 rc2=-9999
 if [ $rc1 -eq 0 ]
 then
-  art.py compare grid --entries 20 "$1" "$2" --mode=semi-detailed --order-trees --ignore-exit-code diff-pool
+  art.py compare grid --entries 50 "$1" "$2" --mode=semi-detailed --order-trees --ignore-exit-code diff-pool
   rc2=$?
 fi
 echo "art-result: $rc2 Diff"

Tools/Tier0ChainTests/test/test_q445.sh

@@ -20,14 +20,7 @@ echo "art-result: $rc1 Reco"
 rc2=-9999
 if [ $rc1 -eq 0 ]
 then
-  art.py compare grid --entries 30 "$1" "$2" --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 '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTF(.*)' \
-  --ignore-leave '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_FTF(.*)' \
-  --ignore-leave '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTF(.*)' \
-  --ignore-leave '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_FTF(.*)' \
-  --ignore-leave '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTF(.*)'  # Ignoring based on ATR-24119 and ATR-24888
+  art.py compare grid --entries 50 "$1" "$2" --mode=semi-detailed --order-trees --ignore-exit-code diff-pool
   rc2=$?
 fi
 echo "art-result: $rc2 Diff"
@@ -37,14 +30,7 @@ if [ $rc1 -eq 0 ]
 then
   ArtRef=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3-22.0_references_for_comparison/test_q445
   cat $ArtRef/version.txt
-  art.py compare ref --entries 30 . $ArtRef --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 '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTF(.*)' \
-  --ignore-leave '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_FTF(.*)' \
-  --ignore-leave '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTF(.*)' \
-  --ignore-leave '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_FTF(.*)' \
-  --ignore-leave '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTF(.*)'  # Ignoring based on ATR-24119 and ATR-24888
+  art.py compare ref --entries 50 . $ArtRef --mode=semi-detailed --order-trees --ignore-exit-code diff-pool
   rc3=$?
 fi
 echo "art-result: $rc3 Diff (fixed reference)"

Tools/Tier0ChainTests/test/test_q445_ignoringBranches.sh

+#!/bin/sh
+#
+# art-description: RecoTrf
+# art-type: grid
+# art-include: master/Athena
+# art-include: 22.0/Athena
+# art-include: 22.0-mc20/Athena
+# art-athena-mt: 8
+
+Reco_tf.py \
+--AMI=q445 \
+--multithreaded \
+--maxEvents=50 \
+--outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root \
+--imf False
+
+rc1=$?
+echo "art-result: $rc1      1 Reco"
+
+
+
+rc2=-9999
+if [ $rc1 -eq 0 ]
+then
+  art.py compare grid --file=*AOD*.pool.root --diff-root --entries 50 "$1" "$2" --mode=semi-detailed --order-trees \
+  --ignore-leave '^HLT_(.*)' \
+  --ignore-leave '^HLTNav_(.*)' \
+  --ignore-leave '^L1_(.*)' \
+  --ignore-leave '^LVL1(.*)' \
+  --ignore-leave 'BunchConfKey(.*)' \
+  --ignore-leave 'TrigConfKeys(.*)' \
+  --ignore-leave 'xTrigDecisionAux(.*)'
+# ignoring as suggested by Tim Martin (the same as in CI)
+  rc2=$?
+fi
+echo "art-result: $rc2     2 AOD diff-root comparison"
+
+rc3=-9999
+if [ $rc1 -eq 0 ]
+then
+  art.py compare grid --file=*ESD*.pool.root --diff-root --entries 50 "$1" "$2" --mode=semi-detailed --order-trees \
+  --ignore-leave '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTF(.*)' \
+  --ignore-leave '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_FTF(.*)' \
+  --ignore-leave '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTF(.*)' \
+  --ignore-leave '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_FTF(.*)' \
+  --ignore-leave '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTF(.*)' \
+  --ignore-leave '(.*)_HLT_(.*)' \
+  --ignore-leave '(.*)_HLTNav_(.*)' \
+  --ignore-leave '(.*)_L1_(.*)' \
+  --ignore-leave '(.*)_LVL1(.*)' \
+  --ignore-leave '(.*)_BunchConfKey(.*)' \
+  --ignore-leave '(.*)_RoIBResult(.*)' \
+  --ignore-leave '(.*)_TrigConfKeys(.*)' \
+  --ignore-leave '(.*)_xTrigDecisionAux(.*)' \
+  --ignore-leave 'Muon::MuonPRD_Container_p2<Muon::MMPrepData_p1>_MM_Measurements.m_prds.m_stripNumbers' \
+  --ignore-leave 'Muon::MuonPRD_Container_p2<Muon::sTgcPrepData_p1>_STGC_Measurements.m_prds.m_stripNumbers' \
+  --ignore-leave 'Muon::MuonPRD_Container_p2<Muon::sTgcPrepData_p2>_STGC_Measurements.m_prds.m_stripNumbers'
+
+ # Ignoring based on ATLASRECTS-7101, ATR-24119 and ATR-24888, and on the suggestion from Tim Martin (as done in CI)
+  rc3=$?
+fi
+echo "art-result: $rc3     3 ESD diff-root comparison"
+
+
+rc4=-9999
+if [ $rc1 -eq 0 ]
+then
+  art.py compare grid --file=*RDO*.pool.root --diff-root --entries 50 "$1" "$2" --mode=semi-detailed --order-trees \
+  rc4=$?
+fi
+echo "art-result: $rc4     4 RDO diff-root comparison"
+
+
+
+rc5=-9999
+if [ $rc1 -eq 0 ]
+then
+  ArtRef=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3-22.0_references_for_comparison/test_q445_ignoringBranches
+  cat $ArtRef/version.txt
+  art.py compare ref --file=*AOD*.pool.root --diff-root --entries 50 . $ArtRef --mode=semi-detailed --order-trees \
+  --ignore-leave '^HLT_(.*)' \
+  --ignore-leave '^HLTNav_(.*)' \
+  --ignore-leave '^L1_(.*)' \
+  --ignore-leave '^LVL1(.*)' \
+  --ignore-leave 'BunchConfKey(.*)' \
+  --ignore-leave 'TrigConfKeys(.*)' \
+  --ignore-leave 'xTrigDecisionAux(.*)'
+# ignoring as suggested by Tim Martin (the same as in CI)
+  rc5=$?
+fi
+echo "art-result: $rc5     5 AOD diff-root (fixed reference)"

Tools/Tier0ChainTests/test/test_q445_mt1.sh

+#!/bin/sh
+#
+# art-description: RecoTrf
+# art-type: grid
+# art-include: master/Athena
+# art-include: 22.0/Athena
+# art-include: 22.0-mc20/Athena
+# art-athena-mt: 8
+
+Reco_tf.py \
+--AMI=q445 \
+--athenaopts "RDOtoRDOTrigger:--threads=1" "RAWtoESD:--threads=1" "ESDtoAOD:--threads=1" \
+--maxEvents=500 \
+--outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root \
+--imf False
+
+rc1=$?
+echo "art-result: $rc1 Reco"
+
+rc2=-9999
+if [ $rc1 -eq 0 ]
+then
+  art.py compare grid --entries 50 "$1" "$2" --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 '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTF(.*)' \
+  --ignore-leave '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_FTF(.*)' \
+  --ignore-leave '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTF(.*)' \
+  --ignore-leave '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_FTF(.*)' \
+  --ignore-leave '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTF(.*)'  # Ignoring based on ATR-24119 and ATR-24888
+  rc2=$?
+fi
+echo "art-result: $rc2 Diff"
+

Tools/Tier0ChainTests/test/test_q445_serial.sh

@@ -19,7 +19,7 @@ echo "art-result: $rc1 Reco"
 rc2=-9999
 if [ $rc1 -eq 0 ]
 then
-  art.py compare grid --entries 30 "$1" "$2" --mode=semi-detailed --order-trees --ignore-exit-code diff-pool \
+  art.py compare grid --entries 50 "$1" "$2" --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 '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTF(.*)' --ignore-leave '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_FTF(.*)' --ignore-leave '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTF(.*)' --ignore-leave '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_FTF(.*)' --ignore-leave '(.*)TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTF(.*)'  # Ignoring based on ATR-24119 and ATR-24888
   rc2=$?
 fi

Tools/Tier0ChainTests/test/test_reco_mc16e.sh

-#!/bin/sh
-#
-# art-description: RecoTrf
-# art-type: grid
-# art-include: 21.0/Athena
-# art-include: master/Athena
-# art-include: 22.0/Athena
-# art-include: 22.0-mc20/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-# art-athena-mt: 8
-
-Reco_tf.py \
---athenaopts "RDOtoRDOTrigger:--threads=8" "RAWtoESD:--threads=8" "ESDtoAOD:--threads=8" \
---digiSteeringConf 'StandardSignalOnlyTruth' \
---conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-09' \
---valid 'True' \
---pileupFinalBunch '6' \
---numberOfHighPtMinBias '0.2595392' \
---autoConfiguration 'everything' \
---numberOfLowPtMinBias '99.2404608' \
---steering 'doRDO_TRIG' \
---preInclude 'HITtoRDO:Digitization/ForceUseOfPileUpTools.py,SimulationJobOptions/preInlcude.PileUpBunchTrainsMC16c_2017_Config1.py,RunDependentSimData/configLumi_run310000.py' \
---postInclude 'default:PyJobTransforms/UseFrontier.py' \
---postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' "ESDtoAOD:fixedAttrib=[s if \"CONTAINER_SPLITLEVEL = '99'\" not in s else \"\" for s in svcMgr.AthenaPoolCnvSvc.PoolAttributes];svcMgr.AthenaPoolCnvSvc.PoolAttributes=fixedAttrib" "RDOtoRDOTrigger:conddb.addOverride(\"/CALO/Ofl/Noise/PileUpNoiseLumi\",\"CALOOflNoisePileUpNoiseLumi-mc15-mu30-dt25ns\")" 'ESDtoAOD:CILMergeAOD.removeItem("xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.LATERAL.LONGITUDINAL.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_BAD_HV_CELLS.N_BAD_HV_CELLS.ENG_POS.SIGNIFICANCE.CELL_SIGNIFICANCE.CELL_SIG_SAMPLING.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.PTD.BadChannelList");CILMergeAOD.add("xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.N_BAD_CELLS.ENG_BAD_CELLS.BADLARQ_FRAC.AVG_TILE_Q.AVG_LAR_Q.CENTER_MAG.ENG_POS.CENTER_LAMBDA.SECOND_LAMBDA.SECOND_R.ISOLATION.EM_PROBABILITY");StreamAOD.ItemList=CILMergeAOD()' \
---preExec 'all:rec.Commissioning.set_Value_and_Lock(True);from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(20.0);from LArROD.LArRODFlags import larRODFlags;larRODFlags.NumberOfCollisions.set_Value_and_Lock(20);larRODFlags.nSamples.set_Value_and_Lock(4);larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True);larRODFlags.firstSample.set_Value_and_Lock(0);larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(True); from LArDigitization.LArDigitizationFlags import jobproperties;jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(False)' \
---geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
---numberOfCavernBkg '0' \
---inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/\* \
---maxEvents=100 \
---runNumber=410000 \
---jobNumber=1 \
---inputLowPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/\* \
---inputHighPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/\* \
---outputAODFile=myAOD.pool.root --outputRDOFile=myRDO.pool.root --outputESDFile=myESD.pool.root --imf False
-
-rc1=$?
-echo "art-result: $rc1 Reco"
-
-# Workaround for the problem "Looping job killed by pilot trans". A message is printed every 30 minutes to avoid killing the job by the pilot. This was suggested in the email thread with atlas-adc-dpa@cern.ch by Serhan on 23.4.2021.
-
-# Periodically print elapsed time while the long command executes
-file=$(mktemp)
-
-progress() {
-  pc=0;
-  inc=1800; # print elapsed time every 1800 seconds
-  while [ -e ${file} ];
-    do
-      echo "[WRAPPER] Elapsed time: $(expr ${pc} \* ${inc}) seconds..."
-      sleep ${inc}
-      ((pc++))
-    done
-}
-
-progress &
-
-rc2=-9999
-if [ ${rc1} -eq 0 ]
-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(.*)'
-  rc2=$?
-fi
-echo  "art-result: ${rc2} Diff"
-
-# Remove tmp file after done
-rm -f $file
-