Commit b2664f37 authored by Oldrich Kepka's avatar Oldrich Kepka
Browse files

Merge remote-tracking branch 'upstream/20.6' into 21.6-superchic-common

parents c0820c02 c2d3084b
......@@ -213,11 +213,12 @@ def OutputTXTFile():
## Main job option include
## 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") :
from EvgenProdTools.EvgenProdToolsConf import TestLHE
if not hasattr(genSeq, "TestLHE"):
genSeq += TestLHE()
print "lheFile events.lhe exists in current directory. Will execute TestLHE checks"
#commenting out for now
#if hasattr(runArgs, "inputGeneratorFile") or hasattr(runArgs, "outputTXTFile") or os.path.isfile("events.lhe") :
# from EvgenProdTools.EvgenProdToolsConf import TestLHE
# if not hasattr(genSeq, "TestLHE"):
# genSeq += TestLHE()
# print "lheFile events.lhe exists in current directory. Will execute TestLHE checks"
if len(runArgs.jobConfig) != 1:
print "INFO runArgs.jobConfig = ", runArgs.jobConfig
......
......@@ -160,10 +160,11 @@ if hasattr(runArgs,"inputGeneratorFile") and ',' not in runArgs.inputGeneratorFi
if hasattr(runArgs,"inputGeneratorFile") and ',' in runArgs.inputGeneratorFile:
multiInput=runArgs.inputGeneratorFile.count(',')+1
if hasattr(runArgs, "outputTXTFile") or hasattr(runArgs, "inputGeneratorFile"):
from EvgenProdTools.EvgenProdToolsConf import TestLHE
if not hasattr(genSeq, "TestLHE"):
genSeq += TestLHE()
#comment out for now
#if hasattr(runArgs, "outputTXTFile") or hasattr(runArgs, "inputGeneratorFile"):
# from EvgenProdTools.EvgenProdToolsConf import TestLHE
# if not hasattr(genSeq, "TestLHE"):
# genSeq += TestLHE()
# Main job option include
# Only permit one jobConfig argument for evgen: does more than one _ever_ make sense?
......
#!/bin/bash
# art-description: Generation test MG+Py8 ttW
# art-include: 21.6/AthGeneration
# art-type: build
# art-output: *.root
# art-output: log.generate
## Any arguments are considered overrides, and will be added at the end
export TRF_ECHO=True;
rm *;
Gen_tf.py --ecmEnergy=13000 --jobConfig=421108 --maxEvents=100 \
--outputEVNTFile=test_mgpythia8_ttW.EVNT.pool.root \
echo "art-result: $? generate"
......@@ -7,7 +7,7 @@
## Any arguments are considered overrides, and will be added at the end
export TRF_ECHO=True;
Gen_tf.py --ecmEnergy=13000 --jobConfig=421126 --maxEvents=100 \
Gen_tf.py --ecmEnergy=13000 --jobConfig=421126 --maxEvents=5 \
--outputEVNTFile=test_Py8JZ2MultiBJetFilt.EVNT.pool.root \
echo "art-result: $? generate"
......
......@@ -312,7 +312,7 @@ def new_process(process='generate p p > t t~\noutput -f', keepJpegs=False, usePM
do_PMG_updates(process_dir)
# After 2.9.3, enforce the standard default sde_strategy, so that this won't randomly change on the user
if is_version_or_newer([2,9,3]):
if is_version_or_newer([2,9,3]) and not is_NLO_run(process_dir=process_dir):
mglog.info('Setting default sde_strategy to old default (1)')
my_settings = {'sde_strategy':1}
modify_run_card(process_dir=process_dir,settings=my_settings,skipBaseFragment=True)
......@@ -2073,7 +2073,11 @@ def modify_param_card(param_card_input=None,param_card_backup=None,process_dir=M
pos = 0 if line.strip().startswith('DECAY') else 1
if blockName=='MASS' and 'MASS' in params:
# Any residual masses to set?
leftOvers = [ x for x in params['MASS'] if x not in doneParams['MASS'] ]
if "MASS" in doneParams:
leftOvers = [ x for x in params['MASS'] if x not in doneParams['MASS'] ]
else:
leftOvers = [ x for x in params['MASS'] ]
for pdg_id in leftOvers:
mglog.warning('Adding mass line for '+str(pdg_id)+' = '+str(params['MASS'][pdg_id])+' which was not in original param card')
newcard.write(' '+str(pdg_id)+' '+str(params['MASS'][pdg_id])+'\n')
......
......@@ -133,6 +133,8 @@ class Registry(object):
self.add_default("dronly", 0, description="include only double resonant diagrams. [1:enabled]")
self.add_default("dummyvirtual", 1, description="run with dummy virtual. [1:enabled]")
self.add_default("dynamic_hdamp", 0, description="if 1, use hdamp = HT/2 (overwrites hdamp), if 0 use fixed hdamp")
self.add_default("dynhdamp", 0, description="ttbb: if 1, use hdamp = HT/2 (overwrites hdamp), if 0 use fixed hdamp")
self.add_default("dynhdampPF", -1, description="ttbb: prefactor for dynamic hdamp")
self.add_default("e+e-", 0, hidden=True, description="WWj decay mode [1:enabled]")
self.add_default("e+mu-", 0, hidden=True, description="WWj decay mode [1:enabled]")
self.add_default("ebeam1", 6500, name="beam_energy", frozen=True, description="energy of beam in GeV")
......
......@@ -129,6 +129,10 @@ class ttbb(PowhegRES):
self.add_keyword("withdamp", 1)
self.add_keyword("xgriditeration")
self.add_keyword("xupbound", 2)
self.add_keyword("hdamp", -1)
self.add_keyword("dynhdamp", 1)
self.add_keyword("dynhdampPF", 0.5)
def validate_decays(self):
"""
......
File mode changed from 100644 to 100755
#
# File specifying the location of MadGraph to use.
#
set( MADGRAPH5AMC_LCGVERSION 2.9.3.atlas2 )
set( MADGRAPH5AMC_LCGVERSION 2.9.5.atlas2 )
set( MADGRAPH5AMC_LCGROOT
${LCG_RELEASE_DIR}/MCGenerators/madgraph5amc/${MADGRAPH5AMC_LCGVERSION}/${LCG_PLATFORM} )
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