diff --git a/AtlasTest/AthenaMPTest/test/AthenaMP_Reco_trf_Test.xml b/AtlasTest/AthenaMPTest/test/AthenaMP_Reco_trf_Test.xml
index 3f95f1b9d54b441db23e1bd44131325f2bb90757..021666bd5da02c927ad6e4c1759329bc67a69c3c 100644
--- a/AtlasTest/AthenaMPTest/test/AthenaMP_Reco_trf_Test.xml
+++ b/AtlasTest/AthenaMPTest/test/AthenaMP_Reco_trf_Test.xml
@@ -17,7 +17,7 @@
<TEST name="SharedPoolReader" type="script" suite="athenamp">
<package_atn>AtlasTest/AthenaMPTest</package_atn>
- <options_atn>TRF_ECHO=1 ATHENA_PROC_NUMBER=2 Reco_tf.py '--inputRDOFile' '/afs/cern.ch/atlas/project/rig/referencefiles/MC/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.e3099_s2578/RDO.04919495._000958.pool.root.1' '--outputESDFile' 'ESD.pool.root' '--autoConfiguration' 'everything' '--maxEvents=4' '--preExec' 'from AthenaMP.AthenaMPFlags import jobproperties as jps' 'jps.AthenaMPFlags.UseSharedReader=True' 'rec.doTrigger=False'</options_atn>
+ <options_atn>TRF_ECHO=1 ATHENA_CORE_NUMBER=2 Reco_tf.py --multiprocess '--inputRDOFile' '/afs/cern.ch/atlas/project/rig/referencefiles/MC/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.e3099_s2578/RDO.04919495._000958.pool.root.1' '--outputESDFile' 'ESD.pool.root' '--autoConfiguration' 'everything' '--maxEvents=4' '--preExec' 'from AthenaMP.AthenaMPFlags import jobproperties as jps' 'jps.AthenaMPFlags.UseSharedReader=True' 'rec.doTrigger=False'</options_atn>
<timelimit>30</timelimit>
<author> Vakho Tsulaia </author>
<mailto> tsulaia@cern.ch </mailto>
diff --git a/AtlasTest/AthenaMPTest/test/AthenaMP_SimulationTest.xml b/AtlasTest/AthenaMPTest/test/AthenaMP_SimulationTest.xml
index 95de15f593a7501989a45b662d03eb865a767353..bab383d6084b71c2c0246c5bd93040a33a2b5804 100644
--- a/AtlasTest/AthenaMPTest/test/AthenaMP_SimulationTest.xml
+++ b/AtlasTest/AthenaMPTest/test/AthenaMP_SimulationTest.xml
@@ -16,8 +16,8 @@
<TEST name="AtlasG4_tfMP" type="script" suite="AthenaMPSim">
<package_atn>AtlasTest/AthenaMPTest</package_atn>
- <doc>Tests MP simulation in TF with ATHENA_PROC_NUMBER</doc>
- <options_atn>TRF_ECHO=1 ATHENA_PROC_NUMBER=2 AtlasG4_tf.py --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/ttbar_muplusjets-pythia6-7000.evgen.pool.root' --outputHITSFile 'HITSMPSim.pool.root' --maxEvents '4' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest.py' --preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False'</options_atn>
+ <doc>Tests MP simulation in TF</doc>
+ <options_atn>TRF_ECHO=1 ATHENA_CORE_NUMBER=2 AtlasG4_tf.py --multiprocess --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/ttbar_muplusjets-pythia6-7000.evgen.pool.root' --outputHITSFile 'HITSMPSim.pool.root' --maxEvents '4' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest.py' --preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False'</options_atn>
<timelimit>30</timelimit>
<author>Vakho Tsulaia</author>
<mailto>tsulaia@cern.ch</mailto>
@@ -29,7 +29,7 @@
<TEST name="AtlasG4_tfMP-SharedReader" type="script" suite="AthenaMPSimSharedReader">
<package_atn>AtlasTest/AthenaMPTest</package_atn>
<doc>Tests MP simulation in TF with the Shared Reader process</doc>
- <options_atn>TRF_ECHO=1 ATHENA_PROC_NUMBER=2 AtlasG4_tf.py --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/ttbar_muplusjets-pythia6-7000.evgen.pool.root' --outputHITSFile 'HITSMPSimSharedReader.pool.root' --maxEvents '4' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest.py' --preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False;from AthenaMP.AthenaMPFlags import jobproperties as jps;jps.AthenaMPFlags.UseSharedReader=True'</options_atn>
+ <options_atn>TRF_ECHO=1 ATHENA_CORE_NUMBER=2 AtlasG4_tf.py --multiprocess --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/ttbar_muplusjets-pythia6-7000.evgen.pool.root' --outputHITSFile 'HITSMPSimSharedReader.pool.root' --maxEvents '4' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest.py' --preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False;from AthenaMP.AthenaMPFlags import jobproperties as jps;jps.AthenaMPFlags.UseSharedReader=True'</options_atn>
<timelimit>30</timelimit>
<author>Vakho Tsulaia</author>
<mailto>tsulaia@cern.ch</mailto>
@@ -41,7 +41,7 @@
<TEST name="DigiTfPileUpMP" type="script" suite="AthenaMPDigi">
<package_atn>AtlasTest/AthenaMPTest</package_atn>
<doc>Tests MP pile-up digitization</doc>
- <options_atn>ATHENA_PROC_NUMBER=4 Digi_tf.py @/afs/cern.ch/user/t/tsulaia/public/DigiTfPileUpMP/HitsFile --conditionsTag default:OFLCOND-RUN12-SDR-25 --digiSeedOffset1 170 --digiSeedOffset2 170 --geometryVersion ATLAS-R2-2015-03-01-00 @/afs/cern.ch/user/t/tsulaia/public/DigiTfPileUpMP/HighPtMinbiasHitsFile @/afs/cern.ch/user/t/tsulaia/public/DigiTfPileUpMP/LowPtMinbiasHitsFile --jobNumber 1 --maxEvents 12 --numberOfCavernBkg 0 --numberOfHighPtMinBias 0.12268057 --numberOfLowPtMinBias 39.8773194 --outputRDOFile mc15_2015_ttbar.RDO.pool.root --postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'HITtoRDO:from AthenaCommon.CfgGetter import getPublicTool;getPublicTool("MergeMcEventCollTool").OnlySaveSignalTruth=True;ToolSvc.LArAutoCorrTotalToolDefault.deltaBunch=1' --postInclude 'default:PyJobTransforms/UseFrontier.py' --pileupFinalBunch 6 --preExec 'all: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)' --preInclude 'HITtoRDO:Digitization/ForceUseOfPileUpTools.py,SimulationJobOptions/preInclude.PileUpBunchTrainsMC15_2015_25ns_Config1.py,RunDependentSimData/configLumi_run222525_v1.py' --skipEvents 0</options_atn>
+ <options_atn>ATHENA_CORE_NUMBER=4 Digi_tf.py @/afs/cern.ch/user/t/tsulaia/public/DigiTfPileUpMP/HitsFile --multiproces --conditionsTag default:OFLCOND-RUN12-SDR-25 --digiSeedOffset1 170 --digiSeedOffset2 170 --geometryVersion ATLAS-R2-2015-03-01-00 @/afs/cern.ch/user/t/tsulaia/public/DigiTfPileUpMP/HighPtMinbiasHitsFile @/afs/cern.ch/user/t/tsulaia/public/DigiTfPileUpMP/LowPtMinbiasHitsFile --jobNumber 1 --maxEvents 12 --numberOfCavernBkg 0 --numberOfHighPtMinBias 0.12268057 --numberOfLowPtMinBias 39.8773194 --outputRDOFile mc15_2015_ttbar.RDO.pool.root --postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'HITtoRDO:from AthenaCommon.CfgGetter import getPublicTool;getPublicTool("MergeMcEventCollTool").OnlySaveSignalTruth=True;ToolSvc.LArAutoCorrTotalToolDefault.deltaBunch=1' --postInclude 'default:PyJobTransforms/UseFrontier.py' --pileupFinalBunch 6 --preExec 'all: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)' --preInclude 'HITtoRDO:Digitization/ForceUseOfPileUpTools.py,SimulationJobOptions/preInclude.PileUpBunchTrainsMC15_2015_25ns_Config1.py,RunDependentSimData/configLumi_run222525_v1.py' --skipEvents 0</options_atn>
<timelimit>30</timelimit>
<author>Vakho Tsulaia</author>
<mailto>tsulaia@cern.ch</mailto>
diff --git a/Control/AthenaCommon/python/AthOptionsParser.py b/Control/AthenaCommon/python/AthOptionsParser.py
index 5b998c9249e15ecbde7bbfc8568c87725ac5f639..c5c4e0e84721e356df170f958ab43e5f0b64565e 100644
--- a/Control/AthenaCommon/python/AthOptionsParser.py
+++ b/Control/AthenaCommon/python/AthOptionsParser.py
@@ -433,15 +433,6 @@ def parse(chk_tcmalloc=True):
# This behavior can be controlled by a flag, if needed
os.environ['LIBC_FATAL_STDERR_']='1'
- # overwrite nprovs if ATHENA_PROC_NUMBER is set
- envNProcs = os.getenv('ATHENA_PROC_NUMBER')
- if envNProcs :
- envNProcs = int(envNProcs)
- print ("ATHENA_PROC_NUMBER set to ", envNProcs, " will run by default with --nprocs=", envNProcs)
- opts.nprocs = envNProcs # enable AthenaMP if >= 1 or == -1
- from AthenaCommon.ConcurrencyFlags import jobproperties as jps
- jps.ConcurrencyFlags.NumProcs = envNProcs
-
# for the benefit of PyROOT
if not opts.display and '-b' not in sys.argv:
sys.argv = sys.argv[:1] + ['-b'] + sys.argv[1:]
diff --git a/Event/ByteStreamCnvSvc/share/BSEventSelector_test_jobOptions_mp.py b/Event/ByteStreamCnvSvc/share/BSEventSelector_test_jobOptions_mp.py
index 7d11a32eb8ab2148729db74690b44575c6ffc318..78e9addee84e22d0696048489e522b55801c9161 100644
--- a/Event/ByteStreamCnvSvc/share/BSEventSelector_test_jobOptions_mp.py
+++ b/Event/ByteStreamCnvSvc/share/BSEventSelector_test_jobOptions_mp.py
@@ -4,9 +4,6 @@
#
#==============================================================
# Input
-import os
-os.environ['ATHENA_PROC_NUMBER']='2'
-
include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
svcMgr.ByteStreamInputSvc.FullFileName = [ "/afs/cern.ch/atlas/offline/test/daq.m4_combined.0020720.extract.L1TT-b00000010._0001.data" ]
diff --git a/Event/ByteStreamCnvSvc/test/pre_mp.sh b/Event/ByteStreamCnvSvc/test/pre_mp.sh
index a7b4ba68951e5c39cfc1efd9333fc780f3a4cabd..d37d32a16a8bc6be5c102ea162f0787c2e755f76 100644
--- a/Event/ByteStreamCnvSvc/test/pre_mp.sh
+++ b/Event/ByteStreamCnvSvc/test/pre_mp.sh
@@ -1,2 +1,2 @@
-export ATHENA_PROC_NUMBER=2
+export ATHENA_CORE_NUMBER=2
source ../cmt/setup.sh
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/CMakeLists.txt b/InnerDetector/InDetDigitization/SCT_Digitization/CMakeLists.txt
index 4b88111403f926ef830d19b56b96dd8ec40a6fc7..48dc3ec8f272c19cb790ea7ede1c3e0fbf4fdc35 100644
--- a/InnerDetector/InDetDigitization/SCT_Digitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/SCT_Digitization/CMakeLists.txt
@@ -43,7 +43,7 @@ atlas_add_component( SCT_Digitization
LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} CommissionEvent AthenaBaseComps AthenaKernel PileUpToolsLib Identifier xAODEventInfo GaudiKernel SiDigitization InDetRawData InDetSimEvent HitManagement GeneratorObjects SiPropertiesToolLib InDetIdentifier InDetReadoutGeometry InDetSimData )
atlas_add_test( SCT_DigitizationMT_test
- SCRIPT Digi_tf.py --inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/HITS.04919495._001041.pool.root.1 --conditionsTag default:OFLCOND-RUN12-SDR-25 --digiSeedOffset1 170 --digiSeedOffset2 170 --geometryVersion ATLAS-R2-2015-03-01-00 --DataRunNumber 222525 --outputRDOFile mc15_2015_ttbar.RDO.pool.root --preInclude HITtoRDO:SimulationJobOptions/preInclude.SCTOnlyConfig.py,Digitization/ForceUseOfAlgorithms.py --postInclude Digitization/FixDataDependenciesForMT.py --skipEvents 0 --maxEvents 100 --athenaopts '--threads 10'
+ SCRIPT Digi_tf.py --inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/HITS.04919495._001041.pool.root.1 --conditionsTag default:OFLCOND-RUN12-SDR-25 --digiSeedOffset1 170 --digiSeedOffset2 170 --geometryVersion ATLAS-R2-2015-03-01-00 --DataRunNumber 222525 --outputRDOFile mc15_2015_ttbar.RDO.pool.root --preInclude HITtoRDO:SimulationJobOptions/preInclude.SCTOnlyConfig.py,Digitization/ForceUseOfAlgorithms.py --postInclude Digitization/FixDataDependenciesForMT.py --skipEvents 0 --maxEvents 100 --athenaopts=--threads=10
PROPERTIES TIMEOUT 1200
ENVIRONMENT THREADS=10 )
diff --git a/InnerDetector/InDetExample/InDetSLHC_Example/test/InDetSLHC_Example_TestConfiguration.xml b/InnerDetector/InDetExample/InDetSLHC_Example/test/InDetSLHC_Example_TestConfiguration.xml
index 2ec85742a7f4b53fdd20061ff90174a1bbb36425..94c1fb45cf04a0c6d8039b5d9031e5c1bd245cf5 100755
--- a/InnerDetector/InDetExample/InDetSLHC_Example/test/InDetSLHC_Example_TestConfiguration.xml
+++ b/InnerDetector/InDetExample/InDetSLHC_Example/test/InDetSLHC_Example_TestConfiguration.xml
@@ -425,7 +425,7 @@
<jobTransformJobName>chainSimsFCalSLHCRTT</jobTransformJobName>
<jobTransformCmd>
xrdcp root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/det-slhc/users/oda/EVNTexample/mc12_14TeV.105204.McAtNloJimmy_AUET2CT10_ttbar_allhad.evgen.EVNT.e2238_tid01485091_00/EVNT.01485091._001049.pool.root.1 .
- ATHENA_PROC_NUMBER=3 Sim_tf.py --inputEVNTFile=EVNT.01485091._001049.pool.root.1 --outputHITSFile=SLHCtest.sFCal.HITS.pool.root --maxEvents=6 --skipEvents=0 --randomSeed=10 --preInclude='all:InDetSLHC_Example/preInclude.SLHC.py,InDetSLHC_Example/preInclude.NoTRT.py' --geometryVersion=ATLAS-P2-SFCAL-01-00-00_VALIDATION --conditionsTag=OFLCOND-MC15c-SDR-06 --postInclude='all:InDetSLHC_Example/postInclude.SLHC_Setup.py' --postExec 'sim:ToolSvc.ISF_ParticlePositionFilterDynamic.CheckRegion=[1]' --DataRunNumber 240120
+ ATHENA_CORE_NUMBER=3 Sim_tf.py --multiprocess --inputEVNTFile=EVNT.01485091._001049.pool.root.1 --outputHITSFile=SLHCtest.sFCal.HITS.pool.root --maxEvents=6 --skipEvents=0 --randomSeed=10 --preInclude='all:InDetSLHC_Example/preInclude.SLHC.py,InDetSLHC_Example/preInclude.NoTRT.py' --geometryVersion=ATLAS-P2-SFCAL-01-00-00_VALIDATION --conditionsTag=OFLCOND-MC15c-SDR-06 --postInclude='all:InDetSLHC_Example/postInclude.SLHC_Setup.py' --postExec 'sim:ToolSvc.ISF_ParticlePositionFilterDynamic.CheckRegion=[1]' --DataRunNumber 240120
</jobTransformCmd>
<group>SLHCFCTTransform</group>
<queue>long</queue>
@@ -442,7 +442,7 @@
xrdcp root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/det-slhc/users/oda/HITSexample/mc15_14TeV.119995.Pythia8_A2MSTW2008LO_minbias_inelastic_low.simul.HITS.e1133_s2638_tid05646683_00/HITS.05646683._000002.pool.root.1 .;
xrdcp root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/det-slhc/users/oda/HITSexample/mc15_14TeV.119995.Pythia8_A2MSTW2008LO_minbias_inelastic_low.simul.HITS.e1133_s2638_tid05646683_00/HITS.05646683._000003.pool.root.1 .;
xrdcp root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/det-slhc/users/oda/HITSexample/mc15_14TeV.119996.Pythia8_A2MSTW2008LO_minbias_inelastic_high.simul.HITS.e1133_s2638_tid05646691_00/HITS.05646691._000001.pool.root.1 .;
- ATHENA_PROC_NUMBER=3 Digi_tf.py --inputHITSFile SLHCtest.sFCal.HITS.pool.root --outputRDOFile SLHCtest.sFCal.RDO.pool.root --LowPtMinbiasHitsFile HITS.05646683._00000[1,2,3].pool.root.1 --numberOfLowPtMinBias 199.3040 --HighPtMinbiasHitsFile HITS.05646691._000001.pool.root.1 --numberOfHighPtMinBias 0.69064 --conditionsTag OFLCOND-MC15c-SDR-06 --geometryVersion ATLAS-P2-SFCAL-01-00-00 --DataRunNumber 240120 --pileupFinalBunch 6 --preInclude 'all:InDetSLHC_Example/preInclude.SLHC.py,InDetSLHC_Example/preInclude.NoTRT.py' 'HITtoRDO:Digitization/ForceUseOfPileUpTools.py,SimulationJobOptions/preInclude.PileUpBunchTrains2012Config1_DigitConfig.py,RunDependentSimData/configLumi_user.py' --postInclude 'all:PyJobTransforms/UseFrontier.py,InDetSLHC_Example/postInclude.SLHC_Setup.py' 'HITtoRDO:InDetSLHC_Example/postInclude.SLHC_Digitization_lowthresh.py' --preExec 'HITtoRDO:from AthenaCommon.BeamFlags import jobproperties; jobproperties.Beam.bunchSpacing=25;from LArROD.LArRODFlags import larRODFlags; larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True);larRODFlags.NumberOfCollisions.set_Value_and_Lock(200);from CaloTools.CaloNoiseFlags import jobproperties;jobproperties.CaloNoiseFlags.FixedLuminosity.set_Value_and_Lock(200.0*1.45/8*50/25);rec.doTrigger.set_Value_and_Lock(False);userRunLumiOverride={"run":240120, "lb":1, "starttstamp":1410120000, "mu":200.0};from Digitization.DigitizationFlags import digitizationFlags;digitizationFlags.overrideMetadata+=["SimLayout","PhysicsList"];digitizationFlags.doInDetNoise.set_Value_and_Lock(False)' --postExec 'HITtoRDO:mergeMcEventCollTool=job.StandardPileUpToolsAlg.PileUpTools["MergeMcEventCollTool"];mergeMcEventCollTool.FirstXing=0;mergeMcEventCollTool.LastXing=0;mergeMcEventCollTool.DoSlimming=False;pixeldigi.EnableSpecialPixels=False;CfgMgr.MessageSvc().setError+=["HepMcParticleLink"];conddb.addOverride("/LAR/Identifier/OnOffIdMap","LARIdentifierOnOffIdMap-SFCAL-000");conddb.addOverride("/LAR/Identifier/CalibIdMap","LARIdentifierCalibIdMap-SFCAL-000")' --skipEvents 0 --maxEvents 2 --digiSeedOffset1 50100 --digiSeedOffset2 50122 --jobNumber 123 --ignorePatterns 'ALL ,LArTTCellMap , ERROR .*'
+ ATHENA_CORE_NUMBER=3 Digi_tf.py --multiprocess --inputHITSFile SLHCtest.sFCal.HITS.pool.root --outputRDOFile SLHCtest.sFCal.RDO.pool.root --LowPtMinbiasHitsFile HITS.05646683._00000[1,2,3].pool.root.1 --numberOfLowPtMinBias 199.3040 --HighPtMinbiasHitsFile HITS.05646691._000001.pool.root.1 --numberOfHighPtMinBias 0.69064 --conditionsTag OFLCOND-MC15c-SDR-06 --geometryVersion ATLAS-P2-SFCAL-01-00-00 --DataRunNumber 240120 --pileupFinalBunch 6 --preInclude 'all:InDetSLHC_Example/preInclude.SLHC.py,InDetSLHC_Example/preInclude.NoTRT.py' 'HITtoRDO:Digitization/ForceUseOfPileUpTools.py,SimulationJobOptions/preInclude.PileUpBunchTrains2012Config1_DigitConfig.py,RunDependentSimData/configLumi_user.py' --postInclude 'all:PyJobTransforms/UseFrontier.py,InDetSLHC_Example/postInclude.SLHC_Setup.py' 'HITtoRDO:InDetSLHC_Example/postInclude.SLHC_Digitization_lowthresh.py' --preExec 'HITtoRDO:from AthenaCommon.BeamFlags import jobproperties; jobproperties.Beam.bunchSpacing=25;from LArROD.LArRODFlags import larRODFlags; larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True);larRODFlags.NumberOfCollisions.set_Value_and_Lock(200);from CaloTools.CaloNoiseFlags import jobproperties;jobproperties.CaloNoiseFlags.FixedLuminosity.set_Value_and_Lock(200.0*1.45/8*50/25);rec.doTrigger.set_Value_and_Lock(False);userRunLumiOverride={"run":240120, "lb":1, "starttstamp":1410120000, "mu":200.0};from Digitization.DigitizationFlags import digitizationFlags;digitizationFlags.overrideMetadata+=["SimLayout","PhysicsList"];digitizationFlags.doInDetNoise.set_Value_and_Lock(False)' --postExec 'HITtoRDO:mergeMcEventCollTool=job.StandardPileUpToolsAlg.PileUpTools["MergeMcEventCollTool"];mergeMcEventCollTool.FirstXing=0;mergeMcEventCollTool.LastXing=0;mergeMcEventCollTool.DoSlimming=False;pixeldigi.EnableSpecialPixels=False;CfgMgr.MessageSvc().setError+=["HepMcParticleLink"];conddb.addOverride("/LAR/Identifier/OnOffIdMap","LARIdentifierOnOffIdMap-SFCAL-000");conddb.addOverride("/LAR/Identifier/CalibIdMap","LARIdentifierCalibIdMap-SFCAL-000")' --skipEvents 0 --maxEvents 2 --digiSeedOffset1 50100 --digiSeedOffset2 50122 --jobNumber 123 --ignorePatterns 'ALL ,LArTTCellMap , ERROR .*'
</jobTransformCmd>
<group>SLHCFCTTransform</group>
<chaindataset_info>
@@ -463,7 +463,7 @@
<doc>SLHCReconstruction</doc>
<jobTransformJobName>chainRecosFCalSLHCRTT</jobTransformJobName>
<jobTransformCmd>
- ATHENA_PROC_NUMBER=3 Reco_tf.py --inputRDOFile SLHCtest.sFCal.RDO.pool.root --outputESDFile SLHCtest.sFCal.ESD.pool.root --outputAODFile SLHCtest.sFCal.AOD.pool.root --geometryVersion 'all:ATLAS-P2-SFCAL-01-00-00' --conditionsTag 'all:OFLCOND-MC15c-SDR-06' --preInclude 'all:InDetSLHC_Example/preInclude.SLHC.NoTRT.Reco.py' --postInclude 'all:PyJobTransforms/UseFrontier.py,InDetSLHC_Example/postInclude.SLHC_Setup.py' 'RAWtoESD:InDetSLHC_Example/postInclude.DigitalClustering.py' --preExec 'all:from CaloTools.CaloNoiseFlags import jobproperties; jobproperties.CaloNoiseFlags.FixedLuminosity.set_Value_and_Lock(200.0*1.45/8*50/25)' --postExec 'all:from IOVDbSvc.CondDB import conddb;conddb.addOverride("/LAR/Identifier/OnOffIdMap","LARIdentifierOnOffIdMap-SFCAL-000");conddb.addOverride("/LAR/Identifier/CalibIdMap","LARIdentifierCalibIdMap-SFCAL-000")' 'RAWtoESD:xAODMaker__xAODTruthCnvAlg("GEN_AOD2xAOD",WriteInTimePileUpTruth=True)' --ignorePatterns 'ALL ,LArTTCellMap , ERROR .*'
+ ATHENA_CORE_NUMBER=3 Reco_tf.py --multiprocess --inputRDOFile SLHCtest.sFCal.RDO.pool.root --outputESDFile SLHCtest.sFCal.ESD.pool.root --outputAODFile SLHCtest.sFCal.AOD.pool.root --geometryVersion 'all:ATLAS-P2-SFCAL-01-00-00' --conditionsTag 'all:OFLCOND-MC15c-SDR-06' --preInclude 'all:InDetSLHC_Example/preInclude.SLHC.NoTRT.Reco.py' --postInclude 'all:PyJobTransforms/UseFrontier.py,InDetSLHC_Example/postInclude.SLHC_Setup.py' 'RAWtoESD:InDetSLHC_Example/postInclude.DigitalClustering.py' --preExec 'all:from CaloTools.CaloNoiseFlags import jobproperties; jobproperties.CaloNoiseFlags.FixedLuminosity.set_Value_and_Lock(200.0*1.45/8*50/25)' --postExec 'all:from IOVDbSvc.CondDB import conddb;conddb.addOverride("/LAR/Identifier/OnOffIdMap","LARIdentifierOnOffIdMap-SFCAL-000");conddb.addOverride("/LAR/Identifier/CalibIdMap","LARIdentifierCalibIdMap-SFCAL-000")' 'RAWtoESD:xAODMaker__xAODTruthCnvAlg("GEN_AOD2xAOD",WriteInTimePileUpTruth=True)' --ignorePatterns 'ALL ,LArTTCellMap , ERROR .*'
</jobTransformCmd>
<group>SLHCFCTTransform</group>
<chaindataset_info>
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_jpsi_no_pileup.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_jpsi_no_pileup.sh
index d7f7dc729df865325310c5b1e20d0c0e5e11f3ea..0c784b48991a06b616001180179fb5cd6e8f1106 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_jpsi_no_pileup.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_jpsi_no_pileup.sh
@@ -44,7 +44,6 @@ case $ArtProcess in
infile="../${file[${ArtProcess}]}"
echo "Processing files: " ${infile}
unset ATHENA_NUM_PROC
- unset ATHENA_PROC_NUMBER
Reco_tf.py --maxEvents=-1 --inputRDOFile=${infile} --outputAODFile=valid1.424100.Pythia8B_A14_CTEQ6L1_Jpsimu4mu4_no_pileup.AOD.pool.root $ValOption --preExec 'from RecExConfig.RecFlags import rec; rec.doTrigger=False; import MuonCombinedRecExample.MuonCombinedRecOnlySetup' --postExec 'r2e:topSequence.BeamBackgroundFiller.Enable = False'
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_jpsi_with_pileup.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_jpsi_with_pileup.sh
index 2567d52e293a1e22d9a1d1d455b497e68b2d9673..5b7d354b165c715504984acf79b293927dfcff7f 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_jpsi_with_pileup.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_jpsi_with_pileup.sh
@@ -44,8 +44,6 @@ case $ArtProcess in
infile="../${file[${ArtProcess}]}"
echo "Processing files: " ${infile}
unset ATHENA_NUM_PROC
- unset ATHENA_PROC_NUMBER
-
Reco_tf.py --maxEvents=-1 --inputRDOFile=${infile} --outputAODFile=valid1.424100.Pythia8B_A14_CTEQ6L1_Jpsimu4mu4_with_pileup.AOD.pool.root $ValOption --preExec 'from RecExConfig.RecFlags import rec; rec.doTrigger=False; import MuonCombinedRecExample.MuonCombinedRecOnlySetup' --postExec 'r2e:topSequence.BeamBackgroundFiller.Enable = False'
@@ -54,4 +52,4 @@ case $ArtProcess in
rm -f tmp.ESD
rm -f core.*
;;
-esac
\ No newline at end of file
+esac
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_toroid_off.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_toroid_off.sh
index 3ab060c1c5a30d86137ff0144b40d236cc61b65c..9f5389794deeefec46fe51900515269860b58b46 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_toroid_off.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_toroid_off.sh
@@ -30,8 +30,6 @@ case $ArtProcess in
infile="../${file[${ArtProcess}]}"
echo "Processing files: " ${infile}
unset ATHENA_NUM_PROC
- unset ATHENA_PROC_NUMBER
-
Reco_tf.py --maxEvents=-1 --conditionsTag RAWtoESD:CONDBR2-BLKPA-2017-12 --geometryVersion ATLAS-R2-2016-01-00-01 --inputBSFile=${infile} --outputAODFile=MuonToroidOff_Reco.AOD.pool.root --preExec 'from RecExConfig.RecFlags import rec; rec.doTrigger=False; import MuonCombinedRecExample.MuonCombinedRecOnlySetup' --postExec 'r2e:topSequence.BeamBackgroundFiller.Enable = False'
@@ -40,4 +38,4 @@ case $ArtProcess in
rm -f tmp.ESD
rm -f core.*
;;
-esac
\ No newline at end of file
+esac
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_ttbar_no_pileup.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_ttbar_no_pileup.sh
index 9182b6a23ea528b581a97084b9af4a9d3d60cac9..6a4d002b8ca7118577cb89c9a60483d890009ece 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_ttbar_no_pileup.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_ttbar_no_pileup.sh
@@ -44,8 +44,6 @@ case $ArtProcess in
infile="../${file[${ArtProcess}]}"
echo "Processing files: " ${infile}
unset ATHENA_NUM_PROC
- unset ATHENA_PROC_NUMBER
-
Reco_tf.py --maxEvents=-1 --inputRDOFile=${infile} --outputAODFile=valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad_no_pileup.AOD.pool.root $ValOption --preExec 'from RecExConfig.RecFlags import rec; rec.doTrigger=False; import MuonCombinedRecExample.MuonCombinedRecOnlySetup' --postExec 'r2e:topSequence.BeamBackgroundFiller.Enable = False'
@@ -54,4 +52,4 @@ case $ArtProcess in
rm -f tmp.ESD
rm -f core.*
;;
-esac
\ No newline at end of file
+esac
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_ttbar_with_pileup.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_ttbar_with_pileup.sh
index 5ef869ec578429a2bef3581a669b5332ddc08209..aa5ce3cf2f3fec5c3ea6e535452706d5ee385da5 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_ttbar_with_pileup.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_ttbar_with_pileup.sh
@@ -44,8 +44,6 @@ case $ArtProcess in
infile="../${file[${ArtProcess}]}"
echo "Processing files: " ${infile}
unset ATHENA_NUM_PROC
- unset ATHENA_PROC_NUMBER
-
Reco_tf.py --maxEvents=-1 --inputRDOFile=${infile} --outputAODFile=valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad_with_pileup.AOD.pool.root $ValOption --preExec 'from RecExConfig.RecFlags import rec; rec.doTrigger=False; import MuonCombinedRecExample.MuonCombinedRecOnlySetup' --postExec 'r2e:topSequence.BeamBackgroundFiller.Enable = False'
@@ -54,4 +52,4 @@ case $ArtProcess in
rm -f tmp.ESD
rm -f core.*
;;
-esac
\ No newline at end of file
+esac
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_z_no_pileup.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_z_no_pileup.sh
index 5c70d2ebd97fb3125e5eaa6b4c3264701a921573..8efcae62a6afd780b1ca8f016a51697be04c3ad5 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_z_no_pileup.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_z_no_pileup.sh
@@ -44,8 +44,6 @@ case $ArtProcess in
infile="../${file[${ArtProcess}]}"
echo "Processing files: " ${infile}
unset ATHENA_NUM_PROC
- unset ATHENA_PROC_NUMBER
-
Reco_tf.py --maxEvents=-1 --inputRDOFile=${infile} --outputAODFile=valid1.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu_no_pileup.AOD.pool.root $ValOption --preExec 'from RecExConfig.RecFlags import rec; rec.doTrigger=False; import MuonCombinedRecExample.MuonCombinedRecOnlySetup' --postExec 'r2e:topSequence.BeamBackgroundFiller.Enable = False'
@@ -54,4 +52,4 @@ case $ArtProcess in
rm -f tmp.ESD
rm -f core.*
;;
-esac
\ No newline at end of file
+esac
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_z_with_pileup.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_z_with_pileup.sh
index bf4dbc4595c327d046e748abd2704bff0f3b11e7..83c435527fb533891218b55fba66dfc41ddb23af 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_z_with_pileup.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_z_with_pileup.sh
@@ -44,8 +44,6 @@ case $ArtProcess in
infile="../${file[${ArtProcess}]}"
echo "Processing files: " ${infile}
unset ATHENA_NUM_PROC
- unset ATHENA_PROC_NUMBER
-
Reco_tf.py --maxEvents=-1 --inputRDOFile=${infile} --outputAODFile=valid1.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu_with_pileup.AOD.pool.root $ValOption --preExec 'from RecExConfig.RecFlags import rec; rec.doTrigger=False; import MuonCombinedRecExample.MuonCombinedRecOnlySetup' --postExec 'r2e:topSequence.BeamBackgroundFiller.Enable = False'
@@ -54,4 +52,4 @@ case $ArtProcess in
rm -f tmp.ESD
rm -f core.*
;;
-esac
\ No newline at end of file
+esac
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_zprime_no_pileup.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_zprime_no_pileup.sh
index d51bd4bf1757d59c47b25e792569d589a60f2c3d..bc67a9f769b6cc315285dcf3f4d7e5d70075f0df 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_zprime_no_pileup.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_zprime_no_pileup.sh
@@ -44,8 +44,6 @@ case $ArtProcess in
infile="../${file[${ArtProcess}]}"
echo "Processing files: " ${infile}
unset ATHENA_NUM_PROC
- unset ATHENA_PROC_NUMBER
-
Reco_tf.py --maxEvents=-1 --inputRDOFile=${infile} --outputAODFile=valid1.361405.Sherpa_CT10_Zmumu_Pt280_500_CVetoBVeto_no_pileup.AOD.pool.root $ValOption --preExec 'from RecExConfig.RecFlags import rec; rec.doTrigger=False; import MuonCombinedRecExample.MuonCombinedRecOnlySetup' --postExec 'r2e:topSequence.BeamBackgroundFiller.Enable = False'
@@ -54,4 +52,4 @@ case $ArtProcess in
rm -f tmp.ESD
rm -f core.*
;;
-esac
\ No newline at end of file
+esac
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_zprime_with_pileup.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_zprime_with_pileup.sh
index b7cd7f908212133991307c24423c529cfeab2948..8c631aa4e950007c2155a63a537b4a913729d18a 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_zprime_with_pileup.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_zprime_with_pileup.sh
@@ -44,8 +44,6 @@ case $ArtProcess in
infile="../${file[${ArtProcess}]}"
echo "Processing files: " ${infile}
unset ATHENA_NUM_PROC
- unset ATHENA_PROC_NUMBER
-
Reco_tf.py --maxEvents=-1 --inputRDOFile=${infile} --outputAODFile=valid1.361405.Sherpa_CT10_Zmumu_Pt280_500_CVetoBVeto_with_pileup.AOD.pool.root $ValOption --preExec 'from RecExConfig.RecFlags import rec; rec.doTrigger=False; import MuonCombinedRecExample.MuonCombinedRecOnlySetup' --postExec 'r2e:topSequence.BeamBackgroundFiller.Enable = False'
@@ -54,4 +52,4 @@ case $ArtProcess in
rm -f tmp.ESD
rm -f core.*
;;
-esac
\ No newline at end of file
+esac
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_calotopoclustering_fromesd_MT_twoThreads.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_calotopoclustering_fromesd_MT_twoThreads.sh
index 38ec96309d7b79cd4fcb8c50f32e088a33ec84bf..a8ecf64cc950d90b1fe46c98c393f143e551cc82 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_calotopoclustering_fromesd_MT_twoThreads.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_calotopoclustering_fromesd_MT_twoThreads.sh
@@ -5,8 +5,6 @@
# art-include: master/Athena
# art-athena-mt: 4
-unset ATHENA_PROC_NUMBER
-
art.py createpoolfile
athena --threads=2 RecExRecoTest/RecExRecoTest_ART_caloTopoClustering_fromESD.py | tee temp.log
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_egamma_fromesd_MT_twoThreads.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_egamma_fromesd_MT_twoThreads.sh
index 458d1518c42ea708d9579f840003147f9e61c79b..f5f9300bd3e20375126063f140161092d831f0c7 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_egamma_fromesd_MT_twoThreads.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_egamma_fromesd_MT_twoThreads.sh
@@ -5,8 +5,6 @@
# art-include: master/Athena
# art-athena-mt: 4
-unset ATHENA_PROC_NUMBER
-
art.py createpoolfile
athena --threads=2 RecExRecoTest/RecExRecoTest_ART_egamma_fromESD.py | tee temp.log
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_muons_fromesd_MT_twoThreads.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_muons_fromesd_MT_twoThreads.sh
index ba27b66ffb18eaa440adb56c5fd4288e1495e00a..ff2699dcc68d9ee2d4fb9643b67d4ef2a84dff27 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_muons_fromesd_MT_twoThreads.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_muons_fromesd_MT_twoThreads.sh
@@ -5,8 +5,6 @@
# art-include: master/Athena
# art-athena-mt: 4
-unset ATHENA_PROC_NUMBER
-
art.py createpoolfile
athena --threads=2 RecExRecoTest/RecExRecoTest_ART_muons_fromESD.py | tee temp.log
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_noalgs_fromesd_MT_twoThreads.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_noalgs_fromesd_MT_twoThreads.sh
index 6dfc925cc96c0cd4246630e23cbeadee5ea367e7..cc2cfce1a15823467b10c0477bb6ae229255fa68 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_noalgs_fromesd_MT_twoThreads.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_noalgs_fromesd_MT_twoThreads.sh
@@ -5,8 +5,6 @@
# art-include: master/Athena
# art-athena-mt: 4
-unset ATHENA_PROC_NUMBER
-
art.py createpoolfile
athena --threads=2 RecExRecoTest/RecExRecoTest_ART_noAlgs_fromESD.py | tee temp.log
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_pflow_and_jets_fromesd_MT_twoThreads.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_pflow_and_jets_fromesd_MT_twoThreads.sh
index c403419ec4b7b4493f32b82cef54cb72f0c1e76e..4b5a02f8d748b0195697eb9688b16b150b0b2337 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_pflow_and_jets_fromesd_MT_twoThreads.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_pflow_and_jets_fromesd_MT_twoThreads.sh
@@ -5,8 +5,6 @@
# art-include: master/Athena
# art-athena-mt: 4
-unset ATHENA_PROC_NUMBER
-
art.py createpoolfile
athena --threads=2 eflowRec/run_ESDStandardReco.py | tee temp.log
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_refit_fromesd_MT_twoThreads.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_refit_fromesd_MT_twoThreads.sh
index 69f27e355ebed67141a0aecd7d27b751c209c8c6..8863efa4f1ea096528cf7d809fba3618e4efe9bd 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_refit_fromesd_MT_twoThreads.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_refit_fromesd_MT_twoThreads.sh
@@ -5,8 +5,6 @@
# art-include: master/Athena
# art-athena-mt: 4
-unset ATHENA_PROC_NUMBER
-
athena --threads=2 RecExRecoTest/RecExRecoTest_ART_refit_fromESD.py | tee temp.log
echo "art-result: ${PIPESTATUS[0]}"
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_tau_fromesd_MT_twoThreads.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_tau_fromesd_MT_twoThreads.sh
index 297d2c6e9d8ca690507226e2158529f3e6a694fb..e34b75dbe93ab751e897c6b3989e6507a8c105c9 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_tau_fromesd_MT_twoThreads.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_tau_fromesd_MT_twoThreads.sh
@@ -5,8 +5,6 @@
# art-include: master/Athena
# art-athena-mt: 4
-unset ATHENA_PROC_NUMBER
-
art.py createpoolfile
athena --threads=2 tauRec/run_tau_standalone.py | tee temp.log
diff --git a/Reconstruction/RecExample/RecPerfTests/test/RecPerfTests_TestConfiguration.xml b/Reconstruction/RecExample/RecPerfTests/test/RecPerfTests_TestConfiguration.xml
index 65fcf353a9e7a7d8786839c06c5bdaa0e743521a..7b913fb194bf52f9659520c7cdcb9cce6405e26a 100644
--- a/Reconstruction/RecExample/RecPerfTests/test/RecPerfTests_TestConfiguration.xml
+++ b/Reconstruction/RecExample/RecPerfTests/test/RecPerfTests_TestConfiguration.xml
@@ -287,8 +287,8 @@
<doc>Reco_tf runs on 13TeV collision data from the mainxf stream</doc>
<jobTransformJobName>mp_monitoring_reco_data15_main</jobTransformJobName>
<jobTransformCmd>
- export ATHENA_PROC_NUMBER=4
- export TRF_ECHO=1; xrdcp root://eosatlas.cern.ch//eos/atlas/user/a/atlaspmb/data15_13TeV/data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data ; Reco_tf.py --inputBSFile data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --AMI q431 --maxEvent 150 --athenaopts='--pmon=sdmonfp' --ignoreErrors 'True' | tee __log.txt;
+ export ATHENA_CORE_NUMBER=4
+ export TRF_ECHO=1; xrdcp root://eosatlas.cern.ch//eos/atlas/user/a/atlaspmb/data15_13TeV/data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data ; Reco_tf.py --multiprocess --inputBSFile data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --AMI q431 --maxEvent 150 --athenaopts='--pmon=sdmonfp' --ignoreErrors 'True' | tee __log.txt;
echo $? > __exitcode ;
touch __done ;
grep -i "Reco_tf" jobReport.txt | head -n1 | awk -F\" '{print $2}' > __command.sh;
@@ -313,8 +313,8 @@
<doc>Reco_tf runs on 13TeV collision data from the mainxf stream</doc>
<jobTransformJobName>mp8_monitoring_reco_data15_main</jobTransformJobName>
<jobTransformCmd>
- export ATHENA_PROC_NUMBER=8
- export TRF_ECHO=1; xrdcp root://eosatlas.cern.ch//eos/atlas/user/a/atlaspmb/data15_13TeV/data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data ; Reco_tf.py --inputBSFile data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --AMI q431 --maxEvent 150 --athenaopts='--pmon=sdmonfp' --ignoreErrors 'True' | tee __log.txt;
+ export ATHENA_CORE_NUMBER=8
+ export TRF_ECHO=1; xrdcp root://eosatlas.cern.ch//eos/atlas/user/a/atlaspmb/data15_13TeV/data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data ; Reco_tf.py --multiprocess --inputBSFile data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --AMI q431 --maxEvent 150 --athenaopts='--pmon=sdmonfp' --ignoreErrors 'True' | tee __log.txt;
echo $? > __exitcode ;
touch __done ;
grep -i "Reco_tf" jobReport.txt | head -n1 | awk -F\" '{print $2}' > __command.sh;
@@ -366,8 +366,8 @@
<doc>Reco_tf runs on 13TeV collision data from the mainxf stream</doc>
<jobTransformJobName>mp_rawtoall_monitoring_reco_data15_main</jobTransformJobName>
<jobTransformCmd>
- export ATHENA_PROC_NUMBER=4
- export TRF_ECHO=1; xrdcp root://eosatlas.cern.ch//eos/atlas/user/a/atlaspmb/data15_13TeV/data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data ; Reco_tf.py --inputBSFile data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data --outputAODFile myAOD.pool.root --outputHISTFile myHIST.pool.root --AMI q431 --maxEvent 150 --athenaopts='--pmon=sdmonfp' --ignoreErrors 'True' --steering doRAWtoALL | tee __log.txt;
+ export ATHENA_CORE_NUMBER=4
+ export TRF_ECHO=1; xrdcp root://eosatlas.cern.ch//eos/atlas/user/a/atlaspmb/data15_13TeV/data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data ; Reco_tf.py --multiprocess --inputBSFile data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data --outputAODFile myAOD.pool.root --outputHISTFile myHIST.pool.root --AMI q431 --maxEvent 150 --athenaopts='--pmon=sdmonfp' --ignoreErrors 'True' --steering doRAWtoALL | tee __log.txt;
echo $? > __exitcode ;
touch __done ;
grep -i "Reco_tf" jobReport.txt | head -n1 | awk -F\" '{print $2}' > __command.sh;
@@ -392,8 +392,8 @@
<doc>Reco_tf runs on 13TeV collision data from the mainxf stream</doc>
<jobTransformJobName>mp8_rawtoall_monitoring_reco_data15_main</jobTransformJobName>
<jobTransformCmd>
- export ATHENA_PROC_NUMBER=8
- export TRF_ECHO=1; xrdcp root://eosatlas.cern.ch//eos/atlas/user/a/atlaspmb/data15_13TeV/data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data ; Reco_tf.py --inputBSFile data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data --outputAODFile myAOD.pool.root --outputHISTFile myHIST.pool.root --AMI q431 --maxEvent 150 --athenaopts='--pmon=sdmonfp' --ignoreErrors 'True' --steering doRAWtoALL | tee __log.txt;
+ export ATHENA_CORE_NUMBER=8
+ export TRF_ECHO=1; xrdcp root://eosatlas.cern.ch//eos/atlas/user/a/atlaspmb/data15_13TeV/data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data ; Reco_tf.py --multiproces --inputBSFile data15_13TeV.00284484.physics_Main.daq.RAW._lb0037._SFO-1._0001.data --outputAODFile myAOD.pool.root --outputHISTFile myHIST.pool.root --AMI q431 --maxEvent 150 --athenaopts='--pmon=sdmonfp' --ignoreErrors 'True' --steering doRAWtoALL | tee __log.txt;
echo $? > __exitcode ;
touch __done ;
grep -i "Reco_tf" jobReport.txt | head -n1 | awk -F\" '{print $2}' > __command.sh;
@@ -580,8 +580,8 @@
<doc>Full chain (MC15 production setup)</doc>
<jobTransformJobName>mp_fullchain_mc15_ttbar_valid_13tev_25ns_mu40</jobTransformJobName>
<jobTransformCmd>
- export ATHENA_PROC_NUMBER=4
- export TRF_ECHO=1; Reco_tf.py --inputHITSFile root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/mc15a/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.simul.HITS.e3099_s2578_tid04919495_00/HITS.04919495._001041.pool.root.1 --conditionsTag 'default:OFLCOND-RUN12-SDR-31' --conditionsTag 'default:OFLCOND-RUN12-SDR-31' --digiSeedOffset1 170 --digiSeedOffset2 170 --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --inputHighPtMinbiasHitsFile root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/mc15a/mc15_valid.361035.Pythia8EvtGen_A2MSTW2008LO_minbias_inelastic_high.merge.HITS.e3581_s2578_s2169_tid05098387_00/HITS.05098387.*.pool.root.? --inputLowPtMinbiasHitsFile root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/mc15a/mc15_valid.361034.Pythia8EvtGen_A2MSTW2008LO_minbias_inelastic_low.merge.HITS.e3581_s2578_s2169_tid05098374_00/HITS.05098374.*.pool.root.? --jobNumber 1 --maxEvents 100 --numberOfCavernBkg="0" --numberOfHighPtMinBias '0.122680569785' --numberOfLowPtMinBias '39.8773194302' --outputAODFile="myAOD.pool.root" --outputESDFile="myESD.pool.root" --outputRDOFile="myRDO.pool.root" --pileupFinalBunch '6' --postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'HITtoRDO:job.StandardPileUpToolsAlg.PileUpTools["MergeMcEventCollTool"].OnlySaveSignalTruth=True;job.StandardPileUpToolsAlg.PileUpTools["MdtDigitizationTool"].LastXing=150' 'RDOtoRDOTrigger:from AthenaCommon.AlgSequence import AlgSequence;AlgSequence().LVL1TGCTrigger.TILEMU=True;from AthenaCommon.AppMgr import ServiceMgr;import MuonRPC_Cabling.MuonRPC_CablingConfig;ServiceMgr.MuonRPC_CablingSvc.RPCTriggerRoadsfromCool=False' --postInclude 'default:RecJobTransforms/UseFrontier.py' --preExec 'all:rec.Commissioning.set_Value_and_Lock(True);from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(40.0);from LArROD.LArRODFlags import larRODFlags;larRODFlags.NumberOfCollisions.set_Value_and_Lock(40);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)' 'RAWtoESD:from CaloRec.CaloCellFlags import jobproperties;jobproperties.CaloCellFlags.doLArCellEmMisCalib=False;from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.triggerMenuSetup="MC_pp_v6_tight_mc_prescale"' 'ESDtoAOD:TriggerFlags.AODEDMSet="AODSLIM"' 'HITtoRDO:userRunLumiOverride={"run":222525, "startmu":40.0, "endmu":41.0, "stepmu":1.0, "startlb":1, "timestamp": 1376703331}' --numberOfCavernBkg '0' --preInclude 'HITtoRDO:Digitization/ForceUseOfPileUpTools.py,SimulationJobOptions/preInclude.PileUpBunchTrainsMC15_2015_25ns_Config1.py,RunDependentSimData/configLumi_muRange.py' --mts ESD:0 --steering "RAWtoESD:in-RDO,in+RDO_TRIG,in-BS" --ignoreErrors 'True' | tee __log.txt;
+ export ATHENA_CORE_NUMBER=4
+ export TRF_ECHO=1; Reco_tf.py --multiprocess --inputHITSFile root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/mc15a/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.simul.HITS.e3099_s2578_tid04919495_00/HITS.04919495._001041.pool.root.1 --conditionsTag 'default:OFLCOND-RUN12-SDR-31' --conditionsTag 'default:OFLCOND-RUN12-SDR-31' --digiSeedOffset1 170 --digiSeedOffset2 170 --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --inputHighPtMinbiasHitsFile root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/mc15a/mc15_valid.361035.Pythia8EvtGen_A2MSTW2008LO_minbias_inelastic_high.merge.HITS.e3581_s2578_s2169_tid05098387_00/HITS.05098387.*.pool.root.? --inputLowPtMinbiasHitsFile root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/mc15a/mc15_valid.361034.Pythia8EvtGen_A2MSTW2008LO_minbias_inelastic_low.merge.HITS.e3581_s2578_s2169_tid05098374_00/HITS.05098374.*.pool.root.? --jobNumber 1 --maxEvents 100 --numberOfCavernBkg="0" --numberOfHighPtMinBias '0.122680569785' --numberOfLowPtMinBias '39.8773194302' --outputAODFile="myAOD.pool.root" --outputESDFile="myESD.pool.root" --outputRDOFile="myRDO.pool.root" --pileupFinalBunch '6' --postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'HITtoRDO:job.StandardPileUpToolsAlg.PileUpTools["MergeMcEventCollTool"].OnlySaveSignalTruth=True;job.StandardPileUpToolsAlg.PileUpTools["MdtDigitizationTool"].LastXing=150' 'RDOtoRDOTrigger:from AthenaCommon.AlgSequence import AlgSequence;AlgSequence().LVL1TGCTrigger.TILEMU=True;from AthenaCommon.AppMgr import ServiceMgr;import MuonRPC_Cabling.MuonRPC_CablingConfig;ServiceMgr.MuonRPC_CablingSvc.RPCTriggerRoadsfromCool=False' --postInclude 'default:RecJobTransforms/UseFrontier.py' --preExec 'all:rec.Commissioning.set_Value_and_Lock(True);from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(40.0);from LArROD.LArRODFlags import larRODFlags;larRODFlags.NumberOfCollisions.set_Value_and_Lock(40);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)' 'RAWtoESD:from CaloRec.CaloCellFlags import jobproperties;jobproperties.CaloCellFlags.doLArCellEmMisCalib=False;from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.triggerMenuSetup="MC_pp_v6_tight_mc_prescale"' 'ESDtoAOD:TriggerFlags.AODEDMSet="AODSLIM"' 'HITtoRDO:userRunLumiOverride={"run":222525, "startmu":40.0, "endmu":41.0, "stepmu":1.0, "startlb":1, "timestamp": 1376703331}' --numberOfCavernBkg '0' --preInclude 'HITtoRDO:Digitization/ForceUseOfPileUpTools.py,SimulationJobOptions/preInclude.PileUpBunchTrainsMC15_2015_25ns_Config1.py,RunDependentSimData/configLumi_muRange.py' --mts ESD:0 --steering "RAWtoESD:in-RDO,in+RDO_TRIG,in-BS" --ignoreErrors 'True' | tee __log.txt;
echo $? > __exitcode ;
touch __done ;
grep -i "Digi_tf" jobReport.txt | head -n1 | awk -F\" '{print $2}' > __command.sh;
diff --git a/Reconstruction/egamma/egammaValidation/test/test_electron.sh b/Reconstruction/egamma/egammaValidation/test/test_electron.sh
index e99826c2cf8c558ac33242ce2ccd2df0bcbc10da..95a7ac452a899d79d9df0cbae4d81125618510a8 100755
--- a/Reconstruction/egamma/egammaValidation/test/test_electron.sh
+++ b/Reconstruction/egamma/egammaValidation/test/test_electron.sh
@@ -25,9 +25,8 @@ case $ArtProcess in
echo "Ending"
echo "Merging AODs"
- echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC} and ATHENA_PROC_NUMBER=${ATHENA_PROC_NUMBER}"
+ echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC}"
unset ATHENA_NUM_PROC
- unset ATHENA_PROC_NUMBER
AODMerge_tf.py --inputAODFile=art_core_*/Nightly_AOD_electron.pool.root --outputAOD_MRGFile=Nightly_AOD_electron.pool.root --postExec "all:CILMergeAOD.removeItem(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList\");CILMergeAOD.add(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList.ENG_CALIB_TOT.ENG_CALIB_OUT_L.ENG_CALIB_EMB0.ENG_CALIB_EME0.ENG_CALIB_TILEG3.ENG_CALIB_DEAD_TOT.ENG_CALIB_DEAD_EMB0.ENG_CALIB_DEAD_TILE0.ENG_CALIB_DEAD_TILEG3.ENG_CALIB_DEAD_EME0.ENG_CALIB_DEAD_HEC0.ENG_CALIB_DEAD_FCAL.ENG_CALIB_DEAD_LEAKAGE.ENG_CALIB_DEAD_UNCLASS.ENG_CALIB_FRAC_EM.ENG_CALIB_FRAC_HAD.ENG_CALIB_FRAC_REST.LATERAL.ENG_FRAC_EM\");StreamAOD.ItemList=CILMergeAOD()"
@@ -60,9 +59,8 @@ case $ArtProcess in
file=${file[${ArtProcess}]}
x="../$file"
- echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC} and ATHENA_PROC_NUMBER=${ATHENA_PROC_NUMBER}"
+ echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC}"
unset ATHENA_NUM_PROC
- unset ATHENA_PROC_NUMBER
Reco_tf.py --inputRDOFile=$x --outputAODFile=Nightly_AOD_electron.pool.root --maxEvents=2000 --autoConfiguration="everything" --preExec="from ParticleBuilderOptions.AODFlags import AODFlags; AODFlags.ThinGeantTruth.set_Value_and_Lock(False);AODFlags.TauTrackSlimmer.set_Value_and_Lock(False);AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False); rec.doTrigger=False; rec.doMuon=False; rec.doTau=False ; from RecExConfig.RecAlgsFlags import recAlgs; recAlgs.doMuonSpShower=False ; rec.doBTagging=False ; recAlgs.doEFlow=False ; recAlgs.doEFlowJet=False ; recAlgs.doMissingET=False ; recAlgs.doMissingETSig=False ; from JetRec.JetRecFlags import jetFlags ; jetFlags.Enabled=False ; " --postExec "ESDtoAOD:CILMergeAOD.removeItem(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList\");CILMergeAOD.add(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.LATERAL.ENG_FRAC_EM.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList.ENG_CALIB_TOT.ENG_CALIB_OUT_L.ENG_CALIB_EMB0.ENG_CALIB_EME0.ENG_CALIB_TILEG3.ENG_CALIB_DEAD_TOT.ENG_CALIB_DEAD_EMB0.ENG_CALIB_DEAD_TILE0.ENG_CALIB_DEAD_TILEG3.ENG_CALIB_DEAD_EME0.ENG_CALIB_DEAD_HEC0.ENG_CALIB_DEAD_FCAL.ENG_CALIB_DEAD_LEAKAGE.ENG_CALIB_DEAD_UNCLASS.ENG_CALIB_FRAC_EM.ENG_CALIB_FRAC_HAD.ENG_CALIB_FRAC_REST\");StreamAOD.ItemList=CILMergeAOD()" "POOLMergeAthenaMPAOD0:CILMergeAOD.removeItem(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList\");CILMergeAOD.add(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.LATERAL.ENG_FRAC_EM.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList.ENG_CALIB_TOT.ENG_CALIB_OUT_L.ENG_CALIB_EMB0.ENG_CALIB_EME0.ENG_CALIB_TILEG3.ENG_CALIB_DEAD_TOT.ENG_CALIB_DEAD_EMB0.ENG_CALIB_DEAD_TILE0.ENG_CALIB_DEAD_TILEG3.ENG_CALIB_DEAD_EME0.ENG_CALIB_DEAD_HEC0.ENG_CALIB_DEAD_FCAL.ENG_CALIB_DEAD_LEAKAGE.ENG_CALIB_DEAD_UNCLASS.ENG_CALIB_FRAC_EM.ENG_CALIB_FRAC_HAD.ENG_CALIB_FRAC_REST\");StreamAOD.ItemList=CILMergeAOD()"
diff --git a/Reconstruction/egamma/egammaValidation/test/test_electron_pileup.sh b/Reconstruction/egamma/egammaValidation/test/test_electron_pileup.sh
index 49ec374b7d12f7177ca6977c9b22ef3aa514458a..8323b6dfc749971edce3f4b661e98bf6c2fb8bd8 100755
--- a/Reconstruction/egamma/egammaValidation/test/test_electron_pileup.sh
+++ b/Reconstruction/egamma/egammaValidation/test/test_electron_pileup.sh
@@ -25,9 +25,8 @@ case $ArtProcess in
echo "Ending"
echo "Merging AODs"
- echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC} and ATHENA_PROC_NUMBER=${ATHENA_PROC_NUMBER}"
+ echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC}"
unset ATHENA_NUM_PROC
- unset ATHENA_PROC_NUMBER
AODMerge_tf.py --inputAODFile=art_core_*/Nightly_AOD_electron.pool.root --outputAOD_MRGFile=Nightly_AOD_electron.pool.root --postExec "all:CILMergeAOD.removeItem(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList\");CILMergeAOD.add(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList.ENG_CALIB_TOT.ENG_CALIB_OUT_L.ENG_CALIB_EMB0.ENG_CALIB_EME0.ENG_CALIB_TILEG3.ENG_CALIB_DEAD_TOT.ENG_CALIB_DEAD_EMB0.ENG_CALIB_DEAD_TILE0.ENG_CALIB_DEAD_TILEG3.ENG_CALIB_DEAD_EME0.ENG_CALIB_DEAD_HEC0.ENG_CALIB_DEAD_FCAL.ENG_CALIB_DEAD_LEAKAGE.ENG_CALIB_DEAD_UNCLASS.ENG_CALIB_FRAC_EM.ENG_CALIB_FRAC_HAD.ENG_CALIB_FRAC_REST.LATERAL.ENG_FRAC_EM\");StreamAOD.ItemList=CILMergeAOD()"
@@ -60,9 +59,8 @@ case $ArtProcess in
file=${file[${ArtProcess}]}
x="../$file"
- echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC} and ATHENA_PROC_NUMBER=${ATHENA_PROC_NUMBER}"
+ echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC}"
unset ATHENA_NUM_PROC
- unset ATHENA_PROC_NUMBER
Reco_tf.py --inputRDOFile=$x --outputAODFile=Nightly_AOD_electron.pool.root --maxEvents=2000 --autoConfiguration="everything" --preExec="from ParticleBuilderOptions.AODFlags import AODFlags; AODFlags.ThinGeantTruth.set_Value_and_Lock(False);AODFlags.TauTrackSlimmer.set_Value_and_Lock(False);AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False); rec.doTrigger=False; rec.doMuon=False; rec.doTau=False ; from RecExConfig.RecAlgsFlags import recAlgs; recAlgs.doMuonSpShower=False ; rec.doBTagging=False ; recAlgs.doEFlow=False ; recAlgs.doEFlowJet=False ; recAlgs.doMissingET=False ; recAlgs.doMissingETSig=False ; from JetRec.JetRecFlags import jetFlags ; jetFlags.Enabled=False ; " --postExec "ESDtoAOD:CILMergeAOD.removeItem(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList\");CILMergeAOD.add(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.LATERAL.ENG_FRAC_EM.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList.ENG_CALIB_TOT.ENG_CALIB_OUT_L.ENG_CALIB_EMB0.ENG_CALIB_EME0.ENG_CALIB_TILEG3.ENG_CALIB_DEAD_TOT.ENG_CALIB_DEAD_EMB0.ENG_CALIB_DEAD_TILE0.ENG_CALIB_DEAD_TILEG3.ENG_CALIB_DEAD_EME0.ENG_CALIB_DEAD_HEC0.ENG_CALIB_DEAD_FCAL.ENG_CALIB_DEAD_LEAKAGE.ENG_CALIB_DEAD_UNCLASS.ENG_CALIB_FRAC_EM.ENG_CALIB_FRAC_HAD.ENG_CALIB_FRAC_REST\");StreamAOD.ItemList=CILMergeAOD()" "POOLMergeAthenaMPAOD0:CILMergeAOD.removeItem(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList\");CILMergeAOD.add(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.LATERAL.ENG_FRAC_EM.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList.ENG_CALIB_TOT.ENG_CALIB_OUT_L.ENG_CALIB_EMB0.ENG_CALIB_EME0.ENG_CALIB_TILEG3.ENG_CALIB_DEAD_TOT.ENG_CALIB_DEAD_EMB0.ENG_CALIB_DEAD_TILE0.ENG_CALIB_DEAD_TILEG3.ENG_CALIB_DEAD_EME0.ENG_CALIB_DEAD_HEC0.ENG_CALIB_DEAD_FCAL.ENG_CALIB_DEAD_LEAKAGE.ENG_CALIB_DEAD_UNCLASS.ENG_CALIB_FRAC_EM.ENG_CALIB_FRAC_HAD.ENG_CALIB_FRAC_REST\");StreamAOD.ItemList=CILMergeAOD()"
diff --git a/Reconstruction/egamma/egammaValidation/test/test_gamma.sh b/Reconstruction/egamma/egammaValidation/test/test_gamma.sh
index 2aebb798d33a5bba07b56c482a919b4f6bacb1f3..dce8a08c1f7610048b7f7774f3221509934998ca 100755
--- a/Reconstruction/egamma/egammaValidation/test/test_gamma.sh
+++ b/Reconstruction/egamma/egammaValidation/test/test_gamma.sh
@@ -26,9 +26,8 @@ case $ArtProcess in
echo "Ending"
echo "Merging AODs"
- echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC} and ATHENA_PROC_NUMBER=${ATHENA_PROC_NUMBER}"
+ echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC}"
unset ATHENA_NUM_PROC
- unset ATHENA_PROC_NUMBER
AODMerge_tf.py --inputAODFile=art_core_*/Nightly_AOD_gamma.pool.root --outputAOD_MRGFile=Nightly_AOD_gamma.pool.root --postExec "all:CILMergeAOD.removeItem(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList\");CILMergeAOD.add(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList.ENG_CALIB_TOT.ENG_CALIB_OUT_L.ENG_CALIB_EMB0.ENG_CALIB_EME0.ENG_CALIB_TILEG3.ENG_CALIB_DEAD_TOT.ENG_CALIB_DEAD_EMB0.ENG_CALIB_DEAD_TILE0.ENG_CALIB_DEAD_TILEG3.ENG_CALIB_DEAD_EME0.ENG_CALIB_DEAD_HEC0.ENG_CALIB_DEAD_FCAL.ENG_CALIB_DEAD_LEAKAGE.ENG_CALIB_DEAD_UNCLASS.ENG_CALIB_FRAC_EM.ENG_CALIB_FRAC_HAD.ENG_CALIB_FRAC_REST.LATERAL.ENG_FRAC_EM\");StreamAOD.ItemList=CILMergeAOD()"
@@ -61,9 +60,8 @@ case $ArtProcess in
file=${file[${ArtProcess}]}
x="../$file"
- echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC} and ATHENA_PROC_NUMBER=${ATHENA_PROC_NUMBER}"
+ echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC}"
unset ATHENA_NUM_PROC
- unset ATHENA_PROC_NUMBER
Reco_tf.py --inputRDOFile=$x --outputAODFile=Nightly_AOD_gamma.pool.root --maxEvents=2000 --autoConfiguration="everything" --preExec="from ParticleBuilderOptions.AODFlags import AODFlags; AODFlags.ThinGeantTruth.set_Value_and_Lock(False);AODFlags.TauTrackSlimmer.set_Value_and_Lock(False);AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False); rec.doTrigger=False; rec.doMuon=False; rec.doTau=False ; from RecExConfig.RecAlgsFlags import recAlgs; recAlgs.doMuonSpShower=False ; rec.doBTagging=False ; recAlgs.doEFlow=False ; recAlgs.doEFlowJet=False ; recAlgs.doMissingET=False ; recAlgs.doMissingETSig=False ; from JetRec.JetRecFlags import jetFlags ; jetFlags.Enabled=False ; " --postExec "ESDtoAOD:CILMergeAOD.removeItem(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList\");CILMergeAOD.add(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.LATERAL.ENG_FRAC_EM.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList.ENG_CALIB_TOT.ENG_CALIB_OUT_L.ENG_CALIB_EMB0.ENG_CALIB_EME0.ENG_CALIB_TILEG3.ENG_CALIB_DEAD_TOT.ENG_CALIB_DEAD_EMB0.ENG_CALIB_DEAD_TILE0.ENG_CALIB_DEAD_TILEG3.ENG_CALIB_DEAD_EME0.ENG_CALIB_DEAD_HEC0.ENG_CALIB_DEAD_FCAL.ENG_CALIB_DEAD_LEAKAGE.ENG_CALIB_DEAD_UNCLASS.ENG_CALIB_FRAC_EM.ENG_CALIB_FRAC_HAD.ENG_CALIB_FRAC_REST\");StreamAOD.ItemList=CILMergeAOD()" "POOLMergeAthenaMPAOD0:CILMergeAOD.removeItem(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList\");CILMergeAOD.add(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.LATERAL.ENG_FRAC_EM.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList.ENG_CALIB_TOT.ENG_CALIB_OUT_L.ENG_CALIB_EMB0.ENG_CALIB_EME0.ENG_CALIB_TILEG3.ENG_CALIB_DEAD_TOT.ENG_CALIB_DEAD_EMB0.ENG_CALIB_DEAD_TILE0.ENG_CALIB_DEAD_TILEG3.ENG_CALIB_DEAD_EME0.ENG_CALIB_DEAD_HEC0.ENG_CALIB_DEAD_FCAL.ENG_CALIB_DEAD_LEAKAGE.ENG_CALIB_DEAD_UNCLASS.ENG_CALIB_FRAC_EM.ENG_CALIB_FRAC_HAD.ENG_CALIB_FRAC_REST\");StreamAOD.ItemList=CILMergeAOD()"
diff --git a/Reconstruction/egamma/egammaValidation/test/test_gamma_pileup.sh b/Reconstruction/egamma/egammaValidation/test/test_gamma_pileup.sh
index 147afa872968f1f29ac1969a4b6152b03f73c79a..93a8cac12d14c2ed90c0d25bc4a97317ce89b3a3 100755
--- a/Reconstruction/egamma/egammaValidation/test/test_gamma_pileup.sh
+++ b/Reconstruction/egamma/egammaValidation/test/test_gamma_pileup.sh
@@ -26,9 +26,8 @@ case $ArtProcess in
echo "Ending"
echo "Merging AODs"
- echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC} and ATHENA_PROC_NUMBER=${ATHENA_PROC_NUMBER}"
+ echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC}"
unset ATHENA_NUM_PROC
- unset ATHENA_PROC_NUMBER
AODMerge_tf.py --inputAODFile=art_core_*/Nightly_AOD_gamma.pool.root --outputAOD_MRGFile=Nightly_AOD_gamma.pool.root --postExec "all:CILMergeAOD.removeItem(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList\");CILMergeAOD.add(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList.ENG_CALIB_TOT.ENG_CALIB_OUT_L.ENG_CALIB_EMB0.ENG_CALIB_EME0.ENG_CALIB_TILEG3.ENG_CALIB_DEAD_TOT.ENG_CALIB_DEAD_EMB0.ENG_CALIB_DEAD_TILE0.ENG_CALIB_DEAD_TILEG3.ENG_CALIB_DEAD_EME0.ENG_CALIB_DEAD_HEC0.ENG_CALIB_DEAD_FCAL.ENG_CALIB_DEAD_LEAKAGE.ENG_CALIB_DEAD_UNCLASS.ENG_CALIB_FRAC_EM.ENG_CALIB_FRAC_HAD.ENG_CALIB_FRAC_REST.LATERAL.ENG_FRAC_EM\");StreamAOD.ItemList=CILMergeAOD()"
@@ -61,9 +60,8 @@ case $ArtProcess in
file=${file[${ArtProcess}]}
x="../$file"
- echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC} and ATHENA_PROC_NUMBER=${ATHENA_PROC_NUMBER}"
+ echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC}"
unset ATHENA_NUM_PROC
- unset ATHENA_PROC_NUMBER
Reco_tf.py --inputRDOFile=$x --outputAODFile=Nightly_AOD_gamma.pool.root --maxEvents=2000 --autoConfiguration="everything" --preExec="from ParticleBuilderOptions.AODFlags import AODFlags; AODFlags.ThinGeantTruth.set_Value_and_Lock(False);AODFlags.TauTrackSlimmer.set_Value_and_Lock(False);AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False); rec.doTrigger=False; rec.doMuon=False; rec.doTau=False ; from RecExConfig.RecAlgsFlags import recAlgs; recAlgs.doMuonSpShower=False ; rec.doBTagging=False ; recAlgs.doEFlow=False ; recAlgs.doEFlowJet=False ; recAlgs.doMissingET=False ; recAlgs.doMissingETSig=False ; from JetRec.JetRecFlags import jetFlags ; jetFlags.Enabled=False ; " --postExec "ESDtoAOD:CILMergeAOD.removeItem(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList\");CILMergeAOD.add(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.LATERAL.ENG_FRAC_EM.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList.ENG_CALIB_TOT.ENG_CALIB_OUT_L.ENG_CALIB_EMB0.ENG_CALIB_EME0.ENG_CALIB_TILEG3.ENG_CALIB_DEAD_TOT.ENG_CALIB_DEAD_EMB0.ENG_CALIB_DEAD_TILE0.ENG_CALIB_DEAD_TILEG3.ENG_CALIB_DEAD_EME0.ENG_CALIB_DEAD_HEC0.ENG_CALIB_DEAD_FCAL.ENG_CALIB_DEAD_LEAKAGE.ENG_CALIB_DEAD_UNCLASS.ENG_CALIB_FRAC_EM.ENG_CALIB_FRAC_HAD.ENG_CALIB_FRAC_REST\");StreamAOD.ItemList=CILMergeAOD()" "POOLMergeAthenaMPAOD0:CILMergeAOD.removeItem(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList\");CILMergeAOD.add(\"xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.LATERAL.ENG_FRAC_EM.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList.ENG_CALIB_TOT.ENG_CALIB_OUT_L.ENG_CALIB_EMB0.ENG_CALIB_EME0.ENG_CALIB_TILEG3.ENG_CALIB_DEAD_TOT.ENG_CALIB_DEAD_EMB0.ENG_CALIB_DEAD_TILE0.ENG_CALIB_DEAD_TILEG3.ENG_CALIB_DEAD_EME0.ENG_CALIB_DEAD_HEC0.ENG_CALIB_DEAD_FCAL.ENG_CALIB_DEAD_LEAKAGE.ENG_CALIB_DEAD_UNCLASS.ENG_CALIB_FRAC_EM.ENG_CALIB_FRAC_HAD.ENG_CALIB_FRAC_REST\");StreamAOD.ItemList=CILMergeAOD()"
diff --git a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_MT.sh b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_MT.sh
index fd2242c9916f85f68dc1040efb5b8492e8dd827c..af416bb6371de42c082c9d93befe8861f64b267a 100755
--- a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_MT.sh
+++ b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_MT.sh
@@ -8,8 +8,6 @@
# art-output: mc15_2015_ttbar_no_pileup.RDO.pool.root
# art-output: log.*
-unset ATHENA_PROC_NUMBER
-
Digi_tf.py \
--inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/HITS.04919495._001041.pool.root.1 \
--conditionsTag default:OFLCOND-RUN12-SDR-25 \
diff --git a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_MT_1thread.sh b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_MT_1thread.sh
index b8c33c4cdde04f16f70aabde8193e6000d22f34e..d77c04547fdb9b5a0201687ebcb71f64c0a354fb 100755
--- a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_MT_1thread.sh
+++ b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_MT_1thread.sh
@@ -8,8 +8,6 @@
# art-output: mc15_2015_ttbar_no_pileup.RDO.pool.root
# art-output: log.*
-unset ATHENA_PROC_NUMBER
-
Digi_tf.py \
--inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/HITS.04919495._001041.pool.root.1 \
--conditionsTag default:OFLCOND-RUN12-SDR-25 \
diff --git a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_no_ID_MT.sh b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_no_ID_MT.sh
index eb2a0a56bf39c8841671aa7368540f24091ef3c1..bd489f0fe0c293d0814bf63a9791a2ee354dd03b 100755
--- a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_no_ID_MT.sh
+++ b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_no_ID_MT.sh
@@ -8,8 +8,6 @@
# art-output: mc15_2015_ttbar_no_pileup.RDO.pool.root
# art-output: log.*
-unset ATHENA_PROC_NUMBER
-
Digi_tf.py \
--inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/HITS.04919495._001041.pool.root.1 \
--conditionsTag default:OFLCOND-RUN12-SDR-25 \
diff --git a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_1thread.sh b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_1thread.sh
index 7849ef524c1d76342527af9d49ca67ec3d806d1a..4b8784f81655987b62520bd9e9c5e32c9c812961 100755
--- a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_1thread.sh
+++ b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_1thread.sh
@@ -11,8 +11,6 @@
# art-output: mem.full.*
# art-output: runargs.*
-unset ATHENA_PROC_NUMBER
-
Overlay_tf.py \
--athenaopts '--threads 1' \
--inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayMonitoringRTT/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1 \
diff --git a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_4threads.sh b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_4threads.sh
index f9c85f21d315fae8fde9c9f1885fd653571fb685..9c6bca35fcf14ba95f5e48759c9d63d8887479c4 100755
--- a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_4threads.sh
+++ b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_4threads.sh
@@ -11,8 +11,6 @@
# art-output: mem.full.*
# art-output: runargs.*
-unset ATHENA_PROC_NUMBER
-
Overlay_tf.py \
--athenaopts '--threads 4' \
--inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayMonitoringRTT/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1 \
diff --git a/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_TTbarSim_MT.sh b/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_TTbarSim_MT.sh
index 88fe5fb99c1ff2e5aa65826a659e2f43ef343386..af81c39918bdf0273f9c46a0ca48744112d8ef0f 100755
--- a/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_TTbarSim_MT.sh
+++ b/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_TTbarSim_MT.sh
@@ -9,8 +9,6 @@
# art-output: log.*
# art-output: tree-orderer.log
-unset ATHENA_PROC_NUMBER
-
AtlasG4_tf.py \
--athenaopts '--threads 4' \
--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/ttbar_muplusjets-pythia6-7000.evgen.pool.root' \
diff --git a/Tools/DirectIOART/generateARTtests.py b/Tools/DirectIOART/generateARTtests.py
index 3953108018cee4d598849f6774b6e0ca4143e554..24be7f0c87c43262a8447d50c0dcaf6e2be0cd5b 100755
--- a/Tools/DirectIOART/generateARTtests.py
+++ b/Tools/DirectIOART/generateARTtests.py
@@ -100,8 +100,8 @@ echo \"art-result: $? DirectIOART_Athena_RecoTF_inputRDO_protocol_{protocol}\"""
# art-include: 21.0/Athena
# art-include: master/Athena\n
set -e\n
-export ATHENA_PROC_NUMBER=2
-Reco_tf.py --AMI q221 --inputRDOFile {turl} --outputRDO_TRIGFile art.pool.root\n
+export ATHENA_CORE_NUMBER=2
+Reco_tf.py --AMI q221 --multiprocess --inputRDOFile {turl} --outputRDO_TRIGFile art.pool.root\n
echo \"art-result: $? DirectIOART_AthenaMP_RecoTF_inputRDO_protocol_{protocol}\"""".format(turl=item.values()[0], protocol=item.keys()[0])
outfile.write(outstring)
outfile.close()
@@ -138,8 +138,8 @@ echo \"art-result: $? DirectIOART_Athena_RecoTF_inputBS_protocol_{protocol}\""""
# art-include: 21.0/Athena
# art-include: master/Athena\n
set -e\n
-export ATHENA_PROC_NUMBER=2
-Reco_tf.py --AMI q431 --inputBSFile {turl} --outputESDFile art.pool.root\n
+export ATHENA_CORE_NUMBER=2
+Reco_tf.py --AMI q431 --multiprocess --inputBSFile {turl} --outputESDFile art.pool.root\n
echo \"art-result: $? DirectIOART_AthenaMP_RecoTF_inputBS_protocol_{protocol}\"""".format(turl=item.values()[0], protocol=item.keys()[0])
outfile.write(outstring)
outfile.close()
diff --git a/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_raw_davs.sh b/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_raw_davs.sh
index bf779a011ce050b80bc56bf987b6dc1a5ff612b4..af2e83e3dda61cb58f735f4b9848ff975dd3b2ac 100755
--- a/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_raw_davs.sh
+++ b/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_raw_davs.sh
@@ -8,7 +8,7 @@
set -e
-export ATHENA_PROC_NUMBER=2
-Reco_tf.py --AMI q431 --inputBSFile davs://lcg-lrz-http.grid.lrz.de:443/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/data15_13TeV/71/42/data15_13TeV.00284285.physics_Main.daq.RAW._lb0856._SFO-1._0003.data --outputESDFile art.pool.root
+export ATHENA_CORE_NUMBER=2
+Reco_tf.py --AMI q431 --multiprocess --inputBSFile davs://lcg-lrz-http.grid.lrz.de:443/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/data15_13TeV/71/42/data15_13TeV.00284285.physics_Main.daq.RAW._lb0856._SFO-1._0003.data --outputESDFile art.pool.root
-echo "art-result: $? DirectIOART_AthenaMP_RecoTF_inputBS_protocol_DAVS"
\ No newline at end of file
+echo "art-result: $? DirectIOART_AthenaMP_RecoTF_inputBS_protocol_DAVS"
diff --git a/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_raw_https.sh b/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_raw_https.sh
index 5e19d2cfd436e12eb846a0f9e962ed42f0d10134..f60236d56b2993128a3a3ba98d54c3c6aefc92ac 100755
--- a/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_raw_https.sh
+++ b/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_raw_https.sh
@@ -8,7 +8,7 @@
set -e
-export ATHENA_PROC_NUMBER=2
-Reco_tf.py --AMI q431 --inputBSFile https://lcg-lrz-http.grid.lrz.de:443/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/data15_13TeV/71/42/data15_13TeV.00284285.physics_Main.daq.RAW._lb0856._SFO-1._0003.data --outputESDFile art.pool.root
+export ATHENA_CORE_NUMBER=2
+Reco_tf.py --AMI q431 --multiprocess--inputBSFile https://lcg-lrz-http.grid.lrz.de:443/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/data15_13TeV/71/42/data15_13TeV.00284285.physics_Main.daq.RAW._lb0856._SFO-1._0003.data --outputESDFile art.pool.root
-echo "art-result: $? DirectIOART_AthenaMP_RecoTF_inputBS_protocol_HTTPS"
\ No newline at end of file
+echo "art-result: $? DirectIOART_AthenaMP_RecoTF_inputBS_protocol_HTTPS"
diff --git a/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_raw_root.sh b/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_raw_root.sh
index cd3b4a7da69c98b517899cfb372397d779bafb0f..7e19dba9ff457af307e3d82c648d3248ad120e10 100755
--- a/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_raw_root.sh
+++ b/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_raw_root.sh
@@ -8,7 +8,7 @@
set -e
-export ATHENA_PROC_NUMBER=2
-Reco_tf.py --AMI q431 --inputBSFile root://lcg-lrz-rootd.grid.lrz.de:1094/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/data15_13TeV/71/42/data15_13TeV.00284285.physics_Main.daq.RAW._lb0856._SFO-1._0003.data --outputESDFile art.pool.root
+export ATHENA_CORE_NUMBER=2
+Reco_tf.py --AMI q431 --multiproces --inputBSFile root://lcg-lrz-rootd.grid.lrz.de:1094/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/data15_13TeV/71/42/data15_13TeV.00284285.physics_Main.daq.RAW._lb0856._SFO-1._0003.data --outputESDFile art.pool.root
-echo "art-result: $? DirectIOART_AthenaMP_RecoTF_inputBS_protocol_ROOT"
\ No newline at end of file
+echo "art-result: $? DirectIOART_AthenaMP_RecoTF_inputBS_protocol_ROOT"
diff --git a/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_rdo_davs.sh b/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_rdo_davs.sh
index 73c39c6b470fb68178429085365073327aa44747..9ccc5f57ad85d703ae6e6a3e8823d275504a58f4 100755
--- a/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_rdo_davs.sh
+++ b/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_rdo_davs.sh
@@ -8,7 +8,7 @@
set -e
-export ATHENA_PROC_NUMBER=2
-Reco_tf.py --AMI q221 --inputRDOFile davs://lcg-lrz-http.grid.lrz.de:443/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/mc16_13TeV/90/96/RDO.11373415._000001.pool.root.1 --outputRDO_TRIGFile art.pool.root
+export ATHENA_CORE_NUMBER=2
+Reco_tf.py --AMI q221 --multiprocess --inputRDOFile davs://lcg-lrz-http.grid.lrz.de:443/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/mc16_13TeV/90/96/RDO.11373415._000001.pool.root.1 --outputRDO_TRIGFile art.pool.root
-echo "art-result: $? DirectIOART_AthenaMP_RecoTF_inputRDO_protocol_DAVS"
\ No newline at end of file
+echo "art-result: $? DirectIOART_AthenaMP_RecoTF_inputRDO_protocol_DAVS"
diff --git a/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_rdo_https.sh b/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_rdo_https.sh
index 1f56f36ac9c59319029448b6bb6f5d6b2886e860..354848b5cb37559bd7fad76024263f1fd604ec5c 100755
--- a/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_rdo_https.sh
+++ b/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_rdo_https.sh
@@ -8,7 +8,7 @@
set -e
-export ATHENA_PROC_NUMBER=2
-Reco_tf.py --AMI q221 --inputRDOFile https://lcg-lrz-http.grid.lrz.de:443/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/mc16_13TeV/90/96/RDO.11373415._000001.pool.root.1 --outputRDO_TRIGFile art.pool.root
+export ATHENA_CORE_NUMBER=2
+Reco_tf.py --AMI q221 --multiprocess --inputRDOFile https://lcg-lrz-http.grid.lrz.de:443/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/mc16_13TeV/90/96/RDO.11373415._000001.pool.root.1 --outputRDO_TRIGFile art.pool.root
-echo "art-result: $? DirectIOART_AthenaMP_RecoTF_inputRDO_protocol_HTTPS"
\ No newline at end of file
+echo "art-result: $? DirectIOART_AthenaMP_RecoTF_inputRDO_protocol_HTTPS"
diff --git a/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_rdo_root.sh b/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_rdo_root.sh
index 56bbfeb3c6289b3bf89a5f9e8fd8e536bc2bf9b9..56d91792bc77e0346a092bd178e477ee19d82295 100755
--- a/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_rdo_root.sh
+++ b/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_rdo_root.sh
@@ -8,7 +8,7 @@
set -e
-export ATHENA_PROC_NUMBER=2
-Reco_tf.py --AMI q221 --inputRDOFile root://lcg-lrz-rootd.grid.lrz.de:1094/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/mc16_13TeV/90/96/RDO.11373415._000001.pool.root.1 --outputRDO_TRIGFile art.pool.root
+export ATHENA_CORE_NUMBER=2
+Reco_tf.py --AMI q221 --multiprocess --inputRDOFile root://lcg-lrz-rootd.grid.lrz.de:1094/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/mc16_13TeV/90/96/RDO.11373415._000001.pool.root.1 --outputRDO_TRIGFile art.pool.root
-echo "art-result: $? DirectIOART_AthenaMP_RecoTF_inputRDO_protocol_ROOT"
\ No newline at end of file
+echo "art-result: $? DirectIOART_AthenaMP_RecoTF_inputRDO_protocol_ROOT"
diff --git a/Tools/PyJobTransforms/python/trfArgs.py b/Tools/PyJobTransforms/python/trfArgs.py
index ccab1ba9d924618ef89aeffd6f59f5fd09a48774..4fd1ac7dcfbbef37ddb68c30ae17897c33324a5e 100644
--- a/Tools/PyJobTransforms/python/trfArgs.py
+++ b/Tools/PyJobTransforms/python/trfArgs.py
@@ -113,6 +113,10 @@ def addAthenaArguments(parser, maxEventsDefaultSubstep='first', addValgrind=True
parser.add_argument('--eventService', type=trfArgClasses.argFactory(trfArgClasses.argBool, runarg=True),
metavar='BOOL', group='Athena',
help='Switch AthenaMP to the Event Service configuration')
+ parser.add_argument('--multithreaded', group='Athena', action='store_true',
+ help='Multithreaded mode active')
+ parser.add_argument('--multiprocess', group='Athena', action='store_true',
+ help='Multiprocess mode active')
if addValgrind:
addValgrindArguments(parser)
diff --git a/Tools/PyJobTransforms/python/trfExe.py b/Tools/PyJobTransforms/python/trfExe.py
index e3b8ca97a09a5507d1d59f1eb0d59899f1f42a43..9139d1b708a895b5e78500ff9757962dad3ea6d9 100755
--- a/Tools/PyJobTransforms/python/trfExe.py
+++ b/Tools/PyJobTransforms/python/trfExe.py
@@ -41,7 +41,7 @@ from PyJobTransforms.trfUtils import bind_port
from PyJobTransforms.trfExitCodes import trfExit
from PyJobTransforms.trfLogger import stdLogLevels
from PyJobTransforms.trfMPTools import detectAthenaMPProcs, athenaMPOutputHandler
-
+from PyJobTransforms.trfMTTools import detectAthenaMTThreads
import PyJobTransforms.trfExceptions as trfExceptions
import PyJobTransforms.trfValidation as trfValidation
@@ -170,6 +170,7 @@ class transformExecutor(object):
self._memStats = {}
self._eventCount = None
self._athenaMP = None
+ self._athenaMT = None
self._dbMonitor = None
# Holder for execution information about any merges done by this executor in MP mode
@@ -791,8 +792,7 @@ class athenaExecutor(scriptExecutor):
# executor to the workflow graph, run the executor manually with these data parameters (useful for
# post-facto executors, e.g., for AthenaMP merging)
# @param memMonitor Enable subprocess memory monitoring
- # @param disableMP Ensure that AthenaMP is not used (i.e., also unset
- # @c ATHENA_PROC_NUMBER before execution)
+ # @param disableMP Ensure that AthenaMP is not used
# @note The difference between @c extraRunargs, @c runtimeRunargs and @c literalRunargs is that: @c extraRunargs
# uses repr(), so the RHS is the same as the python object in the transform; @c runtimeRunargs uses str() so
# that a string can be interpreted at runtime; @c literalRunargs allows the direct insertion of arbitary python
@@ -903,12 +903,34 @@ class athenaExecutor(scriptExecutor):
msg.info('input event count is UNDEFINED, setting expectedEvents to 0')
expectedEvents = 0
+ # Check the consistency of parallel configuration: CLI flags + evnironment
+ # 1. Both --multithreaded and --multiprocess flags have been set
+ if ('multithreaded' in self.conf._argdict and
+ 'multiprocess' in self.conf._argdict):
+ raise trfExceptions.TransformExecutionException(trfExit.nameToCode('TRF_SETUP'),
+ 'both --multithreaded and --multiprocess command line options provided. Please use only one of them')
+
+ # 2. One of the parallel command-line flags has been provided but ATHENA_CORE_NUMBER environment has not been set
+ if (('multithreaded' in self.conf._argdict or 'multiprocess' in self.conf._argdict) and
+ (not 'ATHENA_CORE_NUMBER' in os.environ)):
+ raise trfExceptions.TransformExecutionException(trfExit.nameToCode('TRF_SETUP'),
+ 'either --multithreaded nor --multiprocess command line option provided but ATHENA_CORE_NUMBER environment has not been set')
+
+ # Try to detect AthenaMT mode and number of threads
+ self._athenaMT = detectAthenaMTThreads(self.conf.argdict)
+
# Try to detect AthenaMP mode and number of workers
+ self._athenaMP = detectAthenaMPProcs(self.conf.argdict)
+
+ # Another constistency check: make sure we don't have a configuration like follows:
+ # ... --multithreaded --athenaopts=--nprocs=N
+ if (self._athenaMT != 0 and self._athenaMP != 0):
+ raise trfExceptions.TransformExecutionException(trfExit.nameToCode('TRF_SETUP'),
+ 'transform configured to run Athena in both MT and MP modes. Only one parallel mode at a time must be used')
+
if self._disableMP:
self._athenaMP = 0
else:
- self._athenaMP = detectAthenaMPProcs(self.conf.argdict)
-
# Small hack to detect cases where there are so few events that it's not worthwhile running in MP mode
# which also avoids issues with zero sized files
if expectedEvents < self._athenaMP:
@@ -1223,6 +1245,18 @@ class athenaExecutor(scriptExecutor):
else:
msg.info('Skipping test for "--drop-and-reload" in this executor')
+ # For AthenaMT apply --threads=N if threads have been configured via ATHENA_CORE_NUMBER + multithreaded
+ if self._athenaMT != 0 :
+ if not ('athenaopts' in self.conf.argdict and
+ any('--threads' in opt for opt in self.conf.argdict['athenaopts'].value[currentSubstep])):
+ self._cmd.append('--threads=%s' % str(self._athenaMT))
+
+ # For AthenaMP apply --threads=N if threads have been configured via ATHENA_CORE_NUMBER + multiprocess
+ if (self._athenaMP !=0 and not self._disableMP):
+ if not ('athenaopts' in self.conf.argdict and
+ any('--nprocs' in opt for opt in self.conf.argdict['athenaopts'].value[currentSubstep])):
+ self._cmd.append('--nprocs=%s' % str(self._athenaMP))
+
# Add topoptions
if self._skeleton is not None:
self._cmd += self._topOptionsFiles
@@ -1273,7 +1307,6 @@ class athenaExecutor(scriptExecutor):
print('DATAPATH={dbroot}:$DATAPATH'.format(dbroot = dbroot), file=wrapper)
if self._disableMP:
print("# AthenaMP explicitly disabled for this executor", file=wrapper)
- print("export ATHENA_PROC_NUMBER=0", file=wrapper)
if self._envUpdate.len > 0:
print("# Customised environment", file=wrapper)
for envSetting in self._envUpdate.values:
diff --git a/Tools/PyJobTransforms/python/trfMPTools.py b/Tools/PyJobTransforms/python/trfMPTools.py
index 795b3f47e5219d73f032b569a6711707a3d13b97..f2e8e80bd308dc60fd3f5a39974ddf8e608c488a 100644
--- a/Tools/PyJobTransforms/python/trfMPTools.py
+++ b/Tools/PyJobTransforms/python/trfMPTools.py
@@ -32,23 +32,27 @@ def detectAthenaMPProcs(argdict = {}):
# Try and detect if any AthenaMP has been enabled
try:
- if 'ATHENA_PROC_NUMBER' in os.environ:
- athenaMPProcs = int(os.environ['ATHENA_PROC_NUMBER'])
- if athenaMPProcs < 0:
- raise ValueError("ATHENA_PROC_NUMBER value was less than zero")
- msg.info('AthenaMP detected from ATHENA_PROC_NUMBER with {0} workers'.format(athenaMPProcs))
- elif 'athenaopts' in argdict:
+ if 'athenaopts' in argdict:
for substep in argdict['athenaopts'].value:
procArg = [opt.replace("--nprocs=", "") for opt in argdict['athenaopts'].value[substep] if '--nprocs' in opt]
if len(procArg) == 0:
athenaMPProcs = 0
elif len(procArg) == 1:
+ if 'multiprocess' in argdict:
+ raise ValueError("Detected conflicting methods to configure AthenaMP: --multiprocess and --nprocs=N (via athenaopts). Only one method must be used")
athenaMPProcs = int(procArg[0])
- if athenaMPProcs < 0:
- raise ValueError("--nprocs was set to a value less than zero")
+ if athenaMPProcs < -1:
+ raise ValueError("--nprocs was set to a value less than -1")
else:
raise ValueError("--nprocs was set more than once in 'athenaopts'")
msg.info('AthenaMP detected from "nprocs" setting with {0} workers for substep {1}'.format(athenaMPProcs,substep))
+ if (athenaMPProcs == 0 and
+ 'ATHENA_CORE_NUMBER' in os.environ and
+ 'multiprocess' in argdict):
+ athenaMPProcs = int(os.environ['ATHENA_CORE_NUMBER'])
+ if athenaMPProcs < -1:
+ raise ValueError("ATHENA_CORE_NUMBER value was less than -1")
+ msg.info('AthenaMP detected from ATHENA_CORE_NUMBER with {0} workers'.format(athenaMPProcs))
except ValueError as errMsg:
myError = 'Problem discovering AthenaMP setup: {0}'.format(errMsg)
raise trfExceptions.TransformExecutionException(trfExit.nameToCode('TRF_EXEC_SETUP_FAIL'), myError)
diff --git a/Tools/PyJobTransforms/python/trfMTTools.py b/Tools/PyJobTransforms/python/trfMTTools.py
new file mode 100644
index 0000000000000000000000000000000000000000..d5f4bbf816c0c892f66eea774ec971f2a818b088
--- /dev/null
+++ b/Tools/PyJobTransforms/python/trfMTTools.py
@@ -0,0 +1,52 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+## @package PyJobTransforms.trfMTTools
+#
+# @brief Utilities for handling AthenaMT jobs
+#
+
+__version__ = '$Revision'
+
+import os
+
+import logging
+msg = logging.getLogger(__name__)
+
+from PyJobTransforms.trfExitCodes import trfExit
+
+import PyJobTransforms.trfExceptions as trfExceptions
+
+## @brief Detect if AthenaMT has been requested
+# @param argdict Argument dictionary, used to access athenaopts for the job
+# @return Integer with the number of threads, N.B. 0 means non-MT serial mode
+def detectAthenaMTThreads(argdict = {}):
+ athenaMTThreads = 0
+
+ # Try and detect if any AthenaMT has been enabled
+ try:
+ if 'athenaopts' in argdict:
+ for substep in argdict['athenaopts'].value:
+ threadArg = [opt.replace("--threads=", "") for opt in argdict['athenaopts'].value[substep] if '--threads' in opt]
+ if len(threadArg) == 0:
+ athenaMTThreads = 0
+ elif len(threadArg) == 1:
+ if 'multithreaded' in argdict:
+ raise ValueError("Detected conflicting methods to configure AthenaMT: --multithreaded and --threads=N (via athenaopts). Only one method must be used")
+ athenaMTThreads = int(threadArg[0])
+ if athenaMTThreads < -1:
+ raise ValueError("--threads was set to a value less than -1")
+ else:
+ raise ValueError("--threads was set more than once in 'athenaopts'")
+ msg.info('AthenaMT detected from "threads" setting with {0} threads for substep {1}'.format(athenaMTThreads,substep))
+ if (athenaMTThreads == 0 and
+ 'ATHENA_CORE_NUMBER' in os.environ and
+ 'multithreaded' in argdict):
+ athenaMTThreads = int(os.environ['ATHENA_CORE_NUMBER'])
+ if athenaMTThreads < -1:
+ raise ValueError("ATHENA_CORE_NUMBER value was less than -1")
+ msg.info('AthenaMT detected from ATHENA_CORE_NUMBER with {0} threads'.format(athenaMTThreads))
+ except ValueError as errMsg:
+ myError = 'Problem discovering AthenaMT setup: {0}'.format(errMsg)
+ raise trfExceptions.TransformExecutionException(trfExit.nameToCode('TRF_EXEC_SETUP_FAIL'), myError)
+
+ return athenaMTThreads
diff --git a/Tools/PyJobTransforms/test/test_trfMPTools.py b/Tools/PyJobTransforms/test/test_trfMPTools.py
index aa585d4bb7b20551889799575ae23a2fd62cc25d..287ddf1d0873304d9174b7c445560c6bf45665a4 100755
--- a/Tools/PyJobTransforms/test/test_trfMPTools.py
+++ b/Tools/PyJobTransforms/test/test_trfMPTools.py
@@ -25,7 +25,7 @@ import PyJobTransforms.trfExceptions as trfExceptions
## Unit tests
class AthenaMPProcTests(unittest.TestCase):
def setUp(self):
- os.environ.pop("ATHENA_PROC_NUMBER", "")
+ os.environ.pop("ATHENA_CORE_NUMBER", "")
def test_noMP(self):
self.assertEqual(detectAthenaMPProcs(), 0)
@@ -33,21 +33,7 @@ class AthenaMPProcTests(unittest.TestCase):
def test_noMPwithArgdict(self):
argdict={'movealong': argList('nothing to see here'), 'athenaopts': argSubstepList(['some', 'random', 'values'])}
self.assertEqual(detectAthenaMPProcs(argdict), 0)
-
- def test_MPfromEnv(self):
- os.environ["ATHENA_PROC_NUMBER"] = "8"
- self.assertEqual(detectAthenaMPProcs(), 8)
-
- def test_MPfromEnvEmpty(self):
- os.environ["ATHENA_PROC_NUMBER"] = "0"
- self.assertEqual(detectAthenaMPProcs(), 0)
-
- def test_MPBadfromEnv(self):
- os.environ["ATHENA_PROC_NUMBER"] = "-1"
- self.assertRaises(trfExceptions.TransformExecutionException, detectAthenaMPProcs)
- os.environ["ATHENA_PROC_NUMBER"] = "notAnInt"
- self.assertRaises(trfExceptions.TransformExecutionException, detectAthenaMPProcs)
-
+
def test_MPfromArgdict(self):
argdict={'movealong': argList('nothing to see here'), 'athenaopts': argSubstepList(['--nprocs=8', 'random', 'values'])}
self.assertEqual(detectAthenaMPProcs(argdict), 8)
@@ -64,13 +50,6 @@ class AthenaMPProcTests(unittest.TestCase):
argdict={'movealong': argList('nothing to see here'), 'athenaopts': argSubstepList(['--nprocs=4', '--nprocs=8', 'values'])}
self.assertRaises(trfExceptions.TransformExecutionException, detectAthenaMPProcs, argdict)
- def test_MPfromBoth(self):
- # Env should have priority
- os.environ["ATHENA_PROC_NUMBER"] = "4"
- argdict={'movealong': argList('nothing to see here'), 'athenaopts': argSubstepList(['--nprocs=2', 'random', 'values'])}
- self.assertEqual(detectAthenaMPProcs(argdict), 4)
-
-
class AthenaMPOutputParseTests(unittest.TestCase):
def setUp(self):
# Gah, this is a pest to setup! Need to creat stub files for the mother outputs
diff --git a/Tools/PyUtils/python/AthFile/impl.py b/Tools/PyUtils/python/AthFile/impl.py
index 6528f518dad1d1f2890c0b87591a7929fc0fd87b..f2e9d5f206650c531fdcc91c46dd2dfeafe4b8f7 100644
--- a/Tools/PyUtils/python/AthFile/impl.py
+++ b/Tools/PyUtils/python/AthFile/impl.py
@@ -1024,9 +1024,6 @@ class FilePeeker(object):
# user-driven (and might need user-customized macros or configurations)
self._sub_env['ROOTENV_NO_HOME'] = '1'
- # prevent from running athena-mp unadvertantly...
- self._sub_env['ATHENA_PROC_NUMBER'] ='0'
-
# prevent from running athena in interactive mode (and freeze)
if 'PYTHONINSPECT' in self._sub_env:
del self._sub_env['PYTHONINSPECT']
@@ -1186,9 +1183,6 @@ class FilePeeker(object):
""" % str([file_name])
app << """
import os
- # prevent from running athena-mp in child processes
- os.putenv('ATHENA_PROC_NUMBER','0')
-
# prevent from running athena in interactive mode (and freeze)
if 'PYTHONINSPECT' in os.environ:
del os.environ['PYTHONINSPECT']
diff --git a/Tools/PyUtils/python/AthFileLite.py b/Tools/PyUtils/python/AthFileLite.py
index 917a32475ae7aac54771a585b287fd180239fd1b..e76a27377254f8884548947c508632a0bb716bf3 100644
--- a/Tools/PyUtils/python/AthFileLite.py
+++ b/Tools/PyUtils/python/AthFileLite.py
@@ -126,7 +126,6 @@ class AthPoolFile(object):
print >>jo, os.linesep.join(("FNAME=['{filename}']",
"import os",
- "os.environ['ATHENA_PROC_NUMBER'] = '0'",
"os.environ.pop('PYTHONINSPECT', None)",
"include('AthenaPython/athfile_peeker.py')",
"from AthenaCommon.AlgSequence import AlgSequence",
@@ -145,7 +144,6 @@ class AthPoolFile(object):
out = open(self._logFile, 'wb')
try:
athenv = os.environ.copy()
- athenv["ATHENA_PROC_NUMBER"] = "0" # Suppress AthenaMP running
subprocess.check_call(['athena.py', self._jobOptionsFile], stdout=out, stderr=out, env=athenv)
except subprocess.CalledProcessError:
# Don't delete log files if errors occured
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_all_ttbar_pu40.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_all_ttbar_pu40.sh
index 8e6ccff91a367c7c45cd91e17ee6c2deaa51cdc0..6526c413eacada94734277f4391893b1e987047a 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_all_ttbar_pu40.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_all_ttbar_pu40.sh
@@ -112,10 +112,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_all_ttbar_pu60.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_all_ttbar_pu60.sh
index 4903f1291ddc52ccd65ccb493161806d26b1caf5..6b84cdcf263fdab505d9dd1a17a7b5e7d000c829 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_all_ttbar_pu60.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_all_ttbar_pu60.sh
@@ -112,10 +112,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_all_ttbar_pu80.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_all_ttbar_pu80.sh
index 8c3039ea081a11c01cec235d76be58f75ca2a363..eb49ab9097870c62ce3a28fe82e2f9ece5908350 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_all_ttbar_pu80.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_all_ttbar_pu80.sh
@@ -112,10 +112,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_beamspot_ttbar_pu40.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_beamspot_ttbar_pu40.sh
index d8e15e60aa1d49e059465bfdcc4b1a150d6fac26..3d47d77319b902f29afffb65faa2a3244a90cc25 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_beamspot_ttbar_pu40.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_beamspot_ttbar_pu40.sh
@@ -103,10 +103,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_beamspot_ttbar_pu40_zfinder.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_beamspot_ttbar_pu40_zfinder.sh
index 4fc9483b7955e47d4af6481ac58f9529bbbc46d3..8c028a77bcd22781ec92604d1c9a748a3609c493 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_beamspot_ttbar_pu40_zfinder.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_beamspot_ttbar_pu40_zfinder.sh
@@ -103,10 +103,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_beamspot_ttbar_pu80_zfinder.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_beamspot_ttbar_pu80_zfinder.sh
index cad5c2467075feb0c1cabb26b9e1eb6b4e449e66..1459c1411ed19e5df89a3557038d7179a305cc5b 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_beamspot_ttbar_pu80_zfinder.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_beamspot_ttbar_pu80_zfinder.sh
@@ -103,10 +103,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40.sh
index 54b64387fd93a829822f3936b0f67cc414eb807a..46e3617bdaa8552b25a4e4c09834ab6ca821d18e 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40.sh
@@ -106,10 +106,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40_2016config.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40_2016config.sh
index a83a6ce923342d5c09e3b113be03ed34f02afd47..81db1ed282c28c513caf6e860a2d9fa984449aa4 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40_2016config.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40_2016config.sh
@@ -104,10 +104,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40_offline.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40_offline.sh
index 2933eabc341a0076a5e4f83ae2d08e12c35f75bc..82f6176740484e45069e107f57eca5e715e26bb7 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40_offline.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40_offline.sh
@@ -105,10 +105,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40_offline_2016config.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40_offline_2016config.sh
index 17e8d505fbcbf5051b59879c5125453ac2cc7d00..8b62df6a2b873d51b8aa9a9a07a0fd63938dfe6b 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40_offline_2016config.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40_offline_2016config.sh
@@ -104,10 +104,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu80.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu80.sh
index 10bf0dd9ea7ac839df67398380fd36dbc7ccfc94..7bc33b20c342541b02420894f16411dc42c4f145 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu80.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu80.sh
@@ -104,10 +104,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_jpsiee_pu40.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_jpsiee_pu40.sh
index cf90351176b8b6e13e970aef521cdd7b7634b0c7..7df1762bc7012e17a5b9680e11b09c6bc5c6c939 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_jpsiee_pu40.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_jpsiee_pu40.sh
@@ -104,10 +104,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_ibl.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_ibl.sh
index d36972714f0e99493e972f831014784fa327f2ad..65feb02d21311a1ed67e89692e94e1c5170443d5 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_ibl.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_ibl.sh
@@ -106,10 +106,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_ibl_pu40.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_ibl_pu40.sh
index 5add2cdbe8a822f5896cccb64fa36c743082191b..7ec1700b065c815dd59c9dc65017c9a8410b10a0 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_ibl_pu40.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_ibl_pu40.sh
@@ -106,10 +106,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_larged0.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_larged0.sh
index ca62ee7cb697897f7bacff79e0439a8e80a63c88..6870c3fc0f2f1d7f60af93f98491cc842ab6db61 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_larged0.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_larged0.sh
@@ -106,10 +106,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_larged0_pu.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_larged0_pu.sh
index 856ca09b78718e9dfdc53a0f4806c2e1838006e5..ec0c102a4eb169cf5671210aebbd6a7d7979c730 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_larged0_pu.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_single_e_7-80_larged0_pu.sh
@@ -106,10 +106,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_ttbar_pu40.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_ttbar_pu40.sh
index ea3b12cd0d60cb3058ab9c9aea5b40a52775182b..f4f67768b21dc038b9445f2932a8488652d51a98 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_ttbar_pu40.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_ttbar_pu40.sh
@@ -106,10 +106,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_ttbar_pu80.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_ttbar_pu80.sh
index 94e948f5a26478e6894b81ae392af21c2a0a6794..963ae4a4f741606e8764ff5afbee226e52f0c888 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_ttbar_pu80.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_ttbar_pu80.sh
@@ -106,10 +106,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40.sh
index fdb537747ac62db39eefb41ac38cc0a2847f2618..3db3c0008e166f527da7cbe80f1262ff180a9bad 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40.sh
@@ -106,10 +106,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40_offline.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40_offline.sh
index c4950df8e40cdda077d79b9bea4b7dfe1b2475da..742ceb9b9a376eadab7246395f77a08f3b583d72 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40_offline.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40_offline.sh
@@ -106,10 +106,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40_offline_rzmatcher.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40_offline_rzmatcher.sh
index aca9132a16183f1433a3750836309f355fbc7c19..9b6f6825e9269d347e47fb535413085615d67cee 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40_offline_rzmatcher.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40_offline_rzmatcher.sh
@@ -106,10 +106,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40_rzmatcher.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40_rzmatcher.sh
index fb323072b83fefdd34eff87ae636a30c50cddd1c..dfb6eb925ce52827c44bda01dac9c13df49de24a 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40_rzmatcher.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_el_zee_ibl_pu40_rzmatcher.sh
@@ -106,10 +106,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_beamspot_ttbar.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_beamspot_ttbar.sh
index 27bcc4853c704be23baa4339acff949daad8df99..5e2d9d9db9c730c9ed22aa9a5acb27d2c45b8d61 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_beamspot_ttbar.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_beamspot_ttbar.sh
@@ -104,10 +104,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_bjet_ttbar.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_bjet_ttbar.sh
index e516799b748f14ddf7b3f7e5d860ca2ebf41d3a5..8ecff34d784ff861d0e7a4e4d39d6a32dc842462 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_bjet_ttbar.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_bjet_ttbar.sh
@@ -104,10 +104,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_bjet_ttbar_offline.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_bjet_ttbar_offline.sh
index 7bd21fbb88b0e813536b7274a058e537521b9c43..d4e6b85af5b3e0227303f82a5c1c603b59aedfe2 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_bjet_ttbar_offline.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_bjet_ttbar_offline.sh
@@ -104,10 +104,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_mu_ttbar.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_mu_ttbar.sh
index 538588b2d75fbf1625141aca338c7993daa786f1..4ccb2b7df7c35a34c97b43f0f0c0b0b2e22c7bf8 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_mu_ttbar.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_mu_ttbar.sh
@@ -106,10 +106,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_mu_ttbar_offline.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_mu_ttbar_offline.sh
index edd64517608e526ec03390fba4c6f5a24848138f..bd3cab68d97e6240008090a0a3e66ce0dd9e920d 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_mu_ttbar_offline.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_mu_ttbar_offline.sh
@@ -106,10 +106,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_tau_tautau.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_tau_tautau.sh
index 1933e632c17021c7a978b898884215a99d0bdffc..e71311848c781777608dc6c533606e0c8b0f9c15 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_tau_tautau.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_ftk_tau_tautau.sh
@@ -104,10 +104,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_minbias.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_minbias.sh
index 4c8c0dd2bb20ee091cd61bc569a74539d41ace73..735d9319b90b25510e409155976ef23866b70137 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_minbias.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_minbias.sh
@@ -103,10 +103,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_minbias_offline.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_minbias_offline.sh
index 73faaba405c4aec3b758c7504b9879b21b02b880..7e023074c9ce9445171a7bfbeaf731d23f616347 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_minbias_offline.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_minbias_offline.sh
@@ -103,10 +103,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_bphys_ibl.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_bphys_ibl.sh
index fafe0d74b17882935c85e32b373cd41a68e5972e..7a2cd69f8537ee0c6571aa6e3caccd52bf2bcb7c 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_bphys_ibl.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_bphys_ibl.sh
@@ -104,10 +104,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_single_mu_larged0.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_single_mu_larged0.sh
index 569c18e758ba6b4a0e1f27e44c2f9b0633593dd2..a1accc5c64ea9c5825cbaf53ba2612b7d5b252b9 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_single_mu_larged0.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_single_mu_larged0.sh
@@ -104,10 +104,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_single_mu_larged0_pu.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_single_mu_larged0_pu.sh
index efd605936a19efc154de45678257e0272141c895..1a281b3cf88fdfc4f220377ff81341fb7435cbd4 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_single_mu_larged0_pu.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_single_mu_larged0_pu.sh
@@ -104,10 +104,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40.sh
index a2544cfef206933781fbc817a6ab604eda45d280..3bf076611bf27895b7570e13ec9ef50d89f38611 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40.sh
@@ -104,10 +104,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40_offline.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40_offline.sh
index c7d204658a875991c8972f8c30039323e8e19bc8..067dda3f6a0b92bb442c56fb56563613c7a28a47 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40_offline.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40_offline.sh
@@ -104,10 +104,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40_offline_rzmatcher.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40_offline_rzmatcher.sh
index 53505c5bd696aa338f31efb87b930054519d98c9..707903d198fe8caf1365a27dac7a528d448f2705 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40_offline_rzmatcher.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40_offline_rzmatcher.sh
@@ -104,10 +104,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40_rzmatcher.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40_rzmatcher.sh
index 9d00cc0474770b7bda4d048f7b02e9a878b04b6d..401253268fca16f3dfba876ae3346086dd7bd31c 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40_rzmatcher.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_mu_zmumu_ibl_pu40_rzmatcher.sh
@@ -104,10 +104,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46.sh
index 5b6032e021decefdc4ab04c7b585d4fbb46648ab..9a728dc11597e438286bcee54768a3953abe3392 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46.sh
@@ -104,10 +104,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_nodoublet.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_nodoublet.sh
index cee8265c5eb46affab7f39287b46275b760304b9..6d0e0922b4750c98a184fbd75c6bdbf0ad65d953 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_nodoublet.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_nodoublet.sh
@@ -104,10 +104,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_offline.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_offline.sh
index ec2f5cfb9f8dec1b0ef89c28156d930ee6e06278..62f06bad95dd992c350f22d490c45ef49e887bf9 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_offline.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_offline.sh
@@ -104,10 +104,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_roiparam.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_roiparam.sh
index 8fb21e737dd06df29074b65e040e41eff4aeb580..80c78c998386c48692434ccb76d088a4110b1623 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_roiparam.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_roiparam.sh
@@ -104,10 +104,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/trigindetvalidation_cosmic.sh b/Trigger/TrigValidation/TrigInDetValidation/test/trigindetvalidation_cosmic.sh
index f32f905b814e9d8d5078fef025e5fdc6e8e8cfa2..f35ee082a180ea1f7821e960a258de718d558274 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/trigindetvalidation_cosmic.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/trigindetvalidation_cosmic.sh
@@ -40,10 +40,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER
# count how many jobs are running ...
diff --git a/Trigger/TrigValidation/TrigInDetValidation/utils/template.sh b/Trigger/TrigValidation/TrigInDetValidation/utils/template.sh
index afec9f3c1383eb66bc79f75618d9755b417b1dec..56b4926d0ea6da2833e975c9aed149402a77878b 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/utils/template.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/utils/template.sh
@@ -82,10 +82,8 @@ WAITING=60
# export ATHENA_NUM_PROC=1
unset ATHENA_NUM_PROC
-unset ATHENA_PROC_NUMBER
env | grep ATHENA_NUM_PROC
-env | grep ATHENA_PROC_NUMBER