Commit 93dffedc authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'fc-nov12' into 'master'

Fixes for fastchain and update the new test

See merge request atlas/athena!48215
parents 7ee9e2ec f8c4d678
......@@ -3,6 +3,7 @@
# art-description: G4MS test with pile-up profile
# art-type: grid
# art-include: master/Athena
# art-output: run-*
maxevent=1
inputfile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1"
......@@ -10,6 +11,7 @@ HighPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0C
LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/*"
mkdir run-wopostexec; cd run-wopostexec
FastChain_tf.py \
--simulator ATLFASTIIF_G4MS \
--useISF True \
......@@ -29,7 +31,7 @@ FastChain_tf.py \
--preSimExec 'from TrkDetDescrSvc.TrkDetDescrJobProperties import TrkDetFlags;TrkDetFlags.TRT_BuildStrawLayers=True;from ISF_Config.ISF_jobProperties import ISF_Flags;ISF_Flags.UseTrackingGeometryCond=False' \
--preSimInclude 'Campaigns/MC16a.py' 'Campaigns/PileUpMC16a.py' \
--postInclude='PyJobTransforms/UseFrontier.py' \
--postExec 'from AthenaCommon.ConfigurationShelve import saveToAscii;saveToAscii("config.txt");ServiceMgr.MessageSvc.Format = "% F%32W%S%7W%R%T %0W%M"' \
--postExec 'ServiceMgr.MessageSvc.Format = "% F%32W%S%7W%R%T %0W%M"' \
--inputHighPtMinbiasHitsFile ${HighPtMinbiasHitsFiles} \
--inputLowPtMinbiasHitsFile ${LowPtMinbiasHitsFiles} \
--pileupFinalBunch '6' \
......@@ -37,3 +39,45 @@ FastChain_tf.py \
--numberOfLowPtMinBias '44.3839246425' \
--numberOfCavernBkg 0 \
--imf False
rc1=$?
echo "art-result: ${rc1} EVNTtoRDO"
cd ..
mkdir run-withpostexec; cd run-withpostexec
FastChain_tf.py \
--simulator ATLFASTIIF_G4MS \
--useISF True \
--randomSeed 123 \
--enableLooperKiller True \
--physicsList 'FTFP_BERT_ATL' \
--jobNumber 1 \
--bunchSpacing 25 \
--digiSeedOffset1 '1' \
--digiSeedOffset2 '2' \
--inputEVNTFile ${inputfile} \
--outputRDOFile RDO.pool.root \
--maxEvents ${maxevent} \
--skipEvents 0 \
--geometryVersion default:ATLAS-R2-2016-01-00-01 \
--conditionsTag default:OFLCOND-MC16-SDR-16 \
--preSimExec 'from TrkDetDescrSvc.TrkDetDescrJobProperties import TrkDetFlags;TrkDetFlags.TRT_BuildStrawLayers=True;from ISF_Config.ISF_jobProperties import ISF_Flags;ISF_Flags.UseTrackingGeometryCond=False' \
--preSimInclude 'Campaigns/MC16a.py' 'Campaigns/PileUpMC16a.py' \
--postInclude='PyJobTransforms/UseFrontier.py' \
--postExec 'ServiceMgr.EventSelector.FirstLB=1;ServiceMgr.EventSelector.InitialTimeStamp=1446539425;ServiceMgr.EventSelector.OverrideRunNumber=True;ServiceMgr.EventSelector.OverrideRunNumberFromInput=True;ServiceMgr.EventSelector.RunNumber=284500;ServiceMgr.MessageSvc.Format = "% F%32W%S%7W%R%T %0W%M"' \
--inputHighPtMinbiasHitsFile ${HighPtMinbiasHitsFiles} \
--inputLowPtMinbiasHitsFile ${LowPtMinbiasHitsFiles} \
--pileupFinalBunch '6' \
--numberOfHighPtMinBias '0.116075313' \
--numberOfLowPtMinBias '44.3839246425' \
--numberOfCavernBkg 0 \
--imf False
cd ..
rc2=$?
echo "art-result: ${rc2} "EVNTtoRDO-withpostExec""
if [[ ${rc1} -eq 0 && ${rc2} -eq 0 ]]
then
art.py compare ref run-wopostexec/RDO.pool.root run-withpostexec/RDO.pool.root --mode=summary
echo "art-result: $? diff-root"
fi
......@@ -387,6 +387,7 @@ if hasattr(runArgs,"DataRunNumber"):
elif hasattr(runArgs,'jobNumber'):
if runArgs.jobNumber>=0:
fast_chain_log.info( 'Using job number '+str(runArgs.jobNumber)+' to derive run number.' )
simFlags.RunDict = { digitizationFlags.RunAndLumiOverrideList.getMinMaxRunNumbers()[0] : digitizationFlags.RunAndLumiOverrideList.getEvtsMax() }
simFlags.RunNumber = simFlags.RunDict.GetRunNumber( runArgs.jobNumber )
fast_chain_log.info( 'Set run number based on dictionary to '+str(simFlags.RunNumber) )
......@@ -1051,6 +1052,7 @@ import MagFieldServices.SetupField
if digitizationFlags.RunAndLumiOverrideList.statusOn:
if not(DetFlags.pileup.any_on()):
AthError( "This job will try to override pile-up luminosity configuration, but no pile-up will be set up!" )
ServiceMgr.EventSelector.OverrideRunNumber=True
include("Digitization/LumiBlockOverrides.py")
if digitizationFlags.dataRunNumber.statusOn:
fast_chain_log.warning('digitizationFlags.RunAndLumiOverrideList has been set! digitizationFlags.dataRunNumber (set to %s) will be ignored. ', digitizationFlags.dataRunNumber.get_Value() )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment