From b0b1814d1b2e960d48eba8b139d17ac5cea79db8 Mon Sep 17 00:00:00 2001 From: juacrumar Date: Mon, 18 Mar 2024 13:57:38 +0100 Subject: [PATCH] fix positivity names 5 -> sqrt(5) --- buildmaster/old_new_porting_map.yml | 40 +++++++++---------- extra_tests/regression_fits/central.yml | 4 +- extra_tests/regression_fits/diagonal.yml | 4 +- .../regression_fits/feature_scaling.yml | 4 +- extra_tests/regression_fits/flavour.yml | 4 +- extra_tests/regression_fits/no_msr.yml | 4 +- extra_tests/regression_fits/no_sumrules.yml | 4 +- extra_tests/regression_fits/no_vsr.yml | 4 +- extra_tests/regression_fits/normal_fit.yml | 4 +- .../regression_fits/trainable_prepro.yml | 4 +- .../hyperopt_studies/renew_hyperopt.yml | 30 +++++++------- .../kinematics_DYD.yaml | 0 .../kinematics_DYS.yaml | 0 .../kinematics_DYU.yaml | 0 .../kinematics_F2C-17PTS.yaml | 0 .../kinematics_F2C-CCE-17PTS.yaml | 0 .../kinematics_F2C-CCP-17PTS.yaml | 0 .../kinematics_F2C.yaml | 0 .../kinematics_F2D.yaml | 0 .../kinematics_F2S.yaml | 0 .../kinematics_F2U.yaml | 0 .../kinematics_FLL-19PTS.yaml | 0 .../kinematics_FLL.yaml | 0 .../kinematics_XCQ.yaml | 0 .../kinematics_XDB.yaml | 0 .../kinematics_XDQ.yaml | 0 .../kinematics_XGL.yaml | 0 .../kinematics_XSB.yaml | 0 .../kinematics_XSQ.yaml | 0 .../kinematics_XUB.yaml | 0 .../kinematics_XUQ.yaml | 0 .../metadata.yaml | 2 +- .../new_commondata/dataset_names.yml | 40 +++++++++---------- validphys2/src/validphys/tests/conftest.py | 2 +- 34 files changed, 75 insertions(+), 75 deletions(-) rename nnpdf_data/nnpdf_data/new_commondata/{NNPDF_POS_5GEV => NNPDF_POS_2P24GEV}/kinematics_DYD.yaml (100%) rename nnpdf_data/nnpdf_data/new_commondata/{NNPDF_POS_5GEV => NNPDF_POS_2P24GEV}/kinematics_DYS.yaml (100%) rename nnpdf_data/nnpdf_data/new_commondata/{NNPDF_POS_5GEV => NNPDF_POS_2P24GEV}/kinematics_DYU.yaml (100%) rename nnpdf_data/nnpdf_data/new_commondata/{NNPDF_POS_5GEV => NNPDF_POS_2P24GEV}/kinematics_F2C-17PTS.yaml (100%) rename nnpdf_data/nnpdf_data/new_commondata/{NNPDF_POS_5GEV => NNPDF_POS_2P24GEV}/kinematics_F2C-CCE-17PTS.yaml (100%) rename nnpdf_data/nnpdf_data/new_commondata/{NNPDF_POS_5GEV => NNPDF_POS_2P24GEV}/kinematics_F2C-CCP-17PTS.yaml (100%) rename nnpdf_data/nnpdf_data/new_commondata/{NNPDF_POS_5GEV => NNPDF_POS_2P24GEV}/kinematics_F2C.yaml (100%) rename nnpdf_data/nnpdf_data/new_commondata/{NNPDF_POS_5GEV => NNPDF_POS_2P24GEV}/kinematics_F2D.yaml (100%) rename nnpdf_data/nnpdf_data/new_commondata/{NNPDF_POS_5GEV => NNPDF_POS_2P24GEV}/kinematics_F2S.yaml (100%) rename nnpdf_data/nnpdf_data/new_commondata/{NNPDF_POS_5GEV => NNPDF_POS_2P24GEV}/kinematics_F2U.yaml (100%) rename nnpdf_data/nnpdf_data/new_commondata/{NNPDF_POS_5GEV => NNPDF_POS_2P24GEV}/kinematics_FLL-19PTS.yaml (100%) rename nnpdf_data/nnpdf_data/new_commondata/{NNPDF_POS_5GEV => NNPDF_POS_2P24GEV}/kinematics_FLL.yaml (100%) rename nnpdf_data/nnpdf_data/new_commondata/{NNPDF_POS_5GEV => NNPDF_POS_2P24GEV}/kinematics_XCQ.yaml (100%) rename nnpdf_data/nnpdf_data/new_commondata/{NNPDF_POS_5GEV => NNPDF_POS_2P24GEV}/kinematics_XDB.yaml (100%) rename nnpdf_data/nnpdf_data/new_commondata/{NNPDF_POS_5GEV => NNPDF_POS_2P24GEV}/kinematics_XDQ.yaml (100%) rename nnpdf_data/nnpdf_data/new_commondata/{NNPDF_POS_5GEV => NNPDF_POS_2P24GEV}/kinematics_XGL.yaml (100%) rename nnpdf_data/nnpdf_data/new_commondata/{NNPDF_POS_5GEV => NNPDF_POS_2P24GEV}/kinematics_XSB.yaml (100%) rename nnpdf_data/nnpdf_data/new_commondata/{NNPDF_POS_5GEV => NNPDF_POS_2P24GEV}/kinematics_XSQ.yaml (100%) rename nnpdf_data/nnpdf_data/new_commondata/{NNPDF_POS_5GEV => NNPDF_POS_2P24GEV}/kinematics_XUB.yaml (100%) rename nnpdf_data/nnpdf_data/new_commondata/{NNPDF_POS_5GEV => NNPDF_POS_2P24GEV}/kinematics_XUQ.yaml (100%) rename nnpdf_data/nnpdf_data/new_commondata/{NNPDF_POS_5GEV => NNPDF_POS_2P24GEV}/metadata.yaml (99%) diff --git a/buildmaster/old_new_porting_map.yml b/buildmaster/old_new_porting_map.yml index 86fe455fcf..340e72f81a 100644 --- a/buildmaster/old_new_porting_map.yml +++ b/buildmaster/old_new_porting_map.yml @@ -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 diff --git a/extra_tests/regression_fits/central.yml b/extra_tests/regression_fits/central.yml index 98c52a609c..1f09082958 100644 --- a/extra_tests/regression_fits/central.yml +++ b/extra_tests/regression_fits/central.yml @@ -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: diff --git a/extra_tests/regression_fits/diagonal.yml b/extra_tests/regression_fits/diagonal.yml index 3e599fe4dd..bb324d3d22 100644 --- a/extra_tests/regression_fits/diagonal.yml +++ b/extra_tests/regression_fits/diagonal.yml @@ -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: diff --git a/extra_tests/regression_fits/feature_scaling.yml b/extra_tests/regression_fits/feature_scaling.yml index a0cb3247dd..d848edeec7 100644 --- a/extra_tests/regression_fits/feature_scaling.yml +++ b/extra_tests/regression_fits/feature_scaling.yml @@ -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: diff --git a/extra_tests/regression_fits/flavour.yml b/extra_tests/regression_fits/flavour.yml index 5011983237..df4f7a74b6 100644 --- a/extra_tests/regression_fits/flavour.yml +++ b/extra_tests/regression_fits/flavour.yml @@ -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: diff --git a/extra_tests/regression_fits/no_msr.yml b/extra_tests/regression_fits/no_msr.yml index 4b79f12617..f08a03ab46 100644 --- a/extra_tests/regression_fits/no_msr.yml +++ b/extra_tests/regression_fits/no_msr.yml @@ -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: diff --git a/extra_tests/regression_fits/no_sumrules.yml b/extra_tests/regression_fits/no_sumrules.yml index bb86fa16dc..85ac8c68bf 100644 --- a/extra_tests/regression_fits/no_sumrules.yml +++ b/extra_tests/regression_fits/no_sumrules.yml @@ -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: diff --git a/extra_tests/regression_fits/no_vsr.yml b/extra_tests/regression_fits/no_vsr.yml index 4937a539ba..0b0c6e2a17 100644 --- a/extra_tests/regression_fits/no_vsr.yml +++ b/extra_tests/regression_fits/no_vsr.yml @@ -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: diff --git a/extra_tests/regression_fits/normal_fit.yml b/extra_tests/regression_fits/normal_fit.yml index 3073af5628..c96c3bdaab 100644 --- a/extra_tests/regression_fits/normal_fit.yml +++ b/extra_tests/regression_fits/normal_fit.yml @@ -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: diff --git a/extra_tests/regression_fits/trainable_prepro.yml b/extra_tests/regression_fits/trainable_prepro.yml index 9f5cd1a03e..549a940281 100644 --- a/extra_tests/regression_fits/trainable_prepro.yml +++ b/extra_tests/regression_fits/trainable_prepro.yml @@ -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: diff --git a/n3fit/runcards/hyperopt_studies/renew_hyperopt.yml b/n3fit/runcards/hyperopt_studies/renew_hyperopt.yml index ee15475242..425a25a97d 100644 --- a/n3fit/runcards/hyperopt_studies/renew_hyperopt.yml +++ b/n3fit/runcards/hyperopt_studies/renew_hyperopt.yml @@ -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: diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_DYD.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_DYD.yaml similarity index 100% rename from nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_DYD.yaml rename to nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_DYD.yaml diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_DYS.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_DYS.yaml similarity index 100% rename from nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_DYS.yaml rename to nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_DYS.yaml diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_DYU.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_DYU.yaml similarity index 100% rename from nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_DYU.yaml rename to nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_DYU.yaml diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_F2C-17PTS.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2C-17PTS.yaml similarity index 100% rename from nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_F2C-17PTS.yaml rename to nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2C-17PTS.yaml diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_F2C-CCE-17PTS.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2C-CCE-17PTS.yaml similarity index 100% rename from nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_F2C-CCE-17PTS.yaml rename to nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2C-CCE-17PTS.yaml diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_F2C-CCP-17PTS.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2C-CCP-17PTS.yaml similarity index 100% rename from nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_F2C-CCP-17PTS.yaml rename to nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2C-CCP-17PTS.yaml diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_F2C.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2C.yaml similarity index 100% rename from nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_F2C.yaml rename to nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2C.yaml diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_F2D.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2D.yaml similarity index 100% rename from nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_F2D.yaml rename to nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2D.yaml diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_F2S.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2S.yaml similarity index 100% rename from nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_F2S.yaml rename to nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2S.yaml diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_F2U.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2U.yaml similarity index 100% rename from nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_F2U.yaml rename to nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2U.yaml diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_FLL-19PTS.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_FLL-19PTS.yaml similarity index 100% rename from nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_FLL-19PTS.yaml rename to nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_FLL-19PTS.yaml diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_FLL.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_FLL.yaml similarity index 100% rename from nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_FLL.yaml rename to nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_FLL.yaml diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_XCQ.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XCQ.yaml similarity index 100% rename from nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_XCQ.yaml rename to nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XCQ.yaml diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_XDB.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XDB.yaml similarity index 100% rename from nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_XDB.yaml rename to nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XDB.yaml diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_XDQ.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XDQ.yaml similarity index 100% rename from nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_XDQ.yaml rename to nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XDQ.yaml diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_XGL.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XGL.yaml similarity index 100% rename from nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_XGL.yaml rename to nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XGL.yaml diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_XSB.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XSB.yaml similarity index 100% rename from nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_XSB.yaml rename to nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XSB.yaml diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_XSQ.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XSQ.yaml similarity index 100% rename from nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_XSQ.yaml rename to nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XSQ.yaml diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_XUB.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XUB.yaml similarity index 100% rename from nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_XUB.yaml rename to nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XUB.yaml diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_XUQ.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XUQ.yaml similarity index 100% rename from nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/kinematics_XUQ.yaml rename to nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XUQ.yaml diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/metadata.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/metadata.yaml similarity index 99% rename from nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/metadata.yaml rename to nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/metadata.yaml index 2170645f68..a0557dcdb8 100644 --- a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_5GEV/metadata.yaml +++ b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/metadata.yaml @@ -1,4 +1,4 @@ -setname: NNPDF_POS_5GEV +setname: NNPDF_POS_2P24GEV version: 1 version_comment: Port of old commondata nnpdf_metadata: diff --git a/nnpdf_data/nnpdf_data/new_commondata/dataset_names.yml b/nnpdf_data/nnpdf_data/new_commondata/dataset_names.yml index dbfbec4a50..ddd311faf0 100644 --- a/nnpdf_data/nnpdf_data/new_commondata/dataset_names.yml +++ b/nnpdf_data/nnpdf_data/new_commondata/dataset_names.yml @@ -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: diff --git a/validphys2/src/validphys/tests/conftest.py b/validphys2/src/validphys/tests/conftest.py index 4ce524227f..3df97ea702 100644 --- a/validphys2/src/validphys/tests/conftest.py +++ b/validphys2/src/validphys/tests/conftest.py @@ -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"