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

Fix positivity names from 5 GeV to sqrt(5) GeV and DY -> Z0 #2011

Merged
merged 2 commits into from
Mar 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
42 changes: 21 additions & 21 deletions buildmaster/old_new_porting_map.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ ATLASZPT8TEVMDIST:
journal: Eur. Phys. J. C76 (2016) 291

ATLAS_DY_2D_8TEV_LOWMASS:
new_name: ATLAS_DY_8TEV_LOWMASS_M-Y
new_name: ATLAS_Z0_8TEV_LOWMASS_M-Y
reference_arxiv: '1710.05167'
journal: JHEP 12 (2017) 059
ATLASDY2D8TEV:
Expand Down Expand Up @@ -344,45 +344,45 @@ CMS_TTB_DIFF_13TEV_2016_LJ_TRAP:

# Positivity datasets
POSDYS:
new_name: NNPDF_POS_5GEV_DYS
new_name: NNPDF_POS_2P24GEV_DYS
POSF2C:
new_name: NNPDF_POS_5GEV_F2C
new_name: NNPDF_POS_2P24GEV_F2C
POSF2C_CCE_17PTS:
new_name: NNPDF_POS_5GEV_F2C-CCE-17PTS
new_name: NNPDF_POS_2P24GEV_F2C-CCE-17PTS
POSF2DW:
new_name: NNPDF_POS_5GEV_F2D
new_name: NNPDF_POS_2P24GEV_F2D
POSF2S:
new_name: NNPDF_POS_5GEV_F2S
new_name: NNPDF_POS_2P24GEV_F2S
POSFLL:
new_name: NNPDF_POS_5GEV_FLL
new_name: NNPDF_POS_2P24GEV_FLL
POSXCQ:
new_name: NNPDF_POS_5GEV_XCQ
new_name: NNPDF_POS_2P24GEV_XCQ
POSXDQ:
new_name: NNPDF_POS_5GEV_XDQ
new_name: NNPDF_POS_2P24GEV_XDQ
POSXSB:
new_name: NNPDF_POS_5GEV_XSB
new_name: NNPDF_POS_2P24GEV_XSB
POSXUB:
new_name: NNPDF_POS_5GEV_XUB
new_name: NNPDF_POS_2P24GEV_XUB
POSDYD:
new_name: NNPDF_POS_5GEV_DYD
new_name: NNPDF_POS_2P24GEV_DYD
POSDYU:
new_name: NNPDF_POS_5GEV_DYU
new_name: NNPDF_POS_2P24GEV_DYU
POSF2C_17PTS:
new_name: NNPDF_POS_5GEV_F2C-17PTS
new_name: NNPDF_POS_2P24GEV_F2C-17PTS
POSF2C_CCP_17PTS:
new_name: NNPDF_POS_5GEV_F2C-CCP-17PTS
new_name: NNPDF_POS_2P24GEV_F2C-CCP-17PTS
POSF2U:
new_name: NNPDF_POS_5GEV_F2U
new_name: NNPDF_POS_2P24GEV_F2U
POSFLL_19PTS:
new_name: NNPDF_POS_5GEV_FLL-19PTS
new_name: NNPDF_POS_2P24GEV_FLL-19PTS
POSXDB:
new_name: NNPDF_POS_5GEV_XDB
new_name: NNPDF_POS_2P24GEV_XDB
POSXGL:
new_name: NNPDF_POS_5GEV_XGL
new_name: NNPDF_POS_2P24GEV_XGL
POSXSQ:
new_name: NNPDF_POS_5GEV_XSQ
new_name: NNPDF_POS_2P24GEV_XSQ
POSXUQ:
new_name: NNPDF_POS_5GEV_XUQ
new_name: NNPDF_POS_2P24GEV_XUQ

INTEGXT3:
new_name: NNPDF_INTEG_3GEV_XT3
Expand Down
4 changes: 2 additions & 2 deletions extra_tests/regression_fits/central.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ fitting:
############################################################
positivity:
posdatasets:
- {dataset: NNPDF_POS_5GEV_F2U, maxlambda: 1e6}
- {dataset: NNPDF_POS_5GEV_DYS, maxlambda: 1e5}
- {dataset: NNPDF_POS_2P24GEV_F2U, maxlambda: 1e6}
- {dataset: NNPDF_POS_2P24GEV_DYS, maxlambda: 1e5}

integrability:
integdatasets:
Expand Down
4 changes: 2 additions & 2 deletions extra_tests/regression_fits/diagonal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ fitting:
############################################################
positivity:
posdatasets:
- {dataset: NNPDF_POS_5GEV_F2U, maxlambda: 1e6}
- {dataset: NNPDF_POS_5GEV_DYS, maxlambda: 1e5}
- {dataset: NNPDF_POS_2P24GEV_F2U, maxlambda: 1e6}
- {dataset: NNPDF_POS_2P24GEV_DYS, maxlambda: 1e5}

integrability:
integdatasets:
Expand Down
4 changes: 2 additions & 2 deletions extra_tests/regression_fits/feature_scaling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ fitting:
############################################################
positivity:
posdatasets:
- {dataset: NNPDF_POS_5GEV_F2U, maxlambda: 1e6}
- {dataset: NNPDF_POS_5GEV_DYS, maxlambda: 1e5}
- {dataset: NNPDF_POS_2P24GEV_F2U, maxlambda: 1e6}
- {dataset: NNPDF_POS_2P24GEV_DYS, maxlambda: 1e5}

integrability:
integdatasets:
Expand Down
4 changes: 2 additions & 2 deletions extra_tests/regression_fits/flavour.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ fitting:
############################################################
positivity:
posdatasets:
- {dataset: NNPDF_POS_5GEV_F2U, maxlambda: 1e6}
- {dataset: NNPDF_POS_5GEV_DYS, maxlambda: 1e5}
- {dataset: NNPDF_POS_2P24GEV_F2U, maxlambda: 1e6}
- {dataset: NNPDF_POS_2P24GEV_DYS, maxlambda: 1e5}

integrability:
integdatasets:
Expand Down
4 changes: 2 additions & 2 deletions extra_tests/regression_fits/no_msr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ fitting:
############################################################
positivity:
posdatasets:
- {dataset: NNPDF_POS_5GEV_F2U, maxlambda: 1e6}
- {dataset: NNPDF_POS_5GEV_DYS, maxlambda: 1e5}
- {dataset: NNPDF_POS_2P24GEV_F2U, maxlambda: 1e6}
- {dataset: NNPDF_POS_2P24GEV_DYS, maxlambda: 1e5}

integrability:
integdatasets:
Expand Down
4 changes: 2 additions & 2 deletions extra_tests/regression_fits/no_sumrules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ fitting:
############################################################
positivity:
posdatasets:
- {dataset: NNPDF_POS_5GEV_F2U, maxlambda: 1e6}
- {dataset: NNPDF_POS_5GEV_DYS, maxlambda: 1e5}
- {dataset: NNPDF_POS_2P24GEV_F2U, maxlambda: 1e6}
- {dataset: NNPDF_POS_2P24GEV_DYS, maxlambda: 1e5}

integrability:
integdatasets:
Expand Down
4 changes: 2 additions & 2 deletions extra_tests/regression_fits/no_vsr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ fitting:
############################################################
positivity:
posdatasets:
- {dataset: NNPDF_POS_5GEV_F2U, maxlambda: 1e6}
- {dataset: NNPDF_POS_5GEV_DYS, maxlambda: 1e5}
- {dataset: NNPDF_POS_2P24GEV_F2U, maxlambda: 1e6}
- {dataset: NNPDF_POS_2P24GEV_DYS, maxlambda: 1e5}

integrability:
integdatasets:
Expand Down
4 changes: 2 additions & 2 deletions extra_tests/regression_fits/normal_fit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ fitting:
############################################################
positivity:
posdatasets:
- {dataset: NNPDF_POS_5GEV_F2U, maxlambda: 1e6}
- {dataset: NNPDF_POS_5GEV_DYS, maxlambda: 1e5}
- {dataset: NNPDF_POS_2P24GEV_F2U, maxlambda: 1e6}
- {dataset: NNPDF_POS_2P24GEV_DYS, maxlambda: 1e5}

integrability:
integdatasets:
Expand Down
4 changes: 2 additions & 2 deletions extra_tests/regression_fits/trainable_prepro.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ fitting:
############################################################
positivity:
posdatasets:
- {dataset: NNPDF_POS_5GEV_F2U, maxlambda: 1e6}
- {dataset: NNPDF_POS_5GEV_DYS, maxlambda: 1e5}
- {dataset: NNPDF_POS_2P24GEV_F2U, maxlambda: 1e6}
- {dataset: NNPDF_POS_2P24GEV_DYS, maxlambda: 1e5}

integrability:
integdatasets:
Expand Down
32 changes: 16 additions & 16 deletions n3fit/runcards/hyperopt_studies/renew_hyperopt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dataset_inputs:
- {dataset: ATLAS_Z0_7TEV_46FB_CC-Y, frac: 0.75, cfac: [], variant: legacy}
- {dataset: ATLAS_Z0_7TEV_46FB_CF-Y, frac: 0.75, cfac: [], variant: legacy}
- {dataset: ATLAS_Z0_8TEV_HIMASS_M-Y, frac: 0.75, cfac: [], variant: legacy}
- {dataset: ATLAS_DY_8TEV_LOWMASS_M-Y, frac: 0.75, cfac: [], variant: legacy}
- {dataset: ATLAS_Z0_8TEV_LOWMASS_M-Y, frac: 0.75, cfac: [], variant: legacy}
- {dataset: ATLAS_Z0_13TEV_TOT, frac: 0.75, cfac: [NRM], variant: legacy}
- {dataset: ATLAS_WPWM_13TEV_TOT, frac: 0.75, cfac: [NRM], variant: legacy}
- {dataset: ATLAS_WJ_JET_8TEV_WP-PT, frac: 0.75, cfac: [], variant: legacy}
Expand Down Expand Up @@ -286,21 +286,21 @@ fitting:
############################################################
positivity:
posdatasets:
- {dataset: NNPDF_POS_5GEV_F2U, maxlambda: 1e6} # Positivity Lagrange Multiplier
- {dataset: NNPDF_POS_5GEV_F2D, maxlambda: 1e6}
- {dataset: NNPDF_POS_5GEV_F2S, maxlambda: 1e6}
- {dataset: NNPDF_POS_5GEV_FLL-19PTS, maxlambda: 1e6}
- {dataset: NNPDF_POS_5GEV_DYU, maxlambda: 1e10}
- {dataset: NNPDF_POS_5GEV_DYD, maxlambda: 1e10}
- {dataset: NNPDF_POS_5GEV_DYS, maxlambda: 1e10}
- {dataset: NNPDF_POS_5GEV_F2C-17PTS, maxlambda: 1e6}
- {dataset: NNPDF_POS_5GEV_XUQ, maxlambda: 1e6} # Positivity of MSbar PDFs
- {dataset: NNPDF_POS_5GEV_XUB, maxlambda: 1e6}
- {dataset: NNPDF_POS_5GEV_XDQ, maxlambda: 1e6}
- {dataset: NNPDF_POS_5GEV_XDB, maxlambda: 1e6}
- {dataset: NNPDF_POS_5GEV_XSQ, maxlambda: 1e6}
- {dataset: NNPDF_POS_5GEV_XSB, maxlambda: 1e6}
- {dataset: NNPDF_POS_5GEV_XGL, maxlambda: 1e6}
- {dataset: NNPDF_POS_2P24GEV_F2U, maxlambda: 1e6} # Positivity Lagrange Multiplier
- {dataset: NNPDF_POS_2P24GEV_F2D, maxlambda: 1e6}
- {dataset: NNPDF_POS_2P24GEV_F2S, maxlambda: 1e6}
- {dataset: NNPDF_POS_2P24GEV_FLL-19PTS, maxlambda: 1e6}
- {dataset: NNPDF_POS_2P24GEV_DYU, maxlambda: 1e10}
- {dataset: NNPDF_POS_2P24GEV_DYD, maxlambda: 1e10}
- {dataset: NNPDF_POS_2P24GEV_DYS, maxlambda: 1e10}
- {dataset: NNPDF_POS_2P24GEV_F2C-17PTS, maxlambda: 1e6}
- {dataset: NNPDF_POS_2P24GEV_XUQ, maxlambda: 1e6} # Positivity of MSbar PDFs
- {dataset: NNPDF_POS_2P24GEV_XUB, maxlambda: 1e6}
- {dataset: NNPDF_POS_2P24GEV_XDQ, maxlambda: 1e6}
- {dataset: NNPDF_POS_2P24GEV_XDB, maxlambda: 1e6}
- {dataset: NNPDF_POS_2P24GEV_XSQ, maxlambda: 1e6}
- {dataset: NNPDF_POS_2P24GEV_XSB, maxlambda: 1e6}
- {dataset: NNPDF_POS_2P24GEV_XGL, maxlambda: 1e6}

############################################################
integrability:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
setname: ATLAS_DY_8TEV_LOWMASS
setname: ATLAS_Z0_8TEV_LOWMASS
version: 1
version_comment: Port of old commondata
nnpdf_metadata:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
setname: NNPDF_POS_5GEV
setname: NNPDF_POS_2P24GEV
version: 1
version_comment: Port of old commondata
nnpdf_metadata:
Expand Down
42 changes: 21 additions & 21 deletions nnpdf_data/nnpdf_data/new_commondata/dataset_names.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ ATLASZPT8TEVMDIST:
dataset: ATLAS_Z0J_8TEV_PT-M
variant: legacy
ATLAS_DY_2D_8TEV_LOWMASS:
dataset: ATLAS_DY_8TEV_LOWMASS_M-Y
dataset: ATLAS_Z0_8TEV_LOWMASS_M-Y
variant: legacy
ATLASDY2D8TEV:
dataset: ATLAS_Z0_8TEV_HIMASS_M-Y
Expand Down Expand Up @@ -303,45 +303,45 @@ CMS_TTB_DIFF_13TEV_2016_LJ_TRAP:
dataset: CMS_TTBAR_13TEV_LJ_2016_DIF_YTTBAR
variant: legacy
POSDYS:
dataset: NNPDF_POS_5GEV_DYS
dataset: NNPDF_POS_2P24GEV_DYS
POSF2C:
dataset: NNPDF_POS_5GEV_F2C
dataset: NNPDF_POS_2P24GEV_F2C
POSF2C_CCE_17PTS:
dataset: NNPDF_POS_5GEV_F2C-CCE-17PTS
dataset: NNPDF_POS_2P24GEV_F2C-CCE-17PTS
POSF2DW:
dataset: NNPDF_POS_5GEV_F2D
dataset: NNPDF_POS_2P24GEV_F2D
POSF2S:
dataset: NNPDF_POS_5GEV_F2S
dataset: NNPDF_POS_2P24GEV_F2S
POSFLL:
dataset: NNPDF_POS_5GEV_FLL
dataset: NNPDF_POS_2P24GEV_FLL
POSXCQ:
dataset: NNPDF_POS_5GEV_XCQ
dataset: NNPDF_POS_2P24GEV_XCQ
POSXDQ:
dataset: NNPDF_POS_5GEV_XDQ
dataset: NNPDF_POS_2P24GEV_XDQ
POSXSB:
dataset: NNPDF_POS_5GEV_XSB
dataset: NNPDF_POS_2P24GEV_XSB
POSXUB:
dataset: NNPDF_POS_5GEV_XUB
dataset: NNPDF_POS_2P24GEV_XUB
POSDYD:
dataset: NNPDF_POS_5GEV_DYD
dataset: NNPDF_POS_2P24GEV_DYD
POSDYU:
dataset: NNPDF_POS_5GEV_DYU
dataset: NNPDF_POS_2P24GEV_DYU
POSF2C_17PTS:
dataset: NNPDF_POS_5GEV_F2C-17PTS
dataset: NNPDF_POS_2P24GEV_F2C-17PTS
POSF2C_CCP_17PTS:
dataset: NNPDF_POS_5GEV_F2C-CCP-17PTS
dataset: NNPDF_POS_2P24GEV_F2C-CCP-17PTS
POSF2U:
dataset: NNPDF_POS_5GEV_F2U
dataset: NNPDF_POS_2P24GEV_F2U
POSFLL_19PTS:
dataset: NNPDF_POS_5GEV_FLL-19PTS
dataset: NNPDF_POS_2P24GEV_FLL-19PTS
POSXDB:
dataset: NNPDF_POS_5GEV_XDB
dataset: NNPDF_POS_2P24GEV_XDB
POSXGL:
dataset: NNPDF_POS_5GEV_XGL
dataset: NNPDF_POS_2P24GEV_XGL
POSXSQ:
dataset: NNPDF_POS_5GEV_XSQ
dataset: NNPDF_POS_2P24GEV_XSQ
POSXUQ:
dataset: NNPDF_POS_5GEV_XUQ
dataset: NNPDF_POS_2P24GEV_XUQ
INTEGXT3:
dataset: NNPDF_INTEG_3GEV_XT3
INTEGXT8:
Expand Down
2 changes: 1 addition & 1 deletion validphys2/src/validphys/cuts/filters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
description due to unknown reasons.
rule: "etay <= 1.6"

- dataset: ATLAS_DY_8TEV_LOWMASS_M-Y
- dataset: ATLAS_Z0_8TEV_LOWMASS_M-Y
reason: Avoid overlap with the high mass ATLAS2DDY8TEV dataset.
local_variables:
M: sqrt(M2)
Expand Down
2 changes: 1 addition & 1 deletion validphys2/src/validphys/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def tmp(tmpdir):
{'dataset': 'LHCBZMU8TEV', 'cfac': ['NRM']},
]

POSITIVITIES = ["NNPDF_POS_5GEV_DYU", "NNPDF_POS_5GEV_F2S"]
POSITIVITIES = ["NNPDF_POS_2P24GEV_DYU", "NNPDF_POS_2P24GEV_F2S"]

PDF = "NNPDF40_nnlo_as_01180"
HESSIAN_PDF = "NNPDF40_nnlo_as_01180_hessian"
Expand Down