Commit 5c1511ab authored by Ewelina Maria Lobodzinska's avatar Ewelina Maria Lobodzinska
Browse files

Merge branch 'patch-1' into '21.6'

Updating the default UE tune name in Herwig7Config.py

See merge request !27830
parents e608d4a1 97a84bd8
......@@ -291,7 +291,7 @@ set /Herwig/Partons/RemnantPDF:MaxFlav {}
## \param[in] ps_tune_name name identifying the PS/hadronization tune
## \param[in] ue_tune_name name identifying the UE/MPI tune
## \return Nothing, adds the corresponding commands directly to the generator configuration object
def tune_commands(self, ps_tune_name = "H7-PS-MMHT2014LO", ue_tune_name = "H7-UE-MMHT"):
def tune_commands(self, ps_tune_name = "H7-PS-MMHT2014LO", ue_tune_name = "H7.1-Default"):
cmds = """
## -------------
......@@ -299,7 +299,7 @@ set /Herwig/Partons/RemnantPDF:MaxFlav {}
## -------------
"""
self.ps_tune_commands(tune_name = ps_tune_name)
# self.ps_tune_commands(tune_name = ps_tune_name) # the name of the default PS tune may be obsolete
self.ue_tune_commands(tune_name = ue_tune_name)
......@@ -337,15 +337,15 @@ set /Herwig/Partons/RemnantPDF:MaxFlav {}
##
## \param[in] tune_name name identifying the UE/MPI tune
## \return Nothing, adds the corresponding commands directly to the generator configuration object
def ue_tune_commands(self, tune_name = "H7-UE-MMHT"):
def ue_tune_commands(self, tune_name = "H7.1-Default"):
cmds = """
## Underlying event tune settings
"""
if tune_name == "H7-UE-MMHT":
if tune_name == "H7.1-Default":
cmds += """
# > The underlying event tune "H7-UE-MMHT" is already
# > The underlying event tune "H7.1-Default" is already
# > configured in Herwig7 via the default settings.
"""
# elif tune_name == "some-other-name":
......
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