From 2d6fbd00f8c84b976150e76a9784ec9f94a0c841 Mon Sep 17 00:00:00 2001 From: John Chapman Date: Mon, 18 May 2020 18:34:24 +0200 Subject: [PATCH 1/2] Ensure that all log files are saved in FullG4 and PassBackG4 ST vs MT comparisons --- .../test/test_MC16_FullG4_ttbar_MTvsST.sh | 3 +++ ...vsST.sh => test_MC16_PassBackG4_ttbar_MTvsST.sh} | 13 ++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) rename Simulation/Tests/ISF_ValidationMT/test/{test_MC16_PassbackG4_ttbar_MTvsST.sh => test_MC16_PassBackG4_ttbar_MTvsST.sh} (90%) diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_MC16_FullG4_ttbar_MTvsST.sh b/Simulation/Tests/ISF_ValidationMT/test/test_MC16_FullG4_ttbar_MTvsST.sh index 365cef8c092..61cadf3e786 100755 --- a/Simulation/Tests/ISF_ValidationMT/test/test_MC16_FullG4_ttbar_MTvsST.sh +++ b/Simulation/Tests/ISF_ValidationMT/test/test_MC16_FullG4_ttbar_MTvsST.sh @@ -28,6 +28,7 @@ Sim_tf.py \ --imf False rc=$? +mv log.EVNTtoHITS log.FullG4MTAthenaMT echo "art-result: $rc FullG4MTAthenaMT" rc2=-9999 if [ $rc -eq 0 ] @@ -49,6 +50,7 @@ then --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ --imf False + mv log.EVNTtoHITS log.FullG4MTAthena rc2=$? fi echo "art-result: $rc2 FullG4MTAthena" @@ -72,6 +74,7 @@ then --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ --imf False + mv log.EVNTtoHITS log.FullG4Athena rc3=$? fi echo "art-result: $rc3 FullG4Athena" diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_MC16_PassbackG4_ttbar_MTvsST.sh b/Simulation/Tests/ISF_ValidationMT/test/test_MC16_PassBackG4_ttbar_MTvsST.sh similarity index 90% rename from Simulation/Tests/ISF_ValidationMT/test/test_MC16_PassbackG4_ttbar_MTvsST.sh rename to Simulation/Tests/ISF_ValidationMT/test/test_MC16_PassBackG4_ttbar_MTvsST.sh index c760fb22fec..3bdcf08c423 100755 --- a/Simulation/Tests/ISF_ValidationMT/test/test_MC16_PassbackG4_ttbar_MTvsST.sh +++ b/Simulation/Tests/ISF_ValidationMT/test/test_MC16_PassBackG4_ttbar_MTvsST.sh @@ -28,7 +28,8 @@ Sim_tf.py \ --imf False rc=$? -echo "art-result: $rc PassbackG4MTAthenaMT" +mv log.EVNTtoHITS log.PassBackG4MTAthenaMT +echo "art-result: $rc PassBackG4MTAthenaMT" rc2=-9999 if [ $rc -eq 0 ] then @@ -50,8 +51,9 @@ then --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ --imf False rc2=$? + mv log.EVNTtoHITS log.PassBackG4MTAthena fi -echo "art-result: $rc2 PassbackG4MTAthena" +echo "art-result: $rc2 PassBackG4MTAthena" rc3=-9999 if [ $rc -eq 0 ] then @@ -74,19 +76,20 @@ then --postExec 'svcMgr.ISF_ParticleBrokerSvcNoOrdering.ParticleOrderingTool="ISF__EnergyParticleOrderingTool";svcMgr.ISF_ParticleBrokerSvcNoOrdering.AlwaysUseGeoIDSvc=True' \ --imf False rc3=$? + mv log.EVNTtoHITS log.PassBackG4Athena fi -echo "art-result: $rc3 PassbackG4Athena" +echo "art-result: $rc3 PassBackG4Athena" rc4=-9999 if [ $rc2 -eq 0 ] then acmd.py diff-root test.MT.HITS.pool.root test.ST.HITS.pool.root --error-mode resilient --mode=semi-detailed --order-trees --ignore-leaves RecoTimingObj_p1_EVNTtoHITS_timings index_ref rc4=$? fi -echo "art-result: $rc4 PassbackG4MT_STvsMT" +echo "art-result: $rc4 PassBackG4MT_STvsMT" rc5=-9999 if [ $rc3 -eq 0 ] then acmd.py diff-root test.MT.HITS.pool.root test.ST.old.HITS.pool.root --error-mode resilient --mode=semi-detailed --order-trees --ignore-leaves RecoTimingObj_p1_EVNTtoHITS_timings index_ref rc5=$? fi -echo "art-result: $rc5 PassbackG4MTvsPassbackG4" +echo "art-result: $rc5 PassBackG4MTvsPassBackG4" -- GitLab From 4693d8a72193885a37178c32e34d6d72f39d29b2 Mon Sep 17 00:00:00 2001 From: John Chapman Date: Mon, 18 May 2020 18:34:54 +0200 Subject: [PATCH 2/2] Add test_MC16_G4FastCalo_ttbar_MTvsST.sh script, but do not activate it for any ART runs yet. --- .../test/test_MC16_G4FastCalo_ttbar_MTvsST.sh | 97 +++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100755 Simulation/Tests/ISF_ValidationMT/test/test_MC16_G4FastCalo_ttbar_MTvsST.sh diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_MC16_G4FastCalo_ttbar_MTvsST.sh b/Simulation/Tests/ISF_ValidationMT/test/test_MC16_G4FastCalo_ttbar_MTvsST.sh new file mode 100755 index 00000000000..4841cabf7c7 --- /dev/null +++ b/Simulation/Tests/ISF_ValidationMT/test/test_MC16_G4FastCalo_ttbar_MTvsST.sh @@ -0,0 +1,97 @@ +#!/bin/sh +# +# art-description: Run MT and ST simulation outside ISF, reading ttbar events, writing HITS, using MC16 geometry and conditions + +# art-type: grid +# art-athena-mt: 8 +# art-output: log.* +# art-output: test.MT.HITS.pool.root +# art-output: test.ST.HITS.pool.root + +export ATHENA_CORE_NUMBER=8 + +Sim_tf.py \ +--multithreaded \ +--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \ +--outputHITSFile "test.MT.HITS.pool.root" \ +--maxEvents 10 \ +--geometryVersion 'default:ATLAS-R2-2016-01-00-01' \ +--conditionsTag 'default:OFLCOND-MC16-SDR-14' \ +--DataRunNumber '284500' \ +--physicsList 'FTFP_BERT_ATL' \ +--truthStrategy 'MC15aPlus' \ +--simulator 'G4FastCaloMT' \ +--postInclude 'default:PyJobTransforms/UseFrontier.py' \ +--preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ +--preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' #\ +#--postExec 'EVNTtoHITS:ServiceMgr.MessageSvc.enableSuppression=False;topSeq.ISF_Kernel_G4FastCaloMT.OutputLevel=VERBOSE;' \ +#--imf False + +rc=$? +mv log.EVNTtoHITS log.G4FastCaloMTAthenaMT +echo "art-result: $rc G4FastCaloMTAthenaMT" +rc=0 +rc2=-9999 +if [ $rc -eq 0 ] +then + ArtPackage=$1 + ArtJobName=$2 + unset ATHENA_CORE_NUMBER + Sim_tf.py \ + --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \ + --outputHITSFile "test.ST.HITS.pool.root" \ + --maxEvents 10 \ + --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \ + --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ + --DataRunNumber '284500' \ + --physicsList 'FTFP_BERT_ATL' \ + --truthStrategy 'MC15aPlus' \ + --simulator 'G4FastCaloMT' \ + --postInclude 'default:PyJobTransforms/UseFrontier.py' \ + --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ + --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' #\ +# --postExec 'EVNTtoHITS:ServiceMgr.MessageSvc.enableSuppression=False;topSeq.ISF_Kernel_G4FastCaloMT.OutputLevel=VERBOSE;' \ +# --imf False + rc2=$? + mv log.EVNTtoHITS log.G4FastCaloMTAthena +fi +echo "art-result: $rc2 G4FastCaloMTAthena" +rc3=-9999 +if [ $rc -eq 0 ] +then + ArtPackage=$1 + ArtJobName=$2 + unset ATHENA_CORE_NUMBER + Sim_tf.py \ + --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \ + --outputHITSFile "test.ST.old.HITS.pool.root" \ + --maxEvents 10 \ + --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \ + --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ + --DataRunNumber '284500' \ + --physicsList 'FTFP_BERT_ATL' \ + --truthStrategy 'MC15aPlus' \ + --simulator 'G4FastCalo' \ + --postInclude 'default:PyJobTransforms/UseFrontier.py' \ + --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ + --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' #\ +# --postExec 'EVNTtoHITS:ServiceMgr.MessageSvc.enableSuppression=False;topSeq.ISF_Kernel_G4FastCalo.OutputLevel=VERBOSE;ServiceMgr.ISF_AFIIParticleBrokerSvc.OutputLevel=VERBOSE;' \ +# --imf False + rc3=$? + mv log.EVNTtoHITS log.G4FastCaloAthena +fi +echo "art-result: $rc3 G4FastCaloAthena" +rc4=-9999 +if [ $rc2 -eq 0 ] +then + acmd.py diff-root test.MT.HITS.pool.root test.ST.HITS.pool.root --error-mode=resilient --mode=semi-detailed --order-trees --ignore-leaves RecoTimingObj_p1_EVNTtoHITS_timings index_ref + rc4=$? +fi +echo "art-result: $rc4 G4FastCaloMT_STvsMT" +rc5=-9999 +if [ $rc3 -eq 0 ] +then + acmd.py diff-root test.ST.HITS.pool.root test.ST.old.HITS.pool.root --error-mode=resilient --mode=semi-detailed --order-trees --ignore-leaves RecoTimingObj_p1_EVNTtoHITS_timings index_ref + rc5=$? +fi +echo "art-result: $rc5 G4FastCaloMTvsG4FastCalo" -- GitLab