fix positivity names 5 -> sqrt(5)

NNPDF · Mar 18, 2024 · 2ffb491 · 2ffb491
1 parent 41f658a
commit 2ffb491
Show file tree

Hide file tree

Showing 34 changed files with 75 additions and 75 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...ondata/NNPDF_POS_5GEV/kinematics_DYD.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_DYD.yaml b/...ondata/NNPDF_POS_5GEV/kinematics_DYD.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_DYD.yaml
diff --git a/...ondata/NNPDF_POS_5GEV/kinematics_DYS.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_DYS.yaml b/...ondata/NNPDF_POS_5GEV/kinematics_DYS.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_DYS.yaml
diff --git a/...ondata/NNPDF_POS_5GEV/kinematics_DYU.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_DYU.yaml b/...ondata/NNPDF_POS_5GEV/kinematics_DYU.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_DYU.yaml
diff --git a/.../NNPDF_POS_5GEV/kinematics_F2C-17PTS.yaml → ...PDF_POS_2P24GEV/kinematics_F2C-17PTS.yaml b/.../NNPDF_POS_5GEV/kinematics_F2C-17PTS.yaml → ...PDF_POS_2P24GEV/kinematics_F2C-17PTS.yaml
diff --git a/...DF_POS_5GEV/kinematics_F2C-CCE-17PTS.yaml → ...POS_2P24GEV/kinematics_F2C-CCE-17PTS.yaml b/...DF_POS_5GEV/kinematics_F2C-CCE-17PTS.yaml → ...POS_2P24GEV/kinematics_F2C-CCE-17PTS.yaml
diff --git a/...DF_POS_5GEV/kinematics_F2C-CCP-17PTS.yaml → ...POS_2P24GEV/kinematics_F2C-CCP-17PTS.yaml b/...DF_POS_5GEV/kinematics_F2C-CCP-17PTS.yaml → ...POS_2P24GEV/kinematics_F2C-CCP-17PTS.yaml
diff --git a/...ondata/NNPDF_POS_5GEV/kinematics_F2C.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_F2C.yaml b/...ondata/NNPDF_POS_5GEV/kinematics_F2C.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_F2C.yaml
diff --git a/...ondata/NNPDF_POS_5GEV/kinematics_F2D.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_F2D.yaml b/...ondata/NNPDF_POS_5GEV/kinematics_F2D.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_F2D.yaml
diff --git a/...ondata/NNPDF_POS_5GEV/kinematics_F2S.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_F2S.yaml b/...ondata/NNPDF_POS_5GEV/kinematics_F2S.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_F2S.yaml
diff --git a/...ondata/NNPDF_POS_5GEV/kinematics_F2U.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_F2U.yaml b/...ondata/NNPDF_POS_5GEV/kinematics_F2U.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_F2U.yaml
diff --git a/.../NNPDF_POS_5GEV/kinematics_FLL-19PTS.yaml → ...PDF_POS_2P24GEV/kinematics_FLL-19PTS.yaml b/.../NNPDF_POS_5GEV/kinematics_FLL-19PTS.yaml → ...PDF_POS_2P24GEV/kinematics_FLL-19PTS.yaml
diff --git a/...ondata/NNPDF_POS_5GEV/kinematics_FLL.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_FLL.yaml b/...ondata/NNPDF_POS_5GEV/kinematics_FLL.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_FLL.yaml
diff --git a/...ondata/NNPDF_POS_5GEV/kinematics_XCQ.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_XCQ.yaml b/...ondata/NNPDF_POS_5GEV/kinematics_XCQ.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_XCQ.yaml
diff --git a/...ondata/NNPDF_POS_5GEV/kinematics_XDB.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_XDB.yaml b/...ondata/NNPDF_POS_5GEV/kinematics_XDB.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_XDB.yaml
diff --git a/...ondata/NNPDF_POS_5GEV/kinematics_XDQ.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_XDQ.yaml b/...ondata/NNPDF_POS_5GEV/kinematics_XDQ.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_XDQ.yaml
diff --git a/...ondata/NNPDF_POS_5GEV/kinematics_XGL.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_XGL.yaml b/...ondata/NNPDF_POS_5GEV/kinematics_XGL.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_XGL.yaml
diff --git a/...ondata/NNPDF_POS_5GEV/kinematics_XSB.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_XSB.yaml b/...ondata/NNPDF_POS_5GEV/kinematics_XSB.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_XSB.yaml
diff --git a/...ondata/NNPDF_POS_5GEV/kinematics_XSQ.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_XSQ.yaml b/...ondata/NNPDF_POS_5GEV/kinematics_XSQ.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_XSQ.yaml
diff --git a/...ondata/NNPDF_POS_5GEV/kinematics_XUB.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_XUB.yaml b/...ondata/NNPDF_POS_5GEV/kinematics_XUB.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_XUB.yaml
diff --git a/...ondata/NNPDF_POS_5GEV/kinematics_XUQ.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_XUQ.yaml b/...ondata/NNPDF_POS_5GEV/kinematics_XUQ.yaml → ...ata/NNPDF_POS_2P24GEV/kinematics_XUQ.yaml
diff --git a/...w_commondata/NNPDF_POS_5GEV/metadata.yaml → ...ommondata/NNPDF_POS_2P24GEV/metadata.yaml b/...w_commondata/NNPDF_POS_5GEV/metadata.yaml → ...ommondata/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
@@ -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
@@ -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"