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

Add EIC projection measurements for polarised fits #266

Draft
wants to merge 30 commits into
base: master
Choose a base branch
from
Draft
Changes from 27 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
d4dd159
add EIC projection measurements
Radonirinaunimi Mar 11, 2024
896a054
fix obs in metadata
Radonirinaunimi Mar 11, 2024
b28487b
fix observable name
Radonirinaunimi Mar 11, 2024
99839ff
fix description for F1 obs
Radonirinaunimi Mar 11, 2024
0cc3008
Init template for pDIS generators
Radonirinaunimi Oct 12, 2023
8203721
Neutron case now included for the E155 experiment.
toonhasenack Oct 17, 2023
6fbafc9
Now with the F1 case included for E155.
toonhasenack Oct 17, 2023
bc098a6
generators and init file for pDIS
toonhasenack Jan 11, 2024
8ed191b
Correct names and new data files
toonhasenack Jan 19, 2024
c9d49f4
erroneous after addition of compass15 and smcsx
toonhasenack Feb 28, 2024
413257a
fixing searching issues
toonhasenack Feb 29, 2024
d7f253d
new data
toonhasenack Mar 7, 2024
b989318
dump to utils
toonhasenack Mar 7, 2024
e51b6bd
fix metadata
giacomomagni Mar 7, 2024
9a6a25e
fix last metadata
giacomomagni Mar 7, 2024
9c79a68
black
giacomomagni Mar 7, 2024
f090170
fix dump polarized solution
giacomomagni Mar 7, 2024
dc1907a
first round of metadata fixes
giacomomagni Mar 7, 2024
785e4e7
another round of metadata update
giacomomagni Mar 7, 2024
c8d2452
other fixes on metadata
giacomomagni Mar 7, 2024
c65cdeb
Merge branch 'generators-pDIS' into EIC_pDIS
Radonirinaunimi Mar 11, 2024
3afee92
ATHENA, EIC and EIcC implementation
toonhasenack Mar 14, 2024
cbfe572
minor name change sqrt(s)
toonhasenack Mar 19, 2024
7a624db
add y to ATHENA
toonhasenack Mar 26, 2024
d0ace9b
propagate NOTFIXED name change
toonhasenack Mar 26, 2024
de03522
pre-commit changes
Mar 27, 2024
d431443
projection data processing also in utils
Mar 29, 2024
0c445eb
more compact utils for dump_polarized
toonhasenack Apr 29, 2024
4041c61
ran precommit
toonhasenack Apr 29, 2024
71355eb
Merge branch 'master' into EIC_pDIS
giacomomagni Jul 12, 2024
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
Binary file added extras/data/ATHENA/ATHENA_ALL_EP.xlsx
Binary file not shown.
123 changes: 123 additions & 0 deletions extras/data/ATHENA/athena_105gev_ep
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a file extension here and to the others

Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
0.000205 1.29 0.574
0.000325 1.29 0.362
0.000325 2.05 0.574
0.000515 1.29 0.228
0.000515 2.05 0.362
0.000515 3.25 0.574
0.000815 1.29 0.144
0.000815 2.05 0.228
0.000815 3.25 0.362
0.000815 5.15 0.574
0.00129 1.29 0.0909
0.00129 2.05 0.144
0.00129 3.25 0.228
0.00129 5.15 0.362
0.00129 8.15 0.574
0.00205 1.29 0.0574
0.00205 2.05 0.0909
0.00205 3.25 0.144
0.00205 5.15 0.228
0.00205 8.15 0.362
0.00205 12.9 0.574
0.00325 1.29 0.0362
0.00325 2.05 0.0574
0.00325 3.25 0.0909
0.00325 5.15 0.144
0.00325 8.15 0.228
0.00325 12.9 0.362
0.00325 20.5 0.574
0.00515 1.29 0.0228
0.00515 2.05 0.0362
0.00515 3.25 0.0574
0.00515 5.15 0.0909
0.00515 8.15 0.144
0.00515 12.9 0.228
0.00515 20.5 0.362
0.00515 32.5 0.574
0.00815 2.05 0.0228
0.00815 3.25 0.0362
0.00815 5.15 0.0574
0.00815 8.15 0.0909
0.00815 12.9 0.144
0.00815 20.5 0.228
0.00815 32.5 0.362
0.00815 51.5 0.574
0.0129 3.25 0.0228
0.0129 5.15 0.0362
0.0129 8.15 0.0574
0.0129 12.9 0.0909
0.0129 20.5 0.144
0.0129 32.5 0.228
0.0129 51.5 0.362
0.0129 81.5 0.574
0.0205 5.15 0.0228
0.0205 8.15 0.0362
0.0205 12.9 0.0574
0.0205 20.5 0.0909
0.0205 32.5 0.144
0.0205 51.5 0.228
0.0205 81.5 0.362
0.0205 129 0.574
0.0325 8.15 0.0228
0.0325 12.9 0.0362
0.0325 20.5 0.0574
0.0325 32.5 0.0909
0.0325 51.5 0.144
0.0325 81.5 0.228
0.0325 129 0.362
0.0325 205 0.574
0.0515 12.9 0.0228
0.0515 20.5 0.0362
0.0515 32.5 0.0574
0.0515 51.5 0.0909
0.0515 81.5 0.144
0.0515 129 0.228
0.0515 205 0.362
0.0515 325 0.574
0.0815 20.5 0.0228
0.0815 32.5 0.0362
0.0815 51.5 0.0574
0.0815 81.5 0.0909
0.0815 129 0.144
0.0815 205 0.228
0.0815 325 0.362
0.0815 515 0.574
0.129 32.5 0.0228
0.129 51.5 0.0362
0.129 81.5 0.0574
0.129 129 0.0909
0.129 205 0.144
0.129 325 0.228
0.129 515 0.362
0.129 815 0.574
0.205 51.5 0.0228
0.205 81.5 0.0362
0.205 129 0.0574
0.205 205 0.0909
0.205 325 0.144
0.205 515 0.228
0.205 815 0.362
0.205 1.29E+03 0.574
0.325 81.5 0.0228
0.325 129 0.0362
0.325 205 0.0574
0.325 325 0.0909
0.325 515 0.144
0.325 815 0.228
0.325 1.29E+03 0.362
0.325 2.05E+03 0.574
0.515 129 0.0228
0.515 205 0.0362
0.515 325 0.0574
0.515 515 0.0909
0.515 815 0.144
0.515 1.29E+03 0.228
0.515 2.05E+03 0.362
0.515 3.25E+03 0.574
0.815 205 0.0228
0.815 325 0.0362
0.815 515 0.0574
0.815 815 0.0909
0.815 1.29E+03 0.144
0.815 2.05E+03 0.228
0.815 3.25E+03 0.362
131 changes: 131 additions & 0 deletions extras/data/ATHENA/athena_140gev_ep
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
0.000129 1.29 0.505
0.000205 1.29 0.319
0.000205 2.05 0.505
0.000325 1.29 0.201
0.000325 2.05 0.319
0.000325 3.25 0.505
0.000515 1.29 0.127
0.000515 2.05 0.201
0.000515 3.25 0.319
0.000515 5.15 0.505
0.000815 1.29 0.08
0.000815 2.05 0.127
0.000815 3.25 0.201
0.000815 5.15 0.319
0.000815 8.15 0.505
0.00129 1.29 0.0505
0.00129 2.05 0.08
0.00129 3.25 0.127
0.00129 5.15 0.201
0.00129 8.15 0.319
0.00129 12.9 0.505
0.00205 1.29 0.0319
0.00205 2.05 0.0505
0.00205 3.25 0.08
0.00205 5.15 0.127
0.00205 8.15 0.201
0.00205 12.9 0.319
0.00205 20.5 0.505
0.00325 1.29 0.0201
0.00325 2.05 0.0319
0.00325 3.25 0.0505
0.00325 5.15 0.08
0.00325 8.15 0.127
0.00325 12.9 0.201
0.00325 20.5 0.319
0.00325 32.5 0.505
0.00515 2.05 0.0201
0.00515 3.25 0.0319
0.00515 5.15 0.0505
0.00515 8.15 0.08
0.00515 12.9 0.127
0.00515 20.5 0.201
0.00515 32.5 0.319
0.00515 51.5 0.505
0.00815 3.25 0.0201
0.00815 5.15 0.0319
0.00815 8.15 0.0505
0.00815 12.9 0.08
0.00815 20.5 0.127
0.00815 32.5 0.201
0.00815 51.5 0.319
0.00815 81.5 0.505
0.0129 5.15 0.0201
0.0129 8.15 0.0319
0.0129 12.9 0.0505
0.0129 20.5 0.08
0.0129 32.5 0.127
0.0129 51.5 0.201
0.0129 81.5 0.319
0.0129 129 0.505
0.0205 8.15 0.0201
0.0205 12.9 0.0319
0.0205 20.5 0.0505
0.0205 32.5 0.08
0.0205 51.5 0.127
0.0205 81.5 0.201
0.0205 129 0.319
0.0205 205 0.505
0.0325 12.9 0.0201
0.0325 20.5 0.0319
0.0325 32.5 0.0505
0.0325 51.5 0.08
0.0325 81.5 0.127
0.0325 129 0.201
0.0325 205 0.319
0.0325 325 0.505
0.0515 20.5 0.0201
0.0515 32.5 0.0319
0.0515 51.5 0.0505
0.0515 81.5 0.08
0.0515 129 0.127
0.0515 205 0.201
0.0515 325 0.319
0.0515 515 0.505
0.0815 32.5 0.0201
0.0815 51.5 0.0319
0.0815 81.5 0.0505
0.0815 129 0.08
0.0815 205 0.127
0.0815 325 0.201
0.0815 515 0.319
0.0815 815 0.505
0.129 51.5 0.0201
0.129 81.5 0.0319
0.129 129 0.0505
0.129 205 0.08
0.129 325 0.127
0.129 515 0.201
0.129 815 0.319
0.129 1.29E+03 0.505
0.205 81.5 0.0201
0.205 129 0.0319
0.205 205 0.0505
0.205 325 0.08
0.205 515 0.127
0.205 815 0.201
0.205 1.29E+03 0.319
0.205 2.05E+03 0.505
0.325 129 0.0201
0.325 205 0.0319
0.325 325 0.0505
0.325 515 0.08
0.325 815 0.127
0.325 1.29E+03 0.201
0.325 2.05E+03 0.319
0.325 3.25E+03 0.505
0.515 205 0.0201
0.515 325 0.0319
0.515 515 0.0505
0.515 815 0.08
0.515 1.29E+03 0.127
0.515 2.05E+03 0.201
0.515 3.25E+03 0.319
0.515 5.15E+03 0.505
0.815 325 0.0201
0.815 515 0.0319
0.815 815 0.0505
0.815 1.29E+03 0.08
0.815 2.05E+03 0.127
0.815 3.25E+03 0.201
0.815 5.15E+03 0.319
76 changes: 76 additions & 0 deletions extras/data/ATHENA/athena_29gev_ep
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
0.00325 1.29 0.485
0.00515 1.29 0.306
0.00515 2.05 0.485
0.00815 1.29 0.193
0.00815 2.05 0.306
0.00815 3.25 0.485
0.0129 1.29 0.122
0.0129 2.05 0.193
0.0129 3.25 0.306
0.0129 5.15 0.485
0.0205 1.29 0.0769
0.0205 2.05 0.122
0.0205 3.25 0.193
0.0205 5.15 0.306
0.0205 8.15 0.485
0.0325 1.29 0.0485
0.0325 2.05 0.0769
0.0325 3.25 0.122
0.0325 5.15 0.193
0.0325 8.15 0.306
0.0325 12.9 0.485
0.0515 1.29 0.0306
0.0515 2.05 0.0485
0.0515 3.25 0.0769
0.0515 5.15 0.122
0.0515 8.15 0.193
0.0515 12.9 0.306
0.0515 20.5 0.485
0.0815 1.29 0.0193
0.0815 2.05 0.0306
0.0815 3.25 0.0485
0.0815 5.15 0.0769
0.0815 8.15 0.122
0.0815 12.9 0.193
0.0815 20.5 0.306
0.0815 32.5 0.485
0.129 2.05 0.0193
0.129 3.25 0.0306
0.129 5.15 0.0485
0.129 8.15 0.0769
0.129 12.9 0.122
0.129 20.5 0.193
0.129 32.5 0.306
0.129 51.5 0.485
0.205 3.25 0.0193
0.205 5.15 0.0306
0.205 8.15 0.0485
0.205 12.9 0.0769
0.205 20.5 0.122
0.205 32.5 0.193
0.205 51.5 0.306
0.205 81.5 0.485
0.325 5.15 0.0193
0.325 8.15 0.0306
0.325 12.9 0.0485
0.325 20.5 0.0769
0.325 32.5 0.122
0.325 51.5 0.193
0.325 81.5 0.306
0.325 129 0.485
0.515 8.15 0.0193
0.515 12.9 0.0306
0.515 20.5 0.0485
0.515 32.5 0.0769
0.515 51.5 0.122
0.515 81.5 0.193
0.515 129 0.306
0.515 205 0.485
0.815 12.9 0.0193
0.815 20.5 0.0306
0.815 32.5 0.0485
0.815 51.5 0.0769
0.815 81.5 0.122
0.815 129 0.193
0.815 205 0.306
0.815 325 0.485
92 changes: 92 additions & 0 deletions extras/data/ATHENA/athena_45gev_ep
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
0.00129 1.29 0.5
0.00205 1.29 0.315
0.00205 2.05 0.5
0.00325 1.29 0.199
0.00325 2.05 0.315
0.00325 3.25 0.5
0.00515 1.29 0.126
0.00515 2.05 0.199
0.00515 3.25 0.315
0.00515 5.15 0.5
0.00815 1.29 0.0792
0.00815 2.05 0.126
0.00815 3.25 0.199
0.00815 5.15 0.315
0.00815 8.15 0.5
0.0129 1.29 0.05
0.0129 2.05 0.0792
0.0129 3.25 0.126
0.0129 5.15 0.199
0.0129 8.15 0.315
0.0129 12.9 0.5
0.0205 1.29 0.0315
0.0205 2.05 0.05
0.0205 3.25 0.0792
0.0205 5.15 0.126
0.0205 8.15 0.199
0.0205 12.9 0.315
0.0205 20.5 0.5
0.0325 1.29 0.0199
0.0325 2.05 0.0315
0.0325 3.25 0.05
0.0325 5.15 0.0792
0.0325 8.15 0.126
0.0325 12.9 0.199
0.0325 20.5 0.315
0.0325 32.5 0.5
0.0515 2.05 0.0199
0.0515 3.25 0.0315
0.0515 5.15 0.05
0.0515 8.15 0.0792
0.0515 12.9 0.126
0.0515 20.5 0.199
0.0515 32.5 0.315
0.0515 51.5 0.5
0.0815 3.25 0.0199
0.0815 5.15 0.0315
0.0815 8.15 0.05
0.0815 12.9 0.0792
0.0815 20.5 0.126
0.0815 32.5 0.199
0.0815 51.5 0.315
0.0815 81.5 0.5
0.129 5.15 0.0199
0.129 8.15 0.0315
0.129 12.9 0.05
0.129 20.5 0.0792
0.129 32.5 0.126
0.129 51.5 0.199
0.129 81.5 0.315
0.129 129 0.5
0.205 8.15 0.0199
0.205 12.9 0.0315
0.205 20.5 0.05
0.205 32.5 0.0792
0.205 51.5 0.126
0.205 81.5 0.199
0.205 129 0.315
0.205 205 0.5
0.325 12.9 0.0199
0.325 20.5 0.0315
0.325 32.5 0.05
0.325 51.5 0.0792
0.325 81.5 0.126
0.325 129 0.199
0.325 205 0.315
0.325 325 0.5
0.515 20.5 0.0199
0.515 32.5 0.0315
0.515 51.5 0.05
0.515 81.5 0.0792
0.515 129 0.126
0.515 205 0.199
0.515 325 0.315
0.515 515 0.5
0.815 32.5 0.0199
0.815 51.5 0.0315
0.815 81.5 0.05
0.815 129 0.0792
0.815 205 0.126
0.815 325 0.199
0.815 515 0.315
0.815 815 0.5
91 changes: 91 additions & 0 deletions extras/data/ATHENA/athena_63gev_ep
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
0.000815 1.29 0.396
0.00129 1.29 0.25
0.00129 2.05 0.396
0.00205 1.29 0.158
0.00205 2.05 0.25
0.00205 3.25 0.396
0.00325 1.29 0.0995
0.00325 2.05 0.158
0.00325 3.25 0.25
0.00325 5.15 0.396
0.00515 1.29 0.0628
0.00515 2.05 0.0995
0.00515 3.25 0.158
0.00515 5.15 0.25
0.00515 8.15 0.396
0.00815 1.29 0.0396
0.00815 2.05 0.0628
0.00815 3.25 0.0995
0.00815 5.15 0.158
0.00815 8.15 0.25
0.00815 12.9 0.396
0.0129 1.29 0.025
0.0129 2.05 0.0396
0.0129 3.25 0.0628
0.0129 5.15 0.0995
0.0129 8.15 0.158
0.0129 12.9 0.25
0.0129 20.5 0.396
0.0205 2.05 0.025
0.0205 3.25 0.0396
0.0205 5.15 0.0628
0.0205 8.15 0.0995
0.0205 12.9 0.158
0.0205 20.5 0.25
0.0205 32.5 0.396
0.0325 3.25 0.025
0.0325 5.15 0.0396
0.0325 8.15 0.0628
0.0325 12.9 0.0995
0.0325 20.5 0.158
0.0325 32.5 0.25
0.0325 51.5 0.396
0.0515 5.15 0.025
0.0515 8.15 0.0396
0.0515 12.9 0.0628
0.0515 20.5 0.0995
0.0515 32.5 0.158
0.0515 51.5 0.25
0.0515 81.5 0.396
0.0815 8.15 0.025
0.0815 12.9 0.0396
0.0815 20.5 0.0628
0.0815 32.5 0.0995
0.0815 51.5 0.158
0.0815 81.5 0.25
0.0815 129 0.396
0.129 12.9 0.025
0.129 20.5 0.0396
0.129 32.5 0.0628
0.129 51.5 0.0995
0.129 81.5 0.158
0.129 129 0.25
0.129 205 0.396
0.205 20.5 0.025
0.205 32.5 0.0396
0.205 51.5 0.0628
0.205 81.5 0.0995
0.205 129 0.158
0.205 205 0.25
0.205 325 0.396
0.325 32.5 0.025
0.325 51.5 0.0396
0.325 81.5 0.0628
0.325 129 0.0995
0.325 205 0.158
0.325 325 0.25
0.325 515 0.396
0.515 51.5 0.025
0.515 81.5 0.0396
0.515 129 0.0628
0.515 205 0.0995
0.515 325 0.158
0.515 515 0.25
0.515 815 0.396
0.815 81.5 0.025
0.815 129 0.0396
0.815 205 0.0628
0.815 325 0.0995
0.815 515 0.158
0.815 815 0.25
0.815 1.29E+03 0.396
67 changes: 67 additions & 0 deletions extras/data/ATHENA/metadata.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
nnpdf_id: null
fktable_id: null

# For Sqrt_s=29 GeV and beam energies (5, 41) GeV
ATHENA_NC_29GEV_EP_G1:
description: polarized structure function $g_1$ from ATHENA projections
y_label: 2xg1
y_label_tex: $2xg_1$
hepdata: null

ATHENA_NC_29GEV_EP_F1:
description: unpolarized structure function $F_1$ from ATHENA projections
y_label: 2xF1
y_label_tex: $2xF_1$
hepdata: null

# For Sqrt_s=45 GeV and beam energies (5, 100) GeV
ATHENA_NC_45GEV_EP_G1:
description: polarized structure function $g_1$ from ATHENA projections
y_label: 2xg1
y_label_tex: $2xg_1$
hepdata: null

ATHENA_NC_45GEV_EP_F1:
description: unpolarized structure function $F_1$ from ATHENA projections
y_label: 2xF1
y_label_tex: $2xF_1$
hepdata: null

# For Sqrt_s=63 GeV and beam energies (10, 100) GeV
ATHENA_NC_63GEV_EP_G1:
description: polarized structure function $g_1$ from ATHENA projections
y_label: 2xg1
y_label_tex: $2xg_1$
hepdata: null

ATHENA_NC_63GEV_EP_F1:
description: unpolarized structure function $F_1$ from ATHENA projections
y_label: 2xF1
y_label_tex: $2xF_1$
hepdata: null

# For Sqrt_s=105 GeV and beam energies (10, 275) GeV
ATHENA_NC_105GEV_EP_G1:
description: polarized structure function $g_1$ from ATHENA projections
y_label: 2xg1
y_label_tex: $2xg_1$
hepdata: null

ATHENA_NC_105GEV_EP_F1:
description: unpolarized structure function $F_1$ from ATHENA projections
y_label: 2xF1
y_label_tex: $2xF_1$
hepdata: null

# For Sqrt_s=140 GeV and beam energies (18, 275) GeV
ATHENA_NC_140GEV_EP_G1:
description: polarized structure function $g_1$ from ATHENA projections
y_label: 2xg1
y_label_tex: $2xg_1$
hepdata: null

ATHENA_NC_140GEV_EP_F1:
description: unpolarized structure function $F_1$ from ATHENA projections
y_label: 2xF1
y_label_tex: $2xF_1$
hepdata: null
4 changes: 2 additions & 2 deletions extras/data/COMPASS15/metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
nnpdf_id: null
fktable_id: null

COMPASS15_NC_17GEV_MUP_G1:
COMPASS15_NC_NOTFIXED_MUP_G1:
description: polarized structure function $g_1$ in COMPASS with proton target
y_label: 2xg1
y_label_tex: $2xg_1$
hepdata: https://www.hepdata.net/record/ins1357198

COMPASS15_NC_25GEV_MUD_G1:
COMPASS15_NC_NOTFIXED_MUD_G1:
description: polarized structure function $g_1$ in COMPASS with deuteron target
y_label: 2xg1
y_label_tex: $2xg_1$
2 changes: 1 addition & 1 deletion extras/data/E142/metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
nnpdf_id: null
fktable_id: null

E142_NC_58GEV_EN_G1:
E142_NC_NOTFIXED_EN_G1:
description: polarized structure function $g_1$ in E142 with neutron target
y_label: 2xg1
y_label_tex: $2xg_1$
4 changes: 2 additions & 2 deletions extras/data/E143/metadata.yaml
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@ nnpdf_id: null
fktable_id: null
hepdata: https://www.hepdata.net/record/ins467140

E143_NC_4GEV_EP_G1:
E143_NC_NOTFIXED_EP_G1:
description: polarized structure function $g_1$ in E143 with proton target
y_label: 2xg1
y_label_tex: $2xg_1$

E143_NC_8GEV_ED_G1:
E143_NC_NOTFIXED_ED_G1:
description: polarized structure function $g_1$ in E143 with deuteron target
y_label: 2xg1
y_label_tex: $2xg_1$
11 changes: 11 additions & 0 deletions extras/data/EIC/EIC_18_275_A1c_100fb-1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
0.000240225 2.73001 0.00260049
0.000393498 3.45159 0.0032644
0.000556682 4.03062 0.00393122
0.000760131 4.63043 0.00450892
0.001018 5.29036 0.00525977
0.00135955 5.97483 0.00597521
0.00182221 6.79478 0.00679294
0.00247674 8.30593 0.00758583
0.0035644 11.4853 0.00805148
0.00577839 17.8019 0.00877917
0.0182267 52.3854 0.0101136
10 changes: 10 additions & 0 deletions extras/data/EIC/EIC_5_100_A1c_100fb-1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
0.00210275 2.61524 0.0044181
0.00318165 3.22166 0.00523863
0.00431087 3.76145 0.00594865
0.00563938 4.26883 0.00659991
0.0073065 4.85568 0.00739964
0.00951243 5.58142 0.00834399
0.012632 6.42464 0.00923507
0.0174056 7.63892 0.0103193
0.0260694 9.86135 0.0115804
0.0627151 20.7037 0.0135544
10 changes: 10 additions & 0 deletions extras/data/EIC/EIC_5_41_A1c_100fb-1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
0.0048499 2.54933 0.00672086
0.00703289 3.10815 0.00767392
0.00920086 3.58839 0.00822064
0.0117715 4.09389 0.00935268
0.0149141 4.65683 0.00979612
0.0190106 5.30941 0.0110492
0.0246448 6.2185 0.0118684
0.0332428 7.39412 0.0134677
0.0489573 9.20167 0.0156306
0.103627 15.9766 0.0205952
41 changes: 41 additions & 0 deletions extras/data/EIC/metadata.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
nnpdf_id: null
fktable_id: null

# For Sqrt_s=43 GeV and beam energies (5, 41) GeV
EIC_NC_43GEV_EP_G1CHARM:
description: polarized structure function $g_1^c$ from EIC projections
y_label: 2xg1c
y_label_tex: $2xg_1^c$
hepdata: null

EIC_NC_43GEV_EP_F1CHARM:
description: unpolarized structure function $F_1$ from EIC projections
y_label: 2xF1
y_label_tex: $2xF_1$
hepdata: null

# For Sqrt_s=67 GeV and beam energies (5, 100) GeV
EIC_NC_67GEV_EP_G1CHARM:
description: polarized structure function $g_1^c$ from EIC projections
y_label: 2xg1c
y_label_tex: $2xg_1^c$
hepdata: null

EIC_NC_67GEV_EP_F1CHARM:
description: unpolarized structure function $F_1$ from EIC projections
y_label: 2xF1
y_label_tex: $2xF_1$
hepdata: null

# For Sqrt_s=211 GeV and beam energies (18, 275) GeV
EIC_NC_211GEV_EP_G1CHARM:
description: polarized structure function $g_1^c$ from EIC projections
y_label: 2xg1c
y_label_tex: $2xg_1^c$
hepdata: null

EIC_NC_211GEV_EP_F1CHARM:
description: unpolarized structure function $F_1$ from EIC projections
y_label: 2xF1
y_label_tex: $2xF_1$
hepdata: null
20 changes: 20 additions & 0 deletions extras/data/EIcC/EIcC_3_20_A1c_100fb-1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
0.0118543 2.33943 0.0131741
0.0147498 2.67647 0.0137443
0.0170879 2.92672 0.0145816
0.0193576 3.14972 0.0148745
0.0216843 3.38092 0.0154729
0.024134 3.61084 0.0163357
0.026757 3.83911 0.0166505
0.029609 4.07714 0.0173117
0.0327378 4.32469 0.0177981
0.036235 4.62301 0.0184076
0.0401922 4.91469 0.0196155
0.0447057 5.22312 0.0201606
0.0498705 5.57079 0.0206674
0.0559157 5.90818 0.0224443
0.063158 6.30866 0.0235975
0.0719283 6.76403 0.0249343
0.082977 7.29287 0.028093
0.098045 8.23912 0.0294843
0.122323 9.93854 0.03264
0.194617 15.7033 0.0412479
20 changes: 20 additions & 0 deletions extras/data/EIcC/EIcC_5_25_A1c_100fb-1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
0.0068164 2.35927 0.00858772
0.00867301 2.70472 0.00918325
0.0101997 2.9482 0.00989902
0.0116997 3.18471 0.0105122
0.0132466 3.41175 0.010999
0.0148812 3.63892 0.0115985
0.01666 3.8813 0.0119657
0.018605 4.1459 0.01256
0.0207568 4.43653 0.0129563
0.0232027 4.74319 0.0135662
0.0260104 5.05546 0.0141511
0.0292666 5.42151 0.0149317
0.0330757 5.86492 0.0155973
0.0377102 6.34746 0.0165588
0.0434833 6.871 0.0174989
0.0507568 7.45673 0.0188441
0.0604552 8.18451 0.0205689
0.0743193 9.18998 0.0232922
0.096939 10.822 0.0266716
0.165807 17.5539 0.0342092
28 changes: 28 additions & 0 deletions extras/data/EIcC/metadata.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
nnpdf_id: null
fktable_id: null

# For Sqrt_s=15 GeV and beam energies (3.5, 20) GeV
EIcC_NC_15GEV_EP_G1CHARM:
description: polarized structure function $g_1^c$ from EIcC projections
y_label: 2xg1c
y_label_tex: $2xg_1^c$
hepdata: null

EIcC_NC_15GEV_EP_F1CHARM:
description: unpolarized structure function $F_1$ from EIcC projections
y_label: 2xF1
y_label_tex: $2xF_1$
hepdata: null

# For Sqrt_s=22 GeV and beam energies (5, 25) GeV
EIcC_NC_22GEV_EP_G1CHARM:
description: polarized structure function $g_1^c$ from EIcC projections
y_label: 2xg1c
y_label_tex: $2xg_1^c$
hepdata: null

EIcC_NC_22GEV_EP_F1CHARM:
description: unpolarized structure function $F_1$ from EIcC projections
y_label: 2xF1
y_label_tex: $2xF_1$
hepdata: null
2 changes: 1 addition & 1 deletion extras/data/EMC/metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
nnpdf_id: null
fktable_id: null

EMC_NC_16GEV_MUP_G1:
EMC_NC_NOTFIXED_MUP_G1:
description: polarized structure function $g_1$ in EMC with proton target
y_label: 2xg1
y_label_tex: $2xg_1$
2 changes: 1 addition & 1 deletion extras/data/JLABE97/metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
nnpdf_id: null
fktable_id: null

JLABE97_NC_3GEV_EN_G1:
JLABE97_NC_NOTFIXED_EN_G1:
description: polarized structure function $g_1$ in JLABE97 with neutron target
y_label: 2xg1
y_label_tex: $2xg_1$
8 changes: 4 additions & 4 deletions extras/data/JLABEG1B/metadata.yaml
Original file line number Diff line number Diff line change
@@ -2,22 +2,22 @@ nnpdf_id: null
fktable_id: null
hepdata: https://www.hepdata.net/record/ins717523

JLABEG1B_NC_4GEV_ED_F1:
JLABEG1B_NC_NOTFIXED_ED_F1:
description: unpolarized structure function $F_1$ in JLABEG1B with deuteron target
y_label: 2xF1
y_label_tex: $2xF_1$

JLABEG1B_NC_4GEV_ED_G1:
JLABEG1B_NC_NOTFIXED_ED_G1:
description: polarized structure function $g_1$ in JLABEG1B with deuteron target
y_label: 2xg1
y_label_tex: $2xg_1$

JLABEG1B_NC_3GEV_EP_F1:
JLABEG1B_NC_NOTFIXED_EP_F1:
description: unpolarized structure function $F_1$ in JLABEG1B with proton target
y_label: 2xF1
y_label_tex: $2xF_1$

JLABEG1B_NC_3GEV_EP_G1:
JLABEG1B_NC_NOTFIXED_EP_G1:
description: polarized structure function $g_1$ in JLABEG1B with proton target
y_label: 2xg1
y_label_tex: $2xg_1$
4 changes: 2 additions & 2 deletions extras/data/SMC/metadata.yaml
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@ nnpdf_id: null
fktable_id: null
hepdata: https://www.hepdata.net/record/ins471981

SMC_NC_17GEV_MUP_G1:
SMC_NC_NOTFIXED_MUP_G1:
description: polarized structure function $g_1$ in SMC with proton target
y_label: 2xg1
y_label_tex: $2xg_1$

SMC_NC_24GEV_MUD_G1:
SMC_NC_NOTFIXED_MUD_G1:
description: polarized structure function $g_1$ in SMC with deuteron target
y_label: 2xg1
y_label_tex: $2xg_1$
12 changes: 12 additions & 0 deletions extras/data/machinery/generate/ATHENA.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import numpy as np

from .utils import dump_polarized as dump

# renaming
new_names = {
"athena_29gev_ep": ["ATHENA_NC_29GEV_EP_G1", "ATHENA_NC_29GEV_EP_F1"],
"athena_45gev_ep": ["ATHENA_NC_45GEV_EP_G1", "ATHENA_NC_45GEV_EP_F1"],
"athena_63gev_ep": ["ATHENA_NC_63GEV_EP_G1", "ATHENA_NC_63GEV_EP_F1"],
"athena_105gev_ep": ["ATHENA_NC_105GEV_EP_G1", "ATHENA_NC_105GEV_EP_F1"],
"athena_140gev_ep": ["ATHENA_NC_140GEV_EP_G1", "ATHENA_NC_140GEV_EP_F1"],
}
4 changes: 2 additions & 2 deletions extras/data/machinery/generate/COMPASS15.py
Original file line number Diff line number Diff line change
@@ -2,6 +2,6 @@

# renaming
new_names = {
"compass15_mud_g1": "COMPASS15_NC_25GEV_MUD_G1",
"compass15_mup_g1": "COMPASS15_NC_17GEV_MUP_G1",
"compass15_mud_g1": "COMPASS15_NC_NOTFIXED_MUD_G1",
"compass15_mup_g1": "COMPASS15_NC_NOTFIXED_MUP_G1",
}
2 changes: 1 addition & 1 deletion extras/data/machinery/generate/E142.py
Original file line number Diff line number Diff line change
@@ -2,5 +2,5 @@

# renaming
new_names = {
"e142_en_g1": "E142_NC_58GEV_EN_G1",
"e142_en_g1": "E142_NC_NOTFIXED_EN_G1",
}
4 changes: 2 additions & 2 deletions extras/data/machinery/generate/E143.py
Original file line number Diff line number Diff line change
@@ -2,6 +2,6 @@

# renaming
new_names = {
"e143_ep_g1": "E143_NC_4GEV_EP_G1",
"e143_ed_g1": "E143_NC_8GEV_ED_G1",
"e143_ep_g1": "E143_NC_NOTFIXED_EP_G1",
"e143_ed_g1": "E143_NC_NOTFIXED_ED_G1",
}
10 changes: 10 additions & 0 deletions extras/data/machinery/generate/EIC.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import numpy as np

from .utils import dump_polarized as dump

# renaming
new_names = {
"EIC_5_41_A1c_100fb-1": ["EIC_NC_43GEV_EP_G1", "EIC_NC_43GEV_EP_F1"],
"EIC_5_100_A1c_100fb-1": ["EIC_NC_67GEV_EP_G1", "EIC_NC_67GEV_EP_F1"],
"EIC_18_275_A1c_100fb-1": ["EIC_NC_211GEV_EP_G1", "EIC_NC_211GEV_EP_F1"],
}
9 changes: 9 additions & 0 deletions extras/data/machinery/generate/EIcC.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import numpy as np

from .utils import dump_polarized as dump

# renaming
new_names = {
"EIcC_3_20_A1c_100fb-1": ["EIcC_NC_15GEV_EP_G1", "EIcC_NC_15GEV_EP_F1"],
"EIcC_5_25_A1c_100fb-1": ["EIcC_NC_22GEV_EP_G1", "EIcC_NC_22GEV_EP_F1"],
}
2 changes: 1 addition & 1 deletion extras/data/machinery/generate/EMC.py
Original file line number Diff line number Diff line change
@@ -2,5 +2,5 @@

# renaming
new_names = {
"emc_mup_g1": "EMC_NC_16GEV_MUP_G1",
"emc_mup_g1": "EMC_NC_NOTFIXED_MUP_G1",
}
2 changes: 1 addition & 1 deletion extras/data/machinery/generate/JLABE97.py
Original file line number Diff line number Diff line change
@@ -2,5 +2,5 @@

# renaming
new_names = {
"jlabe97_en_g1": "JLABE97_NC_3GEV_EN_G1",
"jlabe97_en_g1": "JLABE97_NC_NOTFIXED_EN_G1",
}
4 changes: 2 additions & 2 deletions extras/data/machinery/generate/JLABEG1B.py
Original file line number Diff line number Diff line change
@@ -2,6 +2,6 @@

# renaming
new_names = {
"jlabeg1b_ep_g1f1": ["JLABEG1B_NC_3GEV_EP_G1", "JLABEG1B_NC_3GEV_EP_F1"],
"jlabeg1b_ed_g1f1": ["JLABEG1B_NC_4GEV_ED_G1", "JLABEG1B_NC_4GEV_ED_F1"],
"jlabeg1b_ep_g1f1": ["JLABEG1B_NC_NOTFIXED_EP_G1", "JLABEG1B_NC_NOTFIXED_F1"],
"jlabeg1b_ed_g1f1": ["JLABEG1B_NC_NOTFIXED_ED_G1", "JLABEG1B_NC_NOTFIXED_ED_F1"],
}
4 changes: 2 additions & 2 deletions extras/data/machinery/generate/SMC.py
Original file line number Diff line number Diff line change
@@ -2,6 +2,6 @@

# renaming
new_names = {
"smc_mud_g1": "SMC_NC_24GEV_MUD_G1",
"smc_mup_g1": "SMC_NC_17GEV_MUP_G1",
"smc_mud_g1": "SMC_NC_NOTFIXED_MUD_G1",
"smc_mup_g1": "SMC_NC_NOTFIXED_MUP_G1",
}
6 changes: 6 additions & 0 deletions extras/data/machinery/generate/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from . import (
ATHENA,
BCDMS,
CHORUS,
COMPASS,
@@ -7,6 +8,7 @@
E143,
E154,
E155,
EIC,
EMC,
HERA,
HERMES,
@@ -22,6 +24,7 @@
SLAC,
SMC,
SMCSX,
EIcC,
utils,
)

@@ -51,6 +54,9 @@
NUTEV,
POS,
SLAC,
EIC,
EIcC,
ATHENA,
]
}

37 changes: 31 additions & 6 deletions extras/data/machinery/generate/utils.py
Original file line number Diff line number Diff line change
@@ -81,14 +81,39 @@ def dump_polarized(src_path, target):
observables dictionary, corresponding to the runcard
"""

# We make a case distinction for several experiments:
obs = obs_template.copy()
data = load(src_path, 0, ["x", "Q2"])
dict_kins = [
dict(x=d["x"]["mid"], y=d["y"]["mid"], Q2=d["Q2"]["mid"]) for d in data
]
if "ATHENA" in target.parent.name:
data = np.genfromtxt(src_path)
dict_kins = [dict(x=float(d[0]), y=float(d[2]), Q2=float(d[1])) for d in data]

obs["PolarizationDIS"] = 0.0 if "_F1" in target.parent.name else 1.0
observable_name = "F1_total" if "_F1" in target.parent.name else "g1_total"

elif "EIC" in target.parent.name:
data = np.genfromtxt(src_path)
dict_kins = [dict(x=float(d[0]), y=0.0, Q2=float(d[1])) for d in data]

obs["PolarizationDIS"] = 0.0 if "_F1" in target.parent.name else 1.0
observable_name = "F1_charm" if "_F1" in target.parent.name else "g1_charm"

elif "EIcC" in target.parent.name:
data = np.genfromtxt(src_path)
dict_kins = [dict(x=float(d[0]), y=0.0, Q2=float(d[1])) for d in data]

obs["PolarizationDIS"] = 0.0 if "_F1" in target.parent.name else 1.0
observable_name = "F1_charm" if "_F1" in target.parent.name else "g1_charm"

else:
data = load(src_path, 0, ["x", "Q2"])
dict_kins = [
dict(x=d["x"]["mid"], y=d["y"]["mid"], Q2=d["Q2"]["mid"]) for d in data
]

obs["PolarizationDIS"] = 0.0 if "_F1" in target.parent.name else 1.0
observable_name = "F1_total" if "_F1" in target.parent.name else "g1_total"

obs["PolarizationDIS"] = 0.0 if "_F1" in target.parent.name else 1.0
observable_name = "F1_total" if "_F1" in target.parent.name else "g1_total"
obs["observables"] = {observable_name: dict_kins}
if "_ep_" in str(src_path.stem) or "_mup_" in str(src_path.stem):
obs["TargetDIS"] = "proton"