From d2b942be2e35ee909095d8832ee8264fc96b4355 Mon Sep 17 00:00:00 2001 From: RoyStegeman Date: Tue, 14 Nov 2023 10:47:17 +0000 Subject: [PATCH 1/3] remove qed input from ekobox.apply.apply_pdf --- n3fit/src/evolven3fit_new/evolve.py | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/n3fit/src/evolven3fit_new/evolve.py b/n3fit/src/evolven3fit_new/evolve.py index 8caab4e3e2..67f8c2c254 100644 --- a/n3fit/src/evolven3fit_new/evolve.py +++ b/n3fit/src/evolven3fit_new/evolve.py @@ -24,14 +24,7 @@ def evolve_fit( - fit_folder, - q_fin, - q_points, - op_card_dict, - theory_card_dict, - force, - eko_path=None, - dump_eko=None, + fit_folder, q_fin, q_points, op_card_dict, theory_card_dict, force, eko_path=None, dump_eko=None ): """ Evolves all the fitted replica in fit_folder/nnfit @@ -175,7 +168,7 @@ def evolve_exportgrid(exportgrid, eko, x_grid, qed): pdf_grid = np.array(exportgrid["pdfgrid"]).transpose() pdf_to_evolve = utils.LhapdfLike(pdf_grid, exportgrid["q20"], x_grid) # evolve pdf - evolved_pdf = apply.apply_pdf(eko, pdf_to_evolve, qed=qed) + evolved_pdf = apply.apply_pdf(eko, pdf_to_evolve) # generate block to dump targetgrid = eko.bases.targetgrid.tolist() @@ -193,10 +186,7 @@ def pdf_xq2(pid, x, Q2): return x * evolved_pdf[(Q2, nf)]["pdfs"][pid][x_idx] block = genpdf.generate_block( - pdf_xq2, - xgrid=targetgrid, - sorted_q2grid=q2grid, - pids=basis_rotation.flavor_basis_pids, + pdf_xq2, xgrid=targetgrid, sorted_q2grid=q2grid, pids=basis_rotation.flavor_basis_pids ) blocks.append(block) From b97538e1e5388b00a55597d3ebb35c508fe1976c Mon Sep 17 00:00:00 2001 From: RoyStegeman Date: Tue, 14 Nov 2023 11:10:57 +0000 Subject: [PATCH 2/3] remove unused qed in more places --- n3fit/src/evolven3fit_new/evolve.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/n3fit/src/evolven3fit_new/evolve.py b/n3fit/src/evolven3fit_new/evolve.py index 67f8c2c254..17aae9fd0a 100644 --- a/n3fit/src/evolven3fit_new/evolve.py +++ b/n3fit/src/evolven3fit_new/evolve.py @@ -98,8 +98,6 @@ def evolve_fit( theory = eko_op.theory_card op = eko_op.operator_card - qed = theory.order[1] > 0 - # Modify the info file with the fit-specific info info = info_file.build(theory, op, 1, info_update={}) info["NumMembers"] = "REPLACE_NREP" @@ -112,7 +110,7 @@ def evolve_fit( dump_info_file(usr_path, info) for replica, pdf_data in initial_PDFs_dict.items(): - evolved_blocks = evolve_exportgrid(pdf_data, eko_op, x_grid, qed) + evolved_blocks = evolve_exportgrid(pdf_data, eko_op, x_grid) dump_evolved_replica(evolved_blocks, usr_path, int(replica.removeprefix("replica_"))) # remove folder: @@ -145,7 +143,7 @@ def load_fit(usr_path): return pdf_dict -def evolve_exportgrid(exportgrid, eko, x_grid, qed): +def evolve_exportgrid(exportgrid, eko, x_grid): """ Evolves the provided exportgrid for the desired replica with the eko and returns the evolved block @@ -157,8 +155,6 @@ def evolve_exportgrid(exportgrid, eko, x_grid, qed): eko operator for evolution xgrid: list xgrid to be used as the targetgrid - qed: bool - whether qed is activated or not Returns ------- : list(np.array) From fb422e91d530b4f4ccebe67c18812f10428db388 Mon Sep 17 00:00:00 2001 From: RoyStegeman Date: Tue, 14 Nov 2023 13:24:34 +0000 Subject: [PATCH 3/3] update eko dependency --- conda-recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 96ea3f7034..645debb365 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.5,<0.14 + - eko >=0.14.0 - banana-hep >=0.6.8 - fiatlux