From bd2f5987ebbb50532137531d66b4ecce5624b91e Mon Sep 17 00:00:00 2001 From: Felix Hekhorn Date: Wed, 19 Oct 2022 17:08:13 +0200 Subject: [PATCH 1/2] Change alpha_s evaluation point in K --- src/eko/evolution_operator/__init__.py | 17 ++++++++++++----- tests/eko/test_ev_operator.py | 8 +++++++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/eko/evolution_operator/__init__.py b/src/eko/evolution_operator/__init__.py index d990474d2..3d88afeb5 100644 --- a/src/eko/evolution_operator/__init__.py +++ b/src/eko/evolution_operator/__init__.py @@ -123,6 +123,7 @@ def quad_ker( logx, areas, as1, + as_raw, as0, nf, L, @@ -151,9 +152,11 @@ def quad_ker( Mellin inversion point areas : tuple basis function configuration - a1 : float + as1 : float target coupling value - a0 : float + as_raw : float + coupling value at the process scale + as0 : float initial coupling value nf : int number of active flavors @@ -199,7 +202,7 @@ def quad_ker( # scale var expanded is applied on the kernel if sv_mode == sv.Modes.expanded and not is_threshold: ker = np.ascontiguousarray( - sv.expanded.singlet_variation(gamma_singlet, as1, order, nf, L) + sv.expanded.singlet_variation(gamma_singlet, as_raw, order, nf, L) ) @ np.ascontiguousarray(ker) ker = select_singlet_element(ker, mode0, mode1) else: @@ -216,7 +219,9 @@ def quad_ker( ev_op_iterations, ) if sv_mode == sv.Modes.expanded and not is_threshold: - ker = sv.expanded.non_singlet_variation(gamma_ns, as1, order, nf, L) * ker + ker = ( + sv.expanded.non_singlet_variation(gamma_ns, as_raw, order, nf, L) * ker + ) # recombine everything return np.real(ker * integrand) @@ -312,7 +317,8 @@ def a_s(self): self.mur2_shift(self.q2_from), fact_scale=self.q2_from, nf_to=self.nf ) a1 = sc.a_s(self.mur2_shift(self.q2_to), fact_scale=self.q2_to, nf_to=self.nf) - return (a0, a1) + a_raw = sc.a_s(self.q2_to, fact_scale=self.q2_to, nf_to=self.nf) + return (a0, a1, a_raw) @property def labels(self): @@ -369,6 +375,7 @@ def quad_ker(self, label, logx, areas): logx=logx, areas=areas, as1=self.a_s[1], + as_raw=self.a_s[2], as0=self.a_s[0], nf=self.nf, L=np.log(self.fact_to_ren), diff --git a/tests/eko/test_ev_operator.py b/tests/eko/test_ev_operator.py index 1ab6d62ec..093f80b4d 100644 --- a/tests/eko/test_ev_operator.py +++ b/tests/eko/test_ev_operator.py @@ -39,6 +39,7 @@ def test_quad_ker(monkeypatch): logx=0.0, areas=np.zeros(3), as1=1, + as_raw=1, as0=2, nf=3, L=0, @@ -58,6 +59,7 @@ def test_quad_ker(monkeypatch): logx=0.123, areas=np.zeros(3), as1=1, + as_raw=1, as0=2, nf=3, L=0, @@ -77,6 +79,7 @@ def test_quad_ker(monkeypatch): logx=0.0, areas=np.zeros(3), as1=1, + as_raw=1, as0=2, nf=3, L=0, @@ -98,6 +101,7 @@ def test_quad_ker(monkeypatch): logx=0.123, areas=np.zeros(3), as1=1, + as_raw=1, as0=2, nf=3, L=0, @@ -119,6 +123,7 @@ def test_quad_ker(monkeypatch): logx=0.0, areas=np.zeros(3), as1=1, + as_raw=1, as0=2, nf=3, L=0, @@ -390,7 +395,7 @@ def quad_ker_pegasus( mode1 = 0 method = "" logxs = np.log(int_disp.xgrid.raw) - a1 = 1 + as_raw = a1 = 1 a0 = 2 nf = 3 L = 0 @@ -410,6 +415,7 @@ def quad_ker_pegasus( logx, bf.areas_representation, a1, + as_raw, a0, nf, L, From 12c772933309b31055a6453b3c2e796bde0fbc9f Mon Sep 17 00:00:00 2001 From: Alessandro Candido Date: Fri, 28 Oct 2022 15:26:41 +0200 Subject: [PATCH 2/2] Move as_raw position in quad_ker call --- src/eko/evolution_operator/__init__.py | 8 ++++---- tests/eko/test_ev_operator.py | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/eko/evolution_operator/__init__.py b/src/eko/evolution_operator/__init__.py index 3d88afeb5..069d75b0e 100644 --- a/src/eko/evolution_operator/__init__.py +++ b/src/eko/evolution_operator/__init__.py @@ -123,8 +123,8 @@ def quad_ker( logx, areas, as1, - as_raw, as0, + as_raw, nf, L, ev_op_iterations, @@ -154,10 +154,10 @@ def quad_ker( basis function configuration as1 : float target coupling value - as_raw : float - coupling value at the process scale as0 : float initial coupling value + as_raw : float + coupling value at the process scale nf : int number of active flavors L : float @@ -375,8 +375,8 @@ def quad_ker(self, label, logx, areas): logx=logx, areas=areas, as1=self.a_s[1], - as_raw=self.a_s[2], as0=self.a_s[0], + as_raw=self.a_s[2], nf=self.nf, L=np.log(self.fact_to_ren), ev_op_iterations=self.config["ev_op_iterations"], diff --git a/tests/eko/test_ev_operator.py b/tests/eko/test_ev_operator.py index 093f80b4d..45d4d1b95 100644 --- a/tests/eko/test_ev_operator.py +++ b/tests/eko/test_ev_operator.py @@ -39,8 +39,8 @@ def test_quad_ker(monkeypatch): logx=0.0, areas=np.zeros(3), as1=1, - as_raw=1, as0=2, + as_raw=1, nf=3, L=0, ev_op_iterations=0, @@ -59,8 +59,8 @@ def test_quad_ker(monkeypatch): logx=0.123, areas=np.zeros(3), as1=1, - as_raw=1, as0=2, + as_raw=1, nf=3, L=0, ev_op_iterations=0, @@ -79,8 +79,8 @@ def test_quad_ker(monkeypatch): logx=0.0, areas=np.zeros(3), as1=1, - as_raw=1, as0=2, + as_raw=1, nf=3, L=0, ev_op_iterations=0, @@ -101,8 +101,8 @@ def test_quad_ker(monkeypatch): logx=0.123, areas=np.zeros(3), as1=1, - as_raw=1, as0=2, + as_raw=1, nf=3, L=0, ev_op_iterations=0, @@ -123,8 +123,8 @@ def test_quad_ker(monkeypatch): logx=0.0, areas=np.zeros(3), as1=1, - as_raw=1, as0=2, + as_raw=1, nf=3, L=0, ev_op_iterations=0, @@ -415,8 +415,8 @@ def quad_ker_pegasus( logx, bf.areas_representation, a1, - as_raw, a0, + as_raw, nf, L, ev_op_iterations,