Commit a761cf79 authored by Ewelina Maria Lobodzinska's avatar Ewelina Maria Lobodzinska
Browse files

fix MGControl common to remove runNumber dependency, add MP switch to LHEonly...

fix MGControl common to remove runNumber dependency, add MP switch to LHEonly file - in case someone wants to run with MP!=1
parent 4d95e632
......@@ -3,6 +3,16 @@
# No output is kept from this generation
## Base config for Pythia8
import os
if 'ATHENA_PROC_NUMBER' in os.environ:
evgenLog.info('Noticed that you have run with an athena MP-like whole-node setup. Will re-configure now to make sure that the remainder of the job runs
serially.')
njobs = os.environ.pop('ATHENA_PROC_NUMBER')
# Try to modify the opts underfoot
if not hasattr(opts,'nprocs'): mglog.warning('Did not see option!')
else: opts.nprocs = 0
print opts
from Pythia8_i.Pythia8_iConf import Pythia8_i
genSeq += Pythia8_i("Pythia8")
......
......@@ -292,7 +292,7 @@ outputDS=arrange_output(run_name=name,
# Run Pythia 8 Showering
# --------------------------------------------------------------
if not runArgs.runNumber in herwig_dsids:
if not thisDSID in herwig_dsids:
evgenConfig.generators += ["aMcAtNlo", "Pythia8"]
evgenConfig.description = 'MG5_aMC@NLO+Pythia8+EvtGen '+name+' OTF, A14 NNPDF 2.3 LO, ME NNPDF 3.0 NLO, using scale sqrt(sum_i mT(i)**2/2)), for i = top quarks'
evgenConfig.keywords += [ 'SM', 'top']
......@@ -300,7 +300,7 @@ if not runArgs.runNumber in herwig_dsids:
runArgs.inputGeneratorFile=outputDS
include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
include("Pythia8_i/Pythia8_aMcAtNlo.py")
elif runArgs.runNumber in herwig_dsids:
elif thisDSID in herwig_dsids:
runArgs.inputGeneratorFile=outputDS
evgenConfig.generators += ["aMcAtNlo", "Herwig7"]
evgenConfig.description = 'MG5_aMC@NLO+Herwig7+EvtGen '+name+' OTF, H7p1 default tune, ME NNPDF 3.0 NLO, using scale sqrt(sum_i mT(i)**2/2)), for i = top quarks'
......
Supports Markdown
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