Skip to content
Snippets Groups Projects
Commit 026b2e6a authored by Vakhtang Tsulaia's avatar Vakhtang Tsulaia
Browse files

Merge branch 'mhodgkin_fixRecExRecoQTest_July2020' into 'master' 

Bug fix to usage of preExec via bash string for the q-tests.

See merge request !35207
parents 0e88a73a cb96a34f
No related branches found
No related tags found
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,!35207Bug fix to usage of preExec via bash string for the q-tests.
Hide whitespace changes
Inline Side-by-side
Reconstruction/RecExample/RecExRecoTest/test/test_reco_tf_compare_SerialAndThreadedAthenas.sh
+ 6
− 5
View file @ 026b2e6a
#!/bin/bash #!/bin/bash
preExecString = 'RAWtoESD:from RecExConfig.RecFlags import rec;rec.doTrigger.set_Value_and_Lock(False);from AthenaMonitoring.DQMonFlags import jobproperties;jobproperties.DQMonFlagsCont.doMonitoring.set_Value_and_Lock(False)' preExecString="RAWtoESD:from RecExConfig.RecFlags import rec;rec.doTrigger.set_Value_and_Lock(False);from AthenaMonitoring.DQMonFlags import jobproperties;jobproperties.DQMonFlagsCont.doMonitoring.set_Value_and_Lock(False)"
echo $preExecString
echo "Creating new serial directory" echo "Creating new serial directory"
mkdir serial; cd serial mkdir serial; cd serial
Reco_tf.py --AMI=$1 --preExec=preExecString --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenaSerial.log Reco_tf.py --AMI=$1 --preExec="${preExecString}" --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenaSerial.log
rc=${PIPESTATUS[0]} rc=${PIPESTATUS[0]}
echo "art-result: $rc Serial" echo "art-result: $rc Serial"
...@@ -14,7 +15,7 @@ cd ../ ...@@ -14,7 +15,7 @@ cd ../
echo "Creating new threadOne directory" echo "Creating new threadOne directory"
mkdir threadOne; cd threadOne mkdir threadOne; cd threadOne
Reco_tf.py --athenaopts="--threads=1" --AMI=$1 --preExec=preExecString --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenaOneThread.log Reco_tf.py --athenaopts="--threads=1" --AMI=$1 --preExec="${preExecString}" --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenaOneThread.log
rc1=${PIPESTATUS[0]} rc1=${PIPESTATUS[0]}
echo "art-result: $rc1 OneThread" echo "art-result: $rc1 OneThread"
...@@ -36,7 +37,7 @@ cd ../ ...@@ -36,7 +37,7 @@ cd ../
echo "Creating new threadTwo directory" echo "Creating new threadTwo directory"
mkdir threadTwo; cd threadTwo mkdir threadTwo; cd threadTwo
Reco_tf.py --athenaopts="--threads=2" --AMI=$1 --preExec=preExecString --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenaTwoThreads.log Reco_tf.py --athenaopts="--threads=2" --AMI=$1 --preExec="${preExecString}" --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenaTwoThreads.log
rc2=${PIPESTATUS[0]} rc2=${PIPESTATUS[0]}
echo "art-result: $rc2 TwoThreads" echo "art-result: $rc2 TwoThreads"
...@@ -54,7 +55,7 @@ cd ../ ...@@ -54,7 +55,7 @@ cd ../
echo "Creating new threadFive directory" echo "Creating new threadFive directory"
mkdir threadFive; cd threadFive mkdir threadFive; cd threadFive
Reco_tf.py --athenaopts="--threads=5" --AMI=$1 --preExec=preExecString --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenaFiveThreads.log Reco_tf.py --athenaopts="--threads=5" --AMI=$1 --preExec="${preExecString}" --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenaFiveThreads.log
rc5=${PIPESTATUS[0]} rc5=${PIPESTATUS[0]}
echo "art-result: $rc5 FiveThreads" echo "art-result: $rc5 FiveThreads"
......
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