Commit 6edba004 authored by Ewelina Maria Lobodzinska's avatar Ewelina Maria Lobodzinska
Browse files

Merge branch '21.6-hepmc' into '21.6'

TestLHE commented out for now

See merge request atlas/athena!46379
parents 6f0963d8 253e79aa
...@@ -213,11 +213,12 @@ def OutputTXTFile(): ...@@ -213,11 +213,12 @@ def OutputTXTFile():
## Main job option include ## Main job option include
## Only permit one jobConfig argument for evgen: does more than one _ever_ make sense? ## Only permit one jobConfig argument for evgen: does more than one _ever_ make sense?
if hasattr(runArgs, "inputGeneratorFile") or hasattr(runArgs, "outputTXTFile") or os.path.isfile("events.lhe") : #commenting out for now
from EvgenProdTools.EvgenProdToolsConf import TestLHE #if hasattr(runArgs, "inputGeneratorFile") or hasattr(runArgs, "outputTXTFile") or os.path.isfile("events.lhe") :
if not hasattr(genSeq, "TestLHE"): # from EvgenProdTools.EvgenProdToolsConf import TestLHE
genSeq += TestLHE() # if not hasattr(genSeq, "TestLHE"):
print "lheFile events.lhe exists in current directory. Will execute TestLHE checks" # genSeq += TestLHE()
# print "lheFile events.lhe exists in current directory. Will execute TestLHE checks"
if len(runArgs.jobConfig) != 1: if len(runArgs.jobConfig) != 1:
print "INFO runArgs.jobConfig = ", runArgs.jobConfig print "INFO runArgs.jobConfig = ", runArgs.jobConfig
......
...@@ -160,10 +160,11 @@ if hasattr(runArgs,"inputGeneratorFile") and ',' not in runArgs.inputGeneratorFi ...@@ -160,10 +160,11 @@ if hasattr(runArgs,"inputGeneratorFile") and ',' not in runArgs.inputGeneratorFi
if hasattr(runArgs,"inputGeneratorFile") and ',' in runArgs.inputGeneratorFile: if hasattr(runArgs,"inputGeneratorFile") and ',' in runArgs.inputGeneratorFile:
multiInput=runArgs.inputGeneratorFile.count(',')+1 multiInput=runArgs.inputGeneratorFile.count(',')+1
if hasattr(runArgs, "outputTXTFile") or hasattr(runArgs, "inputGeneratorFile"): #comment out for now
from EvgenProdTools.EvgenProdToolsConf import TestLHE #if hasattr(runArgs, "outputTXTFile") or hasattr(runArgs, "inputGeneratorFile"):
if not hasattr(genSeq, "TestLHE"): # from EvgenProdTools.EvgenProdToolsConf import TestLHE
genSeq += TestLHE() # if not hasattr(genSeq, "TestLHE"):
# genSeq += TestLHE()
# Main job option include # Main job option include
# Only permit one jobConfig argument for evgen: does more than one _ever_ make sense? # Only permit one jobConfig argument for evgen: does more than one _ever_ make sense?
......
Markdown is supported
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