Increase number of events in IDCosmic tests to match the number in other tests.

Rename remaining FiveThread tests to MultipleThread tests and also change number of threads to 8 in those.

Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_btagging_fromesd_compareSerialThreadings.sh

@@ -6,8 +6,7 @@
 # art-athena-mt: 8
 # art-output: serial
 # art-output: threadOne
-# art-output: threadTwo
-# art-output: threadFive
+# art-output: threadEight
 
 export ATHENA_CORE_NUMBER=8
 

Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_calotopoclustering_fromesd_compareSerialThreadings.sh

@@ -6,8 +6,7 @@
 # art-athena-mt: 8
 # art-output: serial
 # art-output: threadOne
-# art-output: threadTwo
-# art-output: threadFive
+# art-output: threadEight
 
 export ATHENA_CORE_NUMBER=8
 

Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_calotopoclustering_pflow_and_jets_fromesd_compareSerialThreadings.sh

@@ -6,8 +6,7 @@
 # art-athena-mt: 8
 # art-output: serial
 # art-output: threadOne
-# art-output: threadTwo
-# art-output: threadFive
+# art-output: threadEight
 
 export ATHENA_CORE_NUMBER=8
 

Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_egamma_fromesd_compareSerialThreadings.sh

@@ -6,8 +6,7 @@
 # art-athena-mt: 8
 # art-output: serial
 # art-output: threadOne
-# art-output: threadTwo
-# art-output: threadFive
+# art-output: threadEight
 
 export ATHENA_CORE_NUMBER=8
 

Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_jets_fromesd_compareSerialThreadings.sh

@@ -6,8 +6,7 @@
 # art-athena-mt: 8
 # art-output: serial
 # art-output: threadOne
-# art-output: threadTwo
-# art-output: threadFive
+# art-output: threadEight
 
 export ATHENA_CORE_NUMBER=8
 

Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_met_fromesd_compareSerialThreadings.sh

@@ -6,8 +6,7 @@
 # art-athena-mt: 8
 # art-output: serial
 # art-output: threadOne
-# art-output: threadTwo
-# art-output: threadFive
+# art-output: threadEight
 
 export ATHENA_CORE_NUMBER=8
 

Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_muons_fromesd_compareSerialThreadings.sh

@@ -6,8 +6,7 @@
 # art-athena-mt: 8
 # art-output: serial
 # art-output: threadOne
-# art-output: threadTwo
-# art-output: threadFive
+# art-output: threadEight
 
 export ATHENA_CORE_NUMBER=8
 

Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_noalgs_fromesd_compareSerialThreadings.sh

@@ -6,8 +6,7 @@
 # art-athena-mt: 8
 # art-output: serial
 # art-output: threadOne
-# art-output: threadTwo
-# art-output: threadFive
+# art-output: threadEight
 
 export ATHENA_CORE_NUMBER=8
 

Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q221_compareSerialThreadings.sh

@@ -6,8 +6,7 @@
 # art-athena-mt: 8
 # art-output: serial
 # art-output: threadOne
-# art-output: threadTwo
-# art-output: threadFive
+# art-output: threadEight
 
 export ATHENA_CORE_NUMBER=8
 

Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareSerialThreadings.sh

@@ -6,8 +6,7 @@
 # art-athena-mt: 8
 # art-output: serial
 # art-output: threadOne
-# art-output: threadTwo
-# art-output: threadFive
+# art-output: threadEight
 
 export ATHENA_CORE_NUMBER=8
 

Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_refit_fromesd_compareSerialThreadings.sh

@@ -6,8 +6,7 @@
 # art-athena-mt: 8
 # art-output: serial
 # art-output: threadOne
-# art-output: threadTwo
-# art-output: threadFive
+# art-output: threadEight
 
 export ATHENA_CORE_NUMBER=8
 

Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_tau_fromesd_compareSerialThreadings.sh

@@ -6,8 +6,7 @@
 # art-athena-mt: 8
 # art-output: serial
 # art-output: threadOne
-# art-output: threadTwo
-# art-output: threadFive
+# art-output: threadEight
 
 export ATHENA_CORE_NUMBER=8
 

Reconstruction/RecExample/RecJobTransformTests/test/test_data20_IDCosmic.sh

@@ -4,5 +4,5 @@
 # art-athena-mt: 4
 # art-type: grid
 # art-include: master/Athena
-Reco_tf.py --athenaopts="--threads=1" --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=1" --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=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
 

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=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
+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=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
 

Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_13TeV_FiveThreads.sh → Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_13TeV_MultipleThreads.sh

@@ -6,7 +6,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 "RDOtoRDOTrigger:--imf --threads=5 --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 "RDOtoRDOTrigger:--imf --threads=8 --concurrent-events=1"
 RES=$?
 echo "art-result: $RES Reco"
 if [ $RES -ne 0 ];then

Reconstruction/RecExample/RecJobTransformTests/test/test_splash_events_FiveThreads.sh → Reconstruction/RecExample/RecJobTransformTests/test/test_splash_events_MultipleThreads.sh

@@ -10,7 +10,7 @@
 # art-include: 21.9/Athena
 
 #Monitoring is disabled because it tries to use the trigger information, which is disabled.   
-export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=1" --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_1beam/data15_1beam.00260466.physics_L1Calo.merge.RAW._lb1380._SFO-ALL._0001.1 --autoConfiguration everything --conditionsTag="CONDBR2-BLKPA-2015-04" --geometryVersion="ATLAS-R2-2015-03-01-00" --outputESDFile myESD.pool.root  --maxEvents 300 --preExec 'rec.doTrigger=False;from AthenaMonitoring.DQMonFlags import jobproperties;jobproperties.DQMonFlagsCont.doMonitoring.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_1beam/data15_1beam.00260466.physics_L1Calo.merge.RAW._lb1380._SFO-ALL._0001.1 --autoConfiguration everything --conditionsTag="CONDBR2-BLKPA-2015-04" --geometryVersion="ATLAS-R2-2015-03-01-00" --outputESDFile myESD.pool.root  --maxEvents 300 --preExec 'rec.doTrigger=False;from AthenaMonitoring.DQMonFlags import jobproperties;jobproperties.DQMonFlagsCont.doMonitoring.set_Value_and_Lock(False)'
 
 RES=$?
 echo "art-result: $RES Reco"