Merge branch 'master' into shifts

NNPDF · Jun 12, 2024 · 001fc1f · 001fc1f
2 parents 73976b1 + 16c48f8
commit 001fc1f
Show file tree

Hide file tree

Showing 25 changed files with 801 additions and 2,015 deletions.
diff --git a/n3fit/runcards/examples/Basic_runcard.yml b/n3fit/runcards/examples/Basic_runcard.yml
@@ -73,12 +73,18 @@ positivity:
   posdatasets:
   - {dataset: NNPDF_POS_2P24GEV_F2U, maxlambda: 1e6}        # Positivity Lagrange Multiplier
   - {dataset: NNPDF_POS_2P24GEV_FLL-19PTS, maxlambda: 1e6}
+  - {dataset: NNPDF_POS_2P24GEV_XGL, maxlambda: 1e6}
 
 ############################################################
 integrability:
   integdatasets:
   - {dataset: NNPDF_INTEG_3GEV_XT3, maxlambda: 1e2}
 
+# Apply a cut to a dataset or process type, in this case to the positivity dataset `NNPDF_POS_2P24GEV_XGL` which has process type: POS_XPDF
+added_filter_rules:
+    - process_type: POS_XPDF
+      rule: "x > 0.1"
+
 ############################################################
 debug: True
 maxcores: 8

diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_INTEG_1GEV/metadata.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_INTEG_1GEV/metadata.yaml
@@ -21,7 +21,7 @@ implemented_observables:
     description: Integrability dataset for Polarized Gluon
     label: 'polarized integrability: $x \delta g$ PDF $Q^2=1$ GeV$^2$'
     units: ''
-  process_type: DIS_XDG
+  process_type: INTEG_XDG
   tables: []
   npoints: []
   ndata: 1
@@ -60,7 +60,7 @@ implemented_observables:
     description: Integrability dataset for Polarized Singlet
     label: 'polarized integrability: $x \delta \Sigma$ PDF $Q^2=1$ GeV$^2$'
     units: ''
-  process_type: DIS_XDSIGMA
+  process_type: INTEG_XDSIGMA
   tables: []
   npoints: []
   ndata: 1
@@ -99,7 +99,7 @@ implemented_observables:
     description: Integrability to be used in the flavour basis
     label: 'integrability dataset: $xT_8$ PDF, Q=Q_1'
     units: ''
-  process_type: DIS_XT8
+  process_type: INTEG_XT8
   tables: []
   npoints: []
   ndata: 1
@@ -135,7 +135,7 @@ implemented_observables:
     description: Integrability to be used in the flavour basis
     label: 'integrability dataset: $xT_3$ PDF, Q=Q_1'
     units: ''
-  process_type: DIS_XT8
+  process_type: INTEG_XT8
   tables: []
   npoints: []
   ndata: 1

diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2C-17PTS.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2C-17PTS.yaml
@@ -1,205 +1,137 @@
 bins:
-- k1:
+- x:
     min: null
     mid: 5.0e-07
     max: null
-  k2:
+  Q2:
     min: null
     mid: 5.0
     max: null
-  k3:
-    min: null
-    mid: 0.0
-    max: null
-- k1:
+- x:
     min: null
     mid: 1.940766723678e-06
     max: null
-  k2:
+  Q2:
     min: null
     mid: 5.0
     max: null
-  k3:
-    min: null
-    mid: 0.0
-    max: null
-- k1:
+- x:
     min: null
     mid: 7.533150951473e-06
     max: null
-  k2:
+  Q2:
     min: null
     mid: 5.0
     max: null
-  k3:
-    min: null
-    mid: 0.0
-    max: null
-- k1:
+- x:
     min: null
     mid: 2.924017738213e-05
     max: null
-  k2:
+  Q2:
     min: null
     mid: 5.0
     max: null
-  k3:
-    min: null
-    mid: 0.0
-    max: null
-- k1:
+- x:
     min: null
     mid: 0.0001134967265154
     max: null
-  k2:
+  Q2:
     min: null
     mid: 5.0
     max: null
-  k3:
-    min: null
-    mid: 0.0
-    max: null
-- k1:
+- x:
     min: null
     mid: 0.0004405413401349
     max: null
-  k2:
+  Q2:
     min: null
     mid: 5.0
     max: null
-  k3:
-    min: null
-    mid: 0.0
-    max: null
-- k1:
+- x:
     min: null
     mid: 0.001709975946677
     max: null
-  k2:
+  Q2:
     min: null
     mid: 5.0
     max: null
-  k3:
-    min: null
-    mid: 0.0
-    max: null
-- k1:
+- x:
     min: null
     mid: 0.006637328831201
     max: null
-  k2:
+  Q2:
     min: null
     mid: 5.0
     max: null
-  k3:
-    min: null
-    mid: 0.0
-    max: null
-- k1:
+- x:
     min: null
     mid: 0.02576301385941
     max: null
-  k2:
+  Q2:
     min: null
     mid: 5.0
     max: null
-  k3:
-    min: null
-    mid: 0.0
-    max: null
-- k1:
+- x:
     min: null
     mid: 0.1
     max: null
-  k2:
+  Q2:
     min: null
     mid: 5.0
     max: null
-  k3:
-    min: null
-    mid: 0.0
-    max: null
-- k1:
+- x:
     min: null
     mid: 0.18
     max: null
-  k2:
+  Q2:
     min: null
     mid: 5.0
     max: null
-  k3:
-    min: null
-    mid: 0.0
-    max: null
-- k1:
+- x:
     min: null
     mid: 0.26
     max: null
-  k2:
+  Q2:
     min: null
     mid: 5.0
     max: null
-  k3:
-    min: null
-    mid: 0.0
-    max: null
-- k1:
+- x:
     min: null
     mid: 0.34
     max: null
-  k2:
+  Q2:
     min: null
     mid: 5.0
     max: null
-  k3:
-    min: null
-    mid: 0.0
-    max: null
-- k1:
+- x:
     min: null
     mid: 0.42
     max: null
-  k2:
+  Q2:
     min: null
     mid: 5.0
     max: null
-  k3:
-    min: null
-    mid: 0.0
-    max: null
-- k1:
+- x:
     min: null
     mid: 0.5
     max: null
-  k2:
+  Q2:
     min: null
     mid: 5.0
     max: null
-  k3:
-    min: null
-    mid: 0.0
-    max: null
-- k1:
+- x:
     min: null
     mid: 0.58
     max: null
-  k2:
+  Q2:
     min: null
     mid: 5.0
     max: null
-  k3:
-    min: null
-    mid: 0.0
-    max: null
-- k1:
+- x:
     min: null
     mid: 0.66
     max: null
-  k2:
+  Q2:
     min: null
     mid: 5.0
     max: null
-  k3:
-    min: null
-    mid: 0.0
-    max: null