Skip to content
Snippets Groups Projects
Commit 4fada15e authored by Vincent Pascuzzi's avatar Vincent Pascuzzi
Browse files

Update Fatras-based FastChainPU ART tests

DCube tests were removed previously (!30996) due to `FATAL`s in
retrieving hard-scatter collections in hit tests (see ATLASSIM-4458).

This update adds back the DCube tests using a `postInclude` that now
looks in the correct `StoreGate` for the hard-scatter collections
(!31179).
parent 49bad63a
No related branches found
No related tags found
16 merge requests!46457Draft: Adding the tools to run over data,!46454Draft: Adding the tools to be able to run over data,!44869Draft: Update to candidate store,!4217921.9-first_steps-InDetTrackingGeometryXML,!39162Draft: Insert BCM' support,!38765Bis78 cabling,!36893Fix size of RPC active region in BIS78 and strip material,!3645821.9: Improving material map description (ATLITKSW-127),!36293WIP pixel updates,!34993KF-input adding jXERHO to the AOD outputs,!34864LH rings in front ot HR rigs,!34763Fix L1_4jJ15.0ETA25 item definition (ATR-21261),!33996WIP: Correct MM zpositions,!3291021.3 salva s0,!31887Merge 21.3.19 into 21.9,!31298Update Fatras-based FastChainPU ART tests
#!/bin/sh
#
# art-description: Run AFII simulation and full digitization of an MC16a ttbar sample with 2016a geometry and conditions, 25ns pile-up
# art-type: grid
# art-include: 21.3/Athena
# art-output: *.root
# art-output: config.txt
HighPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/*"
LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/*"
......@@ -18,13 +13,13 @@ FastChain_tf.py \
--enableLooperKiller True \
--inputEVNTFile /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 \
--outputRDOFile RDO.pool.root \
--maxEvents 10 \
--maxEvents 5 \
--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 Digitization.DigitizationFlags import digitizationFlags;digitizationFlags.experimentalDigi=["NewMerge"]' \
--preExec 'EVNTtoRDO:ToolSvc.NewMergeMcEventCollTool.OutputLevel=VERBOSE;' \
--postInclude='PyJobTransforms/UseFrontier.py' \
--postInclude='PyJobTransforms/UseFrontier.py,G4AtlasTests/postInclude.SplitSG_FCpileup.py' \
--postExec 'from AthenaCommon.ConfigurationShelve import saveToAscii;saveToAscii("config.txt");ServiceMgr.MessageSvc.Format = "% F%32W%S%7W%R%T %0W%M"' \
--DataRunNumber '284500' \
--inputHighPtMinbiasHitsFile ${HighPtMinbiasHitsFiles} \
......@@ -34,17 +29,17 @@ FastChain_tf.py \
--numberOfLowPtMinBias '44.3839246425' \
--numberOfCavernBkg 0 \
--imf False
rc=$?
echo "art-result: $rc EVNTtoRDO"
# rc=$?
# echo "art-result: $rc EVNTtoRDO"
rc2=-9999
if [ ${rc} -eq 0 ]
then
# Regression test
ArtPackage=$1
ArtJobName=$2
art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
rc2=$?
# rc2=-9999
# if [ ${rc} -eq 0 ]
# then
# # Regression test
# ArtPackage=$1
# ArtJobName=$2
# art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
# rc2=$?
fi
echo "art-result: ${rc2} regression"
# fi
# echo "art-result: ${rc2} regression"
......@@ -24,7 +24,7 @@ FastChain_tf.py \
--conditionsTag default:OFLCOND-MC16-SDR-16 \
--preSimExec 'from TrkDetDescrSvc.TrkDetDescrJobProperties import TrkDetFlags;TrkDetFlags.TRT_BuildStrawLayers=True;from Digitization.DigitizationFlags import digitizationFlags;digitizationFlags.experimentalDigi=["NewMerge"]' \
--preExec 'EVNTtoRDO:ToolSvc.NewMergeMcEventCollTool.OutputLevel=VERBOSE;' \
--postInclude='PyJobTransforms/UseFrontier.py' \
--postInclude='PyJobTransforms/UseFrontier.py,G4AtlasTests/postInclude.SplitSG_FCpileup.py' \
--postExec 'from AthenaCommon.ConfigurationShelve import saveToAscii;saveToAscii("config.txt");ServiceMgr.MessageSvc.Format = "% F%32W%S%7W%R%T %0W%M"' \
--DataRunNumber '284500' \
--inputHighPtMinbiasHitsFile ${HighPtMinbiasHitsFiles} \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment