diff --git a/n3fit/runcards/examples/Basic_runcard.yml b/n3fit/runcards/examples/Basic_runcard.yml index e64260d3bd..f315d80f45 100644 --- 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 index f023ef4eda..878a047c2a 100644 --- 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 index 034ec37b7d..a42c79d69e 100644 --- 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 diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2C-CCE-17PTS.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2C-CCE-17PTS.yaml index 034ec37b7d..a42c79d69e 100644 --- a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2C-CCE-17PTS.yaml +++ b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2C-CCE-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 diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2C-CCP-17PTS.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2C-CCP-17PTS.yaml index 034ec37b7d..a42c79d69e 100644 --- a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2C-CCP-17PTS.yaml +++ b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2C-CCP-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 diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2C.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2C.yaml index 26edc37705..24b058bef1 100644 --- a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2C.yaml +++ b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2C.yaml @@ -1,241 +1,161 @@ 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 -- k1: +- x: min: null mid: 0.74 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.82 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.9 max: null - k2: + Q2: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2D.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2D.yaml index 26edc37705..24b058bef1 100644 --- a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2D.yaml +++ b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2D.yaml @@ -1,241 +1,161 @@ 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 -- k1: +- x: min: null mid: 0.74 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.82 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.9 max: null - k2: + Q2: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2S.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2S.yaml index 26edc37705..24b058bef1 100644 --- a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2S.yaml +++ b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2S.yaml @@ -1,241 +1,161 @@ 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 -- k1: +- x: min: null mid: 0.74 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.82 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.9 max: null - k2: + Q2: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2U.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2U.yaml index 26edc37705..24b058bef1 100644 --- a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2U.yaml +++ b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2U.yaml @@ -1,241 +1,161 @@ 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 -- k1: +- x: min: null mid: 0.74 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.82 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.9 max: null - k2: + Q2: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XCQ.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XCQ.yaml index 26edc37705..24b058bef1 100644 --- a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XCQ.yaml +++ b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XCQ.yaml @@ -1,241 +1,161 @@ 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 -- k1: +- x: min: null mid: 0.74 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.82 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.9 max: null - k2: + Q2: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XDB.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XDB.yaml index 26edc37705..24b058bef1 100644 --- a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XDB.yaml +++ b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XDB.yaml @@ -1,241 +1,161 @@ 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 -- k1: +- x: min: null mid: 0.74 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.82 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.9 max: null - k2: + Q2: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XDQ.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XDQ.yaml index 26edc37705..24b058bef1 100644 --- a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XDQ.yaml +++ b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XDQ.yaml @@ -1,241 +1,161 @@ 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 -- k1: +- x: min: null mid: 0.74 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.82 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.9 max: null - k2: + Q2: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XGL.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XGL.yaml index 26edc37705..0457a1db84 100644 --- a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XGL.yaml +++ b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XGL.yaml @@ -1,241 +1,161 @@ 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 -- k1: +- x: min: null mid: 0.74 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.82 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.9 max: null - k2: + Q2: min: null mid: 5.0 - max: null - k3: - min: null - mid: 0.0 - max: null + max: null \ No newline at end of file diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XSB.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XSB.yaml index 26edc37705..24b058bef1 100644 --- a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XSB.yaml +++ b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XSB.yaml @@ -1,241 +1,161 @@ 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 -- k1: +- x: min: null mid: 0.74 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.82 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.9 max: null - k2: + Q2: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XSQ.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XSQ.yaml index 26edc37705..24b058bef1 100644 --- a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XSQ.yaml +++ b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XSQ.yaml @@ -1,241 +1,161 @@ 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 -- k1: +- x: min: null mid: 0.74 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.82 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.9 max: null - k2: + Q2: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XUB.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XUB.yaml index 26edc37705..24b058bef1 100644 --- a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XUB.yaml +++ b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XUB.yaml @@ -1,241 +1,161 @@ 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 -- k1: +- x: min: null mid: 0.74 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.82 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.9 max: null - k2: + Q2: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XUQ.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XUQ.yaml index 26edc37705..24b058bef1 100644 --- a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XUQ.yaml +++ b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_XUQ.yaml @@ -1,241 +1,161 @@ 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 -- k1: +- x: min: null mid: 0.74 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.82 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.9 max: null - k2: + Q2: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null diff --git a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/metadata.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/metadata.yaml index e12fcef16d..d9dffbdaa0 100644 --- a/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/metadata.yaml +++ b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/metadata.yaml @@ -17,7 +17,7 @@ implemented_observables: description: Fixed-Target Drell-Yan label: 'positivity dataset: DY cross section $\frac{d^2\sigma_{s\bar{s}}}{dM^2dy}$' units: '' - process_type: DYP_PPY_CON_ST + process_type: POS_PPY_CON_ST tables: [] npoints: [] ndata: 20 @@ -56,7 +56,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: DIS $c+\bar{c}$ structure function $F_2^c$' units: '' - process_type: DIS_F2C + process_type: POS_F2 tables: [] npoints: [] ndata: 20 @@ -64,24 +64,19 @@ implemented_observables: kinematics_override: dis_sqrt_scale theory_reference: Bertone:2013vaa dataset_label: 'positivity dataset: DIS $c+\bar{c}$ structure function $F_2^c$' - plot_x: k1 + plot_x: x kinematic_coverage: - - k1 - - k2 - - k3 + - x + - Q2 kinematics: variables: - k1: - description: Variable k1 - label: k1 - units: '' - k2: - description: Variable k2 - label: k2 + x: + description: Bjorken x + label: x units: '' - k3: - description: Variable k3 - label: k3 + Q2: + description: Factorization Scale + label: Q2 units: '' file: kinematics_F2C.yaml theory: @@ -96,7 +91,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: DIS $c$ structure function $F_2^{W^-,c}$' units: '' - process_type: DIS_F2C_CCE + process_type: POS_F2 tables: [] npoints: [] ndata: 17 @@ -104,24 +99,19 @@ implemented_observables: kinematics_override: dis_sqrt_scale theory_reference: Bertone:2013vaa dataset_label: 'positivity dataset: DIS $c$ structure function $F_2^{W^-,c}$' - plot_x: k1 + plot_x: x kinematic_coverage: - - k1 - - k2 - - k3 + - x + - Q2 kinematics: variables: - k1: - description: Variable k1 - label: k1 - units: '' - k2: - description: Variable k2 - label: k2 + x: + description: Bjorken x + label: x units: '' - k3: - description: Variable k3 - label: k3 + Q2: + description: Factorization Scale + label: Q2 units: '' file: kinematics_F2C-CCE-17PTS.yaml theory: @@ -136,7 +126,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: DIS $d+\bar{d}$ structure function $F_2^d$' units: '' - process_type: DIS_F2d + process_type: POS_F2 tables: [] npoints: [] ndata: 20 @@ -144,24 +134,19 @@ implemented_observables: kinematics_override: dis_sqrt_scale theory_reference: Bertone:2013vaa dataset_label: 'positivity dataset: DIS $d+\bar{d}$ structure function $F_2^d$' - plot_x: k1 + plot_x: x kinematic_coverage: - - k1 - - k2 - - k3 + - x + - Q2 kinematics: variables: - k1: - description: Variable k1 - label: k1 - units: '' - k2: - description: Variable k2 - label: k2 + x: + description: Bjorken x + label: x units: '' - k3: - description: Variable k3 - label: k3 + Q2: + description: Factorization Scale + label: Q2 units: '' file: kinematics_F2D.yaml theory: @@ -176,7 +161,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: DIS $s+\bar{s}$ structure function $F_2^s$' units: '' - process_type: DIS_F2S + process_type: POS_F2 tables: [] npoints: [] ndata: 20 @@ -184,24 +169,19 @@ implemented_observables: kinematics_override: dis_sqrt_scale theory_reference: Bertone:2013vaa dataset_label: 'positivity dataset: DIS $s+\bar{s}$ structure function $F_2^s$' - plot_x: k1 + plot_x: x kinematic_coverage: - - k1 - - k2 - - k3 + - x + - Q2 kinematics: variables: - k1: - description: Variable k1 - label: k1 - units: '' - k2: - description: Variable k2 - label: k2 + x: + description: Bjorken x + label: x units: '' - k3: - description: Variable k3 - label: k3 + Q2: + description: Factorization Scale + label: Q2 units: '' file: kinematics_F2S.yaml theory: @@ -216,7 +196,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: DIS light quark longitudinal structure function $F_L^l$' units: '' - process_type: DIS_FLL + process_type: POS_FLL tables: [] npoints: [] ndata: 20 @@ -257,7 +237,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: $xc$ PDF $Q^2=5$ GeV$^2$' units: '' - process_type: DIS_XCQ + process_type: POS_XPDF tables: [] npoints: [] ndata: 20 @@ -265,24 +245,19 @@ implemented_observables: kinematics_override: dis_sqrt_scale theory_reference: Bertone:2013vaa dataset_label: 'positivity dataset: $xc$ PDF $Q^2=5$ GeV$^2$' - plot_x: k1 + plot_x: x kinematic_coverage: - - k1 - - k2 - - k3 + - x + - Q2 kinematics: variables: - k1: - description: Variable k1 - label: k1 - units: '' - k2: - description: Variable k2 - label: k2 + x: + description: Bjorken x + label: x units: '' - k3: - description: Variable k3 - label: k3 + Q2: + description: Factorization scale + label: Q2 units: '' file: kinematics_XCQ.yaml theory: @@ -296,7 +271,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: $xd$ PDF $Q^2=5$ GeV$^2$' units: '' - process_type: DIS_XDQ + process_type: POS_XPDF tables: [] npoints: [] ndata: 20 @@ -304,24 +279,19 @@ implemented_observables: kinematics_override: dis_sqrt_scale theory_reference: Bertone:2013vaa dataset_label: 'positivity dataset: $xd$ PDF $Q^2=5$ GeV$^2$' - plot_x: k1 + plot_x: x kinematic_coverage: - - k1 - - k2 - - k3 + - x + - Q2 kinematics: variables: - k1: - description: Variable k1 - label: k1 - units: '' - k2: - description: Variable k2 - label: k2 + x: + description: Bjorken x + label: x units: '' - k3: - description: Variable k3 - label: k3 + Q2: + description: Factorization scale + label: Q2 units: '' file: kinematics_XDQ.yaml theory: @@ -336,7 +306,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: $x\bar{s}$ PDF $Q^2=5$ GeV$^2$' units: '' - process_type: DIS_XSB + process_type: POS_XPDF tables: [] npoints: [] ndata: 20 @@ -344,24 +314,19 @@ implemented_observables: kinematics_override: dis_sqrt_scale theory_reference: Bertone:2013vaa dataset_label: 'positivity dataset: $x\bar{s}$ PDF $Q^2=5$ GeV$^2$' - plot_x: k1 + plot_x: x kinematic_coverage: - - k1 - - k2 - - k3 + - x + - Q2 kinematics: variables: - k1: - description: Variable k1 - label: k1 - units: '' - k2: - description: Variable k2 - label: k2 + x: + description: Bjorken x + label: x units: '' - k3: - description: Variable k3 - label: k3 + Q2: + description: Factorization scale + label: Q2 units: '' file: kinematics_XSB.yaml theory: @@ -376,7 +341,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: $x\bar{u}$ PDF $Q^2=5$ GeV$^2$' units: '' - process_type: DIS_XUB + process_type: POS_XPDF tables: [] npoints: [] ndata: 20 @@ -384,24 +349,19 @@ implemented_observables: kinematics_override: dis_sqrt_scale theory_reference: Bertone:2013vaa dataset_label: 'positivity dataset: $x\bar{u}$ PDF $Q^2=5$ GeV$^2$' - plot_x: k1 + plot_x: x kinematic_coverage: - - k1 - - k2 - - k3 + - x + - Q2 kinematics: variables: - k1: - description: Variable k1 - label: k1 - units: '' - k2: - description: Variable k2 - label: k2 + x: + description: Bjorken x + label: x units: '' - k3: - description: Variable k3 - label: k3 + Q2: + description: Factorization scale + label: Q2 units: '' file: kinematics_XUB.yaml theory: @@ -416,7 +376,7 @@ implemented_observables: description: Fixed-Target Drell-Yan label: 'positivity dataset: DY cross section $\frac{d^2\sigma_{d\bar{d}}}{dM^2dy}$' units: '' - process_type: DYP_PPY_CON_DW + process_type: POS_PPY_CON_DW tables: [] npoints: [] ndata: 20 @@ -455,7 +415,7 @@ implemented_observables: description: Fixed-Target Drell-Yan label: 'positivity dataset: DY cross section $\frac{d^2\sigma_{u\bar{u}}}{dM^2dy}$' units: '' - process_type: DYP_PPY_CON_UP + process_type: POS_PPY_CON_UP tables: [] npoints: [] ndata: 20 @@ -494,7 +454,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: DIS $c+\bar{c}$ structure function $F_2^c$' units: '' - process_type: DIS_F2C + process_type: POS_F2 tables: [] npoints: [] ndata: 17 @@ -502,24 +462,19 @@ implemented_observables: kinematics_override: dis_sqrt_scale theory_reference: Bertone:2013vaa dataset_label: 'positivity dataset: DIS $c+\bar{c}$ structure function $F_2^c$' - plot_x: k1 + plot_x: x kinematic_coverage: - - k1 - - k2 - - k3 + - x + - Q2 kinematics: variables: - k1: - description: Variable k1 - label: k1 - units: '' - k2: - description: Variable k2 - label: k2 + x: + description: Bjorken x + label: x units: '' - k3: - description: Variable k3 - label: k3 + Q2: + description: Factorization Scale + label: Q2 units: '' file: kinematics_F2C-17PTS.yaml theory: @@ -534,7 +489,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: CC DIS $\bar{c}$ structure function $F_2^{W^+,c}$' units: '' - process_type: DIS_F2C_CCP + process_type: POS_F2 tables: [] npoints: [] ndata: 17 @@ -542,24 +497,19 @@ implemented_observables: kinematics_override: dis_sqrt_scale theory_reference: Bertone:2013vaa dataset_label: 'positivity dataset: CC DIS $\bar{c}$ structure function $F_2^{W^+,c}$' - plot_x: k1 + plot_x: x kinematic_coverage: - - k1 - - k2 - - k3 + - x + - Q2 kinematics: variables: - k1: - description: Variable k1 - label: k1 - units: '' - k2: - description: Variable k2 - label: k2 + x: + description: Bjorken x + label: x units: '' - k3: - description: Variable k3 - label: k3 + Q2: + description: Factorization Scale + label: Q2 units: '' file: kinematics_F2C-CCP-17PTS.yaml theory: @@ -574,7 +524,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: DIS $u+\bar{u}$ structure function $F_2^u$' units: '' - process_type: DIS_F2U + process_type: POS_F2 tables: [] npoints: [] ndata: 20 @@ -582,24 +532,19 @@ implemented_observables: kinematics_override: dis_sqrt_scale theory_reference: Bertone:2013vaa dataset_label: 'positivity dataset: DIS $u+\bar{u}$ structure function $F_2^u$' - plot_x: k1 + plot_x: x kinematic_coverage: - - k1 - - k2 - - k3 + - x + - Q2 kinematics: variables: - k1: - description: Variable k1 - label: k1 - units: '' - k2: - description: Variable k2 - label: k2 + x: + description: Bjorken x + label: x units: '' - k3: - description: Variable k3 - label: k3 + Q2: + description: Factorization Scale + label: Q2 units: '' file: kinematics_F2U.yaml theory: @@ -614,7 +559,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: DIS light quark longitudinal structure function $F_L^l$' units: '' - process_type: DIS_FLL + process_type: POS_FLL tables: [] npoints: [] ndata: 19 @@ -655,7 +600,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: $x\bar{d}$ PDF $Q^2=5$ GeV$^2$' units: '' - process_type: DIS_XDB + process_type: POS_XPDF tables: [] npoints: [] ndata: 20 @@ -663,24 +608,19 @@ implemented_observables: kinematics_override: dis_sqrt_scale theory_reference: Bertone:2013vaa dataset_label: 'positivity dataset: $x\bar{d}$ PDF $Q^2=5$ GeV$^2$' - plot_x: k1 + plot_x: x kinematic_coverage: - - k1 - - k2 - - k3 + - x + - Q2 kinematics: variables: - k1: - description: Variable k1 - label: k1 - units: '' - k2: - description: Variable k2 - label: k2 + x: + description: Bjorken x + label: x units: '' - k3: - description: Variable k3 - label: k3 + Q2: + description: Factorization scale + label: Q2 units: '' file: kinematics_XDB.yaml theory: @@ -695,7 +635,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: $xg$ PDF $Q^2=5$ GeV$^2$' units: '' - process_type: DIS_XGL + process_type: POS_XPDF tables: [] npoints: [] ndata: 20 @@ -703,24 +643,19 @@ implemented_observables: kinematics_override: dis_sqrt_scale theory_reference: Bertone:2013vaa dataset_label: 'positivity dataset: $xg$ PDF $Q^2=5$ GeV$^2$' - plot_x: k1 + plot_x: x kinematic_coverage: - - k1 - - k2 - - k3 + - x + - Q2 kinematics: variables: - k1: - description: Variable k1 - label: k1 - units: '' - k2: - description: Variable k2 - label: k2 + x: + description: Bjorken x + label: x units: '' - k3: - description: Variable k3 - label: k3 + Q2: + description: Factorization scale + label: Q2 units: '' file: kinematics_XGL.yaml theory: @@ -735,7 +670,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: $xs$ PDF $Q^2=5$ GeV$^2$' units: '' - process_type: DIS_XSQ + process_type: POS_XPDF tables: [] npoints: [] ndata: 20 @@ -743,24 +678,19 @@ implemented_observables: kinematics_override: dis_sqrt_scale theory_reference: Bertone:2013vaa dataset_label: 'positivity dataset: $xs$ PDF $Q^2=5$ GeV$^2$' - plot_x: k1 + plot_x: x kinematic_coverage: - - k1 - - k2 - - k3 + - x + - Q2 kinematics: variables: - k1: - description: Variable k1 - label: k1 - units: '' - k2: - description: Variable k2 - label: k2 + x: + description: Bjorken x + label: x units: '' - k3: - description: Variable k3 - label: k3 + Q2: + description: Factorization scale + label: Q2 units: '' file: kinematics_XSQ.yaml theory: @@ -775,7 +705,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: $xu$ PDF $Q^2=5$ GeV$^2$' units: '' - process_type: DIS_XUQ + process_type: POS_XPDF tables: [] npoints: [] ndata: 20 @@ -783,24 +713,19 @@ implemented_observables: kinematics_override: dis_sqrt_scale theory_reference: Bertone:2013vaa dataset_label: 'positivity dataset: $xu$ PDF $Q^2=5$ GeV$^2$' - plot_x: k1 + plot_x: x kinematic_coverage: - - k1 - - k2 - - k3 + - x + - Q2 kinematics: variables: - k1: - description: Variable k1 - label: k1 - units: '' - k2: - description: Variable k2 - label: k2 + x: + description: Bjorken x + label: x units: '' - k3: - description: Variable k3 - label: k3 + Q2: + description: Factorization scale + label: Q2 units: '' file: kinematics_XUQ.yaml theory: @@ -815,7 +740,7 @@ implemented_observables: description: DIS positivity Boundary Condition label: 'polarized positivity: $x \delta g$ PDF $Q^2=5$ GeV$^2$' units: '' - process_type: DIS_XDG + process_type: POS_XDG tables: [] npoints: [] ndata: 20 @@ -855,7 +780,7 @@ implemented_observables: description: DIS positivity Boundary Condition label: 'polarized positivity: $x \delta d$ PDF $Q^2=5$ GeV$^2$' units: '' - process_type: DIS_XDDQ + process_type: POS_XDDQ tables: [] npoints: [] ndata: 20 @@ -897,7 +822,7 @@ implemented_observables: description: DIS positivity Boundary Condition label: 'polarized positivity: $x \delta s$ PDF $Q^2=5$ GeV$^2$' units: '' - process_type: DIS_XDSQ + process_type: POS_XDSQ tables: [] npoints: [] ndata: 20 @@ -939,7 +864,7 @@ implemented_observables: description: DIS positivity Boundary Condition label: 'polarized positivity: $x \delta u$ PDF $Q^2=5$ GeV$^2$' units: '' - process_type: DIS_XDUQ + process_type: POS_XDUQ tables: [] npoints: [] ndata: 20 diff --git a/validphys2/src/validphys/config.py b/validphys2/src/validphys/config.py index 3b0a66398b..9b3c749e31 100644 --- a/validphys2/src/validphys/config.py +++ b/validphys2/src/validphys/config.py @@ -1004,7 +1004,7 @@ def parse_fakepdf(self, name): """PDF set used to generate the fake data in a closure test.""" return self.parse_pdf(name) - def _parse_lagrange_multiplier(self, kind, theoryid, setdict): + def _parse_lagrange_multiplier(self, kind, theoryid, setdict, rules): """Lagrange multiplier constraints are mappings containing a `dataset` and a `maxlambda` argument which defines the maximum value allowed for the multiplier""" @@ -1027,17 +1027,17 @@ def _parse_lagrange_multiplier(self, kind, theoryid, setdict): except ValueError as e: raise ConfigError(bad_msg) from e if kind == "posdataset": - return self.loader.check_posset(theoryno, name, maxlambda) + return self.loader.check_posset(theoryno, name, maxlambda, rules) elif kind == "integdataset": - return self.loader.check_integset(theoryno, name, maxlambda) + return self.loader.check_integset(theoryno, name, maxlambda, rules) else: raise ConfigError(f"The lagrange multiplier type {kind} is not understood") @element_of("posdatasets") - def parse_posdataset(self, posset: dict, *, theoryid): + def parse_posdataset(self, posset: dict, *, theoryid, rules): """An observable used as positivity constrain in the fit. It is a mapping containing 'dataset' and 'maxlambda'.""" - return self._parse_lagrange_multiplier("posdataset", theoryid, posset) + return self._parse_lagrange_multiplier("posdataset", theoryid, posset, rules) def produce_posdatasets(self, positivity): if not isinstance(positivity, dict) or "posdatasets" not in positivity: @@ -1047,11 +1047,11 @@ def produce_posdatasets(self, positivity): return positivity["posdatasets"] @element_of("integdatasets") - def parse_integdataset(self, integset: dict, *, theoryid): + def parse_integdataset(self, integset: dict, *, theoryid, rules): """An observable corresponding to a PDF in the evolution basis, used as integrability constrain in the fit. It is a mapping containing 'dataset' and 'maxlambda'.""" - return self._parse_lagrange_multiplier("integdataset", theoryid, integset) + return self._parse_lagrange_multiplier("integdataset", theoryid, integset, rules) def produce_integdatasets(self, integrability): if not isinstance(integrability, dict) or "integdatasets" not in integrability: diff --git a/validphys2/src/validphys/core.py b/validphys2/src/validphys/core.py index 1825fd18cc..97ea9d5260 100644 --- a/validphys2/src/validphys/core.py +++ b/validphys2/src/validphys/core.py @@ -393,9 +393,9 @@ def load(self): class InternalCutsWrapper(TupleComp): def __init__(self, commondata, rules): - self.rules = rules + self.rules = rules if rules else tuple() self.commondata = commondata - super().__init__(commondata, tuple(rules)) + super().__init__(commondata, tuple(self.rules)) def load(self): return np.atleast_1d( @@ -460,9 +460,12 @@ def cut_mask(cuts): class DataSetSpec(TupleComp): - def __init__(self, *, name, commondata, fkspecs, thspec, cuts, frac=1, op=None, weight=1): + def __init__( + self, *, name, commondata, fkspecs, thspec, cuts, frac=1, op=None, weight=1, rules=() + ): self.name = name self.commondata = commondata + self.rules = rules if isinstance(fkspecs, FKTableSpec): fkspecs = (fkspecs,) @@ -485,7 +488,7 @@ def __init__(self, *, name, commondata, fkspecs, thspec, cuts, frac=1, op=None, self.op = op self.weight = weight - super().__init__(name, commondata, fkspecs, thspec, cuts, frac, op, weight) + super().__init__(name, commondata, fkspecs, thspec, cuts, frac, op, weight, rules) @functools.lru_cache def load_commondata(self): @@ -573,11 +576,16 @@ class LagrangeSetSpec(DataSetSpec): and other Lagrange Multiplier datasets. """ - def __init__(self, name, commondataspec, fkspec, maxlambda, thspec): - cuts = Cuts(commondataspec, None) + def __init__(self, name, commondataspec, fkspec, maxlambda, thspec, rules): + cuts = InternalCutsWrapper(commondataspec, rules) self.maxlambda = maxlambda super().__init__( - name=name, commondata=commondataspec, fkspecs=fkspec, thspec=thspec, cuts=cuts + name=name, + commondata=commondataspec, + fkspecs=fkspec, + thspec=thspec, + cuts=cuts, + rules=rules, ) def to_unweighted(self): @@ -586,10 +594,6 @@ def to_unweighted(self): ) return self - @functools.lru_cache - def load_commondata(self): - return self.commondata.load() - class PositivitySetSpec(LagrangeSetSpec): pass diff --git a/validphys2/src/validphys/filters.py b/validphys2/src/validphys/filters.py index ecdaef237a..6288af4dc1 100644 --- a/validphys2/src/validphys/filters.py +++ b/validphys2/src/validphys/filters.py @@ -391,7 +391,7 @@ def check_positivity(posdatasets): log.info('Verifying positivity tables:') for pos in posdatasets: pos.load_commondata() - log.info(f'{pos.name} checked.') + log.info(f'{pos.name} checked, {len(pos.cuts.load())}/{pos.commondata.ndata} datapoints passed kinematic cuts.') def check_integrability(integdatasets): diff --git a/validphys2/src/validphys/loader.py b/validphys2/src/validphys/loader.py index c238768bc7..0e4fb47106 100644 --- a/validphys2/src/validphys/loader.py +++ b/validphys2/src/validphys/loader.py @@ -636,18 +636,18 @@ def _check_lagrange_multiplier_set(self, theoryID, setname): fk, _ = self._check_theory_old_or_new(th, cd, []) return cd, fk, th - def check_posset(self, theoryID, setname, postlambda): + def check_posset(self, theoryID, setname, postlambda, rules): """Load a positivity dataset""" cd, fk, th = self._check_lagrange_multiplier_set(theoryID, setname) - return PositivitySetSpec(setname, cd, fk, postlambda, th) + return PositivitySetSpec(setname, cd, fk, postlambda, th, rules) - def check_integset(self, theoryID, setname, postlambda): + def check_integset(self, theoryID, setname, postlambda, rules): """Load an integrability dataset""" cd, fk, th = self._check_lagrange_multiplier_set(theoryID, setname) - return IntegrabilitySetSpec(setname, cd, fk, postlambda, th) + return IntegrabilitySetSpec(setname, cd, fk, postlambda, th, rules) - def get_posset(self, theoryID, setname, postlambda): - return self.check_posset(theoryID, setname, postlambda).load() + def get_posset(self, theoryID, setname, postlambda, rules): + return self.check_posset(theoryID, setname, postlambda, rules).load() def check_fit(self, fitname): resultspath = self.resultspath @@ -799,6 +799,7 @@ def check_dataset( frac=frac, op=op, weight=weight, + rules=rules, ) def check_experiment(self, name: str, datasets: List[DataSetSpec]) -> DataGroupSpec: diff --git a/validphys2/src/validphys/process_options.py b/validphys2/src/validphys/process_options.py index 4b13440dfe..059ddcd28e 100644 --- a/validphys2/src/validphys/process_options.py +++ b/validphys2/src/validphys/process_options.py @@ -206,6 +206,7 @@ def _displusjet_xq2map(kin_info): return x, q2 + def _dyboson_xq2map(kin_info): """ Computes x and q2 mapping for pseudo rapidity observables @@ -307,6 +308,10 @@ def _dybosonpt_xq2map(kin_dict): ) +POS_XPDF = _Process("POS_XPDF", "Positivity of MS bar PDFs", accepted_variables=(_Vars.x, _Vars.Q2)) + +POS_F2 = _Process("POS_F2", "Positivity of F2 structure functions", accepted_variables=(_Vars.x, _Vars.Q2)) + PROCESSES = { "DIS": DIS, "DIS_NC": dataclasses.replace(DIS, name="DIS_NC"), @@ -324,7 +329,9 @@ def _dybosonpt_xq2map(kin_dict): "HERADIJET": dataclasses.replace(HERAJET, name="HERADIJET", description="DIS + jj production"), "DY_Z_Y": dataclasses.replace(DY_2L, name="DY_Z_Y", description="DY Z -> ll (pseudo)rapidity"), "DY_W_ETA": dataclasses.replace(DY_2L, name="DY_W_ETA", description="DY W -> l nu (pseudo)rapidity"), - "DY_NC_PT": dataclasses.replace(DY_PT, name="DY_NC_PT", description="DY Z (ll) + j") + "DY_NC_PT": dataclasses.replace(DY_PT, name="DY_NC_PT", description="DY Z (ll) + j"), + "POS_XPDF": POS_XPDF, + "POS_F2": POS_F2, } diff --git a/validphys2/src/validphys/tests/test_commondataparser.py b/validphys2/src/validphys/tests/test_commondataparser.py index f6453885a5..d8b1bf052f 100644 --- a/validphys2/src/validphys/tests/test_commondataparser.py +++ b/validphys2/src/validphys/tests/test_commondataparser.py @@ -19,10 +19,17 @@ def test_basic_commondata_loading(): # Test systype loading assert res.nsys == 103 assert isinstance(res.systype_table, pd.DataFrame) - + rules = API.rules( + **{ + "dataset_input": "SLAC_NC_NOTFIXED_D_DW_EM-F2", + "variant": "legacy", + "theoryid": THEORYID_NEW, + "use_cuts": "internal", + } + ) # Test a dataset with no systematics emptysyscd = l.check_posset( - theoryID=THEORYID_NEW, setname='NNPDF_POS_2P24GEV_XDQ', postlambda=1e-10 + theoryID=THEORYID_NEW, setname='NNPDF_POS_2P24GEV_XDQ', postlambda=1e-10, rules=rules ) emptysysres = load_commondata(emptysyscd.commondata) assert emptysysres.nsys == 0 diff --git a/validphys2/src/validphys/tests/test_pyfkdata.py b/validphys2/src/validphys/tests/test_pyfkdata.py index f1bb958b72..b5a711c430 100644 --- a/validphys2/src/validphys/tests/test_pyfkdata.py +++ b/validphys2/src/validphys/tests/test_pyfkdata.py @@ -94,13 +94,13 @@ def test_positivity(pdf_name): pdf = l.check_pdf(pdf_name) for posset in POSITIVITIES: # Use the loader to load the positivity dataset - ps = l.check_posset(setname=posset, theoryID=THEORYID, postlambda=1e6) + ps = l.check_posset(setname=posset, theoryID=THEORYID, postlambda=1e6, rules=()) preds = predictions(ps, pdf) core_predictions = PositivityResult.from_convolution(pdf, ps) assert_allclose(preds.values, core_predictions.rawdata) # Now do the same with the API api_predictions = API.positivity_predictions_data_result( - theoryid=THEORYID, pdf=pdf_name, posdataset={"dataset": posset, "maxlambda": 1e6} + theoryid=THEORYID, use_cuts="internal", pdf=pdf_name, posdataset={"dataset": posset, "maxlambda": 1e6} ) assert_allclose(preds.values, api_predictions.rawdata) # And now check that the results are correct for any kind of PDF