TCT: Adding two new tests and small fix for q445_ignoringBranches

TCT: Adding two new tests and small fix for q445_ignoringBranches

Tools/Tier0ChainTests/test/test_bulkProcessing_13600collisions_SB_431493.sh

+#!/bin/sh
+#
+# art-description: RecoTrf
+# art-type: grid
+# art-include: master/Athena
+# art-include: 22.0/Athena
+# art-athena-mt: 8
+
+Reco_tf.py  \
+--AMI f1259  \
+--inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_13p6TeV.00431493.physics_Main.daq.RAW._lb0525._SFO-16._0001.data" \
+--maxEvents=300 \
+--outputAODFile="AOD.pool.root" \
+--outputESDFile="ESD.pool.root" \
+--outputDESDM_MCPFile="myDESDM_MCP.pool.root" \
+--outputHISTFile="HIST.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 150 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool
+  rc2=$?
+fi
+echo  "art-result: ${rc2} (against previous nightly)"

Tools/Tier0ChainTests/test/test_bulkProcessing_13600collisions_SB_reduced2.sh

+#!/bin/sh
+#
+# art-description: RecoTrf
+# art-type: grid
+# art-include: master/Athena
+# art-include: 22.0/Athena
+# art-athena-mt: 8
+
+Reco_tf.py  \
+--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" \
+--outputHISTFile="HIST.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 150 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool
+  rc2=$?
+fi
+echo  "art-result: ${rc2} (against previous nightly)"

Tools/Tier0ChainTests/test/test_q445_ignoringBranches.sh

@@ -10,19 +10,19 @@
 Reco_tf.py \
 --AMI=q445 \
 --multithreaded \
---maxEvents=50 \
+--maxEvents=80 \
 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root \
 --imf False
-
 rc1=$?
-echo "art-result: $rc1      1 Reco"
+echo "art-result: $rc1 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 \
+# ignoring as suggested by Tim Martin (the same as in CI)
+  art.py compare grid --file=*AOD*.pool.root --diff-root --entries 80 "$1" "$2" --mode=semi-detailed --order-trees \
   --ignore-leave '^HLT_(.*)' \
   --ignore-leave '^HLTNav_(.*)' \
   --ignore-leave '^L1_(.*)' \
@@ -30,15 +30,16 @@ then
   --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"
+echo "art-result: $rc2 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 \
+ # Ignoring based on ATLASRECTS-7101, ATR-24119 and ATR-24888, and on the suggestion from Tim Martin (as done in CI)
+  art.py compare grid --file=*ESD*.pool.root --diff-root --entries 80 "$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(.*)' \
@@ -55,29 +56,28 @@ then
   --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"
+echo "art-result: $rc3 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
+  art.py compare grid --file=*RDO*.pool.root --diff-root --entries 80 "$1" "$2" --mode=semi-detailed --order-trees
   rc4=$?
 fi
-echo "art-result: $rc4     4 RDO diff-root comparison"
+echo "art-result: $rc4 RDO diff-root comparison"
 
 
 
 rc5=-9999
 if [ $rc1 -eq 0 ]
 then
+  # ignoring as suggested by Tim Martin (the same as in CI)
   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 \
+  art.py compare ref --file=*AOD*.pool.root --diff-root --entries 80 . $ArtRef --mode=semi-detailed --order-trees \
   --ignore-leave '^HLT_(.*)' \
   --ignore-leave '^HLTNav_(.*)' \
   --ignore-leave '^L1_(.*)' \
@@ -85,7 +85,6 @@ then
   --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)"
+echo "art-result: $rc5 AOD diff-root (fixed reference)"