Skip to content

Add positivity support #132

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.

Sign up for GitHub

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

Merged
cschwan merged 15 commits into from
Jun 2, 2022
Merged

Add positivity support #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
852769a
Add preliminary positivity support
cschwan Apr 5, 2022
ecd40ef
Factorize external call
alecandido Apr 5, 2022
cadd52a
Implement scale variation of positivity grids
cschwan Apr 5, 2022
4358511
Split parts of `run` off to `generate_pineappl`
cschwan Apr 5, 2022
2b9de22
Write JSON runcard into metadata
cschwan Apr 5, 2022
27d096c
Remove TODO item
cschwan Apr 5, 2022
b7ca837
Make uncertainties always positive
cschwan Apr 5, 2022
965b495
Rename positivity dataset
cschwan Apr 5, 2022
90afd12
Store q2 instead of q
cschwan Apr 5, 2022
0c8a543
Try to reproduce up-quark positivity grid
cschwan Apr 5, 2022
0011ad1
Add missing metadata for up quark positivity
cschwan Apr 5, 2022
d2aabc0
Store xf(x) instead of just f(x) in the positivity
cschwan Apr 5, 2022
e0fb8c5
Add missing metadata
cschwan Apr 14, 2022
7d0bf2f
Add missing positivity runcards
cschwan Apr 14, 2022
bf19aa0
Correct units of Q^2
cschwan Apr 14, 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
10 changes: 10 additions & 0 deletions nnpdf31_proc/NNPDF_POS_ANTI_DOWN_40/metadata.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
description=Anti-down quark positivity
x1_label=Q2
x1_label_tex=$Q^2$
x1_unit=GeV^2
x2_label=x
x2_label_tex=$x$
x2_unit=
y_label=xfx
y_label_tex=$xf(x)$
y_unit=
25 changes: 25 additions & 0 deletions nnpdf31_proc/NNPDF_POS_ANTI_DOWN_40/positivity.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
hadron_pid: 2212
lepton_pid: 11
pid: -1
q2: 5.0
xgrid:
- 4.9999999999999998e-07
- 1.9407667236782136e-06
- 7.5331509514733370e-06
- 2.9240177382128657e-05
- 1.1349672651536727e-04
- 4.4054134013486355e-04
- 1.7099759466766963e-03
- 6.6373288312005724e-03
- 2.5763013859408150e-02
- 1.0000000000000001e-01
- 1.7999999999999999e-01
- 2.6000000000000001e-01
- 3.3999999999999997e-01
- 4.2000000000000004e-01
- 5.0000000000000000e-01
- 5.7999999999999996e-01
- 6.6000000000000003e-01
- 7.3999999999999999e-01
- 8.1999999999999995e-01
- 9.0000000000000002e-01
10 changes: 10 additions & 0 deletions nnpdf31_proc/NNPDF_POS_ANTI_STRANGE_40/metadata.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
description=Anti-strange quark positivity
x1_label=Q2
x1_label_tex=$Q^2$
x1_unit=GeV^2
x2_label=x
x2_label_tex=$x$
x2_unit=
y_label=xfx
y_label_tex=$xf(x)$
y_unit=
25 changes: 25 additions & 0 deletions nnpdf31_proc/NNPDF_POS_ANTI_STRANGE_40/positivity.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
hadron_pid: 2212
lepton_pid: 11
pid: -3
q2: 5.0
xgrid:
- 4.9999999999999998e-07
- 1.9407667236782136e-06
- 7.5331509514733370e-06
- 2.9240177382128657e-05
- 1.1349672651536727e-04
- 4.4054134013486355e-04
- 1.7099759466766963e-03
- 6.6373288312005724e-03
- 2.5763013859408150e-02
- 1.0000000000000001e-01
- 1.7999999999999999e-01
- 2.6000000000000001e-01
- 3.3999999999999997e-01
- 4.2000000000000004e-01
- 5.0000000000000000e-01
- 5.7999999999999996e-01
- 6.6000000000000003e-01
- 7.3999999999999999e-01
- 8.1999999999999995e-01
- 9.0000000000000002e-01
10 changes: 10 additions & 0 deletions nnpdf31_proc/NNPDF_POS_ANTI_UP_40/metadata.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
description=Anti-up quark positivity
x1_label=Q2
x1_label_tex=$Q^2$
x1_unit=GeV^2
x2_label=x
x2_label_tex=$x$
x2_unit=
y_label=xfx
y_label_tex=$xf(x)$
y_unit=
25 changes: 25 additions & 0 deletions nnpdf31_proc/NNPDF_POS_ANTI_UP_40/positivity.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
hadron_pid: 2212
lepton_pid: 11
pid: -2
q2: 5.0
xgrid:
- 4.9999999999999998e-07
- 1.9407667236782136e-06
- 7.5331509514733370e-06
- 2.9240177382128657e-05
- 1.1349672651536727e-04
- 4.4054134013486355e-04
- 1.7099759466766963e-03
- 6.6373288312005724e-03
- 2.5763013859408150e-02
- 1.0000000000000001e-01
- 1.7999999999999999e-01
- 2.6000000000000001e-01
- 3.3999999999999997e-01
- 4.2000000000000004e-01
- 5.0000000000000000e-01
- 5.7999999999999996e-01
- 6.6000000000000003e-01
- 7.3999999999999999e-01
- 8.1999999999999995e-01
- 9.0000000000000002e-01
10 changes: 10 additions & 0 deletions nnpdf31_proc/NNPDF_POS_CHARM_40/metadata.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
description=Charm quark positivity
x1_label=Q2
x1_label_tex=$Q^2$
x1_unit=GeV^2
x2_label=x
x2_label_tex=$x$
x2_unit=
y_label=xfx
y_label_tex=$xf(x)$
y_unit=
25 changes: 25 additions & 0 deletions nnpdf31_proc/NNPDF_POS_CHARM_40/positivity.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
hadron_pid: 2212
lepton_pid: 11
pid: 4
q2: 5.0
xgrid:
- 4.9999999999999998e-07
- 1.9407667236782136e-06
- 7.5331509514733370e-06
- 2.9240177382128657e-05
- 1.1349672651536727e-04
- 4.4054134013486355e-04
- 1.7099759466766963e-03
- 6.6373288312005724e-03
- 2.5763013859408150e-02
- 1.0000000000000001e-01
- 1.7999999999999999e-01
- 2.6000000000000001e-01
- 3.3999999999999997e-01
- 4.2000000000000004e-01
- 5.0000000000000000e-01
- 5.7999999999999996e-01
- 6.6000000000000003e-01
- 7.3999999999999999e-01
- 8.1999999999999995e-01
- 9.0000000000000002e-01
10 changes: 10 additions & 0 deletions nnpdf31_proc/NNPDF_POS_DOWN_40/metadata.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
description=Down quark positivity
x1_label=Q2
x1_label_tex=$Q^2$
x1_unit=GeV^2
x2_label=x
x2_label_tex=$x$
x2_unit=
y_label=xfx
y_label_tex=$xf(x)$
y_unit=
25 changes: 25 additions & 0 deletions nnpdf31_proc/NNPDF_POS_DOWN_40/positivity.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
hadron_pid: 2212
lepton_pid: 11
pid: 1
q2: 5.0
xgrid:
- 4.9999999999999998e-07
- 1.9407667236782136e-06
- 7.5331509514733370e-06
- 2.9240177382128657e-05
- 1.1349672651536727e-04
- 4.4054134013486355e-04
- 1.7099759466766963e-03
- 6.6373288312005724e-03
- 2.5763013859408150e-02
- 1.0000000000000001e-01
- 1.7999999999999999e-01
- 2.6000000000000001e-01
- 3.3999999999999997e-01
- 4.2000000000000004e-01
- 5.0000000000000000e-01
- 5.7999999999999996e-01
- 6.6000000000000003e-01
- 7.3999999999999999e-01
- 8.1999999999999995e-01
- 9.0000000000000002e-01
10 changes: 10 additions & 0 deletions nnpdf31_proc/NNPDF_POS_GLUON_40/metadata.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
description=Gluon positivity
x1_label=Q2
x1_label_tex=$Q^2$
x1_unit=GeV^2
x2_label=x
x2_label_tex=$x$
x2_unit=
y_label=xfx
y_label_tex=$xf(x)$
y_unit=
25 changes: 25 additions & 0 deletions nnpdf31_proc/NNPDF_POS_GLUON_40/positivity.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
hadron_pid: 2212
lepton_pid: 11
pid: 21
q2: 5.0
xgrid:
- 4.9999999999999998e-07
- 1.9407667236782136e-06
- 7.5331509514733370e-06
- 2.9240177382128657e-05
- 1.1349672651536727e-04
- 4.4054134013486355e-04
- 1.7099759466766963e-03
- 6.6373288312005724e-03
- 2.5763013859408150e-02
- 1.0000000000000001e-01
- 1.7999999999999999e-01
- 2.6000000000000001e-01
- 3.3999999999999997e-01
- 4.2000000000000004e-01
- 5.0000000000000000e-01
- 5.7999999999999996e-01
- 6.6000000000000003e-01
- 7.3999999999999999e-01
- 8.1999999999999995e-01
- 9.0000000000000002e-01
10 changes: 10 additions & 0 deletions nnpdf31_proc/NNPDF_POS_STRANGE_40/metadata.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
description=Strange quark positivity
x1_label=Q2
x1_label_tex=$Q^2$
x1_unit=GeV^2
x2_label=x
x2_label_tex=$x$
x2_unit=
y_label=xfx
y_label_tex=$xf(x)$
y_unit=
25 changes: 25 additions & 0 deletions nnpdf31_proc/NNPDF_POS_STRANGE_40/positivity.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
hadron_pid: 2212
lepton_pid: 11
pid: 3
q2: 5.0
xgrid:
- 4.9999999999999998e-07
- 1.9407667236782136e-06
- 7.5331509514733370e-06
- 2.9240177382128657e-05
- 1.1349672651536727e-04
- 4.4054134013486355e-04
- 1.7099759466766963e-03
- 6.6373288312005724e-03
- 2.5763013859408150e-02
- 1.0000000000000001e-01
- 1.7999999999999999e-01
- 2.6000000000000001e-01
- 3.3999999999999997e-01
- 4.2000000000000004e-01
- 5.0000000000000000e-01
- 5.7999999999999996e-01
- 6.6000000000000003e-01
- 7.3999999999999999e-01
- 8.1999999999999995e-01
- 9.0000000000000002e-01
10 changes: 10 additions & 0 deletions nnpdf31_proc/NNPDF_POS_UP_40/metadata.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
description=Up-quark positivity
x1_label=Q2
x1_label_tex=$Q^2$
x1_unit=GeV^2
x2_label=x
x2_label_tex=$x$
x2_unit=
y_label=xfx
y_label_tex=$xf(x)$
y_unit=
25 changes: 25 additions & 0 deletions nnpdf31_proc/NNPDF_POS_UP_40/positivity.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
hadron_pid: 2212
lepton_pid: 11
pid: 2
q2: 5.0
xgrid:
- 4.9999999999999998e-07
- 1.9407667236782136e-06
- 7.5331509514733370e-06
- 2.9240177382128657e-05
- 1.1349672651536727e-04
- 4.4054134013486355e-04
- 1.7099759466766963e-03
- 6.6373288312005724e-03
- 2.5763013859408150e-02
- 1.0000000000000001e-01
- 1.7999999999999999e-01
- 2.6000000000000001e-01
- 3.3999999999999997e-01
- 4.2000000000000004e-01
- 5.0000000000000000e-01
- 5.7999999999999996e-01
- 6.6000000000000003e-01
- 7.3999999999999999e-01
- 8.1999999999999995e-01
- 9.0000000000000002e-01
16 changes: 11 additions & 5 deletions runcardsrunner/cli/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import yaml

from .. import install, log, table, tools
from ..external import mg5, yad
from ..external import mg5, positivity, yad
from ._base import command


Expand Down Expand Up @@ -62,11 +62,17 @@ def main(dataset, theory, pdf):
rich.print(dataset)

if yad.is_dis(dataset):
rich.print(f"Computing [red]{dataset}[/]...")
runner = yad.Yadism(dataset, theory, pdf, timestamp=timestamp)
color = "red"
external = yad.Yadism
elif positivity.is_positivity(dataset):
color = "yellow"
external = positivity.Positivity
else:
rich.print(f"Computing [blue]{dataset}[/]...")
runner = mg5.Mg5(dataset, theory, pdf, timestamp=timestamp)
color = "blue"
external = mg5.Mg5

rich.print(f"Computing [{color}]{dataset}[/]...")
runner = external(dataset, theory, pdf, timestamp=timestamp)

install_reqs(runner, pdf)
run_dataset(runner)
Expand Down
Loading