From d2e9a7bf0ab325baf27d37afaed8b5c820f21e7a Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Sun, 4 Jun 2023 20:29:27 +0200 Subject: [PATCH 1/2] sort q2 grid --- n3fit/src/evolven3fit_new/evolve.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/n3fit/src/evolven3fit_new/evolve.py b/n3fit/src/evolven3fit_new/evolve.py index f236fa603b..e41a557b8b 100644 --- a/n3fit/src/evolven3fit_new/evolve.py +++ b/n3fit/src/evolven3fit_new/evolve.py @@ -174,7 +174,7 @@ def ev_pdf(pid, x, Q2): block = genpdf.generate_block( ev_pdf, xgrid=targetgrid, - evolgrid=eko.evolgrid, + evolgrid=[(float(q2), int(nf)) for q2, nf in np.sort(eko.evolgrid, axis=0)], pids=basis_rotation.flavor_basis_pids, ) return block From 74917439afb1b1d38562246d4c5188ae3a63659a Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Mon, 5 Jun 2023 13:09:00 +0200 Subject: [PATCH 2/2] add proper fix in eko --- conda-recipe/meta.yaml | 2 +- n3fit/src/evolven3fit_new/evolve.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index fba1a87567..fb9edea8bf 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -51,7 +51,7 @@ requirements: - sphinxcontrib-bibtex - curio >=1.0 - pineappl >=0.5.8 - - eko >=0.13.2,<0.14 + - eko >=0.13.4,<0.14 - banana-hep >=0.6.8 - fiatlux diff --git a/n3fit/src/evolven3fit_new/evolve.py b/n3fit/src/evolven3fit_new/evolve.py index e41a557b8b..f236fa603b 100644 --- a/n3fit/src/evolven3fit_new/evolve.py +++ b/n3fit/src/evolven3fit_new/evolve.py @@ -174,7 +174,7 @@ def ev_pdf(pid, x, Q2): block = genpdf.generate_block( ev_pdf, xgrid=targetgrid, - evolgrid=[(float(q2), int(nf)) for q2, nf in np.sort(eko.evolgrid, axis=0)], + evolgrid=eko.evolgrid, pids=basis_rotation.flavor_basis_pids, ) return block