From eb7b355a0dc7bfb24bf864680a47b15691db1470 Mon Sep 17 00:00:00 2001 From: Andrea Barontini Date: Mon, 2 Sep 2024 16:29:29 +0200 Subject: [PATCH 1/5] Fix bug in sv operator cards --- src/pineko/evolve.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index d2e4d14b..9d01aafe 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -197,7 +197,7 @@ def write_operator_card(pineappl_grid, default_card, card_path, tcard): muf2_grid = evol_info.fac1 operators_card = copy.deepcopy(default_card) sv_method = sv_scheme(tcard) - xif = 1.0 if sv_method is not None else tcard["XIF"] + xif = 1.0 if sv_method is None else tcard["XIF"] # update scale variation method operators_card["configs"]["scvar_method"] = sv_method From e73f25bb24acae0a2300e44ac484a3891b6749d3 Mon Sep 17 00:00:00 2001 From: Andrea Barontini Date: Mon, 2 Sep 2024 17:02:30 +0200 Subject: [PATCH 2/5] Other error of the same kind --- src/pineko/evolve.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index 9d01aafe..ceba30dd 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -354,7 +354,7 @@ def evolve_grid( evol_info = grid.evolve_info(order_mask) x_grid = evol_info.x1 mur2_grid = evol_info.ren1 - xif = 1.0 if operators1.operator_card.configs.scvar_method is not None else xif + xif = 1.0 if operators1.operator_card.configs.scvar_method is None else xif tcard = operators1.theory_card opcard = operators1.operator_card # rotate the targetgrid From a8501e1da555b898a6aac9a52314244ffee5be5a Mon Sep 17 00:00:00 2001 From: Andrea Barontini Date: Mon, 2 Sep 2024 17:03:33 +0200 Subject: [PATCH 3/5] Add xir*xir to the mur2_grid in the evolution --- src/pineko/evolve.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index ceba30dd..84e603d2 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -426,7 +426,7 @@ def prepare(operator): fktable = grid.evolve_with_slice_iter2( prepare(operators1), prepare(operators2), - ren1=mur2_grid, + ren1=xir*xir*mur2_grid, alphas=alphas_values, xi=(xir, xif), order_mask=order_mask, @@ -434,7 +434,7 @@ def prepare(operator): else: fktable = grid.evolve_with_slice_iter( prepare(operators1), - ren1=mur2_grid, + ren1=xir*xir*mur2_grid, alphas=alphas_values, xi=(xir, xif), order_mask=order_mask, From 759a05e4df440fccf62b1afe7d766740a91680d9 Mon Sep 17 00:00:00 2001 From: Andrea Barontini Date: Tue, 3 Sep 2024 12:58:06 +0200 Subject: [PATCH 4/5] Revert fix to xif and use a variable for ren_grid2 --- src/pineko/evolve.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index 84e603d2..0c98b4e2 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -197,7 +197,7 @@ def write_operator_card(pineappl_grid, default_card, card_path, tcard): muf2_grid = evol_info.fac1 operators_card = copy.deepcopy(default_card) sv_method = sv_scheme(tcard) - xif = 1.0 if sv_method is None else tcard["XIF"] + xif = 1.0 if sv_method is not None else tcard["XIF"] # update scale variation method operators_card["configs"]["scvar_method"] = sv_method @@ -354,7 +354,7 @@ def evolve_grid( evol_info = grid.evolve_info(order_mask) x_grid = evol_info.x1 mur2_grid = evol_info.ren1 - xif = 1.0 if operators1.operator_card.configs.scvar_method is None else xif + xif = 1.0 if operators1.operator_card.configs.scvar_method is not None else xif tcard = operators1.theory_card opcard = operators1.operator_card # rotate the targetgrid @@ -419,14 +419,14 @@ def prepare(operator): pid_basis=PyPidBasis.Evol, ) yield (info, op.operator) - + ren_grid2 = xir*xir*mur2_grid if operators2 is not None: # check convolutions order check_convolution_types(grid, operators1, operators2) fktable = grid.evolve_with_slice_iter2( prepare(operators1), prepare(operators2), - ren1=xir*xir*mur2_grid, + ren1=ren_grid2, alphas=alphas_values, xi=(xir, xif), order_mask=order_mask, @@ -434,7 +434,7 @@ def prepare(operator): else: fktable = grid.evolve_with_slice_iter( prepare(operators1), - ren1=xir*xir*mur2_grid, + ren1=ren_grid2, alphas=alphas_values, xi=(xir, xif), order_mask=order_mask, From dc8eb9b636e5165576c438a85da5cd6134b45a8a Mon Sep 17 00:00:00 2001 From: giacomomagni Date: Tue, 3 Sep 2024 14:45:29 +0200 Subject: [PATCH 5/5] use ren_grid2 also for as --- src/pineko/evolve.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index 0c98b4e2..ca6c1784 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -397,13 +397,14 @@ def xgrid_reshape(full_operator): ) # To compute the alphas values we are first reverting the factorization scale shift # and then obtaining the renormalization scale using xir. + ren_grid2 = xir * xir * mur2_grid alphas_values = [ 4.0 * np.pi * sc.a_s( - xir * xir * mur2, + mur2, ) - for mur2 in mur2_grid + for mur2 in ren_grid2 ] def prepare(operator): @@ -419,7 +420,7 @@ def prepare(operator): pid_basis=PyPidBasis.Evol, ) yield (info, op.operator) - ren_grid2 = xir*xir*mur2_grid + if operators2 is not None: # check convolutions order check_convolution_types(grid, operators1, operators2)