Skip to content
Snippets Groups Projects
Commit 09e033ec authored by John Chapman's avatar John Chapman
Browse files

Patch Simulation RunTier0Test job, so that it works in AthSimulation builds

parent 7f193229
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Tools/PROCTools/python/RunTier0Tests.py
+ 6
− 6
View file @ 09e033ec
...@@ -83,7 +83,7 @@ def RunCleanSTest(stest,input_file,pwd,release,extraArg,CleanRunHeadDir,UniqID): ...@@ -83,7 +83,7 @@ def RunCleanSTest(stest,input_file,pwd,release,extraArg,CleanRunHeadDir,UniqID):
s=stest s=stest
logging.info("Running clean in rel "+release) logging.info("Running clean in rel "+release)
logging.info("\"Sim_tf.py --AMIConfig "+s+" --inputEVNTFile "+ input_file + " --outputHITSFile myHITS.pool.root --imf False " + extraArg+"\"") logging.info("\"Sim_tf.py --AMIConfig "+s+" --inputEVNTFile "+ input_file + " --outputHITSFile myHITS.pool.root --postInclude 'EVNTtoHITS:PyJobTransforms/UseFrontier.py' --imf False " + extraArg+"\"")
CleanDirName="clean_run_"+s+"_"+UniqID CleanDirName="clean_run_"+s+"_"+UniqID
...@@ -92,11 +92,11 @@ def RunCleanSTest(stest,input_file,pwd,release,extraArg,CleanRunHeadDir,UniqID): ...@@ -92,11 +92,11 @@ def RunCleanSTest(stest,input_file,pwd,release,extraArg,CleanRunHeadDir,UniqID):
" mkdir -p " + CleanDirName +" ;" + " mkdir -p " + CleanDirName +" ;" +
" cd " + CleanDirName +" ;" + " cd " + CleanDirName +" ;" +
" source $AtlasSetup/scripts/asetup.sh "+release+" >& /dev/null ;" + " source $AtlasSetup/scripts/asetup.sh "+release+" >& /dev/null ;" +
" Sim_tf.py --AMIConfig="+s+" --inputEVNTFile "+input_file + " --outputHITSFile myHITS.pool.root --imf False " +extraArg+" > "+s+".log 2>&1" ) " Sim_tf.py --AMIConfig="+s+" --inputEVNTFile "+input_file + " --outputHITSFile myHITS.pool.root --postInclude 'EVNTtoHITS:PyJobTransforms/UseFrontier.py' --imf False " +extraArg+" > "+s+".log 2>&1" )
subprocess.call(cmd,shell=True) subprocess.call(cmd,shell=True)
logging.info("Finished clean in rel "+release) logging.info("Finished clean in rel "+release)
logging.info("\"Sim_tf.py --AMIConfig "+s+" --inputEVNTFile "+ input_file + " --outputHITSFile myHITS.pool.root --imf False " + extraArg+"\"") logging.info("\"Sim_tf.py --AMIConfig "+s+" --inputEVNTFile "+ input_file + " --outputHITSFile myHITS.pool.root --postInclude 'EVNTtoHITS:PyJobTransforms/UseFrontier.py' --imf False " + extraArg+"\"")
pass pass
def RunPatchedSTest(stest,input_file,pwd,release,extraArg,nosetup=False): def RunPatchedSTest(stest,input_file,pwd,release,extraArg,nosetup=False):
...@@ -106,7 +106,7 @@ def RunPatchedSTest(stest,input_file,pwd,release,extraArg,nosetup=False): ...@@ -106,7 +106,7 @@ def RunPatchedSTest(stest,input_file,pwd,release,extraArg,nosetup=False):
s=stest s=stest
logging.info("Running patched in rel "+release) logging.info("Running patched in rel "+release)
logging.info("\"Sim_tf.py --AMIConfig "+s+" --inputEVNTFile "+ input_file + " --outputHITSFile myHITS.pool.root --imf False " + extraArg+"\"") logging.info("\"Sim_tf.py --AMIConfig "+s+" --inputEVNTFile "+ input_file + " --outputHITSFile myHITS.pool.root --postInclude 'EVNTtoHITS:PyJobTransforms/UseFrontier.py' --imf False " + extraArg+"\"")
cmd = " cd "+pwd+" ;" cmd = " cd "+pwd+" ;"
if nosetup: if nosetup:
...@@ -118,12 +118,12 @@ def RunPatchedSTest(stest,input_file,pwd,release,extraArg,nosetup=False): ...@@ -118,12 +118,12 @@ def RunPatchedSTest(stest,input_file,pwd,release,extraArg,nosetup=False):
else : else :
cmd = ( " source $AtlasSetup/scripts/asetup.sh "+release+" >& /dev/null;" ) cmd = ( " source $AtlasSetup/scripts/asetup.sh "+release+" >& /dev/null;" )
cmd += " mkdir -p run_"+s+"; cd run_"+s+";" cmd += " mkdir -p run_"+s+"; cd run_"+s+";"
cmd += " Sim_tf.py --AMIConfig="+s+" --inputEVNTFile "+input_file + " --outputHITSFile myHITS.pool.root --imf False " +extraArg+" > "+s+".log 2>&1" cmd += " Sim_tf.py --AMIConfig="+s+" --inputEVNTFile "+input_file + " --outputHITSFile myHITS.pool.root --postInclude 'EVNTtoHITS:PyJobTransforms/UseFrontier.py' --imf False " +extraArg+" > "+s+".log 2>&1"
subprocess.call(cmd,shell=True) subprocess.call(cmd,shell=True)
logging.info("Finished patched in rel "+release) logging.info("Finished patched in rel "+release)
logging.info("\"Sim_tf.py --AMIConfig "+s+" --inputEVNTFile "+ input_file + " --outputHITSFile myHITS.pool.root --imf False " + extraArg+"\"") logging.info("\"Sim_tf.py --AMIConfig "+s+" --inputEVNTFile "+ input_file + " --outputHITSFile myHITS.pool.root --postInclude 'EVNTtoHITS:PyJobTransforms/UseFrontier.py' --imf False " + extraArg+"\"")
pass pass
def RunCleanQTest(qtest,pwd,release,extraArg,CleanRunHeadDir,UniqID, doR2A=False, trigConfig="2017"): def RunCleanQTest(qtest,pwd,release,extraArg,CleanRunHeadDir,UniqID, doR2A=False, trigConfig="2017"):
......
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