Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pineparser for compatibility with new theories #63

Open
wants to merge 29 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
992abff
added new pineparser from nnpdf and legacy option to load_fktable fun…
comane Apr 14, 2024
c33b941
added get_np_fkatable method to FKTableData
comane Apr 14, 2024
ccd7f14
added legacy and metadata args to FKTableSpec
comane Apr 14, 2024
2e641b0
first version of new fktable parser
comane Apr 14, 2024
e27f7ee
added luminosity mapping method to FKTableData
comane Apr 14, 2024
145d528
xgrid reshape
comane Apr 14, 2024
89fd055
include cuts when loading fk table, seems to works for DIS
comane Apr 14, 2024
ff86914
works with theory 270
comane Apr 14, 2024
8552a1e
tmp modifications
comane Apr 27, 2024
32a2891
added load_commondata method to CommonDataSpec
comane Apr 28, 2024
dfa6617
added commondatawriter module
comane Apr 28, 2024
9701a59
added export method to CommonData -> allows to use _filter_real_data …
comane Apr 28, 2024
e69ac93
common_data_reader_dataset and experiment in n3fit_data_utils now onl…
comane Apr 28, 2024
8fe5bea
when new_commondata: True -> legacy: False -> pass a TheoryMeta to FK…
comane Apr 28, 2024
a5878fa
added test for metadata existence, array append, compatibility with 2…
Jul 10, 2024
003f065
fix typo
May 8, 2024
a57a3b5
add .pdf PBSP logos
May 13, 2024
af2dc71
changed cuts to commondata_table_indices
May 30, 2024
848e9d1
added xq2 map for hadronic MQQ processes ref. [2303.06159]
Jun 12, 2024
ff92599
Revert "added xq2 map for hadronic MQQ processes ref. [2303.06159]"
Jun 18, 2024
5848365
Merge branch 'main' into new_pineparser
Jul 24, 2024
433cfd5
updated to support new theory format
Jul 26, 2024
1ad0780
added operation in new format framework
Nov 23, 2024
1ecbc0b
added new_commondata to check_compound in loader
Nov 24, 2024
2331eed
right formatting filtered artificial data
Nov 24, 2024
188a57d
loading cfac for new theory fktables
Nov 26, 2024
18665c1
fixed cfac array for new format
Nov 26, 2024
9eb043b
contamination working in python
Nov 28, 2024
50378e7
merge on the updated main (solve reportengine issue)
Jan 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
xgrid reshape
comane committed Apr 14, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 145d5289be1a5072c520737822d4839bc4bb21f4
11 changes: 9 additions & 2 deletions validphys2/src/validphys/n3fit_data_utils.py
Original file line number Diff line number Diff line change
@@ -89,11 +89,18 @@ def new_fk_parser(fkspec, is_hadronic=False):
"""
fktable_data = load_fktable(fkspec)
ndata = fktable_data.ndata
xgrid = fktable_data.xgrid
xgrid_flat = fktable_data.xgrid
nx = len(xgrid_flat)

if is_hadronic:
xgrid = xgrid_flat.reshape(1, nx)
else:
xgrid = xgrid_flat.reshape(1, nx)

# n of active flavours
basis = fktable_data.luminosity_mapping
nbasis = len(basis)
nx = len(xgrid)

fktable = fktable_data.get_np_fktable()

dict_out = {