diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_btagging_fromesd_compareSerialThreadings.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_btagging_fromesd_compareSerialThreadings.sh index cde95554d1640c81b6656dd6418b951a00e9e23e..11504982622573c6eb697d0acf69a40e506c55d7 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_btagging_fromesd_compareSerialThreadings.sh +++ b/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 diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_calotopoclustering_fromesd_compareSerialThreadings.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_calotopoclustering_fromesd_compareSerialThreadings.sh index f27b93e9a44eb36fa9aa40146e071967c7c6044d..ea26f650ffaba912e31a2e9767c6f1ffc1f6c446 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_calotopoclustering_fromesd_compareSerialThreadings.sh +++ b/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 diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_calotopoclustering_pflow_and_jets_fromesd_compareSerialThreadings.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_calotopoclustering_pflow_and_jets_fromesd_compareSerialThreadings.sh index b1cafcf1a1a0cecad6d7ad9b79c3b49fa748af01..3e8674e321b120498eeef83b697823981a4018d1 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_calotopoclustering_pflow_and_jets_fromesd_compareSerialThreadings.sh +++ b/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 diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_egamma_fromesd_compareSerialThreadings.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_egamma_fromesd_compareSerialThreadings.sh index 38c807ff7001aa89ad5404faefa132b1c1bb5c7a..d28f788b016c051b9f103b68c88ce3221837c13e 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_egamma_fromesd_compareSerialThreadings.sh +++ b/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 diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_jets_fromesd_compareSerialThreadings.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_jets_fromesd_compareSerialThreadings.sh index 978d48ba216b5949ef02259e6590a00e989b0283..9d5edd4d775fdbfca8d8c3969a4a32d8ea12e349 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_jets_fromesd_compareSerialThreadings.sh +++ b/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 diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_met_fromesd_compareSerialThreadings.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_met_fromesd_compareSerialThreadings.sh index e1ef67e74d7330b97b6dc80f586d4408e25ad16b..8844d92922e153b27e4e2f80b0d6cb8b43f03e5c 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_met_fromesd_compareSerialThreadings.sh +++ b/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 diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_muons_fromesd_compareSerialThreadings.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_muons_fromesd_compareSerialThreadings.sh index a8fb1797f54a068815243d0dba73fe8f4034843c..8f4907fd2449a9c165ddb22753b164dff22783b5 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_muons_fromesd_compareSerialThreadings.sh +++ b/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 diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_noalgs_fromesd_compareSerialThreadings.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_noalgs_fromesd_compareSerialThreadings.sh index 7dc3af98b10b5f291fe022de7c0a3e353451e69d..f87c228b4092526b20e9b973f053c9ad2cd1c919 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_noalgs_fromesd_compareSerialThreadings.sh +++ b/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 diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q221_compareSerialThreadings.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q221_compareSerialThreadings.sh index 92beed31f2d58339eed6ebed49112b3ced34bcd0..4e05ccec71d43ba2baf0299cc7851816deca1c12 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q221_compareSerialThreadings.sh +++ b/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 diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareSerialThreadings.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareSerialThreadings.sh index b5cd128854ab9888bc44ef5899d55706c9282c32..7f86e8743f41a43145218429858ff07b76038109 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareSerialThreadings.sh +++ b/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 diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_refit_fromesd_compareSerialThreadings.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_refit_fromesd_compareSerialThreadings.sh index eb54fa2dafa3cd9e096a168e80d42c11b7f1b0f3..b92bd591db2d11845fea3a6ddbcbe88dd84653a8 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_refit_fromesd_compareSerialThreadings.sh +++ b/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 diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_tau_fromesd_compareSerialThreadings.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_tau_fromesd_compareSerialThreadings.sh index 26fc9a25146e04aa2aeba5c7b78c2668644f7253..e03668f0476ff18465dfb914e29636227a86b58d 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_tau_fromesd_compareSerialThreadings.sh +++ b/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 diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data20_IDCosmic.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data20_IDCosmic.sh index d1a90cb42acc0df9b515f5a5194e4ccb61b29686..f33269de49b112fba129cb7fcd6caf9a203a94e6 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data20_IDCosmic.sh +++ b/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 diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data20_IDCosmic_MultipleThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data20_IDCosmic_MultipleThreads.sh index 20f15eb83185efa45475c13bf27339aa7abead86..e5ce6fe15c7e5209adeda18c3d518a572b6d2de6 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data20_IDCosmic_MultipleThreads.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=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 diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_13TeV_FiveThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_13TeV_MultipleThreads.sh similarity index 93% rename from Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_13TeV_FiveThreads.sh rename to Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_13TeV_MultipleThreads.sh index 4b690798843a512d6f209946c8bb7fcab5a490f7..a7b25c8a59351007c2be3728dfd3681002afd7e2 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_13TeV_FiveThreads.sh +++ b/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 diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_splash_events_FiveThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_splash_events_MultipleThreads.sh similarity index 93% rename from Reconstruction/RecExample/RecJobTransformTests/test/test_splash_events_FiveThreads.sh rename to Reconstruction/RecExample/RecJobTransformTests/test/test_splash_events_MultipleThreads.sh index 3dd241e4d284bf40d2e6072ee7f1e3233b91d531..c60c9d29c1e49dd843be25094bc6ce06d5b54319 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_splash_events_FiveThreads.sh +++ b/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"