Skip to content

Commit a7df230

Browse files
achiefaachiefa
committed
Update basic runcard
1 parent 6f3bd38 commit a7df230

File tree

3 files changed

+15
-75
lines changed

3 files changed

+15
-75
lines changed

‎n3fit/runcards/examples/Basic_runcard_pc_covmat.yml‎

Lines changed: 12 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -8,85 +8,20 @@ description: NNPDF4.0 ht with TCM - DIS (NC & CC) only
88
dataset_inputs:
99
- {dataset: NMC_NC_NOTFIXED_EM-F2, frac: 0.75, variant: legacy_dw}
1010
- {dataset: NMC_NC_NOTFIXED_P_EM-SIGMARED, frac: 0.75, variant: legacy}
11-
- {dataset: SLAC_NC_NOTFIXED_P_EM-F2, frac: 0.75, variant: legacy_dw}
1211
- {dataset: SLAC_NC_NOTFIXED_D_EM-F2, frac: 0.75, variant: legacy_dw}
1312
- {dataset: BCDMS_NC_NOTFIXED_P_EM-F2, frac: 0.75, variant: legacy_dw}
14-
- {dataset: BCDMS_NC_NOTFIXED_D_EM-F2, frac: 0.75, variant: legacy_dw}
1513
- {dataset: CHORUS_CC_NOTFIXED_PB_NU-SIGMARED, frac: 0.75, variant: legacy_dw}
16-
- {dataset: CHORUS_CC_NOTFIXED_PB_NB-SIGMARED, frac: 0.75, variant: legacy_dw}
17-
- {dataset: NUTEV_CC_NOTFIXED_FE_NU-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy_dw}
1814
- {dataset: NUTEV_CC_NOTFIXED_FE_NB-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy_dw}
19-
- {dataset: HERA_NC_318GEV_EM-SIGMARED, frac: 0.75, variant: legacy}
20-
- {dataset: HERA_NC_225GEV_EP-SIGMARED, frac: 0.75, variant: legacy}
21-
- {dataset: HERA_NC_251GEV_EP-SIGMARED, frac: 0.75, variant: legacy}
22-
- {dataset: HERA_NC_300GEV_EP-SIGMARED, frac: 0.75, variant: legacy}
23-
- {dataset: HERA_NC_318GEV_EP-SIGMARED, frac: 0.75, variant: legacy}
24-
- {dataset: HERA_CC_318GEV_EM-SIGMARED, frac: 0.75, variant: legacy}
2515
- {dataset: HERA_CC_318GEV_EP-SIGMARED, frac: 0.75, variant: legacy}
2616
- {dataset: HERA_NC_318GEV_EAVG_CHARM-SIGMARED, frac: 0.75, variant: legacy}
2717
- {dataset: HERA_NC_318GEV_EAVG_BOTTOM-SIGMARED, frac: 0.75, variant: legacy}
2818
- {dataset: DYE866_Z0_800GEV_DW_RATIO_PDXSECRATIO, frac: 0.75, variant: legacy}
29-
- {dataset: DYE866_Z0_800GEV_PXSEC, frac: 0.75, variant: legacy}
30-
- {dataset: DYE605_Z0_38P8GEV_DW_PXSEC, frac: 0.75, variant: legacy}
31-
- {dataset: DYE906_Z0_120GEV_DW_PDXSECRATIO, frac: 0.75, cfac: [ACC], variant: legacy}
3219
- {dataset: CDF_Z0_1P96TEV_ZRAP, frac: 0.75, variant: legacy}
33-
- {dataset: D0_Z0_1P96TEV_ZRAP, frac: 0.75, variant: legacy}
34-
- {dataset: D0_WPWM_1P96TEV_ASY, frac: 0.75, variant: legacy}
35-
- {dataset: ATLAS_WPWM_7TEV_36PB_ETA, frac: 0.75, variant: legacy}
36-
- {dataset: ATLAS_Z0_7TEV_36PB_ETA, frac: 0.75, variant: legacy}
37-
- {dataset: ATLAS_Z0_7TEV_49FB_HIMASS, frac: 0.75, variant: legacy}
38-
- {dataset: ATLAS_Z0_7TEV_LOMASS_M, frac: 0.75, variant: legacy}
39-
- {dataset: ATLAS_WPWM_7TEV_46FB_CC-ETA, frac: 0.75, variant: legacy}
40-
- {dataset: ATLAS_Z0_7TEV_46FB_CC-Y, frac: 0.75, variant: legacy}
41-
- {dataset: ATLAS_Z0_7TEV_46FB_CF-Y, frac: 0.75, variant: legacy}
42-
- {dataset: ATLAS_Z0_8TEV_HIMASS_M-Y, frac: 0.75, variant: legacy}
43-
- {dataset: ATLAS_Z0_8TEV_LOWMASS_M-Y, frac: 0.75, variant: legacy}
44-
- {dataset: ATLAS_Z0_13TEV_TOT, frac: 0.75, cfac: [NRM], variant: legacy}
45-
- {dataset: ATLAS_WPWM_13TEV_TOT, frac: 0.75, cfac: [NRM], variant: legacy}
46-
- {dataset: ATLAS_WJ_8TEV_WP-PT, frac: 0.75, variant: legacy}
47-
- {dataset: ATLAS_WJ_8TEV_WM-PT, frac: 0.75, variant: legacy}
48-
- {dataset: ATLAS_Z0J_8TEV_PT-M, frac: 0.75, variant: legacy_10}
4920
- {dataset: ATLAS_Z0J_8TEV_PT-Y, frac: 0.75, variant: legacy_10}
50-
- {dataset: ATLAS_TTBAR_7TEV_TOT_X-SEC, frac: 0.75, variant: legacy}
51-
- {dataset: ATLAS_TTBAR_8TEV_TOT_X-SEC, frac: 0.75, variant: legacy}
52-
- {dataset: ATLAS_TTBAR_13TEV_TOT_X-SEC, frac: 0.75, variant: legacy}
53-
- {dataset: ATLAS_TTBAR_8TEV_LJ_DIF_YT-NORM, frac: 0.75, variant: legacy}
54-
- {dataset: ATLAS_TTBAR_8TEV_LJ_DIF_YTTBAR-NORM, frac: 0.75, variant: legacy}
55-
- {dataset: ATLAS_TTBAR_8TEV_2L_DIF_YTTBAR-NORM, frac: 0.75, variant: legacy}
5621
- {dataset: ATLAS_1JET_8TEV_R06_PTY, frac: 0.75, variant: legacy_decorrelated}
5722
- {dataset: ATLAS_2JET_7TEV_R06_M12Y, frac: 0.75, variant: legacy}
58-
- {dataset: ATLAS_PH_13TEV_XSEC, frac: 0.75, cfac: [EWK], variant: legacy}
59-
- {dataset: ATLAS_SINGLETOP_7TEV_TCHANNEL-XSEC, frac: 0.75, variant: legacy}
60-
- {dataset: ATLAS_SINGLETOP_13TEV_TCHANNEL-XSEC, frac: 0.75, variant: legacy}
61-
- {dataset: ATLAS_SINGLETOP_7TEV_T-Y-NORM, frac: 0.75, variant: legacy}
62-
- {dataset: ATLAS_SINGLETOP_7TEV_TBAR-Y-NORM, frac: 0.75, variant: legacy}
63-
- {dataset: ATLAS_SINGLETOP_8TEV_T-RAP-NORM, frac: 0.75, variant: legacy}
64-
- {dataset: ATLAS_SINGLETOP_8TEV_TBAR-RAP-NORM, frac: 0.75, variant: legacy}
65-
- {dataset: CMS_WPWM_7TEV_ELECTRON_ASY, frac: 0.75}
66-
- {dataset: CMS_WPWM_7TEV_MUON_ASY, frac: 0.75, variant: legacy}
67-
- {dataset: CMS_Z0_7TEV_DIMUON_2D, frac: 0.75}
68-
- {dataset: CMS_WPWM_8TEV_MUON_Y, frac: 0.75, variant: legacy}
69-
- {dataset: CMS_Z0J_8TEV_PT-Y, frac: 0.75, cfac: [NRM], variant: legacy_10}
7023
- {dataset: CMS_2JET_7TEV_M12Y, frac: 0.75}
7124
- {dataset: CMS_1JET_8TEV_PTY, frac: 0.75, variant: legacy}
72-
- {dataset: CMS_TTBAR_7TEV_TOT_X-SEC, frac: 0.75, variant: legacy}
73-
- {dataset: CMS_TTBAR_8TEV_TOT_X-SEC, frac: 0.75, variant: legacy}
74-
- {dataset: CMS_TTBAR_13TEV_TOT_X-SEC, frac: 0.75, variant: legacy}
75-
- {dataset: CMS_TTBAR_8TEV_LJ_DIF_YTTBAR-NORM, frac: 0.75, variant: legacy}
76-
- {dataset: CMS_TTBAR_5TEV_TOT_X-SEC, frac: 0.75, variant: legacy}
77-
- {dataset: CMS_TTBAR_8TEV_2L_DIF_MTTBAR-YT-NORM, frac: 0.75, variant: legacy}
78-
- {dataset: CMS_TTBAR_13TEV_2L_DIF_YT, frac: 0.75, variant: legacy}
79-
- {dataset: CMS_TTBAR_13TEV_LJ_2016_DIF_YTTBAR, frac: 0.75, variant: legacy}
80-
- {dataset: CMS_SINGLETOP_7TEV_TCHANNEL-XSEC, frac: 0.75, variant: legacy}
81-
- {dataset: CMS_SINGLETOP_8TEV_TCHANNEL-XSEC, frac: 0.75, variant: legacy}
82-
- {dataset: CMS_SINGLETOP_13TEV_TCHANNEL-XSEC, frac: 0.75, variant: legacy}
83-
- {dataset: LHCB_Z0_7TEV_DIELECTRON_Y, frac: 0.75}
84-
- {dataset: LHCB_Z0_8TEV_DIELECTRON_Y, frac: 0.75}
85-
- {dataset: LHCB_WPWM_7TEV_MUON_Y, frac: 0.75, cfac: [NRM]}
86-
- {dataset: LHCB_Z0_7TEV_MUON_Y, frac: 0.75, cfac: [NRM]}
87-
- {dataset: LHCB_WPWM_8TEV_MUON_Y, frac: 0.75, cfac: [NRM]}
88-
- {dataset: LHCB_Z0_8TEV_MUON_Y, frac: 0.75, cfac: [NRM]}
89-
- {dataset: LHCB_Z0_13TEV_DIMUON-Y, frac: 0.75}
9025
- {dataset: LHCB_Z0_13TEV_DIELECTRON-Y, frac: 0.75}
9126

9227
################################################################################
@@ -103,18 +38,22 @@ theory:
10338
theorycovmatconfig:
10439
point_prescriptions: ["9 point", "power corrections"]
10540
pc_parameters:
106-
- {ht: H2p, yshift: [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0], nodes: [0.0, 0.1, 0.3, 0.5, 0.7, 0.9, 1]}
107-
- {ht: H2d, yshift: [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0], nodes: [0.0, 0.1, 0.3, 0.5, 0.7, 0.9, 1]}
108-
- {ht: HLp, yshift: [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0], nodes: [0.0, 0.1, 0.3, 0.5, 0.7, 0.9, 1]}
109-
- {ht: HLd, yshift: [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0], nodes: [0.0, 0.1, 0.3, 0.5, 0.7, 0.9, 1]}
110-
- {ht: H3p, yshift: [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0], nodes: [0.0, 0.1, 0.3, 0.5, 0.7, 0.9, 1]}
111-
- {ht: H3d, yshift: [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0], nodes: [0.0, 0.1, 0.3, 0.5, 0.7, 0.9, 1]}
112-
pc_included_procs: ["DIS NC", "DIS CC"]
41+
H2p: {yshift: [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.0], nodes: [0.0, 0.001, 0.01, 0.1, 0.3, 0.5, 0.7, 0.9, 1]}
42+
H2d: {yshift: [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.0], nodes: [0.0, 0.001, 0.01, 0.1, 0.3, 0.5, 0.7, 0.9, 1]}
43+
HLp: {yshift: [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.0], nodes: [0.0, 0.001, 0.01, 0.1, 0.3, 0.5, 0.7, 0.9, 1]}
44+
HLd: {yshift: [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.0], nodes: [0.0, 0.001, 0.01, 0.1, 0.3, 0.5, 0.7, 0.9, 1]}
45+
H3p: {yshift: [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.0], nodes: [0.0, 0.001, 0.01, 0.1, 0.3, 0.5, 0.7, 0.9, 1]}
46+
H3d: {yshift: [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.0], nodes: [0.0, 0.001, 0.01, 0.1, 0.3, 0.5, 0.7, 0.9, 1]}
47+
Hj: {yshift: [2.0, 2.0, 2.0, 2.0, 2.0, 2.0], nodes: [0.25, 0.75, 1.25, 1.75, 2.25, 2.75]}
48+
H2j_ATLAS: {yshift: [2.0, 2.0, 2.0, 2.0, 2.0, 2.0], nodes: [0.25, 0.75, 1.25, 1.75, 2.25, 2.75]}
49+
H2j_CMS: {yshift: [2.0, 2.0, 2.0, 2.0, 2.0], nodes: [0.25, 0.75, 1.25, 1.75, 2.25]}
50+
pc_included_procs: ["JETS", "DIJET", "DIS NC", "DIS CC"]
11351
pc_excluded_exps: [HERA_NC_318GEV_EAVG_CHARM-SIGMARED,
11452
HERA_NC_318GEV_EAVG_BOTTOM-SIGMARED,]
11553
pdf: 210619-n3fit-001
11654
use_thcovmat_in_fitting: true
11755
use_thcovmat_in_sampling: true
56+
resample_negative_pseudodata: false
11857

11958
# For fits <= 4.0 multiplicative and additive uncertainties were sampled separately
12059
# and thus the flag `separate_multiplicative` needs to be set to True
@@ -136,7 +75,7 @@ parameters: # This defines the parameter dictionary that is passed to the Model
13675
clipnorm: 6.073e-6
13776
learning_rate: 2.621e-3
13877
optimizer_name: Nadam
139-
epochs: 17000
78+
epochs: 3000
14079
positivity:
14180
initial: 184.8
14281
multiplier:

‎validphys2/src/validphys/config.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1835,7 +1835,9 @@ def produce_total_phi_data(self, fitthcovmat):
18351835
# TODO: to be removed once we are sure the the triangular
18361836
# function for the prior is the only one of interest
18371837
def produce_pc_func_type(self, theorycovmatconfig=None):
1838-
return theorycovmatconfig.get('func_type', 'step')
1838+
if theorycovmatconfig is None:
1839+
raise ValueError("theorycovmatconfig is defined in the runcard.")
1840+
return theorycovmatconfig.get('func_type', 'linear')
18391841

18401842
@configparser.explicit_node
18411843
def produce_covs_pt_prescrip(self, point_prescription):

‎validphys2/src/validphys/theorycovariance/construction.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,6 @@ def covs_pt_prescrip_mhou(combine_by_type, point_prescription):
346346
running_index = 0
347347

348348
covmats = defaultdict(list)
349-
print(point_prescription)
350349
start_proc = defaultdict(list)
351350
for name in process_info.preds:
352351
size = len(process_info.preds[name][0])

0 commit comments

Comments
 (0)