diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_compare_SerialAndThreadedAthenas.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_compare_SerialAndThreadedAthenas.sh
index 6ceca97222e0be98fce44adb91a2fa8caeff1f82..89f9cff8fc878ff694062a6dc671e5aa4a4981c1 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_compare_SerialAndThreadedAthenas.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_compare_SerialAndThreadedAthenas.sh
@@ -34,41 +34,21 @@ then
 fi
 
 cd ../
-echo "Creating new threadTwo directory"
-mkdir threadTwo; cd threadTwo
+echo "Creating new threadEight directory"
+mkdir threadEight; cd threadEight
 
-athena --threads=2 $1 | tee athenaTwoThreads.log
+athena --threads=8 $1 | tee athenaEightThreads.log
 rc2=${PIPESTATUS[0]}
-xAODDigest.py AOD.pool.root | tee digestTwoThreads.log
-echo "art-result: $rc2 TwoThreads"
+xAODDigest.py AOD.pool.root | tee digestEightThreads.log
+echo "art-result: $rc2 EightThreads"
 
-test_postProcessing_Errors.sh athenaTwoThreads.log | tee errorsTwoThreads.log
+test_postProcessing_Errors.sh athenaEightThreads.log | tee errorsEightThreads.log
 
 if [[ $rc1 -eq 0 ]] && [[ $rc2 -eq  0 ]] 
 then
  echo "Compare two directories"
- art.py compare ref --entries 10 --mode=semi-detailed --order-trees --diff-root . ../threadOne | tee diffTwoThreadsOneThread.log
+ art.py compare ref --entries 10 --mode=semi-detailed --order-trees --diff-root . ../threadOne | tee diffEightThreadsOneThread.log
  rcDiff2=${PIPESTATUS[0]}
- collateDigest.sh digestTwoThreads.log ../threadOne/digestOneThread.log digestDiffTwoThreadsOneThread.log 
- echo "art-result: $rcDiff2 Diff-OneThread-TwoThreads"
-fi
-
-cd ../
-echo "Creating new threadFive directory"
-mkdir threadFive; cd threadFive
-
-athena --threads=5 $1 | tee athenaFiveThreads.log
-rc5=${PIPESTATUS[0]}
-xAODDigest.py AOD.pool.root | tee digestFiveThreads.log
-echo "art-result: $rc5 FiveThreads"
-
-test_postProcessing_Errors.sh athenaFiveThreads.log | tee errorsFiveThreads.log
-
-if [[ $rc2 -eq 0 ]] && [[ $rc5 -eq  0 ]] 
-then
- echo "Compare two directories"
- art.py compare ref --entries 10 --mode=semi-detailed --order-trees --diff-root . ../threadTwo | tee diffFiveThreadsTwoThreads.log
- rcDiff5=${PIPESTATUS[0]}
- ollateDigest.sh digestFiveThreads.log ../threadTwo/digestTwoThreads.log digestDiffFiveThreadsTwoThread.log
- echo "art-result: $rcDiff5 Diff-TwoThreads-FiveThreads"
+ collateDigest.sh digestEightThreads.log ../threadOne/digestOneThread.log digestDiffEightThreadsOneThread.log 
+ echo "art-result: $rcDiff2 Diff-OneThread-EightThreads"
 fi
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareFiveThreads.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareMultipleThreads.sh
similarity index 84%
rename from Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareFiveThreads.sh
rename to Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareMultipleThreads.sh
index 80fa528b6f307c668ddfef84c7df150dbc50dcb3..35821499de30548e90d84038b6a0aa72ae81dffc 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareFiveThreads.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareMultipleThreads.sh
@@ -11,14 +11,14 @@ preExecStringOne="RAWtoESD:from RecExConfig.RecFlags import rec;rec.doTrigger.se
 preExecStringTwo="ESDtoAOD:from RecExConfig.RecFlags import rec;rec.doTrigger.set_Value_and_Lock(False)"
 
 mkdir runOne; cd runOne
-Reco_tf.py --athenaopts="--threads=5" --steering "no" --AMI=q431 --preExec "${preExecStringOne}" "${preExecStringTwo}" --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenarunOne.log
+Reco_tf.py --athenaopts="--threads=8" --steering "no" --AMI=q431 --preExec "${preExecStringOne}" "${preExecStringTwo}" --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenarunOne.log
 rc1=${PIPESTATUS[0]}
 xAODDigest.py myAOD.pool.root | tee digestOne.log
 echo "art-result: $rc1 runOne"
 
 cd ../
 mkdir runTwo; cd runTwo
-Reco_tf.py --athenaopts="--threads=5" --steering "no" --AMI=q431 --preExec "${preExecStringOne}" "${preExecStringTwo}" --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenarunTwo.log
+Reco_tf.py --athenaopts="--threads=8" --steering "no" --AMI=q431 --preExec "${preExecStringOne}" "${preExecStringTwo}" --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenarunTwo.log
 rc2=${PIPESTATUS[0]}
 xAODDigest.py myAOD.pool.root | tee digestTwo.log
 echo "art-result: $rc2 runTwo"
@@ -26,10 +26,10 @@ echo "art-result: $rc2 runTwo"
 if [[ $rc1 -eq 0 ]] && [[ $rc2 -eq  0 ]] 
 then
  echo "Compare two directories"
- art.py compare ref --entries 10 --mode=semi-detailed --order-trees --diff-root . ../runOne/ | tee diffFiveThreads.log
+ art.py compare ref --entries 10 --mode=semi-detailed --order-trees --diff-root . ../runOne/ | tee diffEightThreads.log
  rcDiff=${PIPESTATUS[0]}
  collateDigest.sh digestTwo.log ../runOne/digestOne.log digestDiffOneTwo.log 
- echo "art-result: $rcDiff Diff-Serial-OneThread"
+ echo "art-result: $rcDiff Diff-EightThreads-TwoRuns
 fi
 
 
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareSerialFiveThreads_Long.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareSerialMultipleThreads_Long.sh
similarity index 85%
rename from Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareSerialFiveThreads_Long.sh
rename to Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareSerialMultipleThreads_Long.sh
index a84759a748cb9f69bf8fd77ea88668eab62a1e8b..b899e4c3c993f92300eb2b173bfe158e3a4e6144 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareSerialFiveThreads_Long.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareSerialMultipleThreads_Long.sh
@@ -12,14 +12,14 @@ preExecStringOne="RAWtoESD:from RecExConfig.RecFlags import rec;rec.doTrigger.se
 preExecStringTwo="ESDtoAOD:from RecExConfig.RecFlags import rec;rec.doTrigger.set_Value_and_Lock(False)"
 
 mkdir runOne; cd runOne
-Reco_tf.py --athenaopts="--threads=5" --maxEvents=1000 --steering "no" --AMI=q431 --preExec "${preExecStringOne}" "${preExecStringTwo}" --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenarunOne.log
+Reco_tf.py --athenaopts="--threads=8" --maxEvents=1000 --steering "no" --AMI=q431 --preExec "${preExecStringOne}" "${preExecStringTwo}" --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenarunOne.log
 rc1=${PIPESTATUS[0]}
 xAODDigest.py myAOD.pool.root | tee digestOne.log
 echo "art-result: $rc1 runOne"
 
 cd ../
 mkdir runTwo; cd runTwo
-Reco_tf.py --athenaopts="--threads=5" --maxEvents=1000 --steering "no" --AMI=q431 --preExec "${preExecStringOne}" "${preExecStringTwo}" --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenarunTwo.log
+Reco_tf.py --athenaopts="--threads=8" --maxEvents=1000 --steering "no" --AMI=q431 --preExec "${preExecStringOne}" "${preExecStringTwo}" --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenarunTwo.log
 rc2=${PIPESTATUS[0]}
 xAODDigest.py myAOD.pool.root | tee digestTwo.log
 echo "art-result: $rc2 runTwo"
@@ -27,10 +27,10 @@ echo "art-result: $rc2 runTwo"
 if [[ $rc1 -eq 0 ]] && [[ $rc2 -eq  0 ]] 
 then
  echo "Compare two directories"
- art.py compare ref --entries 10 --mode=semi-detailed --order-trees --diff-root . ../runOne/ | tee diffFiveThreads.log
+ art.py compare ref --entries 10 --mode=semi-detailed --order-trees --diff-root . ../runOne/ | tee diffEightThreads.log
  rcDiff=${PIPESTATUS[0]}
  collateDigest.sh digestTwo.log ../runOne/digestOne.log digestDiffOneTwo.log 
- echo "art-result: $rcDiff Diff-Serial-OneThread"
+ echo "art-result: $rcDiff Diff-EightThreads=TwoRuns"
 fi
 
 
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_reco_tf_compare_SerialAndThreadedAthenas.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_reco_tf_compare_SerialAndThreadedAthenas.sh
index 0cda81d3a2d2a629bf6686cad7b09377a8685789..512970258dc192487fb5e62f3e1e13c4d0b2192b 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_reco_tf_compare_SerialAndThreadedAthenas.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_reco_tf_compare_SerialAndThreadedAthenas.sh
@@ -37,41 +37,21 @@ then
 fi
 
 cd ../
-echo "Creating new threadTwo directory"
-mkdir threadTwo; cd threadTwo
+echo "Creating new threadEight directory"
+mkdir threadEight; cd threadEight
 
-Reco_tf.py --steering "no" --athenaopts="--threads=2" --AMI=$1 --preExec "${preExecStringOne}" "${preExecStringTwo}"  --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenaTwoThreads.log
+Reco_tf.py --steering "no" --athenaopts="--threads=8" --AMI=$1 --preExec "${preExecStringOne}" "${preExecStringTwo}"  --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenaEightThreads.log
 rc2=${PIPESTATUS[0]}
-xAODDigest.py myAOD.pool.root | tee digestTwoThreads.log
-echo "art-result: $rc2 TwoThreads"
+xAODDigest.py myAOD.pool.root | tee digestEightThreads.log
+echo "art-result: $rc2 EightThreads"
 
-test_postProcessing_Errors.sh athenaTwoThreads.log | tee errorsTwoThreads.log
+test_postProcessing_Errors.sh athenaEightThreads.log | tee errorsEightThreads.log
 
 if [[ $rc1 -eq 0 ]] && [[ $rc2 -eq  0 ]] 
 then
  echo "Compare two directories"
- art.py compare ref --entries 10 --mode=semi-detailed --order-trees --diff-root . ../threadOne | tee diffTwoThreadsOneThread.log
+ art.py compare ref --entries 10 --mode=semi-detailed --order-trees --diff-root . ../threadOne | tee diffEightThreadsOneThread.log
  rcDiff2=${PIPESTATUS[0]}
- collateDigest.sh digestTwoThreads.log ../threadOne/digestOneThread.log digestDiffTwoThreadsOneThread.log 
- echo "art-result: $rcDiff2 Diff-OneThread-TwoThreads"
-fi
-
-cd ../
-echo "Creating new threadFive directory"
-mkdir threadFive; cd threadFive
-
-Reco_tf.py --steering "no" --athenaopts="--threads=5" --AMI=$1 --preExec "${preExecStringOne}" "${preExecStringTwo}"  --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenaFiveThreads.log
-rc5=${PIPESTATUS[0]}
-xAODDigest.py myAOD.pool.root | tee digestFiveThreads.log
-echo "art-result: $rc5 FiveThreads"
-
-test_postProcessing_Errors.sh athenaFiveThreads.log | tee errorsFiveThreads.log
-
-if [[ $rc2 -eq 0 ]] && [[ $rc5 -eq  0 ]] 
-then
- echo "Compare two directories"
- art.py compare ref --entries 10 --mode=semi-detailed --order-trees --diff-root . ../threadTwo | tee diffFiveThreadsTwoThreads.log
- rcDiff5=${PIPESTATUS[0]}
- collateDigest.sh digestFiveThreads.log ../threadTwo/digestTwoThreads.log digestDiffFiveThreadsTwoThread.log 
- echo "art-result: $rcDiff5 Diff-TwoThreads-FiveThreads"
+ collateDigest.sh digestEightThreads.log ../threadOne/digestOneThread.log digestDiffEightThreadsOneThread.log 
+ echo "art-result: $rcDiff2 Diff-OneThread-EightThreads"
 fi
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_amitag_q122_FiveThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_amitag_q122_MultipleThreads.sh
similarity index 89%
rename from Reconstruction/RecExample/RecJobTransformTests/test/test_amitag_q122_FiveThreads.sh
rename to Reconstruction/RecExample/RecJobTransformTests/test/test_amitag_q122_MultipleThreads.sh
index 2c8126a4cb02d772dccda065258656a6dbf5c619..c95ba3736cd9aa08490f117c89d60695149edbe0 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_amitag_q122_FiveThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_amitag_q122_MultipleThreads.sh
@@ -9,8 +9,7 @@
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
 
-
-Reco_tf.py --athenaopts="--threads=5" --AMI=q122 --DataRunNumber 00191920 --outputESDFile=myESD.pool.root --outputAODFile=myAOD.pool.root --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data11_7TeV.00191920.physics_JetTauEtmiss.merge.RAW._lb0257._SFO-9._0001.1.10evts
+Reco_tf.py --athenaopts="--threads=8" --AMI=q122 --DataRunNumber 00191920 --outputESDFile=myESD.pool.root --outputAODFile=myAOD.pool.root --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data11_7TeV.00191920.physics_JetTauEtmiss.merge.RAW._lb0257._SFO-9._0001.1.10evts
 
 RES=$?
 echo "art-result: $RES Reco"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_7tev_FiveThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_7tev_MultipleThreads.sh
similarity index 91%
rename from Reconstruction/RecExample/RecJobTransformTests/test/test_data11_7tev_FiveThreads.sh
rename to Reconstruction/RecExample/RecJobTransformTests/test/test_data11_7tev_MultipleThreads.sh
index 78a616326b97ac246b1ecb76cca87d61243c98be..7945a1b01ce8988a365914ed3d0d6dd07b7fb7bb 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_7tev_FiveThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_7tev_MultipleThreads.sh
@@ -9,8 +9,7 @@
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
 
-
-Reco_tf.py --athenaopts="--threads=5" --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/high_mu-data11_7TeV.00179725.physics_JetTauEtmiss.merge.RAW._lb0021.data --maxEvents 300 --autoConfiguration everything --conditionsTag="COMCOND-BLKPA-RUN1-07" --preExec 'rec.doTrigger=False;' --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root
+Reco_tf.py --athenaopts="--threads=8" --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/high_mu-data11_7TeV.00179725.physics_JetTauEtmiss.merge.RAW._lb0021.data --maxEvents 300 --autoConfiguration everything --conditionsTag="COMCOND-BLKPA-RUN1-07" --preExec 'rec.doTrigger=False;' --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root
 
 RES=$?
 echo "art-result: $RES Reco"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion_FiveThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion_MultipleThreads.sh
similarity index 94%
rename from Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion_FiveThreads.sh
rename to Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion_MultipleThreads.sh
index 0bcfc1674b14ba687115988943fd9a212af14f2b..d5f8bd0c9a4a7762c19cecb342b352593201c1b0 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion_FiveThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion_MultipleThreads.sh
@@ -9,8 +9,7 @@
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
 
-
-export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=5" --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data11_hi.00193321.physics_HardProbes.merge.RAW._lb0050._SFO-9._0002.1 --outputESDFile ESD.pool.root --outputAODFile AOD.pool.root --conditionsTag COMCOND-BLKPA-RUN1-06 --geometryVersion ATLAS-R1-2011-02-00-00 --autoConfiguration=everything --maxEvents='25' --preExec 'rec.doZdc.set_Value_and_Lock(False);from CaloRec.CaloRecFlags import jobproperties;jobproperties.CaloRecFlags.doCaloTopoCluster.set_Value_and_Lock(True);AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False);AODFlags.AddEgammaMuonTracksInAOD.set_Value_and_Lock(False);AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False);'
+export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=8" --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data11_hi.00193321.physics_HardProbes.merge.RAW._lb0050._SFO-9._0002.1 --outputESDFile ESD.pool.root --outputAODFile AOD.pool.root --conditionsTag COMCOND-BLKPA-RUN1-06 --geometryVersion ATLAS-R1-2011-02-00-00 --autoConfiguration=everything --maxEvents='25' --preExec 'rec.doZdc.set_Value_and_Lock(False);from CaloRec.CaloRecFlags import jobproperties;jobproperties.CaloRecFlags.doCaloTopoCluster.set_Value_and_Lock(True);AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False);AODFlags.AddEgammaMuonTracksInAOD.set_Value_and_Lock(False);AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False);'
 
 RES=$?
 echo "art-result: $RES Reco"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data12_8tev_FiveThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data12_8tev_MultipleThreads.sh
similarity index 91%
rename from Reconstruction/RecExample/RecJobTransformTests/test/test_data12_8tev_FiveThreads.sh
rename to Reconstruction/RecExample/RecJobTransformTests/test/test_data12_8tev_MultipleThreads.sh
index f79706c3e5a12006c80afaa0ba42318fd01404c4..b5efebbcef32dbb40db5c6ee0b1b539ae50b9418 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data12_8tev_FiveThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data12_8tev_MultipleThreads.sh
@@ -9,8 +9,7 @@
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
 
-
-Reco_tf.py --athenaopts="--threads=1" --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data12_8TeV.00209109.physics_JetTauEtmiss.merge.RAW._lb0186._SFO-1._0001.1 --maxEvents 300 --autoConfiguration everything --conditionsTag="COMCOND-BLKPA-RUN1-07" --preExec 'rec.doTrigger=False;' --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root 
+Reco_tf.py --athenaopts="--threads=8" --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data12_8TeV.00209109.physics_JetTauEtmiss.merge.RAW._lb0186._SFO-1._0001.1 --maxEvents 300 --autoConfiguration everything --conditionsTag="COMCOND-BLKPA-RUN1-07" --preExec 'rec.doTrigger=False;' --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root 
 
 RES=$?
 echo "art-result: $RES Reco"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_13tev_FiveThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_13tev_MultipleThreads.sh
similarity index 91%
rename from Reconstruction/RecExample/RecJobTransformTests/test/test_data15_13tev_FiveThreads.sh
rename to Reconstruction/RecExample/RecJobTransformTests/test/test_data15_13tev_MultipleThreads.sh
index b1163d072c4690189b0a69ebf208a3d60676ff4c..b36a3975e260b53a4db1e2c75452d4a8498d700d 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_13tev_FiveThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_13tev_MultipleThreads.sh
@@ -9,8 +9,7 @@
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
 
-
-Reco_tf.py --athenaopts="--threads=5" --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_13TeV.00283429.physics_Main.daq.RAW._lb0154._SFO-1._0001.data --maxEvents 300 --autoConfiguration everything --conditionsTag="CONDBR2-BLKPA-2016-14" --preExec 'rec.doTrigger=False;' --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root
+Reco_tf.py --athenaopts="--threads=8" --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_13TeV.00283429.physics_Main.daq.RAW._lb0154._SFO-1._0001.data --maxEvents 300 --autoConfiguration everything --conditionsTag="CONDBR2-BLKPA-2016-14" --preExec 'rec.doTrigger=False;' --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root
 
 RES=$?
 echo "art-result: $RES Reco"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion_FiveThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion_MultipleThreads.sh
similarity index 94%
rename from Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion_FiveThreads.sh
rename to Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion_MultipleThreads.sh
index 896f1abd98f17ce5fecda98357ac0d1ecadeba5c..39f3d97b3e264f135cc45c336e8a78ab5a7e90df 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion_FiveThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion_MultipleThreads.sh
@@ -9,8 +9,7 @@
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
 
-
-export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=5"  --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_hi.00286711.physics_MinBiasOverlay.daq.RAW._lb0217._SFO-2._0001.data --outputESDFile=ESD.root --outputAODFile=AOD.root --maxEvents=25 --conditionsTag 'default:CONDBR2-BLKPA-2016-07' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --autoConfiguration 'everything' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);from CaloRec.CaloRecFlags import jobproperties;jobproperties.CaloRecFlags.doCaloTopoCluster.set_Value_and_Lock(True);AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False);AODFlags.AddEgammaMuonTracksInAOD.set_Value_and_Lock(False);AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False);'
+export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=8"  --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_hi.00286711.physics_MinBiasOverlay.daq.RAW._lb0217._SFO-2._0001.data --outputESDFile=ESD.root --outputAODFile=AOD.root --maxEvents=25 --conditionsTag 'default:CONDBR2-BLKPA-2016-07' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --autoConfiguration 'everything' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);from CaloRec.CaloRecFlags import jobproperties;jobproperties.CaloRecFlags.doCaloTopoCluster.set_Value_and_Lock(True);AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False);AODFlags.AddEgammaMuonTracksInAOD.set_Value_and_Lock(False);AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False);'
 
 RES=$?
 echo "art-result: $RES Reco"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data16_13tev_FiveThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data16_13tev_MultipleThreads.sh
similarity index 91%
rename from Reconstruction/RecExample/RecJobTransformTests/test/test_data16_13tev_FiveThreads.sh
rename to Reconstruction/RecExample/RecJobTransformTests/test/test_data16_13tev_MultipleThreads.sh
index ae0d9b0834badc5ce661d272434cc78507413f73..076af834e47e0c0cf1d253671f31813f41e18e84 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data16_13tev_FiveThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data16_13tev_MultipleThreads.sh
@@ -9,8 +9,7 @@
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
 
-
-Reco_tf.py --athenaopts="--threads=5" --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data16_13TeV.00310809.physics_Main.daq.RAW._lb1219._SFO-2._0001.data --maxEvents 300 --autoConfiguration everything --conditionsTag="CONDBR2-BLKPA-2016-19" --preExec 'rec.doTrigger=False;' --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root
+Reco_tf.py --athenaopts="--threads=8" --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data16_13TeV.00310809.physics_Main.daq.RAW._lb1219._SFO-2._0001.data --maxEvents 300 --autoConfiguration everything --conditionsTag="CONDBR2-BLKPA-2016-19" --preExec 'rec.doTrigger=False;' --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root
 
 RES=$?
 echo "art-result: $RES Reco"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data17_13tev_FiveThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data17_13tev_MultipleThreads.sh
similarity index 90%
rename from Reconstruction/RecExample/RecJobTransformTests/test/test_data17_13tev_FiveThreads.sh
rename to Reconstruction/RecExample/RecJobTransformTests/test/test_data17_13tev_MultipleThreads.sh
index e51f35c2a742cc95660338cf8db66ddf089f238c..74caec6454141855434498cca0330e6950d22d9f 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data17_13tev_FiveThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data17_13tev_MultipleThreads.sh
@@ -9,8 +9,7 @@
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
 
-
-Reco_tf.py --athenaopts="--threads=5" --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data17_13TeV.00324910.physics_Main.daq.RAW._lb0713._SFO-6._0001.data --maxEvents 300 --AMI=f1088 --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root
+Reco_tf.py --athenaopts="--threads=8" --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data17_13TeV.00324910.physics_Main.daq.RAW._lb0713._SFO-6._0001.data --maxEvents 300 --AMI=f1088 --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root
 
 #Remember retval of transform as art result
 RES=$?
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV_FiveThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV_MultipleThreads.sh
similarity index 90%
rename from Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV_FiveThreads.sh
rename to Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV_MultipleThreads.sh
index 7cefe3541b5cc6981d66a7c86b8a0196d7b08e33..71fa41106726a22ba2c4bc7bf583780406c78c2a 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV_FiveThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV_MultipleThreads.sh
@@ -9,8 +9,7 @@
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
 
-
-Reco_tf.py --athenaopts="--threads=5" --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data18_13TeV/data18_13TeV.00348885.physics_Main.daq.RAW._lb0827._SFO-8._0002.data --maxEvents 300 --AMI=f1089 --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root
+Reco_tf.py --athenaopts="--threads=8" --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data18_13TeV/data18_13TeV.00348885.physics_Main.daq.RAW._lb0827._SFO-8._0002.data --maxEvents 300 --AMI=f1089 --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root
 
 #Remember retval of transform as art result
 RES=$?
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV_notrigger_fpe_FiveThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV_notrigger_fpe_MultipleThreads.sh
similarity index 91%
rename from Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV_notrigger_fpe_FiveThreads.sh
rename to Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV_notrigger_fpe_MultipleThreads.sh
index cf8846d6e05fd35f29b43b4993ed8f4bd3929923..fe38bbcbcfbc75b80044d557da104abf6149ae9a 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV_notrigger_fpe_FiveThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV_notrigger_fpe_MultipleThreads.sh
@@ -9,8 +9,7 @@
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
 
-
-Reco_tf.py --athenaopts="--threads=5" --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data18_13TeV/data18_13TeV.00348885.physics_Main.daq.RAW._lb0827._SFO-8._0002.data --maxEvents 300 --AMI=f1089 --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root --preExec 'rec.doFloatingPointException=True;rec.doTrigger=False;' --postExec 'FPEAuditor.NStacktracesOnFPE=5'
+Reco_tf.py --athenaopts="--threads=8" --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data18_13TeV/data18_13TeV.00348885.physics_Main.daq.RAW._lb0827._SFO-8._0002.data --maxEvents 300 --AMI=f1089 --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root --preExec 'rec.doFloatingPointException=True;rec.doTrigger=False;' --postExec 'FPEAuditor.NStacktracesOnFPE=5'
 
 #Remember retval of transform as art result
 RES=$?
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger_FiveThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger_MultipleThreads.sh
similarity index 97%
rename from Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger_FiveThreads.sh
rename to Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger_MultipleThreads.sh
index 661fa87e262cb7a5fa3e38cdb1d76e852463726d..7482fa8e99412f6d3a430fa600c5f9a555c7de69 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger_FiveThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger_MultipleThreads.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
 # art-description: heavy ion reconstruction test from Sebastian Tapia 
+# art-athena-mt: 4
 # art-type: grid
 # art-include: master/Athena
 
-
 export TRF_ECHO=True; Reco_tf.py \
---athenaopts="--threads=5" \
+--athenaopts="--threads=8" \
 --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data18_hi.00367384.physics_HardProbes.daq.RAW._lb0145._SFO-8._0001.data \
 --outputESDFile=ESD.pool.root \
 --outputAODFile=AOD.pool.root \
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data20_CosmicCalo_FiveThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data20_CosmicCalo_MultipleThreads.sh
similarity index 89%
rename from Reconstruction/RecExample/RecJobTransformTests/test/test_data20_CosmicCalo_FiveThreads.sh
rename to Reconstruction/RecExample/RecJobTransformTests/test/test_data20_CosmicCalo_MultipleThreads.sh
index 0a68939baad917c444c3507eba69d1da9b0191f2..848d861bd24b26e7a1779c0892286d0b61c06caa 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data20_CosmicCalo_FiveThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data20_CosmicCalo_MultipleThreads.sh
@@ -5,7 +5,7 @@
 # art-type: grid
 # art-include: master/Athena
 
-Reco_tf.py --athenaopts="--threads=5" --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data20_calib/data20_calib.00384960.physics_CosmicCalo.merge.RAW._lb0864._SFO-ALL._0001.1 --maxEvents=300 --preExec="rec.doTrigger=False;rec.doBTagging=False;" --outputESDFile=myESD.pool.root --outputAODFile=myAOD.pool.root --conditionsTag=CONDBR2-BLKPA-RUN2-01 --geometryVersion=ATLAS-R2-2016-01-00-01 
+Reco_tf.py --athenaopts="--threads=8" --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data20_calib/data20_calib.00384960.physics_CosmicCalo.merge.RAW._lb0864._SFO-ALL._0001.1 --maxEvents=300 --preExec="rec.doTrigger=False;rec.doBTagging=False;" --outputESDFile=myESD.pool.root --outputAODFile=myAOD.pool.root --conditionsTag=CONDBR2-BLKPA-RUN2-01 --geometryVersion=ATLAS-R2-2016-01-00-01 
 
 
 
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data20_IDCosmic_FiveThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data20_IDCosmic_MultipleThreads.sh
similarity index 88%
rename from Reconstruction/RecExample/RecJobTransformTests/test/test_data20_IDCosmic_FiveThreads.sh
rename to Reconstruction/RecExample/RecJobTransformTests/test/test_data20_IDCosmic_MultipleThreads.sh
index 9b9319c990c7eef277bcbba5f392396f78df4e1a..20f15eb83185efa45475c13bf27339aa7abead86 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data20_IDCosmic_FiveThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data20_IDCosmic_MultipleThreads.sh
@@ -4,5 +4,5 @@
 # art-athena-mt: 4
 # art-type: grid
 # art-include: master/Athena
-Reco_tf.py --athenaopts="--threads=5" --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data20_idcomm/data20_idcomm.00375727.physics_IDCosmic.merge.RAW._lb0876._SFO-ALL._0001.1 --maxEvents=10 --preExec="rec.doTrigger=False;rec.doBTagging=False;" --outputESDFile=myESD.pool.root --outputAODFile=myAOD.pool.root --conditionsTag=CONDBR2-BLKPA-RUN2-01 --geometryVersion=ATLAS-R2-2016-01-00-01
+Reco_tf.py --athenaopts="--threads=8" --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data20_idcomm/data20_idcomm.00375727.physics_IDCosmic.merge.RAW._lb0876._SFO-ALL._0001.1 --maxEvents=10 --preExec="rec.doTrigger=False;rec.doBTagging=False;" --outputESDFile=myESD.pool.root --outputAODFile=myAOD.pool.root --conditionsTag=CONDBR2-BLKPA-RUN2-01 --geometryVersion=ATLAS-R2-2016-01-00-01
 
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc15_heavy_ion_FiveThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc15_heavy_ion_MultipleThreads.sh
similarity index 93%
rename from Reconstruction/RecExample/RecJobTransformTests/test/test_mc15_heavy_ion_FiveThreads.sh
rename to Reconstruction/RecExample/RecJobTransformTests/test/test_mc15_heavy_ion_MultipleThreads.sh
index f46947d1da79618a41d86bcbc0acf91427a7c3e8..b2d66e8b758c476a0f2de7ca602ec565f522f1f6 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc15_heavy_ion_FiveThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc15_heavy_ion_MultipleThreads.sh
@@ -9,8 +9,7 @@
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
 
-
-export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=5" --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc15_5TeV.420000.Hijing_PbPb_5p02TeV_MinBias_Flow_JJFV6.merge.HITS.e4962_s3004_s2921/HITS.09732013._000496.pool.root.1 --outputESDFile=ESD.pool.root --outputAODFile=AOD.pool.root --maxEvents=25 --conditionsTag 'all:OFLCOND-MC15c-SDR-11' --postInclude 'all:RecJobTransforms/UseFrontier.py,SimulationJobOptions/postInclude.HijingPars.py' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);' --autoConfiguration 'everything' --triggerConfig 'MCRECO:MC_HI_v3_tight_mc_prescale' --DataRunNumber '226000' --geometryVersion 'all:ATLAS-R2-2015-03-01-00'
+export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=8" --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc15_5TeV.420000.Hijing_PbPb_5p02TeV_MinBias_Flow_JJFV6.merge.HITS.e4962_s3004_s2921/HITS.09732013._000496.pool.root.1 --outputESDFile=ESD.pool.root --outputAODFile=AOD.pool.root --maxEvents=25 --conditionsTag 'all:OFLCOND-MC15c-SDR-11' --postInclude 'all:RecJobTransforms/UseFrontier.py,SimulationJobOptions/postInclude.HijingPars.py' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);' --autoConfiguration 'everything' --triggerConfig 'MCRECO:MC_HI_v3_tight_mc_prescale' --DataRunNumber '226000' --geometryVersion 'all:ATLAS-R2-2015-03-01-00'
 
 RES=$?
 echo "art-result: $RES Reco"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_FiveThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_MultipleThreads.sh
similarity index 92%
rename from Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_FiveThreads.sh
rename to Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_MultipleThreads.sh
index 8b05db11e01a22c2937ec8201e70c5b79f43d86c..db3330847ab8fd54ed8f23d1b129fe9dc33b981f 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_FiveThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_MultipleThreads.sh
@@ -9,8 +9,7 @@
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
 
-
-Reco_tf.py --athenaopts="--threads=5" --inputRDOFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.410501.PowhegPythia8EvtGen_A14_ttbar_hdamp258p75_nonallhad.merge.RDO.e5458_s3126_d1437/RDO.11426804._000001.pool.root.1 --maxEvents=300 --autoConfiguration everything --conditionsTag=default:OFLCOND-MC16-SDR-16 --geometryVersion=default:ATLAS-R2-2016-01-00-01 --runNumber=410501 --preExec 'rec.doTrigger=False;' --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHIST.root
+Reco_tf.py --athenaopts="--threads=8" --inputRDOFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.410501.PowhegPythia8EvtGen_A14_ttbar_hdamp258p75_nonallhad.merge.RDO.e5458_s3126_d1437/RDO.11426804._000001.pool.root.1 --maxEvents=300 --autoConfiguration everything --conditionsTag=default:OFLCOND-MC16-SDR-16 --geometryVersion=default:ATLAS-R2-2016-01-00-01 --runNumber=410501 --preExec 'rec.doTrigger=False;' --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHIST.root
 
 RES=$?
 echo "art-result: $RES Reco"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_rdotobs_FiveThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_rdotobs_MultipleThreads.sh
similarity index 91%
rename from Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_rdotobs_FiveThreads.sh
rename to Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_rdotobs_MultipleThreads.sh
index 024569b7069d5350ec2434b696e3f052d3b2d3bb..c3cb74a3486a0e0e1cef9124b93619943bd46472 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_rdotobs_FiveThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_rdotobs_MultipleThreads.sh
@@ -9,8 +9,7 @@
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
 
-
-Reco_tf.py --athenaopts="--threads=5" --inputRDOFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.410501.PowhegPythia8EvtGen_A14_ttbar_hdamp258p75_nonallhad.merge.RDO.e5458_s3126_d1437/RDO.11426804._000001.pool.root.1 --outputBSFile mc16_13TeV.410501.PowhegPythia8EvtGen_A14_ttbar_hdamp258p75_nonallhad.data --autoConfiguration everything --maxEvents 300 --conditionsTag=default:OFLCOND-MC16-SDR-16 --geometryVersion=default:ATLAS-R2-2016-01-00-01 --runNumber=410501
+Reco_tf.py --athenaopts="--threads=8" --inputRDOFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.410501.PowhegPythia8EvtGen_A14_ttbar_hdamp258p75_nonallhad.merge.RDO.e5458_s3126_d1437/RDO.11426804._000001.pool.root.1 --outputBSFile mc16_13TeV.410501.PowhegPythia8EvtGen_A14_ttbar_hdamp258p75_nonallhad.data --autoConfiguration everything --maxEvents 300 --conditionsTag=default:OFLCOND-MC16-SDR-16 --geometryVersion=default:ATLAS-R2-2016-01-00-01 --runNumber=410501
 
 RES=$?
 echo "art-result: $RES Reco"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_trigsplit_FiveThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_trigsplit_MultipleThreads.sh
similarity index 92%
rename from Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_trigsplit_FiveThreads.sh
rename to Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_trigsplit_MultipleThreads.sh
index 5d964dfa17eadfd0ba1fa199d704cf3a9d9aa05c..dc3222583d94bd3ef4da0d0ba69ff87da9fdf1bc 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_trigsplit_FiveThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_trigsplit_MultipleThreads.sh
@@ -9,8 +9,7 @@
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
 
-
-Reco_tf.py --athenaopts="--threads=5" --inputRDOFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.410501.PowhegPythia8EvtGen_A14_ttbar_hdamp258p75_nonallhad.merge.RDO.e5458_s3126_d1437/RDO.11426804._000001.pool.root.1 --maxEvents 300 --autoConfiguration everything --conditionsTag=default:OFLCOND-MC16-SDR-16 --geometryVersion=default:ATLAS-R2-2016-01-00-01 --runNumber=410501 --steering RAWtoESD:in-RDO RAWtoESD:in-BS RAWtoESD:in+RDO_TRIG --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHIST.root
+Reco_tf.py --athenaopts="--threads=8" --inputRDOFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.410501.PowhegPythia8EvtGen_A14_ttbar_hdamp258p75_nonallhad.merge.RDO.e5458_s3126_d1437/RDO.11426804._000001.pool.root.1 --maxEvents 300 --autoConfiguration everything --conditionsTag=default:OFLCOND-MC16-SDR-16 --geometryVersion=default:ATLAS-R2-2016-01-00-01 --runNumber=410501 --steering RAWtoESD:in-RDO RAWtoESD:in-BS RAWtoESD:in+RDO_TRIG --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHIST.root
 
 RES=$?
 echo "art-result: $RES Reco"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger_FiveThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger_MultipleThreads.sh
similarity index 98%
rename from Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger_FiveThreads.sh
rename to Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger_MultipleThreads.sh
index a9d5edc28c7479a6518db0b44c23bd2eb41bf183..bde192b1b799248223eb282e5a71ee3111b7f8aa 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger_FiveThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger_MultipleThreads.sh
@@ -4,9 +4,8 @@
 # art-type: grid
 # art-include: master/Athena
 
-
 export TRF_ECHO=True; Reco_tf.py \
---athenaopts="--threads=5" \
+--athenaopts="--threads=8" \
 --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_5TeV.420000.Hijing_PbPb_5p02TeV_MinBias_Flow_JJFV6.merge.HITS.e4962_a890_s3136/HITS.17784755._001903.pool.root.1 \
 --outputESDFile=ESD.pool.root \
 --outputAODFile=AOD.pool.root \
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_stdcmalloc_13TeV_FiveThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_stdcmalloc_13TeV_MultipleThreads.sh
similarity index 92%
rename from Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_stdcmalloc_13TeV_FiveThreads.sh
rename to Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_stdcmalloc_13TeV_MultipleThreads.sh
index 185774a7f8c00dc6a38a8f58a983254f4563d075..133c825dfdc295791cc17117fde5667316553d6b 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_stdcmalloc_13TeV_FiveThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_stdcmalloc_13TeV_MultipleThreads.sh
@@ -7,7 +7,7 @@
 # art-include: master/Athena
 
 export TRF_ECHO=True;
-Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1  --maxEvents=500 --jobNumber=1 --imf False --athenaopts "all:--stdcmalloc" "RDOtoRDOTrigger:--imf --threads=1 --concurrent-events=1"
+Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1  --maxEvents=500 --jobNumber=1 --imf False --athenaopts "all:--stdcmalloc" "RDOtoRDOTrigger:--imf --threads=8 --concurrent-events=8"
 RES=$?
 echo "art-result: $RES Reco"
 if [ $RES -ne 0 ];then