From 24ba6faff6c20055898eedc911d96143ea27808c Mon Sep 17 00:00:00 2001 From: andreab1997 Date: Thu, 29 Feb 2024 16:28:34 +0100 Subject: [PATCH 01/22] Add init of implementation --- validphys2/src/validphys/filters.py | 4 ++-- validphys2/src/validphys/pseudodata.py | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/validphys2/src/validphys/filters.py b/validphys2/src/validphys/filters.py index 566b372c6d..dfd783aec6 100644 --- a/validphys2/src/validphys/filters.py +++ b/validphys2/src/validphys/filters.py @@ -226,9 +226,9 @@ def _filter_closure_data(filter_path, data, fakepdf, fakenoise, filterseed, data total_cut_data_points = 0 # circular import generated @ core.py - from validphys.pseudodata import level0_commondata_wc, make_level1_data + from validphys.pseudodata import level0_commondata_wc_patched, make_level1_data - closure_data = level0_commondata_wc(data, fakepdf) + closure_data = level0_commondata_wc_patched(data, fakepdf) for dataset in data.datasets: # == print number of points passing cuts, make dataset directory and write FKMASK ==# diff --git a/validphys2/src/validphys/pseudodata.py b/validphys2/src/validphys/pseudodata.py index 9c7d21244a..749a00097b 100644 --- a/validphys2/src/validphys/pseudodata.py +++ b/validphys2/src/validphys/pseudodata.py @@ -304,8 +304,11 @@ def level0_commondata_wc(data, fakepdf): return level0_commondata_instances_wc +def level0_commondata_wc_patched(data, fakepdf): + import ipdb; ipdb.set_trace() + return level0_commondata_wc(data, fakepdf) -def make_level1_data(data, level0_commondata_wc, filterseed, data_index, sep_mult): +def make_level1_data(data, level0_commondata_wc_patched, filterseed, data_index, sep_mult): """ Given a list of Level 0 commondata instances, return the same list with central values replaced by Level 1 data. @@ -366,7 +369,7 @@ def make_level1_data(data, level0_commondata_wc, filterseed, data_index, sep_mul dataset_input_list = list(data.dsinputs) covmat = dataset_inputs_covmat_from_systematics( - level0_commondata_wc, + level0_commondata_wc_patched, dataset_input_list, use_weights_in_covmat=False, norm_threshold=None, @@ -376,15 +379,15 @@ def make_level1_data(data, level0_commondata_wc, filterseed, data_index, sep_mul # ================== generation of Level1 data ======================# level1_data = make_replica( - level0_commondata_wc, filterseed, covmat, sep_mult=sep_mult, genrep=True + level0_commondata_wc_patched, filterseed, covmat, sep_mult=sep_mult, genrep=True ) indexed_level1_data = indexed_make_replica(data_index, level1_data) - dataset_order = {cd.setname: i for i, cd in enumerate(level0_commondata_wc)} + dataset_order = {cd.setname: i for i, cd in enumerate(level0_commondata_wc_patched)} # ===== create commondata instances with central values given by pseudo_data =====# - level1_commondata_dict = {c.setname: c for c in level0_commondata_wc} + level1_commondata_dict = {c.setname: c for c in level0_commondata_wc_patched} level1_commondata_instances_wc = [] for xx, grp in indexed_level1_data.groupby('dataset'): From b20e99d8c78d1a72ce3787217c90409a4a856c94 Mon Sep 17 00:00:00 2001 From: andreab1997 Date: Fri, 1 Mar 2024 17:58:17 +0100 Subject: [PATCH 02/22] Add config that do what I want (hopefully) --- validphys2/src/validphys/config.py | 15 ++++++++++++++ validphys2/src/validphys/filters.py | 20 +++++++++---------- validphys2/src/validphys/pseudodata.py | 12 +++++------ validphys2/src/validphys/results.py | 4 +++- .../src/validphys/tests/test_pseudodata.py | 4 ++-- 5 files changed, 35 insertions(+), 20 deletions(-) diff --git a/validphys2/src/validphys/config.py b/validphys2/src/validphys/config.py index d59372c3a7..760da2c090 100644 --- a/validphys2/src/validphys/config.py +++ b/validphys2/src/validphys/config.py @@ -1370,7 +1370,22 @@ def produce_defaults( filter_defaults["maxTau"] = maxTau return filter_defaults + + def produce_data_level0(self, data_input, *, group_name="data"): + """A set of datasets where correlated systematics are taken + into account + """ + from validphys.loader import Loader + theoryid_118 = 708 + bb = Loader() + theoryid_alpha118 = bb.check_theoryID(theoryid_118) + datasets = [] + for dsinp in data_input: + with self.set_context(ns=self._curr_ns.new_child({"dataset_input": dsinp, "theoryid": theoryid_alpha118})): + datasets.append(self.parse_from_(None, "dataset", write=False)[1]) + return DataGroupSpec(name=group_name, datasets=datasets, dsinputs=data_input) + def produce_data(self, data_input, *, group_name="data"): """A set of datasets where correlated systematics are taken into account diff --git a/validphys2/src/validphys/filters.py b/validphys2/src/validphys/filters.py index dfd783aec6..3673e102e4 100644 --- a/validphys2/src/validphys/filters.py +++ b/validphys2/src/validphys/filters.py @@ -100,7 +100,7 @@ def export_mask(path, mask): np.savetxt(path, mask, fmt='%d') -def filter_closure_data(filter_path, data, fakepdf, fakenoise, filterseed, sep_mult): +def filter_closure_data(filter_path, data_level0, fakepdf, fakenoise, filterseed, sep_mult): """Filter closure data. In addition to cutting data points, the data is generated from an underlying ``fakepdf``, applying a shift to the data if ``fakenoise`` is ``True``, which emulates the experimental central values @@ -108,11 +108,11 @@ def filter_closure_data(filter_path, data, fakepdf, fakenoise, filterseed, sep_m """ log.info('Filtering closure-test data.') - return _filter_closure_data(filter_path, data, fakepdf, fakenoise, filterseed, sep_mult) + return _filter_closure_data(filter_path, data_level0, fakepdf, fakenoise, filterseed, sep_mult) def filter_closure_data_by_experiment( - filter_path, experiments_data, fakepdf, fakenoise, filterseed, data_index, sep_mult + filter_path, experiments_data, fakepdf, fakenoise, filterseed, data_index_level0, sep_mult ): """ Like :py:func:`filter_closure_data` except filters data by experiment. @@ -126,7 +126,7 @@ def filter_closure_data_by_experiment( res = [] for exp in experiments_data: - experiment_index = data_index[data_index.isin([exp.name], level=0)] + experiment_index = data_index_level0[data_index_level0.isin([exp.name], level=0)] res.append( _filter_closure_data( filter_path, exp, fakepdf, fakenoise, filterseed, experiment_index, sep_mult @@ -136,10 +136,10 @@ def filter_closure_data_by_experiment( return res -def filter_real_data(filter_path, data): +def filter_real_data(filter_path, data_level0): """Filter real data, cutting any points which do not pass the filter rules.""" log.info('Filtering real data.') - return _filter_real_data(filter_path, data) + return _filter_real_data(filter_path, data_level0) def filter(filter_data): @@ -180,7 +180,7 @@ def _filter_real_data(filter_path, data): return total_data_points, total_cut_data_points -def _filter_closure_data(filter_path, data, fakepdf, fakenoise, filterseed, data_index, sep_mult): +def _filter_closure_data(filter_path, data_level0, fakepdf, fakenoise, filterseed, data_index_level0, sep_mult): """ This function is accessed within a closure test only, that is, the fakedata namespace has to be True (If fakedata = False, the _filter_real_data function @@ -228,9 +228,9 @@ def _filter_closure_data(filter_path, data, fakepdf, fakenoise, filterseed, data # circular import generated @ core.py from validphys.pseudodata import level0_commondata_wc_patched, make_level1_data - closure_data = level0_commondata_wc_patched(data, fakepdf) + closure_data = level0_commondata_wc_patched(data_level0, fakepdf) - for dataset in data.datasets: + for dataset in data_level0.datasets: # == print number of points passing cuts, make dataset directory and write FKMASK ==# path = filter_path / dataset.name nfull, ncut = _write_ds_cut_data(path, dataset) @@ -241,7 +241,7 @@ def _filter_closure_data(filter_path, data, fakepdf, fakenoise, filterseed, data if fakenoise: # ======= Level 1 closure test =======# - closure_data = make_level1_data(data, closure_data, filterseed, data_index, sep_mult) + closure_data = make_level1_data(data_level0, closure_data, filterseed, data_index_level0, sep_mult) # ====== write commondata and systype files ======# if fakenoise: diff --git a/validphys2/src/validphys/pseudodata.py b/validphys2/src/validphys/pseudodata.py index 749a00097b..e2837bd379 100644 --- a/validphys2/src/validphys/pseudodata.py +++ b/validphys2/src/validphys/pseudodata.py @@ -296,7 +296,6 @@ def level0_commondata_wc(data, fakepdf): commondata_wc = commondata_wc.with_cuts(cuts) # == Generate a new CommonData instance with central value given by Level 0 data generated with fakepdf ==# - t0_prediction = dataset_t0_predictions( dataset=dataset, t0set=fakepdf ) # N.B. cuts already applied to th. pred. @@ -304,11 +303,10 @@ def level0_commondata_wc(data, fakepdf): return level0_commondata_instances_wc -def level0_commondata_wc_patched(data, fakepdf): - import ipdb; ipdb.set_trace() - return level0_commondata_wc(data, fakepdf) +def level0_commondata_wc_patched(data_level0, fakepdf): + return level0_commondata_wc(data_level0, fakepdf) -def make_level1_data(data, level0_commondata_wc_patched, filterseed, data_index, sep_mult): +def make_level1_data(data_level0, level0_commondata_wc_patched, filterseed, data_index_level0, sep_mult): """ Given a list of Level 0 commondata instances, return the same list with central values replaced by Level 1 data. @@ -366,7 +364,7 @@ def make_level1_data(data, level0_commondata_wc_patched, filterseed, data_index, [CommonData(setname='NMC', ndata=204, commondataproc='DIS_NCE', nkin=3, nsys=16)] """ - dataset_input_list = list(data.dsinputs) + dataset_input_list = list(data_level0.dsinputs) covmat = dataset_inputs_covmat_from_systematics( level0_commondata_wc_patched, @@ -382,7 +380,7 @@ def make_level1_data(data, level0_commondata_wc_patched, filterseed, data_index, level0_commondata_wc_patched, filterseed, covmat, sep_mult=sep_mult, genrep=True ) - indexed_level1_data = indexed_make_replica(data_index, level1_data) + indexed_level1_data = indexed_make_replica(data_index_level0, level1_data) dataset_order = {cd.setname: i for i, cd in enumerate(level0_commondata_wc_patched)} diff --git a/validphys2/src/validphys/results.py b/validphys2/src/validphys/results.py index db5642afd7..87829d1491 100644 --- a/validphys2/src/validphys/results.py +++ b/validphys2/src/validphys/results.py @@ -206,6 +206,8 @@ def from_convolution(cls, pdf, posset): stats = pdf.stats_class(data.T) return cls(stats) +def data_index_level0(data_level0): + return data_index(data_level0) def data_index(data): """ @@ -239,7 +241,7 @@ def data_index(data): # TODO: finish deprecating all dependencies on this index largely in theorycovmat module groups_data = collect("data", ("group_dataset_inputs_by_metadata",)) -experiments_data = collect("data", ("group_dataset_inputs_by_experiment",)) +experiments_data = collect("data_level0", ("group_dataset_inputs_by_experiment",)) procs_data = collect("data", ("group_dataset_inputs_by_process",)) diff --git a/validphys2/src/validphys/tests/test_pseudodata.py b/validphys2/src/validphys/tests/test_pseudodata.py index b6149006ff..223a46261c 100644 --- a/validphys2/src/validphys/tests/test_pseudodata.py +++ b/validphys2/src/validphys/tests/test_pseudodata.py @@ -85,7 +85,7 @@ def test_read_matches_recreate(): pd.testing.assert_index_equal(read.val_idx, recreate.val_idx, check_order=False) -def test_level0_commondata_wc(): +def test_level0_commondata_wc_patched(): """ check whether level0_commondata_wc and dataset_t0_predictions coincide @@ -96,7 +96,7 @@ def test_level0_commondata_wc(): datasetspec = l.check_dataset(list(dataset.values())[0], theoryid=THEORYID) t0set = l.check_pdf(pdfname) - l0_cd = API.level0_commondata_wc( + l0_cd = API.level0_commondata_wc_patched( dataset_inputs=[dataset], use_cuts="internal", theoryid=THEORYID, From f02bf4b6791a0d8ca9f22b1e3060fb09215372c0 Mon Sep 17 00:00:00 2001 From: andreab1997 Date: Mon, 4 Mar 2024 16:05:17 +0100 Subject: [PATCH 03/22] Add function to compute chi2 --- .../src/validphys/closuretest/closure_results.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/validphys2/src/validphys/closuretest/closure_results.py b/validphys2/src/validphys/closuretest/closure_results.py index 4f86cdbb48..764a47d8c3 100644 --- a/validphys2/src/validphys/closuretest/closure_results.py +++ b/validphys2/src/validphys/closuretest/closure_results.py @@ -24,7 +24,16 @@ underlying_results = collect("results", ("fitunderlyinglaw",)) - +def central_chi2_level0(dataset_inputs_results_central, data_fits_cv): + dt_ct, th_ct = dataset_inputs_results_central + preds = [] + for ds in data_fits_cv: + preds.append(ds[0]) + preds_conc = np.array([j for i in preds for j in i]) + central_diff = preds_conc - th_ct.central_value + chi2s = calc_chi2(dt_ct.sqrtcovmat, central_diff) + return chi2s / (len(preds_conc)) + @check_fit_isclosure @check_use_fitcommondata def bias_dataset(results, underlying_results, fit, use_fitcommondata): From 564599a9d6cc5702a5b3142332122bc6ebcc202a Mon Sep 17 00:00:00 2001 From: andreab1997 Date: Mon, 4 Mar 2024 17:45:01 +0100 Subject: [PATCH 04/22] Add chi2 replica by replica on level1 --- .../src/validphys/closuretest/closure_results.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/validphys2/src/validphys/closuretest/closure_results.py b/validphys2/src/validphys/closuretest/closure_results.py index 764a47d8c3..6cf5011c95 100644 --- a/validphys2/src/validphys/closuretest/closure_results.py +++ b/validphys2/src/validphys/closuretest/closure_results.py @@ -24,7 +24,20 @@ underlying_results = collect("results", ("fitunderlyinglaw",)) -def central_chi2_level0(dataset_inputs_results_central, data_fits_cv): +def replica_chi2_level1(dataset_inputs_results, data_fits_cv): + dt_ct, th_ct = dataset_inputs_results + preds = [] + for ds in data_fits_cv: + preds.append(ds[0]) + preds_conc = np.array([j for i in preds for j in i]) + chi2s = [] + for th_ct_replica in th_ct.error_members.T: + diff = preds_conc - th_ct_replica + chi2 = calc_chi2(dt_ct.sqrtcovmat, diff) / (len(preds_conc)) + chi2s.append(chi2) + return chi2s + +def central_chi2_level1(dataset_inputs_results_central, data_fits_cv): dt_ct, th_ct = dataset_inputs_results_central preds = [] for ds in data_fits_cv: From 95717296a339a5bc1b697d0642498f13a942d76a Mon Sep 17 00:00:00 2001 From: andreab1997 Date: Wed, 6 Mar 2024 10:52:05 +0100 Subject: [PATCH 05/22] Use t0 in sampling --- validphys2/src/validphys/config.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/validphys2/src/validphys/config.py b/validphys2/src/validphys/config.py index 760da2c090..37ea595df7 100644 --- a/validphys2/src/validphys/config.py +++ b/validphys2/src/validphys/config.py @@ -677,9 +677,11 @@ def produce_dataset_inputs_sampling_covmat( return covmats.dataset_inputs_total_covmat else: if sep_mult: - return covmats.dataset_inputs_exp_covmat_separate + #return covmats.dataset_inputs_exp_covmat_separate + return covmats.dataset_inputs_t0_exp_covmat_separate else: - return covmats.dataset_inputs_exp_covmat + #return covmats.dataset_inputs_exp_covmat + return covmats.dataset_inputs_t0_exp_covmat def produce_loaded_theory_covmat( self, From e1c0230ed5a0fa3b4780762d255a6b65d423b58d Mon Sep 17 00:00:00 2001 From: andreab1997 Date: Wed, 6 Mar 2024 11:20:46 +0100 Subject: [PATCH 06/22] Add alpha tcm stuff --- .../scalevariations/pointprescriptions.yaml | 2 ++ .../scalevariationtheoryids.yaml | 15 ++++++++++++++- .../validphys/theorycovariance/construction.py | 18 +++++++++++++++++- .../theorycovariance/theorycovarianceutils.py | 5 ++++- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/validphys2/src/validphys/scalevariations/pointprescriptions.yaml b/validphys2/src/validphys/scalevariations/pointprescriptions.yaml index d76d2ca400..6757fb1ecb 100644 --- a/validphys2/src/validphys/scalevariations/pointprescriptions.yaml +++ b/validphys2/src/validphys/scalevariations/pointprescriptions.yaml @@ -25,3 +25,5 @@ 'n3lo fhmv full thcovmat': ['(0, 0, 0, 0, 0, 0, 0)','(1, 0, 0, 0, 0, 0, 0)','(2, 0, 0, 0, 0, 0, 0)','(0, 1, 0, 0, 0, 0, 0)','(0, 2, 0, 0, 0, 0, 0)', '(0, 0, 1, 0, 0, 0, 0)','(0, 0, 2, 0, 0, 0, 0)','(0, 0, 0, 1, 0, 0, 0)','(0, 0, 0, 2, 0, 0, 0)','(0, 0, 0, 0, 1, 0, 0)','(0, 0, 0, 0, 2, 0, 0)','(0, 0, 0, 0, 0, 1, 0)','(0, 0, 0, 0, 0, 2, 0)','(0, 0, 0, 0, 0, 0, 1)','(0, 0, 0, 0, 0, 0, 2)','(2, 1)', '(0.5, 1)', '(1, 2)', '(1, 0.5)', '(2, 2)', '(0.5, 0.5)','(-1, -1)','(1, 1)'] # N3LO full IHOU + 3 point scale variations for hadronic dasasets with FHMV splittings 'n3lo fhmv 3pt hadronic': ['(0, 0, 0, 0, 0, 0, 0)','(1, 0, 0, 0, 0, 0, 0)','(2, 0, 0, 0, 0, 0, 0)','(0, 1, 0, 0, 0, 0, 0)','(0, 2, 0, 0, 0, 0, 0)', '(0, 0, 1, 0, 0, 0, 0)','(0, 0, 2, 0, 0, 0, 0)','(0, 0, 0, 1, 0, 0, 0)','(0, 0, 0, 2, 0, 0, 0)','(0, 0, 0, 0, 1, 0, 0)','(0, 0, 0, 0, 2, 0, 0)','(0, 0, 0, 0, 0, 1, 0)','(0, 0, 0, 0, 0, 2, 0)','(0, 0, 0, 0, 0, 0, 1)','(0, 0, 0, 0, 0, 0, 2)','(1, 0.5 hadronic)', '(1, 2 hadronic)','(-1, -1)','(1, 1)'] +# alpha_s determination +'alpha_s_extended' : ['(0.118)', '(0.122)', '(0.114)'] \ No newline at end of file diff --git a/validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml b/validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml index 98031c3498..be755b01b3 100644 --- a/validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml +++ b/validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml @@ -260,4 +260,17 @@ scale_variations_for: (1, 1): 1024 # IHOU + MHOU missing prescription (1, 0.5 hadronic): 1025 # As 1018 but DIS from 1000 - (1, 2 hadronic): 1026 # As 1021 but DIS from 1000 \ No newline at end of file + (1, 2 hadronic): 1026 # As 1021 but DIS from 1000 + # alpha_s variations + - theoryid: 708 + variations: + # alpha_s 3pt variations + (0.114): 804 + (0.115): 805 + (0.116): 806 + (0.117): 807 + (0.118): 708 + (0.119): 808 + (0.120): 809 + (0.121): 810 + (0.122): 811 \ No newline at end of file diff --git a/validphys2/src/validphys/theorycovariance/construction.py b/validphys2/src/validphys/theorycovariance/construction.py index 4e6513f4ba..c32e1d124c 100644 --- a/validphys2/src/validphys/theorycovariance/construction.py +++ b/validphys2/src/validphys/theorycovariance/construction.py @@ -99,6 +99,20 @@ def combine_by_type(each_dataset_results_central_bytheory): ) return process_info +def covmat_alphas(name1, name2, deltas1, deltas2): + """Returns the covariance sub-matrix for 3-pt alpha_s + variation given two dataset names and collections of the + alpha_s shifts. This is equivalent to 3 point factorisation + scale variation because it's fully correlated across all + processes. + """ + s = 0.5 * (np.outer(deltas1[0], deltas2[0]) + np.outer(deltas1[1], deltas2[1])) + # NOTE: an edit has been made to redefine the covmat to account for + # second order derivatives of the theory prediction wrt alpha_s. (see + # section 1.1 of 2105.05114) + # s = 0.5 * np.outer(deltas1[0] - deltas1[1], deltas2[0] - deltas2[1]) + return s + def covmat_3fpt(name1, name2, deltas1, deltas2): """Returns theory covariance sub-matrix for 3pt factorisation scale variation *only*, given two dataset names and collections @@ -300,7 +314,9 @@ def compute_covs_pt_prescrip( deltas2 = deltas1 if l == 3: - if point_prescription == "3f point": + if point_prescription.startswith("alpha_s"): + s = covmat_alphas(name1, name2, deltas1, deltas2) + elif point_prescription == "3f point": s = covmat_3fpt(name1, name2, deltas1, deltas2) elif point_prescription == "3r point": s = covmat_3rpt(name1, name2, deltas1, deltas2) diff --git a/validphys2/src/validphys/theorycovariance/theorycovarianceutils.py b/validphys2/src/validphys/theorycovariance/theorycovarianceutils.py index 33d0f230a9..c38b62437e 100644 --- a/validphys2/src/validphys/theorycovariance/theorycovarianceutils.py +++ b/validphys2/src/validphys/theorycovariance/theorycovarianceutils.py @@ -23,7 +23,10 @@ def check_correct_theory_combination_internal( xifs = [theoryid.get_description()["XIF"] for theoryid in theoryids] xirs = [theoryid.get_description()["XIR"] for theoryid in theoryids] if l == 3: - if point_prescription == "3f point": + if point_prescription.startswith("alpha_s"): + correct_xifs = [1.0, 1.0, 1.0] + correct_xirs = [1.0, 1.0, 1.0] + elif point_prescription == "3f point": correct_xifs = [1.0, 2.0, 0.5] correct_xirs = [1.0, 1.0, 1.0] elif point_prescription == "3r point": From 816edb338afd6413620a5ebc2805c89cf2a8a56d Mon Sep 17 00:00:00 2001 From: andreab1997 Date: Wed, 6 Mar 2024 17:36:07 +0100 Subject: [PATCH 07/22] Revert t0 for sampling --- validphys2/src/validphys/config.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/validphys2/src/validphys/config.py b/validphys2/src/validphys/config.py index 37ea595df7..760da2c090 100644 --- a/validphys2/src/validphys/config.py +++ b/validphys2/src/validphys/config.py @@ -677,11 +677,9 @@ def produce_dataset_inputs_sampling_covmat( return covmats.dataset_inputs_total_covmat else: if sep_mult: - #return covmats.dataset_inputs_exp_covmat_separate - return covmats.dataset_inputs_t0_exp_covmat_separate + return covmats.dataset_inputs_exp_covmat_separate else: - #return covmats.dataset_inputs_exp_covmat - return covmats.dataset_inputs_t0_exp_covmat + return covmats.dataset_inputs_exp_covmat def produce_loaded_theory_covmat( self, From abdc46a41ff7fab90447fc79327b58957fbd2635 Mon Sep 17 00:00:00 2001 From: andreab1997 Date: Wed, 6 Mar 2024 18:08:25 +0100 Subject: [PATCH 08/22] First try with thcovmat in ct --- validphys2/src/validphys/config.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/validphys2/src/validphys/config.py b/validphys2/src/validphys/config.py index 760da2c090..49ed55db46 100644 --- a/validphys2/src/validphys/config.py +++ b/validphys2/src/validphys/config.py @@ -1649,16 +1649,11 @@ def produce_filter_data(self, fakedata: bool = False, theorycovmatconfig=None): if not fakedata: return validphys.filters.filter_real_data else: - if theorycovmatconfig is not None and theorycovmatconfig.get( - "use_thcovmat_in_sampling" - ): - # NOTE: By the time we run theory covmat closure tests, - # hopefully the generation of pseudodata will be done in python. - raise ConfigError( - "Generating closure test data which samples from the theory " - "covariance matrix has not been implemented yet." - ) - return validphys.filters.filter_closure_data_by_experiment + if theorycovmatconfig is not None: + # Here I do not care anymore of the thcovmat, I am producing the fakedata + # without it. However I need to group all the groups together + return validphys.filters.filter_closure_data + return validphys.filters.filter_closure_data_by_experiment @configparser.explicit_node def produce_total_chi2_data(self, fitthcovmat): From 67caa351d12b9fb52b2f019517a2b04c373324b8 Mon Sep 17 00:00:00 2001 From: andreab1997 Date: Wed, 6 Mar 2024 18:14:43 +0100 Subject: [PATCH 09/22] fix small bug --- validphys2/src/validphys/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validphys2/src/validphys/config.py b/validphys2/src/validphys/config.py index 49ed55db46..ea419ec4c4 100644 --- a/validphys2/src/validphys/config.py +++ b/validphys2/src/validphys/config.py @@ -1652,7 +1652,7 @@ def produce_filter_data(self, fakedata: bool = False, theorycovmatconfig=None): if theorycovmatconfig is not None: # Here I do not care anymore of the thcovmat, I am producing the fakedata # without it. However I need to group all the groups together - return validphys.filters.filter_closure_data + return validphys.filters._filter_closure_data return validphys.filters.filter_closure_data_by_experiment @configparser.explicit_node From 919e7977373bccfb777778e8c04b0916cd5cb6f0 Mon Sep 17 00:00:00 2001 From: andreab1997 Date: Thu, 7 Mar 2024 15:37:08 +0100 Subject: [PATCH 10/22] Correct a file prefix for closuretest --- validphys2/src/validphys/pseudodata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validphys2/src/validphys/pseudodata.py b/validphys2/src/validphys/pseudodata.py index e2837bd379..4f63c97115 100644 --- a/validphys2/src/validphys/pseudodata.py +++ b/validphys2/src/validphys/pseudodata.py @@ -17,7 +17,7 @@ sqrt_covmat, ) -FILE_PREFIX = "datacuts_theory_fitting_" +FILE_PREFIX = "datacuts_theory_closuretest_fitting_" log = logging.getLogger(__name__) From 09b4c2e8e84d23bfe478de45d55d353c15292443 Mon Sep 17 00:00:00 2001 From: RoyStegeman Date: Thu, 28 Mar 2024 14:13:22 +0000 Subject: [PATCH 11/22] add alphas variations NNLO and NLO --- nnpdf_data/nnpdf_data/theory_cards/825.yaml | 48 +++++++++++++++++++++ nnpdf_data/nnpdf_data/theory_cards/826.yaml | 48 +++++++++++++++++++++ nnpdf_data/nnpdf_data/theory_cards/827.yaml | 48 +++++++++++++++++++++ nnpdf_data/nnpdf_data/theory_cards/828.yaml | 48 +++++++++++++++++++++ nnpdf_data/nnpdf_data/theory_cards/829.yaml | 48 +++++++++++++++++++++ nnpdf_data/nnpdf_data/theory_cards/830.yaml | 48 +++++++++++++++++++++ nnpdf_data/nnpdf_data/theory_cards/831.yaml | 48 +++++++++++++++++++++ nnpdf_data/nnpdf_data/theory_cards/832.yaml | 48 +++++++++++++++++++++ nnpdf_data/nnpdf_data/theory_cards/833.yaml | 48 +++++++++++++++++++++ nnpdf_data/nnpdf_data/theory_cards/834.yaml | 48 +++++++++++++++++++++ nnpdf_data/nnpdf_data/theory_cards/835.yaml | 48 +++++++++++++++++++++ nnpdf_data/nnpdf_data/theory_cards/836.yaml | 48 +++++++++++++++++++++ nnpdf_data/nnpdf_data/theory_cards/837.yaml | 48 +++++++++++++++++++++ nnpdf_data/nnpdf_data/theory_cards/838.yaml | 48 +++++++++++++++++++++ nnpdf_data/nnpdf_data/theory_cards/839.yaml | 48 +++++++++++++++++++++ nnpdf_data/nnpdf_data/theory_cards/840.yaml | 48 +++++++++++++++++++++ nnpdf_data/nnpdf_data/theory_cards/841.yaml | 48 +++++++++++++++++++++ nnpdf_data/nnpdf_data/theory_cards/842.yaml | 48 +++++++++++++++++++++ nnpdf_data/nnpdf_data/theory_cards/843.yaml | 48 +++++++++++++++++++++ 19 files changed, 912 insertions(+) create mode 100644 nnpdf_data/nnpdf_data/theory_cards/825.yaml create mode 100644 nnpdf_data/nnpdf_data/theory_cards/826.yaml create mode 100644 nnpdf_data/nnpdf_data/theory_cards/827.yaml create mode 100644 nnpdf_data/nnpdf_data/theory_cards/828.yaml create mode 100644 nnpdf_data/nnpdf_data/theory_cards/829.yaml create mode 100644 nnpdf_data/nnpdf_data/theory_cards/830.yaml create mode 100644 nnpdf_data/nnpdf_data/theory_cards/831.yaml create mode 100644 nnpdf_data/nnpdf_data/theory_cards/832.yaml create mode 100644 nnpdf_data/nnpdf_data/theory_cards/833.yaml create mode 100644 nnpdf_data/nnpdf_data/theory_cards/834.yaml create mode 100644 nnpdf_data/nnpdf_data/theory_cards/835.yaml create mode 100644 nnpdf_data/nnpdf_data/theory_cards/836.yaml create mode 100644 nnpdf_data/nnpdf_data/theory_cards/837.yaml create mode 100644 nnpdf_data/nnpdf_data/theory_cards/838.yaml create mode 100644 nnpdf_data/nnpdf_data/theory_cards/839.yaml create mode 100644 nnpdf_data/nnpdf_data/theory_cards/840.yaml create mode 100644 nnpdf_data/nnpdf_data/theory_cards/841.yaml create mode 100644 nnpdf_data/nnpdf_data/theory_cards/842.yaml create mode 100644 nnpdf_data/nnpdf_data/theory_cards/843.yaml diff --git a/nnpdf_data/nnpdf_data/theory_cards/825.yaml b/nnpdf_data/nnpdf_data/theory_cards/825.yaml new file mode 100644 index 0000000000..754fa3ea96 --- /dev/null +++ b/nnpdf_data/nnpdf_data/theory_cards/825.yaml @@ -0,0 +1,48 @@ +ID: 825 +PTO: 2 +FNS: FONLL-C +DAMP: 0 +IC: 1 +ModEv: TRN +XIR: 1.0 +XIF: 1.0 +NfFF: 5 +MaxNfAs: 5 +MaxNfPdf: 5 +Q0: 1.65 +alphas: 0.122 +Qref: 91.2 +QED: 0 +alphaqed: 0.007496252 +Qedref: 1.777 +SxRes: 0 +SxOrd: LL +HQ: POLE +mc: 1.51 +Qmc: 1.51 +kcThr: 1.0 +mb: 4.92 +Qmb: 4.92 +kbThr: 1.0 +mt: 172.5 +Qmt: 172.5 +ktThr: 1.0 +CKM: +- 0.97428 +- 0.2253 +- 0.00347 +- 0.2252 +- 0.97345 +- 0.041 +- 0.00862 +- 0.0403 +- 0.999152 +MZ: 91.1876 +MW: 80.398 +GF: 1.1663787e-05 +SIN2TW: 0.23126 +TMC: 1 +MP: 0.938 +Comments: NNLO nFONLL alpha_s=0.106 +global_nx: 0 +EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/826.yaml b/nnpdf_data/nnpdf_data/theory_cards/826.yaml new file mode 100644 index 0000000000..9e49db6782 --- /dev/null +++ b/nnpdf_data/nnpdf_data/theory_cards/826.yaml @@ -0,0 +1,48 @@ +ID: 812 +PTO: 2 +FNS: FONLL-C +DAMP: 0 +IC: 1 +ModEv: TRN +XIR: 1.0 +XIF: 1.0 +NfFF: 5 +MaxNfAs: 5 +MaxNfPdf: 5 +Q0: 1.65 +alphas: 0.123 +Qref: 91.2 +QED: 0 +alphaqed: 0.007496252 +Qedref: 1.777 +SxRes: 0 +SxOrd: LL +HQ: POLE +mc: 1.51 +Qmc: 1.51 +kcThr: 1.0 +mb: 4.92 +Qmb: 4.92 +kbThr: 1.0 +mt: 172.5 +Qmt: 172.5 +ktThr: 1.0 +CKM: +- 0.97428 +- 0.2253 +- 0.00347 +- 0.2252 +- 0.97345 +- 0.041 +- 0.00862 +- 0.0403 +- 0.999152 +MZ: 91.1876 +MW: 80.398 +GF: 1.1663787e-05 +SIN2TW: 0.23126 +TMC: 1 +MP: 0.938 +Comments: NNLO nFONLL alpha_s=0.123 +global_nx: 0 +EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/827.yaml b/nnpdf_data/nnpdf_data/theory_cards/827.yaml new file mode 100644 index 0000000000..2fc95de9fc --- /dev/null +++ b/nnpdf_data/nnpdf_data/theory_cards/827.yaml @@ -0,0 +1,48 @@ +ID: 827 +PTO: 2 +FNS: FONLL-C +DAMP: 0 +IC: 1 +ModEv: TRN +XIR: 1.0 +XIF: 1.0 +NfFF: 5 +MaxNfAs: 5 +MaxNfPdf: 5 +Q0: 1.65 +alphas: 0.124 +Qref: 91.2 +QED: 0 +alphaqed: 0.007496252 +Qedref: 1.777 +SxRes: 0 +SxOrd: LL +HQ: POLE +mc: 1.51 +Qmc: 1.51 +kcThr: 1.0 +mb: 4.92 +Qmb: 4.92 +kbThr: 1.0 +mt: 172.5 +Qmt: 172.5 +ktThr: 1.0 +CKM: +- 0.97428 +- 0.2253 +- 0.00347 +- 0.2252 +- 0.97345 +- 0.041 +- 0.00862 +- 0.0403 +- 0.999152 +MZ: 91.1876 +MW: 80.398 +GF: 1.1663787e-05 +SIN2TW: 0.23126 +TMC: 1 +MP: 0.938 +Comments: NNLO nFONLL alpha_s=0.124 +global_nx: 0 +EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/828.yaml b/nnpdf_data/nnpdf_data/theory_cards/828.yaml new file mode 100644 index 0000000000..1d3d5d932c --- /dev/null +++ b/nnpdf_data/nnpdf_data/theory_cards/828.yaml @@ -0,0 +1,48 @@ +ID: 828 +PTO: 2 +FNS: FONLL-C +DAMP: 0 +IC: 1 +ModEv: TRN +XIR: 1.0 +XIF: 1.0 +NfFF: 5 +MaxNfAs: 5 +MaxNfPdf: 5 +Q0: 1.65 +alphas: 0.125 +Qref: 91.2 +QED: 0 +alphaqed: 0.007496252 +Qedref: 1.777 +SxRes: 0 +SxOrd: LL +HQ: POLE +mc: 1.51 +Qmc: 1.51 +kcThr: 1.0 +mb: 4.92 +Qmb: 4.92 +kbThr: 1.0 +mt: 172.5 +Qmt: 172.5 +ktThr: 1.0 +CKM: +- 0.97428 +- 0.2253 +- 0.00347 +- 0.2252 +- 0.97345 +- 0.041 +- 0.00862 +- 0.0403 +- 0.999152 +MZ: 91.1876 +MW: 80.398 +GF: 1.1663787e-05 +SIN2TW: 0.23126 +TMC: 1 +MP: 0.938 +Comments: NNLO nFONLL alpha_s=0.125 +global_nx: 0 +EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/829.yaml b/nnpdf_data/nnpdf_data/theory_cards/829.yaml new file mode 100644 index 0000000000..335790dd4c --- /dev/null +++ b/nnpdf_data/nnpdf_data/theory_cards/829.yaml @@ -0,0 +1,48 @@ +ID: 829 +PTO: 2 +FNS: FONLL-C +DAMP: 0 +IC: 1 +ModEv: TRN +XIR: 1.0 +XIF: 1.0 +NfFF: 5 +MaxNfAs: 5 +MaxNfPdf: 5 +Q0: 1.65 +alphas: 0.130 +Qref: 91.2 +QED: 0 +alphaqed: 0.007496252 +Qedref: 1.777 +SxRes: 0 +SxOrd: LL +HQ: POLE +mc: 1.51 +Qmc: 1.51 +kcThr: 1.0 +mb: 4.92 +Qmb: 4.92 +kbThr: 1.0 +mt: 172.5 +Qmt: 172.5 +ktThr: 1.0 +CKM: +- 0.97428 +- 0.2253 +- 0.00347 +- 0.2252 +- 0.97345 +- 0.041 +- 0.00862 +- 0.0403 +- 0.999152 +MZ: 91.1876 +MW: 80.398 +GF: 1.1663787e-05 +SIN2TW: 0.23126 +TMC: 1 +MP: 0.938 +Comments: NNLO nFONLL alpha_s=0.130 +global_nx: 0 +EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/830.yaml b/nnpdf_data/nnpdf_data/theory_cards/830.yaml new file mode 100644 index 0000000000..fb15db449b --- /dev/null +++ b/nnpdf_data/nnpdf_data/theory_cards/830.yaml @@ -0,0 +1,48 @@ +ID: 830 +PTO: 2 +FNS: FONLL-B +DAMP: 0 +IC: 1 +ModEv: TRN +XIR: 1.0 +XIF: 1.0 +NfFF: 5 +MaxNfAs: 5 +MaxNfPdf: 5 +Q0: 1.65 +alphas: 0.106 +Qref: 91.2 +QED: 0 +alphaqed: 0.007496252 +Qedref: 1.777 +SxRes: 0 +SxOrd: LL +HQ: POLE +mc: 1.51 +Qmc: 1.51 +kcThr: 1.0 +mb: 4.92 +Qmb: 4.92 +kbThr: 1.0 +mt: 172.5 +Qmt: 172.5 +ktThr: 1.0 +CKM: +- 0.97428 +- 0.2253 +- 0.00347 +- 0.2252 +- 0.97345 +- 0.041 +- 0.00862 +- 0.0403 +- 0.999152 +MZ: 91.1876 +MW: 80.398 +GF: 1.1663787e-05 +SIN2TW: 0.23126 +TMC: 1 +MP: 0.938 +Comments: NLO nFONLL alpha_s=0.106 +global_nx: 0 +EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/831.yaml b/nnpdf_data/nnpdf_data/theory_cards/831.yaml new file mode 100644 index 0000000000..4359bce04c --- /dev/null +++ b/nnpdf_data/nnpdf_data/theory_cards/831.yaml @@ -0,0 +1,48 @@ +ID: 831 +PTO: 2 +FNS: FONLL-B +DAMP: 0 +IC: 1 +ModEv: TRN +XIR: 1.0 +XIF: 1.0 +NfFF: 5 +MaxNfAs: 5 +MaxNfPdf: 5 +Q0: 1.65 +alphas: 0.114 +Qref: 91.2 +QED: 0 +alphaqed: 0.007496252 +Qedref: 1.777 +SxRes: 0 +SxOrd: LL +HQ: POLE +mc: 1.51 +Qmc: 1.51 +kcThr: 1.0 +mb: 4.92 +Qmb: 4.92 +kbThr: 1.0 +mt: 172.5 +Qmt: 172.5 +ktThr: 1.0 +CKM: +- 0.97428 +- 0.2253 +- 0.00347 +- 0.2252 +- 0.97345 +- 0.041 +- 0.00862 +- 0.0403 +- 0.999152 +MZ: 91.1876 +MW: 80.398 +GF: 1.1663787e-05 +SIN2TW: 0.23126 +TMC: 1 +MP: 0.938 +Comments: NLO nFONLL alpha_s=0.114 +global_nx: 0 +EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/832.yaml b/nnpdf_data/nnpdf_data/theory_cards/832.yaml new file mode 100644 index 0000000000..b5651794d6 --- /dev/null +++ b/nnpdf_data/nnpdf_data/theory_cards/832.yaml @@ -0,0 +1,48 @@ +ID: 832 +PTO: 2 +FNS: FONLL-B +DAMP: 0 +IC: 1 +ModEv: TRN +XIR: 1.0 +XIF: 1.0 +NfFF: 5 +MaxNfAs: 5 +MaxNfPdf: 5 +Q0: 1.65 +alphas: 0.115 +Qref: 91.2 +QED: 0 +alphaqed: 0.007496252 +Qedref: 1.777 +SxRes: 0 +SxOrd: LL +HQ: POLE +mc: 1.51 +Qmc: 1.51 +kcThr: 1.0 +mb: 4.92 +Qmb: 4.92 +kbThr: 1.0 +mt: 172.5 +Qmt: 172.5 +ktThr: 1.0 +CKM: +- 0.97428 +- 0.2253 +- 0.00347 +- 0.2252 +- 0.97345 +- 0.041 +- 0.00862 +- 0.0403 +- 0.999152 +MZ: 91.1876 +MW: 80.398 +GF: 1.1663787e-05 +SIN2TW: 0.23126 +TMC: 1 +MP: 0.938 +Comments: NLO nFONLL alpha_s=0.115 +global_nx: 0 +EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/833.yaml b/nnpdf_data/nnpdf_data/theory_cards/833.yaml new file mode 100644 index 0000000000..493490ecc0 --- /dev/null +++ b/nnpdf_data/nnpdf_data/theory_cards/833.yaml @@ -0,0 +1,48 @@ +ID: 833 +PTO: 2 +FNS: FONLL-B +DAMP: 0 +IC: 1 +ModEv: TRN +XIR: 1.0 +XIF: 1.0 +NfFF: 5 +MaxNfAs: 5 +MaxNfPdf: 5 +Q0: 1.65 +alphas: 0.116 +Qref: 91.2 +QED: 0 +alphaqed: 0.007496252 +Qedref: 1.777 +SxRes: 0 +SxOrd: LL +HQ: POLE +mc: 1.51 +Qmc: 1.51 +kcThr: 1.0 +mb: 4.92 +Qmb: 4.92 +kbThr: 1.0 +mt: 172.5 +Qmt: 172.5 +ktThr: 1.0 +CKM: +- 0.97428 +- 0.2253 +- 0.00347 +- 0.2252 +- 0.97345 +- 0.041 +- 0.00862 +- 0.0403 +- 0.999152 +MZ: 91.1876 +MW: 80.398 +GF: 1.1663787e-05 +SIN2TW: 0.23126 +TMC: 1 +MP: 0.938 +Comments: NLO nFONLL alpha_s=0.116 +global_nx: 0 +EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/834.yaml b/nnpdf_data/nnpdf_data/theory_cards/834.yaml new file mode 100644 index 0000000000..0227b5b3e7 --- /dev/null +++ b/nnpdf_data/nnpdf_data/theory_cards/834.yaml @@ -0,0 +1,48 @@ +ID: 834 +PTO: 2 +FNS: FONLL-B +DAMP: 0 +IC: 1 +ModEv: TRN +XIR: 1.0 +XIF: 1.0 +NfFF: 5 +MaxNfAs: 5 +MaxNfPdf: 5 +Q0: 1.65 +alphas: 0.117 +Qref: 91.2 +QED: 0 +alphaqed: 0.007496252 +Qedref: 1.777 +SxRes: 0 +SxOrd: LL +HQ: POLE +mc: 1.51 +Qmc: 1.51 +kcThr: 1.0 +mb: 4.92 +Qmb: 4.92 +kbThr: 1.0 +mt: 172.5 +Qmt: 172.5 +ktThr: 1.0 +CKM: +- 0.97428 +- 0.2253 +- 0.00347 +- 0.2252 +- 0.97345 +- 0.041 +- 0.00862 +- 0.0403 +- 0.999152 +MZ: 91.1876 +MW: 80.398 +GF: 1.1663787e-05 +SIN2TW: 0.23126 +TMC: 1 +MP: 0.938 +Comments: NLO nFONLL alpha_s=0.117 +global_nx: 0 +EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/835.yaml b/nnpdf_data/nnpdf_data/theory_cards/835.yaml new file mode 100644 index 0000000000..8e217ccd9e --- /dev/null +++ b/nnpdf_data/nnpdf_data/theory_cards/835.yaml @@ -0,0 +1,48 @@ +ID: 835 +PTO: 2 +FNS: FONLL-B +DAMP: 0 +IC: 1 +ModEv: TRN +XIR: 1.0 +XIF: 1.0 +NfFF: 5 +MaxNfAs: 5 +MaxNfPdf: 5 +Q0: 1.65 +alphas: 0.118 +Qref: 91.2 +QED: 0 +alphaqed: 0.007496252 +Qedref: 1.777 +SxRes: 0 +SxOrd: LL +HQ: POLE +mc: 1.51 +Qmc: 1.51 +kcThr: 1.0 +mb: 4.92 +Qmb: 4.92 +kbThr: 1.0 +mt: 172.5 +Qmt: 172.5 +ktThr: 1.0 +CKM: +- 0.97428 +- 0.2253 +- 0.00347 +- 0.2252 +- 0.97345 +- 0.041 +- 0.00862 +- 0.0403 +- 0.999152 +MZ: 91.1876 +MW: 80.398 +GF: 1.1663787e-05 +SIN2TW: 0.23126 +TMC: 1 +MP: 0.938 +Comments: NLO nFONLL alpha_s=0.118 +global_nx: 0 +EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/836.yaml b/nnpdf_data/nnpdf_data/theory_cards/836.yaml new file mode 100644 index 0000000000..453fa5e524 --- /dev/null +++ b/nnpdf_data/nnpdf_data/theory_cards/836.yaml @@ -0,0 +1,48 @@ +ID: 836 +PTO: 2 +FNS: FONLL-B +DAMP: 0 +IC: 1 +ModEv: TRN +XIR: 1.0 +XIF: 1.0 +NfFF: 5 +MaxNfAs: 5 +MaxNfPdf: 5 +Q0: 1.65 +alphas: 0.119 +Qref: 91.2 +QED: 0 +alphaqed: 0.007496252 +Qedref: 1.777 +SxRes: 0 +SxOrd: LL +HQ: POLE +mc: 1.51 +Qmc: 1.51 +kcThr: 1.0 +mb: 4.92 +Qmb: 4.92 +kbThr: 1.0 +mt: 172.5 +Qmt: 172.5 +ktThr: 1.0 +CKM: +- 0.97428 +- 0.2253 +- 0.00347 +- 0.2252 +- 0.97345 +- 0.041 +- 0.00862 +- 0.0403 +- 0.999152 +MZ: 91.1876 +MW: 80.398 +GF: 1.1663787e-05 +SIN2TW: 0.23126 +TMC: 1 +MP: 0.938 +Comments: NLO nFONLL alpha_s=0.119 +global_nx: 0 +EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/837.yaml b/nnpdf_data/nnpdf_data/theory_cards/837.yaml new file mode 100644 index 0000000000..27598d43ed --- /dev/null +++ b/nnpdf_data/nnpdf_data/theory_cards/837.yaml @@ -0,0 +1,48 @@ +ID: 837 +PTO: 2 +FNS: FONLL-B +DAMP: 0 +IC: 1 +ModEv: TRN +XIR: 1.0 +XIF: 1.0 +NfFF: 5 +MaxNfAs: 5 +MaxNfPdf: 5 +Q0: 1.65 +alphas: 0.120 +Qref: 91.2 +QED: 0 +alphaqed: 0.007496252 +Qedref: 1.777 +SxRes: 0 +SxOrd: LL +HQ: POLE +mc: 1.51 +Qmc: 1.51 +kcThr: 1.0 +mb: 4.92 +Qmb: 4.92 +kbThr: 1.0 +mt: 172.5 +Qmt: 172.5 +ktThr: 1.0 +CKM: +- 0.97428 +- 0.2253 +- 0.00347 +- 0.2252 +- 0.97345 +- 0.041 +- 0.00862 +- 0.0403 +- 0.999152 +MZ: 91.1876 +MW: 80.398 +GF: 1.1663787e-05 +SIN2TW: 0.23126 +TMC: 1 +MP: 0.938 +Comments: NLO nFONLL alpha_s=0.120 +global_nx: 0 +EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/838.yaml b/nnpdf_data/nnpdf_data/theory_cards/838.yaml new file mode 100644 index 0000000000..6681251a80 --- /dev/null +++ b/nnpdf_data/nnpdf_data/theory_cards/838.yaml @@ -0,0 +1,48 @@ +ID: 838 +PTO: 2 +FNS: FONLL-B +DAMP: 0 +IC: 1 +ModEv: TRN +XIR: 1.0 +XIF: 1.0 +NfFF: 5 +MaxNfAs: 5 +MaxNfPdf: 5 +Q0: 1.65 +alphas: 0.121 +Qref: 91.2 +QED: 0 +alphaqed: 0.007496252 +Qedref: 1.777 +SxRes: 0 +SxOrd: LL +HQ: POLE +mc: 1.51 +Qmc: 1.51 +kcThr: 1.0 +mb: 4.92 +Qmb: 4.92 +kbThr: 1.0 +mt: 172.5 +Qmt: 172.5 +ktThr: 1.0 +CKM: +- 0.97428 +- 0.2253 +- 0.00347 +- 0.2252 +- 0.97345 +- 0.041 +- 0.00862 +- 0.0403 +- 0.999152 +MZ: 91.1876 +MW: 80.398 +GF: 1.1663787e-05 +SIN2TW: 0.23126 +TMC: 1 +MP: 0.938 +Comments: NLO nFONLL alpha_s=0.121 +global_nx: 0 +EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/839.yaml b/nnpdf_data/nnpdf_data/theory_cards/839.yaml new file mode 100644 index 0000000000..cb80274ce2 --- /dev/null +++ b/nnpdf_data/nnpdf_data/theory_cards/839.yaml @@ -0,0 +1,48 @@ +ID: 839 +PTO: 2 +FNS: FONLL-B +DAMP: 0 +IC: 1 +ModEv: TRN +XIR: 1.0 +XIF: 1.0 +NfFF: 5 +MaxNfAs: 5 +MaxNfPdf: 5 +Q0: 1.65 +alphas: 0.122 +Qref: 91.2 +QED: 0 +alphaqed: 0.007496252 +Qedref: 1.777 +SxRes: 0 +SxOrd: LL +HQ: POLE +mc: 1.51 +Qmc: 1.51 +kcThr: 1.0 +mb: 4.92 +Qmb: 4.92 +kbThr: 1.0 +mt: 172.5 +Qmt: 172.5 +ktThr: 1.0 +CKM: +- 0.97428 +- 0.2253 +- 0.00347 +- 0.2252 +- 0.97345 +- 0.041 +- 0.00862 +- 0.0403 +- 0.999152 +MZ: 91.1876 +MW: 80.398 +GF: 1.1663787e-05 +SIN2TW: 0.23126 +TMC: 1 +MP: 0.938 +Comments: NLO nFONLL alpha_s=0.122 +global_nx: 0 +EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/840.yaml b/nnpdf_data/nnpdf_data/theory_cards/840.yaml new file mode 100644 index 0000000000..309c1361cc --- /dev/null +++ b/nnpdf_data/nnpdf_data/theory_cards/840.yaml @@ -0,0 +1,48 @@ +ID: 840 +PTO: 2 +FNS: FONLL-B +DAMP: 0 +IC: 1 +ModEv: TRN +XIR: 1.0 +XIF: 1.0 +NfFF: 5 +MaxNfAs: 5 +MaxNfPdf: 5 +Q0: 1.65 +alphas: 0.123 +Qref: 91.2 +QED: 0 +alphaqed: 0.007496252 +Qedref: 1.777 +SxRes: 0 +SxOrd: LL +HQ: POLE +mc: 1.51 +Qmc: 1.51 +kcThr: 1.0 +mb: 4.92 +Qmb: 4.92 +kbThr: 1.0 +mt: 172.5 +Qmt: 172.5 +ktThr: 1.0 +CKM: +- 0.97428 +- 0.2253 +- 0.00347 +- 0.2252 +- 0.97345 +- 0.041 +- 0.00862 +- 0.0403 +- 0.999152 +MZ: 91.1876 +MW: 80.398 +GF: 1.1663787e-05 +SIN2TW: 0.23126 +TMC: 1 +MP: 0.938 +Comments: NLO nFONLL alpha_s=0.123 +global_nx: 0 +EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/841.yaml b/nnpdf_data/nnpdf_data/theory_cards/841.yaml new file mode 100644 index 0000000000..a81ca88295 --- /dev/null +++ b/nnpdf_data/nnpdf_data/theory_cards/841.yaml @@ -0,0 +1,48 @@ +ID: 841 +PTO: 2 +FNS: FONLL-B +DAMP: 0 +IC: 1 +ModEv: TRN +XIR: 1.0 +XIF: 1.0 +NfFF: 5 +MaxNfAs: 5 +MaxNfPdf: 5 +Q0: 1.65 +alphas: 0.124 +Qref: 91.2 +QED: 0 +alphaqed: 0.007496252 +Qedref: 1.777 +SxRes: 0 +SxOrd: LL +HQ: POLE +mc: 1.51 +Qmc: 1.51 +kcThr: 1.0 +mb: 4.92 +Qmb: 4.92 +kbThr: 1.0 +mt: 172.5 +Qmt: 172.5 +ktThr: 1.0 +CKM: +- 0.97428 +- 0.2253 +- 0.00347 +- 0.2252 +- 0.97345 +- 0.041 +- 0.00862 +- 0.0403 +- 0.999152 +MZ: 91.1876 +MW: 80.398 +GF: 1.1663787e-05 +SIN2TW: 0.23126 +TMC: 1 +MP: 0.938 +Comments: NLO nFONLL alpha_s=0.124 +global_nx: 0 +EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/842.yaml b/nnpdf_data/nnpdf_data/theory_cards/842.yaml new file mode 100644 index 0000000000..2fef743bc1 --- /dev/null +++ b/nnpdf_data/nnpdf_data/theory_cards/842.yaml @@ -0,0 +1,48 @@ +ID: 842 +PTO: 2 +FNS: FONLL-B +DAMP: 0 +IC: 1 +ModEv: TRN +XIR: 1.0 +XIF: 1.0 +NfFF: 5 +MaxNfAs: 5 +MaxNfPdf: 5 +Q0: 1.65 +alphas: 0.125 +Qref: 91.2 +QED: 0 +alphaqed: 0.007496252 +Qedref: 1.777 +SxRes: 0 +SxOrd: LL +HQ: POLE +mc: 1.51 +Qmc: 1.51 +kcThr: 1.0 +mb: 4.92 +Qmb: 4.92 +kbThr: 1.0 +mt: 172.5 +Qmt: 172.5 +ktThr: 1.0 +CKM: +- 0.97428 +- 0.2253 +- 0.00347 +- 0.2252 +- 0.97345 +- 0.041 +- 0.00862 +- 0.0403 +- 0.999152 +MZ: 91.1876 +MW: 80.398 +GF: 1.1663787e-05 +SIN2TW: 0.23126 +TMC: 1 +MP: 0.938 +Comments: NLO nFONLL alpha_s=0.125 +global_nx: 0 +EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/843.yaml b/nnpdf_data/nnpdf_data/theory_cards/843.yaml new file mode 100644 index 0000000000..3c6079d860 --- /dev/null +++ b/nnpdf_data/nnpdf_data/theory_cards/843.yaml @@ -0,0 +1,48 @@ +ID: 843 +PTO: 2 +FNS: FONLL-B +DAMP: 0 +IC: 1 +ModEv: TRN +XIR: 1.0 +XIF: 1.0 +NfFF: 5 +MaxNfAs: 5 +MaxNfPdf: 5 +Q0: 1.65 +alphas: 0.130 +Qref: 91.2 +QED: 0 +alphaqed: 0.007496252 +Qedref: 1.777 +SxRes: 0 +SxOrd: LL +HQ: POLE +mc: 1.51 +Qmc: 1.51 +kcThr: 1.0 +mb: 4.92 +Qmb: 4.92 +kbThr: 1.0 +mt: 172.5 +Qmt: 172.5 +ktThr: 1.0 +CKM: +- 0.97428 +- 0.2253 +- 0.00347 +- 0.2252 +- 0.97345 +- 0.041 +- 0.00862 +- 0.0403 +- 0.999152 +MZ: 91.1876 +MW: 80.398 +GF: 1.1663787e-05 +SIN2TW: 0.23126 +TMC: 1 +MP: 0.938 +Comments: NLO nFONLL alpha_s=0.130 +global_nx: 0 +EScaleVar: 1 From 7eaccc77f72e558b6bb5b7688d0b58e2b87ed390 Mon Sep 17 00:00:00 2001 From: RoyStegeman Date: Thu, 28 Mar 2024 14:29:04 +0000 Subject: [PATCH 12/22] remove double alphas=0.118 NLO theory --- nnpdf_data/nnpdf_data/theory_cards/835.yaml | 4 +- nnpdf_data/nnpdf_data/theory_cards/836.yaml | 4 +- nnpdf_data/nnpdf_data/theory_cards/837.yaml | 4 +- nnpdf_data/nnpdf_data/theory_cards/838.yaml | 4 +- nnpdf_data/nnpdf_data/theory_cards/839.yaml | 4 +- nnpdf_data/nnpdf_data/theory_cards/840.yaml | 4 +- nnpdf_data/nnpdf_data/theory_cards/841.yaml | 4 +- nnpdf_data/nnpdf_data/theory_cards/842.yaml | 4 +- nnpdf_data/nnpdf_data/theory_cards/843.yaml | 48 --------------------- 9 files changed, 16 insertions(+), 64 deletions(-) delete mode 100644 nnpdf_data/nnpdf_data/theory_cards/843.yaml diff --git a/nnpdf_data/nnpdf_data/theory_cards/835.yaml b/nnpdf_data/nnpdf_data/theory_cards/835.yaml index 8e217ccd9e..cc44225cdf 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/835.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/835.yaml @@ -10,7 +10,7 @@ NfFF: 5 MaxNfAs: 5 MaxNfPdf: 5 Q0: 1.65 -alphas: 0.118 +alphas: 0.119 Qref: 91.2 QED: 0 alphaqed: 0.007496252 @@ -43,6 +43,6 @@ GF: 1.1663787e-05 SIN2TW: 0.23126 TMC: 1 MP: 0.938 -Comments: NLO nFONLL alpha_s=0.118 +Comments: NLO nFONLL alpha_s=0.119 global_nx: 0 EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/836.yaml b/nnpdf_data/nnpdf_data/theory_cards/836.yaml index 453fa5e524..393e8afb5f 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/836.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/836.yaml @@ -10,7 +10,7 @@ NfFF: 5 MaxNfAs: 5 MaxNfPdf: 5 Q0: 1.65 -alphas: 0.119 +alphas: 0.120 Qref: 91.2 QED: 0 alphaqed: 0.007496252 @@ -43,6 +43,6 @@ GF: 1.1663787e-05 SIN2TW: 0.23126 TMC: 1 MP: 0.938 -Comments: NLO nFONLL alpha_s=0.119 +Comments: NLO nFONLL alpha_s=0.120 global_nx: 0 EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/837.yaml b/nnpdf_data/nnpdf_data/theory_cards/837.yaml index 27598d43ed..296d266604 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/837.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/837.yaml @@ -10,7 +10,7 @@ NfFF: 5 MaxNfAs: 5 MaxNfPdf: 5 Q0: 1.65 -alphas: 0.120 +alphas: 0.121 Qref: 91.2 QED: 0 alphaqed: 0.007496252 @@ -43,6 +43,6 @@ GF: 1.1663787e-05 SIN2TW: 0.23126 TMC: 1 MP: 0.938 -Comments: NLO nFONLL alpha_s=0.120 +Comments: NLO nFONLL alpha_s=0.121 global_nx: 0 EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/838.yaml b/nnpdf_data/nnpdf_data/theory_cards/838.yaml index 6681251a80..c54a89ceec 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/838.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/838.yaml @@ -10,7 +10,7 @@ NfFF: 5 MaxNfAs: 5 MaxNfPdf: 5 Q0: 1.65 -alphas: 0.121 +alphas: 0.122 Qref: 91.2 QED: 0 alphaqed: 0.007496252 @@ -43,6 +43,6 @@ GF: 1.1663787e-05 SIN2TW: 0.23126 TMC: 1 MP: 0.938 -Comments: NLO nFONLL alpha_s=0.121 +Comments: NLO nFONLL alpha_s=0.122 global_nx: 0 EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/839.yaml b/nnpdf_data/nnpdf_data/theory_cards/839.yaml index cb80274ce2..3c7cadba29 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/839.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/839.yaml @@ -10,7 +10,7 @@ NfFF: 5 MaxNfAs: 5 MaxNfPdf: 5 Q0: 1.65 -alphas: 0.122 +alphas: 0.123 Qref: 91.2 QED: 0 alphaqed: 0.007496252 @@ -43,6 +43,6 @@ GF: 1.1663787e-05 SIN2TW: 0.23126 TMC: 1 MP: 0.938 -Comments: NLO nFONLL alpha_s=0.122 +Comments: NLO nFONLL alpha_s=0.123 global_nx: 0 EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/840.yaml b/nnpdf_data/nnpdf_data/theory_cards/840.yaml index 309c1361cc..f35be20538 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/840.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/840.yaml @@ -10,7 +10,7 @@ NfFF: 5 MaxNfAs: 5 MaxNfPdf: 5 Q0: 1.65 -alphas: 0.123 +alphas: 0.124 Qref: 91.2 QED: 0 alphaqed: 0.007496252 @@ -43,6 +43,6 @@ GF: 1.1663787e-05 SIN2TW: 0.23126 TMC: 1 MP: 0.938 -Comments: NLO nFONLL alpha_s=0.123 +Comments: NLO nFONLL alpha_s=0.124 global_nx: 0 EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/841.yaml b/nnpdf_data/nnpdf_data/theory_cards/841.yaml index a81ca88295..67eed8ba92 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/841.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/841.yaml @@ -10,7 +10,7 @@ NfFF: 5 MaxNfAs: 5 MaxNfPdf: 5 Q0: 1.65 -alphas: 0.124 +alphas: 0.125 Qref: 91.2 QED: 0 alphaqed: 0.007496252 @@ -43,6 +43,6 @@ GF: 1.1663787e-05 SIN2TW: 0.23126 TMC: 1 MP: 0.938 -Comments: NLO nFONLL alpha_s=0.124 +Comments: NLO nFONLL alpha_s=0.125 global_nx: 0 EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/842.yaml b/nnpdf_data/nnpdf_data/theory_cards/842.yaml index 2fef743bc1..a6a9469e8c 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/842.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/842.yaml @@ -10,7 +10,7 @@ NfFF: 5 MaxNfAs: 5 MaxNfPdf: 5 Q0: 1.65 -alphas: 0.125 +alphas: 0.130 Qref: 91.2 QED: 0 alphaqed: 0.007496252 @@ -43,6 +43,6 @@ GF: 1.1663787e-05 SIN2TW: 0.23126 TMC: 1 MP: 0.938 -Comments: NLO nFONLL alpha_s=0.125 +Comments: NLO nFONLL alpha_s=0.130 global_nx: 0 EScaleVar: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/843.yaml b/nnpdf_data/nnpdf_data/theory_cards/843.yaml deleted file mode 100644 index 3c6079d860..0000000000 --- a/nnpdf_data/nnpdf_data/theory_cards/843.yaml +++ /dev/null @@ -1,48 +0,0 @@ -ID: 843 -PTO: 2 -FNS: FONLL-B -DAMP: 0 -IC: 1 -ModEv: TRN -XIR: 1.0 -XIF: 1.0 -NfFF: 5 -MaxNfAs: 5 -MaxNfPdf: 5 -Q0: 1.65 -alphas: 0.130 -Qref: 91.2 -QED: 0 -alphaqed: 0.007496252 -Qedref: 1.777 -SxRes: 0 -SxOrd: LL -HQ: POLE -mc: 1.51 -Qmc: 1.51 -kcThr: 1.0 -mb: 4.92 -Qmb: 4.92 -kbThr: 1.0 -mt: 172.5 -Qmt: 172.5 -ktThr: 1.0 -CKM: -- 0.97428 -- 0.2253 -- 0.00347 -- 0.2252 -- 0.97345 -- 0.041 -- 0.00862 -- 0.0403 -- 0.999152 -MZ: 91.1876 -MW: 80.398 -GF: 1.1663787e-05 -SIN2TW: 0.23126 -TMC: 1 -MP: 0.938 -Comments: NLO nFONLL alpha_s=0.130 -global_nx: 0 -EScaleVar: 1 From 80fb004c54b6cdd05219b526c817610523b6dc93 Mon Sep 17 00:00:00 2001 From: andreab1997 Date: Fri, 29 Mar 2024 12:48:36 +0100 Subject: [PATCH 13/22] Correct ID in theory 826 --- nnpdf_data/nnpdf_data/theory_cards/826.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nnpdf_data/nnpdf_data/theory_cards/826.yaml b/nnpdf_data/nnpdf_data/theory_cards/826.yaml index 9e49db6782..40d3075b52 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/826.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/826.yaml @@ -1,4 +1,4 @@ -ID: 812 +ID: 826 PTO: 2 FNS: FONLL-C DAMP: 0 From 68047760df44e9f14171301b5a43c707357e627b Mon Sep 17 00:00:00 2001 From: RoyStegeman Date: Fri, 29 Mar 2024 11:54:18 +0000 Subject: [PATCH 14/22] fix alphasvar theorycards --- nnpdf_data/nnpdf_data/theory_cards/825.yaml | 2 +- nnpdf_data/nnpdf_data/theory_cards/826.yaml | 2 +- nnpdf_data/nnpdf_data/theory_cards/830.yaml | 2 +- nnpdf_data/nnpdf_data/theory_cards/831.yaml | 2 +- nnpdf_data/nnpdf_data/theory_cards/832.yaml | 2 +- nnpdf_data/nnpdf_data/theory_cards/833.yaml | 2 +- nnpdf_data/nnpdf_data/theory_cards/834.yaml | 2 +- nnpdf_data/nnpdf_data/theory_cards/835.yaml | 2 +- nnpdf_data/nnpdf_data/theory_cards/836.yaml | 2 +- nnpdf_data/nnpdf_data/theory_cards/837.yaml | 2 +- nnpdf_data/nnpdf_data/theory_cards/838.yaml | 2 +- nnpdf_data/nnpdf_data/theory_cards/839.yaml | 2 +- nnpdf_data/nnpdf_data/theory_cards/840.yaml | 2 +- nnpdf_data/nnpdf_data/theory_cards/841.yaml | 2 +- nnpdf_data/nnpdf_data/theory_cards/842.yaml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/nnpdf_data/nnpdf_data/theory_cards/825.yaml b/nnpdf_data/nnpdf_data/theory_cards/825.yaml index 754fa3ea96..5f10af72bb 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/825.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/825.yaml @@ -10,7 +10,7 @@ NfFF: 5 MaxNfAs: 5 MaxNfPdf: 5 Q0: 1.65 -alphas: 0.122 +alphas: 0.106 Qref: 91.2 QED: 0 alphaqed: 0.007496252 diff --git a/nnpdf_data/nnpdf_data/theory_cards/826.yaml b/nnpdf_data/nnpdf_data/theory_cards/826.yaml index 9e49db6782..40d3075b52 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/826.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/826.yaml @@ -1,4 +1,4 @@ -ID: 812 +ID: 826 PTO: 2 FNS: FONLL-C DAMP: 0 diff --git a/nnpdf_data/nnpdf_data/theory_cards/830.yaml b/nnpdf_data/nnpdf_data/theory_cards/830.yaml index fb15db449b..1c9e4f9467 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/830.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/830.yaml @@ -1,5 +1,5 @@ ID: 830 -PTO: 2 +PTO: 1 FNS: FONLL-B DAMP: 0 IC: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/831.yaml b/nnpdf_data/nnpdf_data/theory_cards/831.yaml index 4359bce04c..98e5e320a8 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/831.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/831.yaml @@ -1,5 +1,5 @@ ID: 831 -PTO: 2 +PTO: 1 FNS: FONLL-B DAMP: 0 IC: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/832.yaml b/nnpdf_data/nnpdf_data/theory_cards/832.yaml index b5651794d6..4293bd43d8 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/832.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/832.yaml @@ -1,5 +1,5 @@ ID: 832 -PTO: 2 +PTO: 1 FNS: FONLL-B DAMP: 0 IC: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/833.yaml b/nnpdf_data/nnpdf_data/theory_cards/833.yaml index 493490ecc0..ac88a54bc9 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/833.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/833.yaml @@ -1,5 +1,5 @@ ID: 833 -PTO: 2 +PTO: 1 FNS: FONLL-B DAMP: 0 IC: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/834.yaml b/nnpdf_data/nnpdf_data/theory_cards/834.yaml index 0227b5b3e7..2bcec6fbf5 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/834.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/834.yaml @@ -1,5 +1,5 @@ ID: 834 -PTO: 2 +PTO: 1 FNS: FONLL-B DAMP: 0 IC: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/835.yaml b/nnpdf_data/nnpdf_data/theory_cards/835.yaml index cc44225cdf..a55e1c01ce 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/835.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/835.yaml @@ -1,5 +1,5 @@ ID: 835 -PTO: 2 +PTO: 1 FNS: FONLL-B DAMP: 0 IC: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/836.yaml b/nnpdf_data/nnpdf_data/theory_cards/836.yaml index 393e8afb5f..66f08a5215 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/836.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/836.yaml @@ -1,5 +1,5 @@ ID: 836 -PTO: 2 +PTO: 1 FNS: FONLL-B DAMP: 0 IC: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/837.yaml b/nnpdf_data/nnpdf_data/theory_cards/837.yaml index 296d266604..4f1bdcd85d 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/837.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/837.yaml @@ -1,5 +1,5 @@ ID: 837 -PTO: 2 +PTO: 1 FNS: FONLL-B DAMP: 0 IC: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/838.yaml b/nnpdf_data/nnpdf_data/theory_cards/838.yaml index c54a89ceec..81df19b2c5 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/838.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/838.yaml @@ -1,5 +1,5 @@ ID: 838 -PTO: 2 +PTO: 1 FNS: FONLL-B DAMP: 0 IC: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/839.yaml b/nnpdf_data/nnpdf_data/theory_cards/839.yaml index 3c7cadba29..3f28f22019 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/839.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/839.yaml @@ -1,5 +1,5 @@ ID: 839 -PTO: 2 +PTO: 1 FNS: FONLL-B DAMP: 0 IC: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/840.yaml b/nnpdf_data/nnpdf_data/theory_cards/840.yaml index f35be20538..3563935fe2 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/840.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/840.yaml @@ -1,5 +1,5 @@ ID: 840 -PTO: 2 +PTO: 1 FNS: FONLL-B DAMP: 0 IC: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/841.yaml b/nnpdf_data/nnpdf_data/theory_cards/841.yaml index 67eed8ba92..b6b8231c7c 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/841.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/841.yaml @@ -1,5 +1,5 @@ ID: 841 -PTO: 2 +PTO: 1 FNS: FONLL-B DAMP: 0 IC: 1 diff --git a/nnpdf_data/nnpdf_data/theory_cards/842.yaml b/nnpdf_data/nnpdf_data/theory_cards/842.yaml index a6a9469e8c..1804e9dbc0 100644 --- a/nnpdf_data/nnpdf_data/theory_cards/842.yaml +++ b/nnpdf_data/nnpdf_data/theory_cards/842.yaml @@ -1,5 +1,5 @@ ID: 842 -PTO: 2 +PTO: 1 FNS: FONLL-B DAMP: 0 IC: 1 From 037e2df30e3a0690293b9e63d350d55910ff9556 Mon Sep 17 00:00:00 2001 From: andreab1997 Date: Thu, 4 Apr 2024 11:58:06 +0200 Subject: [PATCH 15/22] Remove SKIP uncert in definitions --- validphys2/src/validphys/coredata.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/validphys2/src/validphys/coredata.py b/validphys2/src/validphys/coredata.py index b3e8c21978..f7ff0f504d 100644 --- a/validphys2/src/validphys/coredata.py +++ b/validphys2/src/validphys/coredata.py @@ -397,7 +397,8 @@ def export_uncertainties(self, buffer): """Exports the uncertainties defined by this commondata instance to the given buffer""" definitions = {} for idx, row in self.systype_table.iterrows(): - definitions[f"sys_{idx}"] = {"treatment": row["treatment"], "type": row["name"]} + if row["name"] != "SKIP": + definitions[f"sys_{idx}"] = {"treatment": row["treatment"], "type": row["name"]} bins = [] for idx, row in self.systematic_errors().iterrows(): From a56c6c5e330d70684ac62665b96c545e3b4add3f Mon Sep 17 00:00:00 2001 From: andreab1997 Date: Mon, 15 Apr 2024 15:19:28 +0200 Subject: [PATCH 16/22] Restore wrong cut and fix a detail --- validphys2/src/validphys/closuretest/closure_results.py | 4 ++-- validphys2/src/validphys/cuts/filters.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/validphys2/src/validphys/closuretest/closure_results.py b/validphys2/src/validphys/closuretest/closure_results.py index 6cf5011c95..436ba81dbd 100644 --- a/validphys2/src/validphys/closuretest/closure_results.py +++ b/validphys2/src/validphys/closuretest/closure_results.py @@ -29,7 +29,7 @@ def replica_chi2_level1(dataset_inputs_results, data_fits_cv): preds = [] for ds in data_fits_cv: preds.append(ds[0]) - preds_conc = np.array([j for i in preds for j in i]) + preds_conc = np.array([j[0] for i in preds for j in i]) chi2s = [] for th_ct_replica in th_ct.error_members.T: diff = preds_conc - th_ct_replica @@ -42,7 +42,7 @@ def central_chi2_level1(dataset_inputs_results_central, data_fits_cv): preds = [] for ds in data_fits_cv: preds.append(ds[0]) - preds_conc = np.array([j for i in preds for j in i]) + preds_conc = np.array([j[0] for i in preds for j in i]) central_diff = preds_conc - th_ct.central_value chi2s = calc_chi2(dt_ct.sqrtcovmat, central_diff) return chi2s / (len(preds_conc)) diff --git a/validphys2/src/validphys/cuts/filters.yaml b/validphys2/src/validphys/cuts/filters.yaml index 462f711dad..60f1b2b6e9 100644 --- a/validphys2/src/validphys/cuts/filters.yaml +++ b/validphys2/src/validphys/cuts/filters.yaml @@ -2,7 +2,7 @@ reason: | We remove one bin from the normalised distribution because it is linearly dependent on the others - rule: "y_t<1.975 or m_ttBar<1075" + rule: "idat != 8" - dataset: ATLAS_TTBAR_8TEV_LJ_DIF_PTT-NORM reason: | From 450cddae841687d64ccd555e549c11d91a30662b Mon Sep 17 00:00:00 2001 From: andreab1997 Date: Mon, 29 Apr 2024 12:12:59 +0200 Subject: [PATCH 17/22] Switch to NLO --- validphys2/src/validphys/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validphys2/src/validphys/config.py b/validphys2/src/validphys/config.py index 769964f564..5fce1255a3 100644 --- a/validphys2/src/validphys/config.py +++ b/validphys2/src/validphys/config.py @@ -1429,7 +1429,7 @@ def produce_data_level0(self, data_input, *, group_name="data"): into account """ from validphys.loader import Loader - theoryid_118 = 708 + theoryid_118 = 717 bb = Loader() theoryid_alpha118 = bb.check_theoryID(theoryid_118) datasets = [] From 7864648af84792f2a5779e040526c62108daf715 Mon Sep 17 00:00:00 2001 From: andreab1997 Date: Mon, 29 Apr 2024 12:22:56 +0200 Subject: [PATCH 18/22] Implement a way to use the same t0covmat in ct --- validphys2/src/validphys/config.py | 73 ++++++++++++++++++++++++++--- validphys2/src/validphys/covmats.py | 4 +- 2 files changed, 69 insertions(+), 8 deletions(-) diff --git a/validphys2/src/validphys/config.py b/validphys2/src/validphys/config.py index 5fce1255a3..683dbab4ab 100644 --- a/validphys2/src/validphys/config.py +++ b/validphys2/src/validphys/config.py @@ -151,7 +151,19 @@ def parse_theoryid(self, theoryID: (str, int)): raise ConfigError( str(e), theoryID, self.loader.available_theories, display_alternatives="all" ) - + + @element_of("theoryids") + @_id_with_label + def parse_t0theoryid(self, theoryID: (str, int)): + """A number corresponding to the database theory ID where the + corresponding theory folder is installed in te data directory.""" + try: + return self.loader.check_theoryID(theoryID) + except LoaderError as e: + raise ConfigError( + str(e), theoryID, self.loader.available_theories, display_alternatives="all" + ) + def parse_use_cuts(self, use_cuts: (bool, str)): """Whether to filter the points based on the cuts applied in the fit, or the whole data in the dataset. The possible options are: @@ -633,6 +645,54 @@ def produce_dataset( if not ds.commondata.plotfiles: log.warning(f"Plotting files not found for: {ds}") return ds + + def produce_t0dataset( + self, + *, + dataset_input, + theoryid, + cuts, + t0theoryid=None, + use_fitcommondata=False, + fit=None, + check_plotting: bool = False, + ): + """Dataset specification from the theory and CommonData. + Use the cuts from the fit, if provided. If check_plotting is set to + True, attempt to lod and check the PLOTTING files + (note this may cause a noticeable slowdown in general).""" + name = dataset_input.name + sysnum = dataset_input.sys + cfac = dataset_input.cfac + frac = dataset_input.frac + weight = dataset_input.weight + variant = dataset_input.variant + if t0theoryid: + theoryid = t0theoryid + try: + ds = self.loader.check_dataset( + name=name, + sysnum=sysnum, + theoryid=theoryid, + cfac=cfac, + cuts=cuts, + frac=frac, + use_fitcommondata=use_fitcommondata, + fit=fit, + weight=weight, + variant=variant, + ) + except DataNotFoundError as e: + raise ConfigError(str(e), name, self.loader.available_datasets) + + except LoadFailedError as e: + raise ConfigError(e) + if check_plotting: + # normalize=True should check for more stuff + get_info(ds, normalize=True) + if not ds.commondata.plotfiles: + log.warning(f"Plotting files not found for: {ds}") + return ds @configparser.element_of("experiments") def parse_experiment(self, experiment: dict): @@ -1424,17 +1484,18 @@ def produce_defaults( return filter_defaults - def produce_data_level0(self, data_input, *, group_name="data"): + def produce_data_level0(self, data_input, t0theoryid, *, group_name="data"): """A set of datasets where correlated systematics are taken into account """ from validphys.loader import Loader - theoryid_118 = 717 - bb = Loader() - theoryid_alpha118 = bb.check_theoryID(theoryid_118) + #theoryid_118 = 717 + #bb = Loader() + #theoryid_alpha118 = bb.check_theoryID(theoryid_118) + theoryid_alphacentral = t0theoryid datasets = [] for dsinp in data_input: - with self.set_context(ns=self._curr_ns.new_child({"dataset_input": dsinp, "theoryid": theoryid_alpha118})): + with self.set_context(ns=self._curr_ns.new_child({"dataset_input": dsinp, "theoryid": theoryid_alphacentral})): datasets.append(self.parse_from_(None, "dataset", write=False)[1]) return DataGroupSpec(name=group_name, datasets=datasets, dsinputs=data_input) diff --git a/validphys2/src/validphys/covmats.py b/validphys2/src/validphys/covmats.py index dec41cd2ba..e280531368 100644 --- a/validphys2/src/validphys/covmats.py +++ b/validphys2/src/validphys/covmats.py @@ -224,7 +224,7 @@ def dataset_inputs_covmat_from_systematics( @check_cuts_considered @functools.lru_cache -def dataset_t0_predictions(dataset, t0set): +def dataset_t0_predictions(t0dataset, t0set): """Returns the t0 predictions for a ``dataset`` which are the predictions calculated using the central member of ``pdf``. Note that if ``pdf`` has errortype ``replicas``, and the dataset is a hadronic observable then the @@ -246,7 +246,7 @@ def dataset_t0_predictions(dataset, t0set): """ # reshape because the underlying data has shape ndata * 1 # accounting for the fact that some datasets are single datapoint - return central_predictions(dataset, t0set).to_numpy().reshape(-1) + return central_predictions(t0dataset, t0set).to_numpy().reshape(-1) def t0_covmat_from_systematics( From 3db8f0338f8023d3dc6a239c535f57ce0dc278fc Mon Sep 17 00:00:00 2001 From: andreab1997 Date: Mon, 29 Apr 2024 12:41:40 +0200 Subject: [PATCH 19/22] Correct bug in level0_commondata_wc --- validphys2/src/validphys/pseudodata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validphys2/src/validphys/pseudodata.py b/validphys2/src/validphys/pseudodata.py index 04e9925d4e..917a134d9b 100644 --- a/validphys2/src/validphys/pseudodata.py +++ b/validphys2/src/validphys/pseudodata.py @@ -321,7 +321,7 @@ def level0_commondata_wc(data, fakepdf): # == Generate a new CommonData instance with central value given by Level 0 data generated with fakepdf ==# t0_prediction = dataset_t0_predictions( - dataset=dataset, t0set=fakepdf + t0dataset=dataset, t0set=fakepdf ) # N.B. cuts already applied to th. pred. level0_commondata_instances_wc.append(commondata_wc.with_central_value(t0_prediction)) From a827abf8cb05d1a8b895e257d68f87516751a8f5 Mon Sep 17 00:00:00 2001 From: andreab1997 Date: Mon, 6 May 2024 11:54:27 +0200 Subject: [PATCH 20/22] Allow t0theoryid to be different from faketheoryid --- validphys2/src/validphys/config.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/validphys2/src/validphys/config.py b/validphys2/src/validphys/config.py index 683dbab4ab..c40f4b8e40 100644 --- a/validphys2/src/validphys/config.py +++ b/validphys2/src/validphys/config.py @@ -152,6 +152,18 @@ def parse_theoryid(self, theoryID: (str, int)): str(e), theoryID, self.loader.available_theories, display_alternatives="all" ) + @element_of("theoryids") + @_id_with_label + def parse_faketheoryid(self, theoryID: (str, int)): + """A number corresponding to the database theory ID where the + corresponding theory folder is installed in te data directory.""" + try: + return self.loader.check_theoryID(theoryID) + except LoaderError as e: + raise ConfigError( + str(e), theoryID, self.loader.available_theories, display_alternatives="all" + ) + @element_of("theoryids") @_id_with_label def parse_t0theoryid(self, theoryID: (str, int)): @@ -1484,15 +1496,12 @@ def produce_defaults( return filter_defaults - def produce_data_level0(self, data_input, t0theoryid, *, group_name="data"): + def produce_data_level0(self, data_input, faketheoryid, *, group_name="data"): """A set of datasets where correlated systematics are taken into account """ from validphys.loader import Loader - #theoryid_118 = 717 - #bb = Loader() - #theoryid_alpha118 = bb.check_theoryID(theoryid_118) - theoryid_alphacentral = t0theoryid + theoryid_alphacentral = faketheoryid datasets = [] for dsinp in data_input: with self.set_context(ns=self._curr_ns.new_child({"dataset_input": dsinp, "theoryid": theoryid_alphacentral})): From 62b88b123f9652d393c6e65eaded664eccefa2ca Mon Sep 17 00:00:00 2001 From: RoyStegeman Date: Mon, 13 May 2024 17:00:59 +0100 Subject: [PATCH 21/22] add validphys.commondata to vp_setupfit providers --- n3fit/src/n3fit/scripts/vp_setupfit.py | 1 + 1 file changed, 1 insertion(+) diff --git a/n3fit/src/n3fit/scripts/vp_setupfit.py b/n3fit/src/n3fit/scripts/vp_setupfit.py index fe844117bb..4d197bbadd 100644 --- a/n3fit/src/n3fit/scripts/vp_setupfit.py +++ b/n3fit/src/n3fit/scripts/vp_setupfit.py @@ -50,6 +50,7 @@ 'validphys.theorycovariance.construction', 'validphys.results', 'validphys.covmats', + 'validphys.commondata', 'n3fit.n3fit_checks_provider', ] From 35f0fa2a7ae047ad8120e06869f283fd8d2fbc15 Mon Sep 17 00:00:00 2001 From: andreab1997 Date: Mon, 15 Jul 2024 20:21:15 +0200 Subject: [PATCH 22/22] Add resample_pseudodata key and allow tcm at nlo for alpha_s --- validphys2/src/validphys/pseudodata.py | 3 ++- .../scalevariationtheoryids.yaml | 21 ++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/validphys2/src/validphys/pseudodata.py b/validphys2/src/validphys/pseudodata.py index 917a134d9b..bb523bdfd7 100644 --- a/validphys2/src/validphys/pseudodata.py +++ b/validphys2/src/validphys/pseudodata.py @@ -132,6 +132,7 @@ def make_replica( sep_mult, genrep=True, max_tries=int(1e6), + resample_negative_pseudodata=True, ): """Function that takes in a list of :py:class:`validphys.coredata.CommonData` objects and returns a pseudodata replica accounting for @@ -266,7 +267,7 @@ def make_replica( # Shifting pseudodata shifted_pseudodata = (all_pseudodata + shifts) * mult_part # positivity control - if np.all(shifted_pseudodata[full_mask] >= 0): + if np.all(shifted_pseudodata[full_mask] >= 0) or not resample_negative_pseudodata: return shifted_pseudodata dfail = " ".join(i.setname for i in groups_dataset_inputs_loaded_cd_with_cuts) diff --git a/validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml b/validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml index be755b01b3..b0b7eb542f 100644 --- a/validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml +++ b/validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml @@ -273,4 +273,23 @@ scale_variations_for: (0.119): 808 (0.120): 809 (0.121): 810 - (0.122): 811 \ No newline at end of file + (0.122): 811 + - theoryid: 717 + variations: + # alpha_s 3pt variations + (0.106): 830 + (0.114): 831 + (0.115): 832 + (0.116): 833 + (0.117): 834 + (0.118): 717 + (0.119): 835 + (0.120): 836 + (0.121): 837 + (0.122): 838 + (0.123): 839 + (0.124): 840 + (0.125): 841 + (0.130): 842 + + \ No newline at end of file