From 34da016f88c6efcc1a3e1bcf30d9c6d3a3e01a08 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Sat, 18 May 2024 15:01:04 +0100 Subject: [PATCH 01/21] removed LagrangeSetSpec load_commondata method so that the is inherited from DataSetSpec by Pos and INt datasets --- validphys2/src/validphys/config.py | 14 +++++++------- validphys2/src/validphys/core.py | 22 +++++++++++++--------- validphys2/src/validphys/filters.py | 7 ++++++- validphys2/src/validphys/loader.py | 13 +++++++------ 4 files changed, 33 insertions(+), 23 deletions(-) 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..77acd5e157 100644 --- a/validphys2/src/validphys/core.py +++ b/validphys2/src/validphys/core.py @@ -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..b8e1d8aa6f 100644 --- a/validphys2/src/validphys/filters.py +++ b/validphys2/src/validphys/filters.py @@ -390,7 +390,12 @@ def check_positivity(posdatasets): """Verify positive datasets are ready for the fit.""" log.info('Verifying positivity tables:') for pos in posdatasets: - pos.load_commondata() + cd = pos.commondata.load() + if pos.cuts is not None: + loaded_cuts = pos.cuts.load() + if not (hasattr(loaded_cuts, '_full') and loaded_cuts._full): + intmask = [int(ele) for ele in loaded_cuts] + cd = cd.with_cuts(intmask) log.info(f'{pos.name} checked.') 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: From 6e0135c2797d3ca1328d63ca3d1e8a3a109392ab Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Thu, 6 Jun 2024 12:32:48 +0100 Subject: [PATCH 02/21] added POS_XGL process --- .../NNPDF_POS_2P24GEV/kinematics_XGL.yaml | 162 +++++------------- .../NNPDF_POS_2P24GEV/metadata.yaml | 25 ++- validphys2/src/validphys/process_options.py | 6 +- 3 files changed, 56 insertions(+), 137 deletions(-) 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/metadata.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/metadata.yaml index e12fcef16d..695090a37a 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 @@ -695,7 +695,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_XGL tables: [] npoints: [] ndata: 20 @@ -703,24 +703,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: diff --git a/validphys2/src/validphys/process_options.py b/validphys2/src/validphys/process_options.py index 4b13440dfe..2af9ffc65b 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,8 @@ def _dybosonpt_xq2map(kin_dict): ) +POS_XPDF = _Process("POS_XPDF", "Positivity of MS bar PDFs", accepted_variables=(_Vars.x, _Vars.Q2)) + PROCESSES = { "DIS": DIS, "DIS_NC": dataclasses.replace(DIS, name="DIS_NC"), @@ -324,7 +327,8 @@ 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, } From a47db3cbeeb89a884463de23f746cfbe8b823ce9 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Sat, 20 Apr 2024 14:12:21 +0100 Subject: [PATCH 03/21] fixed commondataparser test --- .../src/validphys/tests/test_commondataparser.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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 From 712473f6efb51f1e24edfab77120bf9f07dc8000 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Sat, 11 May 2024 12:31:13 +0100 Subject: [PATCH 04/21] added XPDF generic process and changed metadata as well as kinematics of PDF postivity sets --- .../NNPDF_POS_2P24GEV/kinematics_XCQ.yaml | 160 ++++------------ .../NNPDF_POS_2P24GEV/kinematics_XDB.yaml | 160 ++++------------ .../NNPDF_POS_2P24GEV/kinematics_XDQ.yaml | 160 ++++------------ .../NNPDF_POS_2P24GEV/kinematics_XSB.yaml | 160 ++++------------ .../NNPDF_POS_2P24GEV/kinematics_XSQ.yaml | 160 ++++------------ .../NNPDF_POS_2P24GEV/kinematics_XUB.yaml | 160 ++++------------ .../NNPDF_POS_2P24GEV/kinematics_XUQ.yaml | 160 ++++------------ .../NNPDF_POS_2P24GEV/metadata.yaml | 177 +++++++----------- 8 files changed, 351 insertions(+), 946 deletions(-) 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_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 695090a37a..7435d40d61 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 @@ -257,7 +257,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 +265,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 +291,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 +299,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 +326,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 +334,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 +361,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 +369,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: @@ -655,7 +635,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 +643,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 +670,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: $xg$ PDF $Q^2=5$ GeV$^2$' units: '' - process_type: POS_XGL + process_type: POS_XPDF tables: [] npoints: [] ndata: 20 @@ -730,7 +705,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 @@ -738,24 +713,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: @@ -770,7 +740,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 @@ -778,24 +748,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: From b40936d4a77671be72f35defce1e920e55179018 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Thu, 9 May 2024 10:24:38 +0100 Subject: [PATCH 05/21] added nnpdf40 like with positivity cut --- .../examples/nnpdf40-like_pos_cut.yaml | 189 ++++++++++++++++++ 1 file changed, 189 insertions(+) create mode 100644 n3fit/runcards/examples/nnpdf40-like_pos_cut.yaml diff --git a/n3fit/runcards/examples/nnpdf40-like_pos_cut.yaml b/n3fit/runcards/examples/nnpdf40-like_pos_cut.yaml new file mode 100644 index 0000000000..83927d5d0a --- /dev/null +++ b/n3fit/runcards/examples/nnpdf40-like_pos_cut.yaml @@ -0,0 +1,189 @@ +# +# Configuration file for n3fit +# +################################################################### +description: NNPDF4.0 NNLO baseline fit with theory 708 (nFONLL, new commondata) +dataset_inputs: +- {dataset: NMC_NC_NOTFIXED_DW_EM-F2, frac: 0.75, variant: legacy} +- {dataset: NMC_NC_NOTFIXED_P_EM-SIGMARED, frac: 0.75, variant: legacy} +- {dataset: SLAC_NC_NOTFIXED_P_DW_EM-F2, frac: 0.75, variant: legacy} +- {dataset: SLAC_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy} +- {dataset: BCDMS_NC_NOTFIXED_P_DW_EM-F2, frac: 0.75, variant: legacy} +- {dataset: BCDMS_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy} +- {dataset: CHORUS_CC_NOTFIXED_PB_DW_NU-SIGMARED, frac: 0.75, variant: legacy} +- {dataset: CHORUS_CC_NOTFIXED_PB_DW_NB-SIGMARED, frac: 0.75, variant: legacy} +- {dataset: NUTEV_CC_NOTFIXED_FE_DW_NU-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy} +- {dataset: NUTEV_CC_NOTFIXED_FE_DW_NB-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy} +- {dataset: HERA_NC_318GEV_EM-SIGMARED, frac: 0.75, variant: legacy} +- {dataset: HERA_NC_225GEV_EP-SIGMARED, frac: 0.75, variant: legacy} +- {dataset: HERA_NC_251GEV_EP-SIGMARED, frac: 0.75, variant: legacy} +- {dataset: HERA_NC_300GEV_EP-SIGMARED, frac: 0.75, variant: legacy} +- {dataset: HERA_NC_318GEV_EP-SIGMARED, frac: 0.75, variant: legacy} +- {dataset: HERA_CC_318GEV_EM-SIGMARED, frac: 0.75, variant: legacy} +- {dataset: HERA_CC_318GEV_EP-SIGMARED, frac: 0.75, variant: legacy} +- {dataset: HERA_NC_318GEV_EAVG_CHARM-SIGMARED, frac: 0.75, variant: legacy} +- {dataset: HERA_NC_318GEV_EAVG_BOTTOM-SIGMARED, frac: 0.75, variant: legacy} +- {dataset: DYE866_Z0_800GEV_DW_RATIO_PDXSECRATIO, frac: 0.75, variant: legacy} +- {dataset: DYE866_Z0_800GEV_PXSEC, frac: 0.75, variant: legacy} +- {dataset: DYE605_Z0_38P8GEV_DW_PXSEC, frac: 0.75, variant: legacy} +- {dataset: DYE906_Z0_120GEV_DW_PDXSECRATIO, frac: 0.75, cfac: [ACC], variant: legacy} +- {dataset: CDF_Z0_1P96TEV_ZRAP, frac: 0.75, variant: legacy} +- {dataset: D0_Z0_1P96TEV_ZRAP, frac: 0.75, variant: legacy} +- {dataset: D0_WPWM_1P96TEV_ASY, frac: 0.75, variant: legacy} +- {dataset: ATLAS_WPWM_7TEV_36PB_ETA, frac: 0.75, variant: legacy} +- {dataset: ATLAS_Z0_7TEV_36PB_ETA, frac: 0.75, variant: legacy} +- {dataset: ATLAS_Z0_7TEV_49FB_HIMASS, frac: 0.75, variant: legacy} +- {dataset: ATLAS_Z0_7TEV_LOMASS_M, frac: 0.75, variant: legacy} +- {dataset: ATLAS_WPWM_7TEV_46FB_CC-ETA, frac: 0.75, variant: legacy} +- {dataset: ATLAS_Z0_7TEV_46FB_CC-Y, frac: 0.75, variant: legacy} +- {dataset: ATLAS_Z0_7TEV_46FB_CF-Y, frac: 0.75, variant: legacy} +- {dataset: ATLAS_Z0_8TEV_HIMASS_M-Y, frac: 0.75, variant: legacy} +- {dataset: ATLAS_Z0_8TEV_LOWMASS_M-Y, frac: 0.75, variant: legacy} +- {dataset: ATLAS_Z0_13TEV_TOT, frac: 0.75, cfac: [NRM], variant: legacy} +- {dataset: ATLAS_WPWM_13TEV_TOT, frac: 0.75, cfac: [NRM], variant: legacy} +- {dataset: ATLAS_WJ_JET_8TEV_WP-PT, frac: 0.75, variant: legacy} +- {dataset: ATLAS_WJ_JET_8TEV_WM-PT, frac: 0.75, variant: legacy} +- {dataset: ATLAS_Z0J_8TEV_PT-M, frac: 0.75, variant: legacy_10} +- {dataset: ATLAS_Z0J_8TEV_PT-Y, frac: 0.75, variant: legacy_10} +- {dataset: ATLAS_TTBAR_7TEV_TOT_X-SEC, frac: 0.75, variant: legacy} +- {dataset: ATLAS_TTBAR_8TEV_TOT_X-SEC, frac: 0.75, variant: legacy} +- {dataset: ATLAS_TTBAR_13TEV_TOT_X-SEC, frac: 0.75, variant: legacy} +- {dataset: ATLAS_TTBAR_8TEV_LJ_DIF_YT-NORM, frac: 0.75, variant: legacy} +- {dataset: ATLAS_TTBAR_8TEV_LJ_DIF_YTTBAR-NORM, frac: 0.75, variant: legacy} +- {dataset: ATLAS_TTBAR_8TEV_2L_DIF_YTTBAR-NORM, frac: 0.75, variant: legacy} +- {dataset: ATLAS_1JET_8TEV_R06_PTY, frac: 0.75, variant: legacy_decorrelated} +- {dataset: ATLAS_2JET_7TEV_R06_M12Y, frac: 0.75, variant: legacy} +- {dataset: ATLAS_PH_13TEV_XSEC, frac: 0.75, cfac: [EWK], variant: legacy} +- {dataset: ATLAS_SINGLETOP_7TEV_TCHANNEL-XSEC, frac: 0.75, variant: legacy} +- {dataset: ATLAS_SINGLETOP_13TEV_TCHANNEL-XSEC, frac: 0.75, variant: legacy} +- {dataset: ATLAS_SINGLETOP_7TEV_T-Y-NORM, frac: 0.75, variant: legacy} +- {dataset: ATLAS_SINGLETOP_7TEV_TBAR-Y-NORM, frac: 0.75, variant: legacy} +- {dataset: ATLAS_SINGLETOP_8TEV_T-RAP-NORM, frac: 0.75, variant: legacy} +- {dataset: ATLAS_SINGLETOP_8TEV_TBAR-RAP-NORM, frac: 0.75, variant: legacy} +- {dataset: CMS_WPWM_7TEV_ELECTRON_ASY, frac: 0.75} +- {dataset: CMS_WPWM_7TEV_MUON_ASY, frac: 0.75, variant: legacy} +- {dataset: CMS_Z0_7TEV_DIMUON_2D, frac: 0.75} +- {dataset: CMS_WPWM_8TEV_MUON_Y, frac: 0.75, variant: legacy} +- {dataset: CMS_Z0J_8TEV_PT-Y, frac: 0.75, cfac: [NRM], variant: legacy_10} +- {dataset: CMS_2JET_7TEV_M12Y, frac: 0.75} +- {dataset: CMS_1JET_8TEV_PTY, frac: 0.75, variant: legacy} +- {dataset: CMS_TTBAR_7TEV_TOT_X-SEC, frac: 0.75, variant: legacy} +- {dataset: CMS_TTBAR_8TEV_TOT_X-SEC, frac: 0.75, variant: legacy} +- {dataset: CMS_TTBAR_13TEV_TOT_X-SEC, frac: 0.75, variant: legacy} +- {dataset: CMS_TTBAR_8TEV_LJ_DIF_YTTBAR-NORM, frac: 0.75, variant: legacy} +- {dataset: CMS_TTBAR_5TEV_TOT_X-SEC, frac: 0.75, variant: legacy} +- {dataset: CMS_TTBAR_8TEV_2L_DIF_MTTBAR-YT-NORM, frac: 0.75, variant: legacy} +- {dataset: CMS_TTBAR_13TEV_2L_DIF_YT, frac: 0.75, variant: legacy} +- {dataset: CMS_TTBAR_13TEV_LJ_2016_DIF_YTTBAR, frac: 0.75, variant: legacy} +- {dataset: CMS_SINGLETOP_7TEV_TCHANNEL-XSEC, frac: 0.75, variant: legacy} +- {dataset: CMS_SINGLETOP_8TEV_TCHANNEL-XSEC, frac: 0.75, variant: legacy} +- {dataset: CMS_SINGLETOP_13TEV_TCHANNEL-XSEC, frac: 0.75, variant: legacy} +- {dataset: LHCB_Z0_7TEV_DIELECTRON_Y, frac: 0.75} +- {dataset: LHCB_Z0_8TEV_DIELECTRON_Y, frac: 0.75} +- {dataset: LHCB_WPWM_7TEV_MUON_Y, frac: 0.75, cfac: [NRM]} +- {dataset: LHCB_Z0_7TEV_MUON_Y, frac: 0.75, cfac: [NRM]} +- {dataset: LHCB_WPWM_8TEV_MUON_Y, frac: 0.75, cfac: [NRM]} +- {dataset: LHCB_Z0_8TEV_MUON_Y, frac: 0.75, cfac: [NRM]} +- {dataset: LHCB_Z0_13TEV_DIMUON-Y, frac: 0.75} +- {dataset: LHCB_Z0_13TEV_DIELECTRON-Y, frac: 0.75} + +############################################################ +datacuts: + t0pdfset: 240329-01-rs-nnpdf40like-baseline + q2min: 3.49 + w2min: 12.5 + +############################################################ +theory: + theoryid: 708 +sampling: + separate_multiplicative: false + +############################################################ +trvlseed: 591866982 +nnseed: 945709987 +mcseed: 519562661 +genrep: true + +parameters: # This defines the parameter dictionary that is passed to the Model Trainer + nodes_per_layer: [25, 20, 8] + activation_per_layer: [tanh, tanh, linear] + initializer: glorot_normal + optimizer: + clipnorm: 6.073e-6 + learning_rate: 2.621e-3 + optimizer_name: Nadam + epochs: 17000 + positivity: + initial: 184.8 + multiplier: + integrability: + initial: 10 + multiplier: + stopping_patience: 0.1 + layer_type: dense + dropout: 0.0 + threshold_chi2: 3.5 + +fitting: + fitbasis: EVOL + basis: + - {fl: sng, trainable: false, smallx: [1.092, 1.118], largex: [1.479, 3.037]} + - {fl: g, trainable: false, smallx: [0.8048, 1.053], largex: [2.828, 5.503]} + - {fl: v, trainable: false, smallx: [0.4678, 0.744], largex: [1.547, 3.319]} + - {fl: v3, trainable: false, smallx: [0.1268, 0.4549], largex: [1.725, 3.38]} + - {fl: v8, trainable: false, smallx: [0.5864, 0.7822], largex: [1.533, 3.282]} + - {fl: t3, trainable: false, smallx: [-0.436, 1.0], largex: [1.771, 3.47]} + - {fl: t8, trainable: false, smallx: [0.5878, 0.874], largex: [1.548, 3.265]} + - {fl: t15, trainable: false, smallx: [1.087, 1.146], largex: [1.493, 3.441]} + +############################################################ +positivity: + posdatasets: + - {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} + +added_filter_rules: + - dataset: NNPDF_POS_2P24GEV_XGL + rule: "x > 0.1" + + - dataset: NNPDF_POS_2P24GEV_XUQ + rule: "x > 0.1" + + - dataset: NNPDF_POS_2P24GEV_XUB + rule: "x > 0.1" + + - dataset: NNPDF_POS_2P24GEV_XDQ + rule: "x > 0.1" + + - dataset: NNPDF_POS_2P24GEV_XDB + rule: "x > 0.1" + + - dataset: NNPDF_POS_2P24GEV_XSQ + rule: "x > 0.1" + + - dataset: NNPDF_POS_2P24GEV_XSB + rule: "x > 0.1" + +############################################################ +integrability: + integdatasets: + - {dataset: NNPDF_INTEG_3GEV_XT8, maxlambda: 1e2} + - {dataset: NNPDF_INTEG_3GEV_XT3, maxlambda: 1e2} + +############################################################ +debug: false +maxcores: 8 From 95ceb1e4b141d836efa6bccaa39751402c71fada Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Sun, 12 May 2024 16:38:55 +0100 Subject: [PATCH 06/21] changed process type names for positivity sets. all start with POS --- .../NNPDF_POS_2P24GEV/metadata.yaml | 32 +++++++++---------- .../src/validphys/tests/test_pyfkdata.py | 4 +-- 2 files changed, 18 insertions(+), 18 deletions(-) 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 7435d40d61..105fd9171c 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_F2C tables: [] npoints: [] ndata: 20 @@ -96,7 +96,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_F2C_CCE tables: [] npoints: [] ndata: 17 @@ -136,7 +136,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_F2d tables: [] npoints: [] ndata: 20 @@ -176,7 +176,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_F2S tables: [] npoints: [] ndata: 20 @@ -216,7 +216,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 @@ -396,7 +396,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 @@ -435,7 +435,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 @@ -474,7 +474,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_F2C tables: [] npoints: [] ndata: 17 @@ -514,7 +514,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_F2C_CCP tables: [] npoints: [] ndata: 17 @@ -554,7 +554,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_F2U tables: [] npoints: [] ndata: 20 @@ -594,7 +594,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 @@ -775,7 +775,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 @@ -815,7 +815,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 @@ -857,7 +857,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 @@ -899,7 +899,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/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 From 0e947e53df9cfc0054c8776e0300ae8db6df2295 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Sun, 12 May 2024 16:39:28 +0100 Subject: [PATCH 07/21] add log of nposadata passing kin cuts --- validphys2/src/validphys/filters.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/validphys2/src/validphys/filters.py b/validphys2/src/validphys/filters.py index b8e1d8aa6f..6288af4dc1 100644 --- a/validphys2/src/validphys/filters.py +++ b/validphys2/src/validphys/filters.py @@ -390,13 +390,8 @@ def check_positivity(posdatasets): """Verify positive datasets are ready for the fit.""" log.info('Verifying positivity tables:') for pos in posdatasets: - cd = pos.commondata.load() - if pos.cuts is not None: - loaded_cuts = pos.cuts.load() - if not (hasattr(loaded_cuts, '_full') and loaded_cuts._full): - intmask = [int(ele) for ele in loaded_cuts] - cd = cd.with_cuts(intmask) - log.info(f'{pos.name} checked.') + pos.load_commondata() + log.info(f'{pos.name} checked, {len(pos.cuts.load())}/{pos.commondata.ndata} datapoints passed kinematic cuts.') def check_integrability(integdatasets): From 958d2d8a76a82265a9ca215fbd9f46463b033360 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Sat, 18 May 2024 14:07:05 +0100 Subject: [PATCH 08/21] changed process type of INTEGRABILITY datasets from DIS_ to INTEG_ --- .../new_commondata/NNPDF_INTEG_1GEV/metadata.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 From 4e1456122ebdb8b77180424943edc457396b01f8 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Mon, 27 May 2024 18:25:35 +0100 Subject: [PATCH 09/21] avoid TypeError: 'NoneType' object is not iterable due to rules being None --- validphys2/src/validphys/core.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/validphys2/src/validphys/core.py b/validphys2/src/validphys/core.py index 77acd5e157..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( From 3cb9347b80b7d4031ffec77f846b3dca41854ce2 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Thu, 6 Jun 2024 12:16:14 +0100 Subject: [PATCH 10/21] removed runcard nnpdf40-like_pos_cut.yaml and added added_filter_rules to Basic_runcard.yml --- n3fit/runcards/examples/Basic_runcard.yml | 22 ++ .../examples/nnpdf40-like_pos_cut.yaml | 189 ------------------ 2 files changed, 22 insertions(+), 189 deletions(-) delete mode 100644 n3fit/runcards/examples/nnpdf40-like_pos_cut.yaml diff --git a/n3fit/runcards/examples/Basic_runcard.yml b/n3fit/runcards/examples/Basic_runcard.yml index e64260d3bd..629416394b 100644 --- a/n3fit/runcards/examples/Basic_runcard.yml +++ b/n3fit/runcards/examples/Basic_runcard.yml @@ -74,6 +74,28 @@ positivity: - {dataset: NNPDF_POS_2P24GEV_F2U, maxlambda: 1e6} # Positivity Lagrange Multiplier - {dataset: NNPDF_POS_2P24GEV_FLL-19PTS, maxlambda: 1e6} +added_filter_rules: + - dataset: NNPDF_POS_2P24GEV_XGL + rule: "x > 0.1" + + - dataset: NNPDF_POS_2P24GEV_XUQ + rule: "x > 0.1" + + - dataset: NNPDF_POS_2P24GEV_XUB + rule: "x > 0.1" + + - dataset: NNPDF_POS_2P24GEV_XDQ + rule: "x > 0.1" + + - dataset: NNPDF_POS_2P24GEV_XDB + rule: "x > 0.1" + + - dataset: NNPDF_POS_2P24GEV_XSQ + rule: "x > 0.1" + + - dataset: NNPDF_POS_2P24GEV_XSB + rule: "x > 0.1" + ############################################################ integrability: integdatasets: diff --git a/n3fit/runcards/examples/nnpdf40-like_pos_cut.yaml b/n3fit/runcards/examples/nnpdf40-like_pos_cut.yaml deleted file mode 100644 index 83927d5d0a..0000000000 --- a/n3fit/runcards/examples/nnpdf40-like_pos_cut.yaml +++ /dev/null @@ -1,189 +0,0 @@ -# -# Configuration file for n3fit -# -################################################################### -description: NNPDF4.0 NNLO baseline fit with theory 708 (nFONLL, new commondata) -dataset_inputs: -- {dataset: NMC_NC_NOTFIXED_DW_EM-F2, frac: 0.75, variant: legacy} -- {dataset: NMC_NC_NOTFIXED_P_EM-SIGMARED, frac: 0.75, variant: legacy} -- {dataset: SLAC_NC_NOTFIXED_P_DW_EM-F2, frac: 0.75, variant: legacy} -- {dataset: SLAC_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy} -- {dataset: BCDMS_NC_NOTFIXED_P_DW_EM-F2, frac: 0.75, variant: legacy} -- {dataset: BCDMS_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy} -- {dataset: CHORUS_CC_NOTFIXED_PB_DW_NU-SIGMARED, frac: 0.75, variant: legacy} -- {dataset: CHORUS_CC_NOTFIXED_PB_DW_NB-SIGMARED, frac: 0.75, variant: legacy} -- {dataset: NUTEV_CC_NOTFIXED_FE_DW_NU-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy} -- {dataset: NUTEV_CC_NOTFIXED_FE_DW_NB-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy} -- {dataset: HERA_NC_318GEV_EM-SIGMARED, frac: 0.75, variant: legacy} -- {dataset: HERA_NC_225GEV_EP-SIGMARED, frac: 0.75, variant: legacy} -- {dataset: HERA_NC_251GEV_EP-SIGMARED, frac: 0.75, variant: legacy} -- {dataset: HERA_NC_300GEV_EP-SIGMARED, frac: 0.75, variant: legacy} -- {dataset: HERA_NC_318GEV_EP-SIGMARED, frac: 0.75, variant: legacy} -- {dataset: HERA_CC_318GEV_EM-SIGMARED, frac: 0.75, variant: legacy} -- {dataset: HERA_CC_318GEV_EP-SIGMARED, frac: 0.75, variant: legacy} -- {dataset: HERA_NC_318GEV_EAVG_CHARM-SIGMARED, frac: 0.75, variant: legacy} -- {dataset: HERA_NC_318GEV_EAVG_BOTTOM-SIGMARED, frac: 0.75, variant: legacy} -- {dataset: DYE866_Z0_800GEV_DW_RATIO_PDXSECRATIO, frac: 0.75, variant: legacy} -- {dataset: DYE866_Z0_800GEV_PXSEC, frac: 0.75, variant: legacy} -- {dataset: DYE605_Z0_38P8GEV_DW_PXSEC, frac: 0.75, variant: legacy} -- {dataset: DYE906_Z0_120GEV_DW_PDXSECRATIO, frac: 0.75, cfac: [ACC], variant: legacy} -- {dataset: CDF_Z0_1P96TEV_ZRAP, frac: 0.75, variant: legacy} -- {dataset: D0_Z0_1P96TEV_ZRAP, frac: 0.75, variant: legacy} -- {dataset: D0_WPWM_1P96TEV_ASY, frac: 0.75, variant: legacy} -- {dataset: ATLAS_WPWM_7TEV_36PB_ETA, frac: 0.75, variant: legacy} -- {dataset: ATLAS_Z0_7TEV_36PB_ETA, frac: 0.75, variant: legacy} -- {dataset: ATLAS_Z0_7TEV_49FB_HIMASS, frac: 0.75, variant: legacy} -- {dataset: ATLAS_Z0_7TEV_LOMASS_M, frac: 0.75, variant: legacy} -- {dataset: ATLAS_WPWM_7TEV_46FB_CC-ETA, frac: 0.75, variant: legacy} -- {dataset: ATLAS_Z0_7TEV_46FB_CC-Y, frac: 0.75, variant: legacy} -- {dataset: ATLAS_Z0_7TEV_46FB_CF-Y, frac: 0.75, variant: legacy} -- {dataset: ATLAS_Z0_8TEV_HIMASS_M-Y, frac: 0.75, variant: legacy} -- {dataset: ATLAS_Z0_8TEV_LOWMASS_M-Y, frac: 0.75, variant: legacy} -- {dataset: ATLAS_Z0_13TEV_TOT, frac: 0.75, cfac: [NRM], variant: legacy} -- {dataset: ATLAS_WPWM_13TEV_TOT, frac: 0.75, cfac: [NRM], variant: legacy} -- {dataset: ATLAS_WJ_JET_8TEV_WP-PT, frac: 0.75, variant: legacy} -- {dataset: ATLAS_WJ_JET_8TEV_WM-PT, frac: 0.75, variant: legacy} -- {dataset: ATLAS_Z0J_8TEV_PT-M, frac: 0.75, variant: legacy_10} -- {dataset: ATLAS_Z0J_8TEV_PT-Y, frac: 0.75, variant: legacy_10} -- {dataset: ATLAS_TTBAR_7TEV_TOT_X-SEC, frac: 0.75, variant: legacy} -- {dataset: ATLAS_TTBAR_8TEV_TOT_X-SEC, frac: 0.75, variant: legacy} -- {dataset: ATLAS_TTBAR_13TEV_TOT_X-SEC, frac: 0.75, variant: legacy} -- {dataset: ATLAS_TTBAR_8TEV_LJ_DIF_YT-NORM, frac: 0.75, variant: legacy} -- {dataset: ATLAS_TTBAR_8TEV_LJ_DIF_YTTBAR-NORM, frac: 0.75, variant: legacy} -- {dataset: ATLAS_TTBAR_8TEV_2L_DIF_YTTBAR-NORM, frac: 0.75, variant: legacy} -- {dataset: ATLAS_1JET_8TEV_R06_PTY, frac: 0.75, variant: legacy_decorrelated} -- {dataset: ATLAS_2JET_7TEV_R06_M12Y, frac: 0.75, variant: legacy} -- {dataset: ATLAS_PH_13TEV_XSEC, frac: 0.75, cfac: [EWK], variant: legacy} -- {dataset: ATLAS_SINGLETOP_7TEV_TCHANNEL-XSEC, frac: 0.75, variant: legacy} -- {dataset: ATLAS_SINGLETOP_13TEV_TCHANNEL-XSEC, frac: 0.75, variant: legacy} -- {dataset: ATLAS_SINGLETOP_7TEV_T-Y-NORM, frac: 0.75, variant: legacy} -- {dataset: ATLAS_SINGLETOP_7TEV_TBAR-Y-NORM, frac: 0.75, variant: legacy} -- {dataset: ATLAS_SINGLETOP_8TEV_T-RAP-NORM, frac: 0.75, variant: legacy} -- {dataset: ATLAS_SINGLETOP_8TEV_TBAR-RAP-NORM, frac: 0.75, variant: legacy} -- {dataset: CMS_WPWM_7TEV_ELECTRON_ASY, frac: 0.75} -- {dataset: CMS_WPWM_7TEV_MUON_ASY, frac: 0.75, variant: legacy} -- {dataset: CMS_Z0_7TEV_DIMUON_2D, frac: 0.75} -- {dataset: CMS_WPWM_8TEV_MUON_Y, frac: 0.75, variant: legacy} -- {dataset: CMS_Z0J_8TEV_PT-Y, frac: 0.75, cfac: [NRM], variant: legacy_10} -- {dataset: CMS_2JET_7TEV_M12Y, frac: 0.75} -- {dataset: CMS_1JET_8TEV_PTY, frac: 0.75, variant: legacy} -- {dataset: CMS_TTBAR_7TEV_TOT_X-SEC, frac: 0.75, variant: legacy} -- {dataset: CMS_TTBAR_8TEV_TOT_X-SEC, frac: 0.75, variant: legacy} -- {dataset: CMS_TTBAR_13TEV_TOT_X-SEC, frac: 0.75, variant: legacy} -- {dataset: CMS_TTBAR_8TEV_LJ_DIF_YTTBAR-NORM, frac: 0.75, variant: legacy} -- {dataset: CMS_TTBAR_5TEV_TOT_X-SEC, frac: 0.75, variant: legacy} -- {dataset: CMS_TTBAR_8TEV_2L_DIF_MTTBAR-YT-NORM, frac: 0.75, variant: legacy} -- {dataset: CMS_TTBAR_13TEV_2L_DIF_YT, frac: 0.75, variant: legacy} -- {dataset: CMS_TTBAR_13TEV_LJ_2016_DIF_YTTBAR, frac: 0.75, variant: legacy} -- {dataset: CMS_SINGLETOP_7TEV_TCHANNEL-XSEC, frac: 0.75, variant: legacy} -- {dataset: CMS_SINGLETOP_8TEV_TCHANNEL-XSEC, frac: 0.75, variant: legacy} -- {dataset: CMS_SINGLETOP_13TEV_TCHANNEL-XSEC, frac: 0.75, variant: legacy} -- {dataset: LHCB_Z0_7TEV_DIELECTRON_Y, frac: 0.75} -- {dataset: LHCB_Z0_8TEV_DIELECTRON_Y, frac: 0.75} -- {dataset: LHCB_WPWM_7TEV_MUON_Y, frac: 0.75, cfac: [NRM]} -- {dataset: LHCB_Z0_7TEV_MUON_Y, frac: 0.75, cfac: [NRM]} -- {dataset: LHCB_WPWM_8TEV_MUON_Y, frac: 0.75, cfac: [NRM]} -- {dataset: LHCB_Z0_8TEV_MUON_Y, frac: 0.75, cfac: [NRM]} -- {dataset: LHCB_Z0_13TEV_DIMUON-Y, frac: 0.75} -- {dataset: LHCB_Z0_13TEV_DIELECTRON-Y, frac: 0.75} - -############################################################ -datacuts: - t0pdfset: 240329-01-rs-nnpdf40like-baseline - q2min: 3.49 - w2min: 12.5 - -############################################################ -theory: - theoryid: 708 -sampling: - separate_multiplicative: false - -############################################################ -trvlseed: 591866982 -nnseed: 945709987 -mcseed: 519562661 -genrep: true - -parameters: # This defines the parameter dictionary that is passed to the Model Trainer - nodes_per_layer: [25, 20, 8] - activation_per_layer: [tanh, tanh, linear] - initializer: glorot_normal - optimizer: - clipnorm: 6.073e-6 - learning_rate: 2.621e-3 - optimizer_name: Nadam - epochs: 17000 - positivity: - initial: 184.8 - multiplier: - integrability: - initial: 10 - multiplier: - stopping_patience: 0.1 - layer_type: dense - dropout: 0.0 - threshold_chi2: 3.5 - -fitting: - fitbasis: EVOL - basis: - - {fl: sng, trainable: false, smallx: [1.092, 1.118], largex: [1.479, 3.037]} - - {fl: g, trainable: false, smallx: [0.8048, 1.053], largex: [2.828, 5.503]} - - {fl: v, trainable: false, smallx: [0.4678, 0.744], largex: [1.547, 3.319]} - - {fl: v3, trainable: false, smallx: [0.1268, 0.4549], largex: [1.725, 3.38]} - - {fl: v8, trainable: false, smallx: [0.5864, 0.7822], largex: [1.533, 3.282]} - - {fl: t3, trainable: false, smallx: [-0.436, 1.0], largex: [1.771, 3.47]} - - {fl: t8, trainable: false, smallx: [0.5878, 0.874], largex: [1.548, 3.265]} - - {fl: t15, trainable: false, smallx: [1.087, 1.146], largex: [1.493, 3.441]} - -############################################################ -positivity: - posdatasets: - - {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} - -added_filter_rules: - - dataset: NNPDF_POS_2P24GEV_XGL - rule: "x > 0.1" - - - dataset: NNPDF_POS_2P24GEV_XUQ - rule: "x > 0.1" - - - dataset: NNPDF_POS_2P24GEV_XUB - rule: "x > 0.1" - - - dataset: NNPDF_POS_2P24GEV_XDQ - rule: "x > 0.1" - - - dataset: NNPDF_POS_2P24GEV_XDB - rule: "x > 0.1" - - - dataset: NNPDF_POS_2P24GEV_XSQ - rule: "x > 0.1" - - - dataset: NNPDF_POS_2P24GEV_XSB - rule: "x > 0.1" - -############################################################ -integrability: - integdatasets: - - {dataset: NNPDF_INTEG_3GEV_XT8, maxlambda: 1e2} - - {dataset: NNPDF_INTEG_3GEV_XT3, maxlambda: 1e2} - -############################################################ -debug: false -maxcores: 8 From 5f789d5c403d40f9733508466e4520e5ccc6a488 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Thu, 6 Jun 2024 12:30:58 +0100 Subject: [PATCH 11/21] added basic runcard for cuts to ms bar pos --- n3fit/runcards/examples/Basic_runcard.yml | 22 ---- .../examples/Basic_runcard_msbar_pos_cut.yaml | 102 ++++++++++++++++++ 2 files changed, 102 insertions(+), 22 deletions(-) create mode 100644 n3fit/runcards/examples/Basic_runcard_msbar_pos_cut.yaml diff --git a/n3fit/runcards/examples/Basic_runcard.yml b/n3fit/runcards/examples/Basic_runcard.yml index 629416394b..e64260d3bd 100644 --- a/n3fit/runcards/examples/Basic_runcard.yml +++ b/n3fit/runcards/examples/Basic_runcard.yml @@ -74,28 +74,6 @@ positivity: - {dataset: NNPDF_POS_2P24GEV_F2U, maxlambda: 1e6} # Positivity Lagrange Multiplier - {dataset: NNPDF_POS_2P24GEV_FLL-19PTS, maxlambda: 1e6} -added_filter_rules: - - dataset: NNPDF_POS_2P24GEV_XGL - rule: "x > 0.1" - - - dataset: NNPDF_POS_2P24GEV_XUQ - rule: "x > 0.1" - - - dataset: NNPDF_POS_2P24GEV_XUB - rule: "x > 0.1" - - - dataset: NNPDF_POS_2P24GEV_XDQ - rule: "x > 0.1" - - - dataset: NNPDF_POS_2P24GEV_XDB - rule: "x > 0.1" - - - dataset: NNPDF_POS_2P24GEV_XSQ - rule: "x > 0.1" - - - dataset: NNPDF_POS_2P24GEV_XSB - rule: "x > 0.1" - ############################################################ integrability: integdatasets: diff --git a/n3fit/runcards/examples/Basic_runcard_msbar_pos_cut.yaml b/n3fit/runcards/examples/Basic_runcard_msbar_pos_cut.yaml new file mode 100644 index 0000000000..afee9cc03a --- /dev/null +++ b/n3fit/runcards/examples/Basic_runcard_msbar_pos_cut.yaml @@ -0,0 +1,102 @@ +# +# Configuration file for n3fit +# +################################################################################ +description: NNPDF4.0 NNLO baseline fit (nFONLL). Comparable to NNPDF40_nnlo_as_01180_qcd + +################################################################################ +dataset_inputs: +- {dataset: NMC_NC_NOTFIXED_DW_EM-F2, frac: 0.75, variant: legacy} +- {dataset: NMC_NC_NOTFIXED_P_EM-SIGMARED, frac: 0.75, variant: legacy} +- {dataset: SLAC_NC_NOTFIXED_P_DW_EM-F2, frac: 0.75, variant: legacy} +- {dataset: SLAC_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy} + + +################################################################################ +datacuts: + t0pdfset: NNPDF40_nnlo_as_01180 + q2min: 3.49 + w2min: 12.5 + +################################################################################ +# NNLO QCD TRN evolution +theory: + theoryid: 40_000_000 + +# For fits <= 4.0 multiplicative and additive uncertainties were sampled separately +sampling: + separate_multiplicative: False + +################################################################################ +trvlseed: 591866982 +nnseed: 945709987 +mcseed: 519562661 +genrep: true + +################################################################################ +parameters: # This defines the parameter dictionary that is passed to the Model Trainer + nodes_per_layer: [25, 20, 8] + activation_per_layer: [tanh, tanh, linear] + initializer: glorot_normal + optimizer: + clipnorm: 6.073e-6 + learning_rate: 2.621e-3 + optimizer_name: Nadam + epochs: 17000 + positivity: + initial: 184.8 + multiplier: + integrability: + initial: 10 + multiplier: + stopping_patience: 0.1 + layer_type: dense + dropout: 0.0 + threshold_chi2: 3.5 + +fitting: + fitbasis: EVOL + savepseudodata: True + basis: + - {fl: sng, trainable: false, smallx: [1.091, 1.119], largex: [1.471, 3.021]} + - {fl: g, trainable: false, smallx: [0.7795, 1.095], largex: [2.742, 5.547]} + - {fl: v, trainable: false, smallx: [0.472, 0.7576], largex: [1.571, 3.559]} + - {fl: v3, trainable: false, smallx: [0.07483, 0.4501], largex: [1.714, 3.467]} + - {fl: v8, trainable: false, smallx: [0.5731, 0.779], largex: [1.555, 3.465]} + - {fl: t3, trainable: false, smallx: [-0.5498, 1.0], largex: [1.778, 3.5]} + - {fl: t8, trainable: false, smallx: [0.5469, 0.857], largex: [1.555, 3.391]} + - {fl: t15, trainable: false, smallx: [1.081, 1.142], largex: [1.491, 3.092]} + +################################################################################ +positivity: + posdatasets: + - {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: + integdatasets: + - {dataset: NNPDF_INTEG_3GEV_XT8, maxlambda: 1e2} + - {dataset: NNPDF_INTEG_3GEV_XT3, maxlambda: 1e2} + + +added_filter_rules: + - process_type: POS_XPDF + rule: "x > 0.1" + + +################################################################################ +debug: false +maxcores: 8 From e717368b2faff22f8738b1208c0262287506c656 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Thu, 6 Jun 2024 14:13:48 +0100 Subject: [PATCH 12/21] added msbar gluon pos and added_filter_rules --- n3fit/runcards/examples/Basic_runcard.yml | 5 + .../examples/Basic_runcard_msbar_pos_cut.yaml | 102 ------------------ 2 files changed, 5 insertions(+), 102 deletions(-) delete mode 100644 n3fit/runcards/examples/Basic_runcard_msbar_pos_cut.yaml diff --git a/n3fit/runcards/examples/Basic_runcard.yml b/n3fit/runcards/examples/Basic_runcard.yml index e64260d3bd..7d186980e4 100644 --- a/n3fit/runcards/examples/Basic_runcard.yml +++ b/n3fit/runcards/examples/Basic_runcard.yml @@ -73,12 +73,17 @@ 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} +added_filter_rules: + - process_type: POS_XPDF + rule: "x > 0.1" + ############################################################ debug: True maxcores: 8 diff --git a/n3fit/runcards/examples/Basic_runcard_msbar_pos_cut.yaml b/n3fit/runcards/examples/Basic_runcard_msbar_pos_cut.yaml deleted file mode 100644 index afee9cc03a..0000000000 --- a/n3fit/runcards/examples/Basic_runcard_msbar_pos_cut.yaml +++ /dev/null @@ -1,102 +0,0 @@ -# -# Configuration file for n3fit -# -################################################################################ -description: NNPDF4.0 NNLO baseline fit (nFONLL). Comparable to NNPDF40_nnlo_as_01180_qcd - -################################################################################ -dataset_inputs: -- {dataset: NMC_NC_NOTFIXED_DW_EM-F2, frac: 0.75, variant: legacy} -- {dataset: NMC_NC_NOTFIXED_P_EM-SIGMARED, frac: 0.75, variant: legacy} -- {dataset: SLAC_NC_NOTFIXED_P_DW_EM-F2, frac: 0.75, variant: legacy} -- {dataset: SLAC_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy} - - -################################################################################ -datacuts: - t0pdfset: NNPDF40_nnlo_as_01180 - q2min: 3.49 - w2min: 12.5 - -################################################################################ -# NNLO QCD TRN evolution -theory: - theoryid: 40_000_000 - -# For fits <= 4.0 multiplicative and additive uncertainties were sampled separately -sampling: - separate_multiplicative: False - -################################################################################ -trvlseed: 591866982 -nnseed: 945709987 -mcseed: 519562661 -genrep: true - -################################################################################ -parameters: # This defines the parameter dictionary that is passed to the Model Trainer - nodes_per_layer: [25, 20, 8] - activation_per_layer: [tanh, tanh, linear] - initializer: glorot_normal - optimizer: - clipnorm: 6.073e-6 - learning_rate: 2.621e-3 - optimizer_name: Nadam - epochs: 17000 - positivity: - initial: 184.8 - multiplier: - integrability: - initial: 10 - multiplier: - stopping_patience: 0.1 - layer_type: dense - dropout: 0.0 - threshold_chi2: 3.5 - -fitting: - fitbasis: EVOL - savepseudodata: True - basis: - - {fl: sng, trainable: false, smallx: [1.091, 1.119], largex: [1.471, 3.021]} - - {fl: g, trainable: false, smallx: [0.7795, 1.095], largex: [2.742, 5.547]} - - {fl: v, trainable: false, smallx: [0.472, 0.7576], largex: [1.571, 3.559]} - - {fl: v3, trainable: false, smallx: [0.07483, 0.4501], largex: [1.714, 3.467]} - - {fl: v8, trainable: false, smallx: [0.5731, 0.779], largex: [1.555, 3.465]} - - {fl: t3, trainable: false, smallx: [-0.5498, 1.0], largex: [1.778, 3.5]} - - {fl: t8, trainable: false, smallx: [0.5469, 0.857], largex: [1.555, 3.391]} - - {fl: t15, trainable: false, smallx: [1.081, 1.142], largex: [1.491, 3.092]} - -################################################################################ -positivity: - posdatasets: - - {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: - integdatasets: - - {dataset: NNPDF_INTEG_3GEV_XT8, maxlambda: 1e2} - - {dataset: NNPDF_INTEG_3GEV_XT3, maxlambda: 1e2} - - -added_filter_rules: - - process_type: POS_XPDF - rule: "x > 0.1" - - -################################################################################ -debug: false -maxcores: 8 From 7cdf60ee7e0d078d30c017d9f9baf16142b1e77d Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini <85164495+comane@users.noreply.github.com> Date: Mon, 10 Jun 2024 11:33:37 +0200 Subject: [PATCH 13/21] Update n3fit/runcards/examples/Basic_runcard.yml Co-authored-by: Juan M. Cruz-Martinez --- n3fit/runcards/examples/Basic_runcard.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/n3fit/runcards/examples/Basic_runcard.yml b/n3fit/runcards/examples/Basic_runcard.yml index 7d186980e4..f315d80f45 100644 --- a/n3fit/runcards/examples/Basic_runcard.yml +++ b/n3fit/runcards/examples/Basic_runcard.yml @@ -80,6 +80,7 @@ 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" From e079c262b3218c465b34d649bfc7721c4a04248d Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Tue, 11 Jun 2024 12:24:15 +0200 Subject: [PATCH 14/21] changed kinematic names and process type for F2U positivity --- .../NNPDF_POS_2P24GEV/kinematics_F2U.yaml | 80 +++++++++---------- .../NNPDF_POS_2P24GEV/metadata.yaml | 20 ++--- 2 files changed, 50 insertions(+), 50 deletions(-) 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..7908d58fa9 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,9 +1,9 @@ bins: -- k1: +- x: min: null mid: 5.0e-07 max: null - k2: + Q2: min: null mid: 5.0 max: null @@ -11,11 +11,11 @@ bins: 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 @@ -23,11 +23,11 @@ bins: 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 @@ -35,11 +35,11 @@ bins: 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 @@ -47,11 +47,11 @@ bins: 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 @@ -59,11 +59,11 @@ bins: 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 @@ -71,11 +71,11 @@ bins: 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 @@ -83,11 +83,11 @@ bins: 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 @@ -95,11 +95,11 @@ bins: 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 @@ -107,11 +107,11 @@ bins: 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 @@ -119,11 +119,11 @@ bins: 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 @@ -131,11 +131,11 @@ bins: 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 @@ -143,11 +143,11 @@ bins: 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 @@ -155,11 +155,11 @@ bins: 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 @@ -167,11 +167,11 @@ bins: 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 @@ -179,11 +179,11 @@ bins: 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 @@ -191,11 +191,11 @@ bins: 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 @@ -203,11 +203,11 @@ bins: 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 @@ -215,11 +215,11 @@ bins: 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 @@ -227,11 +227,11 @@ bins: 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 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 105fd9171c..9cf0d5d773 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 @@ -554,7 +554,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: DIS $u+\bar{u}$ structure function $F_2^u$' units: '' - process_type: POS_F2U + process_type: POS_F2 tables: [] npoints: [] ndata: 20 @@ -562,20 +562,20 @@ 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 + - x + - Q2 - k3 kinematics: variables: - k1: - description: Variable k1 - label: k1 + x: + description: Bjorken x + label: x units: '' - k2: - description: Variable k2 - label: k2 + Q2: + description: Factorization Scale + label: Q2 units: '' k3: description: Variable k3 From 980a742a6571ea99fffd2c4b0d40a5fceb6a431a Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Tue, 11 Jun 2024 14:03:25 +0200 Subject: [PATCH 15/21] added POS_F2 process --- validphys2/src/validphys/process_options.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/validphys2/src/validphys/process_options.py b/validphys2/src/validphys/process_options.py index 2af9ffc65b..059ddcd28e 100644 --- a/validphys2/src/validphys/process_options.py +++ b/validphys2/src/validphys/process_options.py @@ -310,6 +310,8 @@ 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"), @@ -329,6 +331,7 @@ def _dybosonpt_xq2map(kin_dict): "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"), "POS_XPDF": POS_XPDF, + "POS_F2": POS_F2, } From afa6620accd2caae9991fb24bd1a66e21b978e1b Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Tue, 11 Jun 2024 14:04:24 +0200 Subject: [PATCH 16/21] F2U and F2C as POS_F2 processes --- .../kinematics_F2C-17PTS.yaml | 136 +++++------------- .../NNPDF_POS_2P24GEV/kinematics_F2U.yaml | 80 ----------- .../NNPDF_POS_2P24GEV/metadata.yaml | 30 ++-- 3 files changed, 44 insertions(+), 202 deletions(-) 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_F2U.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/kinematics_F2U.yaml index 7908d58fa9..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 @@ -7,10 +7,6 @@ bins: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null - x: min: null mid: 1.940766723678e-06 @@ -19,10 +15,6 @@ bins: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null - x: min: null mid: 7.533150951473e-06 @@ -31,10 +23,6 @@ bins: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null - x: min: null mid: 2.924017738213e-05 @@ -43,10 +31,6 @@ bins: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null - x: min: null mid: 0.0001134967265154 @@ -55,10 +39,6 @@ bins: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null - x: min: null mid: 0.0004405413401349 @@ -67,10 +47,6 @@ bins: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null - x: min: null mid: 0.001709975946677 @@ -79,10 +55,6 @@ bins: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null - x: min: null mid: 0.006637328831201 @@ -91,10 +63,6 @@ bins: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null - x: min: null mid: 0.02576301385941 @@ -103,10 +71,6 @@ bins: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null - x: min: null mid: 0.1 @@ -115,10 +79,6 @@ bins: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null - x: min: null mid: 0.18 @@ -127,10 +87,6 @@ bins: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null - x: min: null mid: 0.26 @@ -139,10 +95,6 @@ bins: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null - x: min: null mid: 0.34 @@ -151,10 +103,6 @@ bins: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null - x: min: null mid: 0.42 @@ -163,10 +111,6 @@ bins: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null - x: min: null mid: 0.5 @@ -175,10 +119,6 @@ bins: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null - x: min: null mid: 0.58 @@ -187,10 +127,6 @@ bins: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null - x: min: null mid: 0.66 @@ -199,10 +135,6 @@ bins: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null - x: min: null mid: 0.74 @@ -211,10 +143,6 @@ bins: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null - x: min: null mid: 0.82 @@ -223,10 +151,6 @@ bins: min: null mid: 5.0 max: null - k3: - min: null - mid: 0.0 - max: null - x: min: null mid: 0.9 @@ -235,7 +159,3 @@ bins: 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 9cf0d5d773..25c77f3b19 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 @@ -474,7 +474,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: DIS $c+\bar{c}$ structure function $F_2^c$' units: '' - process_type: POS_F2C + process_type: POS_F2 tables: [] npoints: [] ndata: 17 @@ -482,24 +482,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: @@ -566,7 +561,6 @@ implemented_observables: kinematic_coverage: - x - Q2 - - k3 kinematics: variables: x: @@ -577,10 +571,6 @@ implemented_observables: description: Factorization Scale label: Q2 units: '' - k3: - description: Variable k3 - label: k3 - units: '' file: kinematics_F2U.yaml theory: conversion_factor: 1.0 From 6b48c57f14a71d41dfc90a5c5151485f25a90f66 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Tue, 11 Jun 2024 14:07:27 +0200 Subject: [PATCH 17/21] F2C as POS_F2 process --- .../NNPDF_POS_2P24GEV/kinematics_F2C.yaml | 160 +++++------------- .../NNPDF_POS_2P24GEV/metadata.yaml | 25 ++- 2 files changed, 50 insertions(+), 135 deletions(-) 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/metadata.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/metadata.yaml index 25c77f3b19..8e228c106b 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 @@ -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: POS_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: From 8533832b138b76fab3df55376350899ad933488c Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Tue, 11 Jun 2024 14:09:42 +0200 Subject: [PATCH 18/21] F2C-CCE as F2 Process --- .../kinematics_F2C-CCE-17PTS.yaml | 136 +++++------------- .../NNPDF_POS_2P24GEV/metadata.yaml | 23 ++- 2 files changed, 43 insertions(+), 116 deletions(-) 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/metadata.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/metadata.yaml index 8e228c106b..d4cf9222fb 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 @@ -99,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: From c858a3e76e7873b8659602d870b681b141bf9e37 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Tue, 11 Jun 2024 14:13:48 +0200 Subject: [PATCH 19/21] F2D as POS_F2 --- .../NNPDF_POS_2P24GEV/kinematics_F2D.yaml | 160 +++++------------- .../NNPDF_POS_2P24GEV/metadata.yaml | 27 ++- 2 files changed, 51 insertions(+), 136 deletions(-) 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/metadata.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/metadata.yaml index d4cf9222fb..f8dbc42f78 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 @@ -91,7 +91,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: DIS $c$ structure function $F_2^{W^-,c}$' units: '' - process_type: POS_F2C_CCE + process_type: POS_F2 tables: [] npoints: [] ndata: 17 @@ -126,7 +126,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: DIS $d+\bar{d}$ structure function $F_2^d$' units: '' - process_type: POS_F2d + process_type: POS_F2 tables: [] npoints: [] ndata: 20 @@ -134,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: From df248f970c6f44bed71a9bf746acc7a83bc0e033 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Tue, 11 Jun 2024 14:18:40 +0200 Subject: [PATCH 20/21] F2C as F2 process --- .../NNPDF_POS_2P24GEV/kinematics_F2S.yaml | 160 +++++------------- .../NNPDF_POS_2P24GEV/metadata.yaml | 25 ++- 2 files changed, 50 insertions(+), 135 deletions(-) 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/metadata.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/metadata.yaml index f8dbc42f78..bea1db0fce 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 @@ -161,7 +161,7 @@ implemented_observables: description: Deep Inelastic Scattering label: 'positivity dataset: DIS $s+\bar{s}$ structure function $F_2^s$' units: '' - process_type: POS_F2S + process_type: POS_F2 tables: [] npoints: [] ndata: 20 @@ -169,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: From 4fe95df8f1cc37fc662c691b44c2c7eb42f97e5e Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Tue, 11 Jun 2024 14:21:46 +0200 Subject: [PATCH 21/21] F2C-CCP as F2 process --- .../kinematics_F2C-CCP-17PTS.yaml | 136 +++++------------- .../NNPDF_POS_2P24GEV/metadata.yaml | 25 ++-- 2 files changed, 44 insertions(+), 117 deletions(-) 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/metadata.yaml b/nnpdf_data/nnpdf_data/new_commondata/NNPDF_POS_2P24GEV/metadata.yaml index bea1db0fce..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 @@ -489,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: POS_F2C_CCP + process_type: POS_F2 tables: [] npoints: [] ndata: 17 @@ -497,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: