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 runner for vrap #139

Merged
merged 28 commits into from
Jul 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
0dbeefb
add vrap runner
scarlehoff Jun 14, 2022
8a6376d
add DYE866
scarlehoff Jun 14, 2022
3d7962b
add DYE866R
scarlehoff Jun 14, 2022
66f6f87
add DYE906R
scarlehoff Jun 14, 2022
89f3578
define the vrap runcard with a vrap.yaml file
scarlehoff Jun 14, 2022
accf5e5
define version
scarlehoff Jun 14, 2022
d527985
change all to vrap.yaml
scarlehoff Jun 14, 2022
df4557b
revert change to kinematics
scarlehoff Jun 14, 2022
e4318c0
add metadata for E605
scarlehoff Jun 14, 2022
e203ba5
Update runcardsrunner/external/vrap.py
scarlehoff Jun 14, 2022
4c8a347
Update runcardsrunner/external/vrap.py
scarlehoff Jun 14, 2022
f21a7a7
add metadatas
scarlehoff Jun 15, 2022
8a7241a
update E605
scarlehoff Jun 15, 2022
b44ee78
update metadata for E866 and E905
scarlehoff Jun 15, 2022
61e5dae
update 866
scarlehoff Jun 15, 2022
fddb929
implemented grid merging for E906 applyinc acceptance factors
scarlehoff Jun 21, 2022
2179291
remove PDFfile key from E605
scarlehoff Jun 21, 2022
4f717d1
save partial results for MC comparison
scarlehoff Jun 21, 2022
17ac990
update for vrap latest version
scarlehoff Jun 21, 2022
94fa1ba
update docs
scarlehoff Jun 21, 2022
88b434d
fix pineappl dep to 0.5.3
scarlehoff Jun 22, 2022
8fad1d0
remove headers
scarlehoff Jun 24, 2022
daef66d
Pre-commit all files
alecandido Jun 24, 2022
11ed670
fix version in module
scarlehoff Jun 24, 2022
1f84b1e
Poetry update
alecandido Jun 24, 2022
281f6bc
Add VRAP installation to CLI
alecandido Jun 24, 2022
e215692
Add short alias for CLI help
alecandido Jun 24, 2022
89dede3
Correct CLI help
alecandido Jun 24, 2022
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
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exclude: '^.*\.patch$'
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0
rev: v4.3.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand All @@ -13,7 +13,7 @@ repos:
- id: debug-statements
- id: fix-encoding-pragma
- repo: https://github.com/psf/black
rev: 22.1.0
rev: 22.3.0
hooks:
- id: black
- repo: https://github.com/asottile/blacken-docs
Expand All @@ -26,6 +26,6 @@ repos:
- id: isort
args: ["--profile", "black"]
- repo: https://github.com/asottile/pyupgrade
rev: v2.31.0
rev: v2.34.0
hooks:
- id: pyupgrade
119 changes: 119 additions & 0 deletions nnpdf31_proc/DYE605/DYE605.dat
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
7.10428 -0.2
7.30604 -0.2
7.5078 -0.2
7.70568 -0.2
7.90744 -0.2
8.10532 -0.2
8.30708 -0.2
8.50496 -0.2
8.70672 -0.2
8.90848 -0.2
10.507 -0.2
10.7088 -0.2
10.9106 -0.2
11.3102 -0.2
12.1095 -0.2
13.3123 -0.2
14.9108 -0.2
7.10428 -0.1
7.30604 -0.1
7.5078 -0.1
7.70568 -0.1
7.90744 -0.1
8.10532 -0.1
8.30708 -0.1
8.50496 -0.1
8.70672 -0.1
8.90848 -0.1
10.507 -0.1
10.7088 -0.1
10.9106 -0.1
11.3102 -0.1
12.1095 -0.1
13.3123 -0.1
14.9108 -0.1
16.9129 -0.1
7.10428 0
7.30604 0
7.5078 0
7.70568 0
7.90744 0
8.10532 0
8.30708 0
8.50496 0
8.70672 0
8.90848 0
10.507 0
10.7088 0
10.9106 0
11.3102 0
12.1095 0
13.3123 0
14.9108 0
16.9129 0
7.10428 0.1
7.30604 0.1
7.5078 0.1
7.70568 0.1
7.90744 0.1
8.10532 0.1
8.30708 0.1
8.50496 0.1
8.70672 0.1
8.90848 0.1
10.507 0.1
10.7088 0.1
10.9106 0.1
11.3102 0.1
12.1095 0.1
13.3123 0.1
14.9108 0.1
16.9129 0.1
7.10428 0.2
7.30604 0.2
7.5078 0.2
7.70568 0.2
7.90744 0.2
8.10532 0.2
8.30708 0.2
8.50496 0.2
8.70672 0.2
8.90848 0.2
10.507 0.2
10.7088 0.2
10.9106 0.2
11.3102 0.2
12.1095 0.2
13.3123 0.2
14.9108 0.2
16.9129 0.2
7.10428 0.3
7.30604 0.3
7.5078 0.3
7.70568 0.3
7.90744 0.3
8.10532 0.3
8.30708 0.3
8.50496 0.3
8.70672 0.3
8.90848 0.3
10.507 0.3
10.7088 0.3
10.9106 0.3
11.3102 0.3
12.1095 0.3
13.3123 0.3
14.9108 0.3
16.9129 0.3
8.30708 0.4
8.50496 0.4
8.70672 0.4
8.90848 0.4
10.507 0.4
10.7088 0.4
10.9106 0.4
11.3102 0.4
12.1095 0.4
13.3123 0.4
14.9108 0.4
16.9129 0.4
14 changes: 14 additions & 0 deletions nnpdf31_proc/DYE605/metadata.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
description='E605 Fixed-Target Drell-Yan cross section measurement with nuclear copper target'
hepdata=10.17182/hepdata.22831/t1-t8
data_url=
nnpdf_id=DYE605
fktable_id=DYE605
x1_label=sqrt(tau)
x1_label_tex=$\sqrt(\tau)$
x1_unit=
x2_label=y
x2_label_tex=$y$
x2_unit=
y_label_tex = $s*\frac{d^2\sigma}{d\sqrt(\tau)dy}$
y_label=s*d^2sigma/dsqrt(tau)/dy
Copy link
Contributor

Choose a reason for hiding this comment

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

I think y_label will be used in CLI outputs (@cschwan ?) and then this might be too long ... I've no good counter proposal though ... sd2sig/dst/dy?

Copy link
Contributor

Choose a reason for hiding this comment

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

@felixhekhorn right. For the time being y_label is used in pineappl convolute, for instance, and y_label_tex in pineappl plot.

y_unit=pb GeV^2
20 changes: 20 additions & 0 deletions nnpdf31_proc/DYE605/vrap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Collider: piso
E_CM: 38.8

Alphat: 0.00757002271
Q: 0
VectorBoson: Zgamma

muFoverQ: 1.0
muRoverQ: 1.0
Nf: 5

UseOtherPDF: "yes"
PDFset: 0
AlphasZ: 0.118
Order: NLO

PrintDirection: Forward
NNLO_only: "No"

RandomSeed: 22334
184 changes: 184 additions & 0 deletions nnpdf31_proc/DYE866/DYE866.dat
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@
4.45 0
4.95 0
5.45 0
5.95 0
6.45 0
6.95 0
7.45 0
7.95 0
8.45 0
11.35 0
4.45 0.31685
4.95 0.286595
5.45 0.260745
5.95 0.239253
6.45 0.221213
6.95 0.206301
7.45 0.192444
7.95 0.180491
8.45 0.170103
11.35 0.127198
4.45 0.511321
4.95 0.465052
5.45 0.425766
5.95 0.392707
6.45 0.363141
6.95 0.338909
7.45 0.316692
7.95 0.297734
8.45 0.28079
11.35 0.211089
4.45 0.688628
4.95 0.630667
5.45 0.579347
5.95 0.536303
6.45 0.498936
6.95 0.465869
7.45 0.436634
7.95 0.411183
8.45 0.388038
11.35 0.293516
12.35 0.269933
13.85 0.241787
4.45 0.849991
4.95 0.78162
5.45 0.723087
5.95 0.670962
6.45 0.627011
6.95 0.586301
7.45 0.551076
7.95 0.519605
8.45 0.491492
11.35 0.372787
12.35 0.344552
13.85 0.309321
4.45 0.994947
4.95 0.919562
5.45 0.853921
5.95 0.796922
6.45 0.745567
6.95 0.699818
7.45 0.65933
7.95 0.622856
8.45 0.589683
11.35 0.451939
12.35 0.417352
13.85 0.373969
4.45 1.12651
4.95 1.04636
5.45 0.975099
5.95 0.912443
6.45 0.856615
6.95 0.805772
7.45 0.760842
7.95 0.720621
8.45 0.684214
11.35 0.527286
12.35 0.488748
13.85 0.438977
4.45 1.24554
4.95 1.16004
5.45 1.0858
5.95 1.01988
6.45 0.959232
6.95 0.905138
7.45 0.856181
7.95 0.813311
8.45 0.773481
11.35 0.600886
12.35 0.556681
13.85 0.501632
4.45 1.35461
4.95 1.26584
5.45 1.18889
5.95 1.11816
6.45 1.05544
6.95 0.997418
7.45 0.946584
7.95 0.899935
8.45 0.85716
11.35 0.670006
12.35 0.622924
13.85 0.562164
4.45 1.45483
4.95 1.36274
5.45 1.28222
5.95 1.2105
6.45 1.14425
6.95 1.08447
7.45 1.03161
7.95 0.982627
8.45 0.936131
11.35 0.738197
12.35 0.687354
13.85 0.622877
4.45 1.54148
4.95 1.45078
5.45 1.36852
5.95 1.29477
6.45 1.22722
6.95 1.1658
7.45 1.11049
7.95 1.05889
8.45 1.01196
11.35 0.803554
12.35 0.748651
13.85 0.679481
15.85 0.604361
4.45 1.62821
4.95 1.5344
5.45 1.45203
5.95 1.37645
6.45 1.30539
6.95 1.24191
7.45 1.18448
7.95 1.13125
8.45 1.08479
11.35 0.865536
12.35 0.808952
13.85 0.734776
4.45 1.70671
4.95 1.61193
5.45 1.52679
5.95 1.44913
6.45 1.37768
6.95 1.31399
7.45 1.25558
7.95 1.20169
8.45 1.15147
11.35 0.925245
12.35 0.864339
13.85 0.789739
4.45 1.77822
4.95 1.68474
5.45 1.59863
5.95 1.51995
6.45 1.44805
6.95 1.38102
7.45 1.32102
7.95 1.26592
8.45 1.21535
11.35 0.981686
12.35 0.919571
13.85 0.841066
4.45 1.85292
4.95 1.75174
5.45 1.66315
5.95 1.58161
6.45 1.51083
6.95 1.4474
7.45 1.38448
7.95 1.32757
8.45 1.27509
11.35 1.03577
13.85 0.889041
4.45 1.90778
4.95 1.81673
5.45 1.73262
5.95 1.64523
6.45 1.57521
6.95 1.50795
7.45 1.44419
7.95 1.38003
8.45 1.33645
11.35 1.08632
16 changes: 16 additions & 0 deletions nnpdf31_proc/DYE866/metadata.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
description='E866 (NuSea) Fixed-Target Drell-Yan cross section measurement'
arxiv=hep-ex/0302019
hepdata=10.17182/hepdata.41970.v1
inspirehep=613362
data_url=
nnpdf_id=DYE866
fktable_id=DYE866
x1_label=M
x1_label_tex=$M$
x1_unit=GeV
x2_label=y
x2_label_tex=$y$
x2_unit=
y_label_tex=$M^3*\frac{d^2\sigma_{d}}{dMdy}$
y_label=M^3*d^2sigma/dM/dy
y_unit=pb GeV^2
Loading