diff --git a/Generators/PowhegControl/python/parameters/registry.py b/Generators/PowhegControl/python/parameters/registry.py index e758be8d0e50de2e76fcf9c100cdc581ad3ebaba..bf2e39b758768ddda62b8cd2de82645d165ef8da 100644 --- a/Generators/PowhegControl/python/parameters/registry.py +++ b/Generators/PowhegControl/python/parameters/registry.py @@ -149,10 +149,10 @@ class Registry(object): self.add_default("ggproc", -1, description="(-1:Powheg default)") self.add_default("gmu", atlas_common.G_F, name="G_F", description="Fermi constant") self.add_default("gqbproc", -1, description="(-1:Powheg default)") - self.add_default("hdamp", 0, description="apply damping factor (in GeV) for high-pt radiation: h**2/(pt2+h**2). [>0:enabled]") + self.add_default("hdamp", 0, description="apply damping factor (in GeV) for high-pT radiation: h**2/(pt2+h**2). [>0:enabled]") self.add_default("hdecaymode", 0, description="DEPRECATED: this does nothing. It specifies decay mode in Powheg's PYTHIA/HERWIG which we do not use.") self.add_default("hdecaywidth", 0, description="Higgs width determination. [0:use hwidth; >0:read total decay width from HDECAY sm.br2 file]") - self.add_default("hfact", -1, frozen=True, description="DEPRECATED: enable hdamp and bornzerodamp. [>0:enabled]") + self.add_default("hfact", -1, description="apply damping factor for high-pT radiation. [>0:enabled]") self.add_default("higgsfixedwidth", 0, description="(0:running width; 1:fixed width in Breit-Wigner)") self.add_default("Hmass", atlas_common.mass.H, name="mass_H", description="Higgs boson mass in GeV") self.add_default("hmass", atlas_common.mass.H, name="mass_H", description="Higgs boson mass in GeV") @@ -420,7 +420,7 @@ class Registry(object): self.add_default("width_W", atlas_common.width.W, name="width_W", description="W boson width in GeV") self.add_default("width_Z", atlas_common.width.Z, description="Z boson width in GeV") self.add_default("withbtilde", 1, frozen=True, description="do btilde step. [0:disabled]") - self.add_default("withdamp", -1, frozen=True, description="enable hdamp and bornzerodamp. [1:enabled]") + self.add_default("withdamp", -1, description="enable hdamp and bornzerodamp. [1:enabled]") self.add_default("withfluxfactor", -1, description="(-1:Powheg default)") self.add_default("withinterference", 1, description="(0:disabled; 1:enabled) include interference for like flavour charged leptons") self.add_default("withnegweights", 1, description="allow negative weights. [1:enabled]") diff --git a/Generators/PowhegControl/python/processes/configurable.py b/Generators/PowhegControl/python/processes/configurable.py index b9d30edcfc2b70e829e290a48a2a20a8ec452b93..79507e949ff9f57894b796c96b0492a06a9a443e 100644 --- a/Generators/PowhegControl/python/processes/configurable.py +++ b/Generators/PowhegControl/python/processes/configurable.py @@ -32,6 +32,8 @@ class Configurable(object): # Retrieve default settings from registry overriding if requested defaults = Registry().get_defaults(keyword) if value == defaults["value"] and value is not None: + if keyword in ["ebeam1", "ebeam2"]: + continue logger.warning("Unnecessarily setting parameter {} to {} which is its default value!".format(keyword, value)) value = [value, defaults["value"]][value is None] name = [name, defaults["name"]][name is None] diff --git a/Generators/PowhegControl/python/processes/powheg/Wbbj.py b/Generators/PowhegControl/python/processes/powheg/Wbbj.py index 10a33c5c14637b2130ea3df80296079dcc22bbf9..95e3db5005dfdbc0bab70ecad4f7e60f918b96ef 100644 --- a/Generators/PowhegControl/python/processes/powheg/Wbbj.py +++ b/Generators/PowhegControl/python/processes/powheg/Wbbj.py @@ -87,7 +87,7 @@ class Wbbj(PowhegV2): self.add_keyword("manyseeds") self.add_keyword("max_w_mass") self.add_keyword("maxseeds") - self.add_keyword("min_w_mass", 1.0) + self.add_keyword("min_w_mass") self.add_keyword("minlo", 1) self.add_keyword("minloscfac") self.add_keyword("mintupbratlim") diff --git a/Generators/PowhegControl/python/processes/powheg/Wjj.py b/Generators/PowhegControl/python/processes/powheg/Wjj.py index 232cf65297dffbcc0980c3df735fc27ac2b4fed8..0aa5b605e1ce5faaa3e3e32d97d908bc49039de5 100644 --- a/Generators/PowhegControl/python/processes/powheg/Wjj.py +++ b/Generators/PowhegControl/python/processes/powheg/Wjj.py @@ -34,7 +34,7 @@ class Wjj(PowhegV2): self.add_keyword("bornktmin", 10.0) self.add_keyword("bornonly") self.add_keyword("bornsuppfact") - self.add_keyword("bornzerodamp", 1) + self.add_keyword("bornzerodamp") self.add_keyword("bottomthr") self.add_keyword("bottomthrpdf") self.add_keyword("btildeborn") @@ -133,7 +133,7 @@ class Wjj(PowhegV2): self.add_keyword("withsubtr") self.add_keyword("wmass") self.add_keyword("xgriditeration") - self.add_keyword("xupbound", 1) + self.add_keyword("xupbound") self.add_keyword("zfixedwidth") self.add_keyword("zmass") diff --git a/Generators/PowhegControl/python/processes/powheg/jjj.py b/Generators/PowhegControl/python/processes/powheg/jjj.py index 8b3a800d433e345a056a81bc55c3b4ebb7bc16ed..4d981303654edf45fbb8285204777bb9410f966d 100644 --- a/Generators/PowhegControl/python/processes/powheg/jjj.py +++ b/Generators/PowhegControl/python/processes/powheg/jjj.py @@ -24,7 +24,7 @@ class jjj(PowhegV2): self.add_keyword("bornktmin", 10.0) self.add_keyword("bornonly") self.add_keyword("bornsuppfact", 800.0) - self.add_keyword("bornzerodamp", 1) + self.add_keyword("bornzerodamp") self.add_keyword("bottomthr") self.add_keyword("bottomthrpdf") self.add_keyword("brpar_diexp")