Skip to content
Snippets Groups Projects
Commit da5b7ade authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'mhodgkin_ATR_22498' into 'master' 

Improvements and bug fixes to reco tests

See merge request atlas/athena!39245
parents 022a08ba 89c2fd10
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!39245Improvements and bug fixes to reco tests
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 22 deletions
Reconstruction/RecExample/RecExRecoTest/test/test_compare_SerialAndThreadedAthenas.sh
+ 4
− 4
View file @ da5b7ade
...@@ -4,7 +4,7 @@ echo "Creating new serial directory" ...@@ -4,7 +4,7 @@ echo "Creating new serial directory"
mkdir serial; cd serial mkdir serial; cd serial
athena $1 | tee athenaSerial.log athena $1 | tee athenaSerial.log
rc=${PIPESTATUS[0]} rc=${PIPESTATUS[0]}
xAODDigest.py myAOD.pool.root | tee digestSerial.log xAODDigest.py AOD.pool.root | tee digestSerial.log
echo "art-result: $rc Serial" echo "art-result: $rc Serial"
test_postProcessing_Errors.sh athenaSerial.log | tee errorsSerial.log test_postProcessing_Errors.sh athenaSerial.log | tee errorsSerial.log
...@@ -15,7 +15,7 @@ mkdir threadOne; cd threadOne ...@@ -15,7 +15,7 @@ mkdir threadOne; cd threadOne
athena --threads=1 $1 | tee athenaOneThread.log athena --threads=1 $1 | tee athenaOneThread.log
rc1=${PIPESTATUS[0]} rc1=${PIPESTATUS[0]}
xAODDigest.py myAOD.pool.root | tee digestOneThread.log xAODDigest.py AOD.pool.root | tee digestOneThread.log
echo "art-result: $rc1 OneThread" echo "art-result: $rc1 OneThread"
test_postProcessing_Errors.sh athenaOneThread.log | tee errorsOneThread.log test_postProcessing_Errors.sh athenaOneThread.log | tee errorsOneThread.log
...@@ -39,7 +39,7 @@ mkdir threadTwo; cd threadTwo ...@@ -39,7 +39,7 @@ mkdir threadTwo; cd threadTwo
athena --threads=2 $1 | tee athenaTwoThreads.log athena --threads=2 $1 | tee athenaTwoThreads.log
rc2=${PIPESTATUS[0]} rc2=${PIPESTATUS[0]}
xAODDigest.py myAOD.pool.root | tee digestTwoThreads.log xAODDigest.py AOD.pool.root | tee digestTwoThreads.log
echo "art-result: $rc2 TwoThreads" echo "art-result: $rc2 TwoThreads"
test_postProcessing_Errors.sh athenaTwoThreads.log | tee errorsTwoThreads.log test_postProcessing_Errors.sh athenaTwoThreads.log | tee errorsTwoThreads.log
...@@ -59,7 +59,7 @@ mkdir threadFive; cd threadFive ...@@ -59,7 +59,7 @@ mkdir threadFive; cd threadFive
athena --threads=5 $1 | tee athenaFiveThreads.log athena --threads=5 $1 | tee athenaFiveThreads.log
rc5=${PIPESTATUS[0]} rc5=${PIPESTATUS[0]}
xAODDigest.py myAOD.pool.root | tee digestFiveThreads.log xAODDigest.py AOD.pool.root | tee digestFiveThreads.log
echo "art-result: $rc5 FiveThreads" echo "art-result: $rc5 FiveThreads"
test_postProcessing_Errors.sh athenaFiveThreads.log | tee errorsFiveThreads.log test_postProcessing_Errors.sh athenaFiveThreads.log | tee errorsFiveThreads.log
......
Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV.sh
+ 1
− 1
View file @ da5b7ade
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# art-include: master/Athena # art-include: master/Athena
export TRF_ECHO=True; export TRF_ECHO=True;
Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --inputHighPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/HITS.10501933._000008.pool.root.1 --inputLowPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/HITS.10501925._000027.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --inputHighPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/HITS.10501933._000008.pool.root.1 --inputLowPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/HITS.10501925._000027.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False --athenaopts "RDOtoRDOTrigger:--imf --threads=1 --concurrent-events=1"
RES=$? RES=$?
echo "art-result: $RES Reco" echo "art-result: $RES Reco"
if [ $RES -ne 0 ];then if [ $RES -ne 0 ];then
......
Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV_largeRadiusTrackingOn.sh deleted 100755 → 0
+ 0
− 15
View file @ 022a08ba
#!/bin/sh
#
# art-description: Run reco with a latest (September 2020) MC setup with pileup. This test also enables Large Radius Tracking.
# art-output: log.*
# art-athena-mt: 4
# art-type: grid
# art-include: master/Athena
export TRF_ECHO=True;
Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --inputHighPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/HITS.10501933._000008.pool.root.1 --inputLowPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/HITS.10501925._000027.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False --preExec r2e:'from InDetRecExample.InDetJobProperties import InDetFlags; InDetFlags.doR3LargeD0.set_Value_and_Lock(True);InDetFlags.storeSeparateLargeD0Container.set_Value_and_Lock(True);'
RES=$?
echo "art-result: $RES Reco"
if [ $RES -ne 0 ];then
return $RES
fi
Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_13TeV.sh
+ 1
− 1
View file @ da5b7ade
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# art-include: master/Athena # art-include: master/Athena
export TRF_ECHO=True; export TRF_ECHO=True;
Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False --athenaopts "RDOtoRDOTrigger:--imf --threads=1 --concurrent-events=1"
RES=$? RES=$?
echo "art-result: $RES Reco" echo "art-result: $RES Reco"
if [ $RES -ne 0 ];then if [ $RES -ne 0 ];then
......
Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_stdcmalloc_13TeV.sh
+ 1
− 1
View file @ da5b7ade
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# art-include: master/Athena # art-include: master/Athena
export TRF_ECHO=True; export TRF_ECHO=True;
Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False --athenaopts="--stdcmalloc" Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False --athenaopts "all:--stdcmalloc" "RDOtoRDOTrigger:--imf --threads=1 --concurrent-events=1"
RES=$? RES=$?
echo "art-result: $RES Reco" echo "art-result: $RES Reco"
if [ $RES -ne 0 ];then if [ $RES -ne 0 ];then
......
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