Skip to content

Commit e78db3b

Browse files
achiefaachiefa
authored
Merge branch 'master' into new_ht_thcovmat
2 parents 9dcf0b6 + 3db217b commit e78db3b

File tree

88 files changed

+131226
-173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+131226
-173
lines changed

‎.github/workflows/fitbot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
POSTFIT_NREP: 15 # requested minimum replicas for postfit
1313
# IMPORTANT
1414
# WHEN CHANGING THE REFERENCE SET, THE NEW REFERENCE MUST BE MANUALLY UPLOADED TO THE SERVER
15-
REFERENCE_SET: NNNBOT-1a81255f3-2026-01-27 # reference set for exact results
15+
REFERENCE_SET: NNBOT-351efa9ef-2026-03-11 # reference set for exact results
1616
STABLE_REFERENCE_SET: NNBOT-99108504e-2025-11-22 # reference set for last tag
1717
PYTHONHASHSEED: "0"
1818

‎.github/workflows/redo_regressions.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ jobs:
2323
fetch-depth: 0
2424
ref: ${{ github.event.pull_request.head.ref }}
2525
- uses: ./.github/actions/install_conda_pip
26-
with:
27-
python-version: "[qed,tests]"
2826
- name: Regenerate regressions
2927
shell: bash -l {0}
3028
run: |

‎extra_tests/regression_checks.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"polarized_evol": 34,
3131
"t0theoryid": 100,
3232
"no_t0_sampling": 430,
33+
"hyperopt_sampling": 4,
3334
}
3435

3536

‎extra_tests/regression_fits/central_16.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,6 @@
6868
4.779973403498672e-05,
6969
0.46639937162399386,
7070
0.006792142638006371
71-
]
71+
],
72+
"hyperparameters": "from runcard"
7273
}

‎extra_tests/regression_fits/feature_scaling_81.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,6 @@
6868
2.446863373944952e-05,
6969
0.05534580023959301,
7070
0.010789581050630881
71-
]
71+
],
72+
"hyperparameters": "from runcard"
7273
}

‎extra_tests/regression_fits/flavour_29.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,6 @@
6868
0.08181699179112917,
6969
0.10192120075225847,
7070
0.5177502781152727
71-
]
71+
],
72+
"hyperparameters": "from runcard"
7273
}

‎extra_tests/regression_fits/hyperopt_sampling.yml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
#
2+
# Configuration file for n3fit regression tests
3+
# This runcard includes two DIS datasets, one Hadronic dataset
4+
# and two positivity datasets
5+
#
6+
7+
############################################################
8+
description: n3fit regression test for hyperotp sampling in NNPDF4.1
9+
10+
############################################################
11+
# frac: training fraction
12+
# ewk: apply ewk k-factors
13+
# sys: systematics treatment (see systypes)
14+
dataset_inputs:
15+
- {dataset: NMC_NC_NOTFIXED_P_EM-SIGMARED, variant: legacy}
16+
- {dataset: SLAC_NC_NOTFIXED_P_EM-F2, variant: legacy_dw}
17+
- {dataset: CMS_Z0J_8TEV_PT-Y}
18+
- {dataset: ATLAS_TTBAR_8TEV_TOT_X-SEC}
19+
############################################################
20+
datacuts:
21+
t0pdfset: NNPDF40_nnlo_as_01180 # PDF set to generate t0 covmat
22+
q2min : 3.49 # Q2 minimum
23+
w2min : 12.5 # W2 minimum
24+
25+
############################################################
26+
theory:
27+
theoryid: 41_000_000 # database id
28+
29+
############################################################
30+
genrep: False # on = generate MC replicas, False = use real data
31+
trvlseed: 3
32+
nnseed: 2
33+
mcseed: 1
34+
35+
36+
trial_specs:
37+
hyperscan: 260204-jcm-hyperopt
38+
thermalization: 400
39+
number_of_trials: 10
40+
41+
parameters: # This defines the parameter dictionary that is passed to the Model Trainer
42+
positivity:
43+
multiplier: 1.05
44+
initial: 1.5
45+
threshold_chi2: 10.0
46+
feature_scaling_points: 5
47+
48+
fitting:
49+
fitbasis: CCBAR_ASYMM # EVOL (7), EVOLQED (8), etc.
50+
savepseudodata: False
51+
basis:
52+
- {fl: sng, trainable: false, smallx: [1.058, 1.155]}
53+
- {fl: g, trainable: false, smallx: [0.9017, 1.084]}
54+
- {fl: v, trainable: false, smallx: [0.481, 0.6499]}
55+
- {fl: v3, trainable: false, smallx: [0.08225, 0.502]}
56+
- {fl: v8, trainable: false, smallx: [0.5823, 0.7928]}
57+
- {fl: t3, trainable: false, smallx: [-0.3987, 0.9689]}
58+
- {fl: t8, trainable: false, smallx: [0.6077, 0.9459]}
59+
- {fl: t15, trainable: false, smallx: [1.023, 1.147]}
60+
- {fl: v15, trainable: false, smallx: [0.5005, 0.7189]}
61+
62+
############################################################
63+
positivity:
64+
posdatasets:
65+
- {dataset: NNPDF_POS_2P24GEV_F2U, maxlambda: 1e6}
66+
- {dataset: NNPDF_POS_2P24GEV_DYS, maxlambda: 1e5}
67+
68+
integrability:
69+
integdatasets:
70+
- {dataset: NNPDF_INTEG_3GEV_XT8, maxlambda: 1e2}
71+
72+
############################################################
73+
debug: true
74+
double_precision: false

‎extra_tests/regression_fits/hyperopt_sampling_4.exportgrid‎

Lines changed: 635 additions & 0 deletions
Large diffs are not rendered by default.

‎extra_tests/regression_fits/hyperopt_sampling_4.json‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
{
2+
"preprocessing": [
3+
{
4+
"fl": "sng",
5+
"smallx": 1.1070080995559692,
6+
"largex": 0.0,
7+
"trainable": false
8+
},
9+
{
10+
"fl": "g",
11+
"smallx": 1.0574088096618652,
12+
"largex": 0.0,
13+
"trainable": false
14+
},
15+
{
16+
"fl": "v",
17+
"smallx": 0.5285826325416565,
18+
"largex": 0.0,
19+
"trainable": false
20+
},
21+
{
22+
"fl": "v3",
23+
"smallx": 0.46124693751335144,
24+
"largex": 0.0,
25+
"trainable": false
26+
},
27+
{
28+
"fl": "v8",
29+
"smallx": 0.7556604743003845,
30+
"largex": 0.0,
31+
"trainable": false
32+
},
33+
{
34+
"fl": "t3",
35+
"smallx": 0.7078039646148682,
36+
"largex": 0.0,
37+
"trainable": false
38+
},
39+
{
40+
"fl": "t8",
41+
"smallx": 0.6369834542274475,
42+
"largex": 0.0,
43+
"trainable": false
44+
},
45+
{
46+
"fl": "t15",
47+
"smallx": 1.1202620267868042,
48+
"largex": 0.0,
49+
"trainable": false
50+
},
51+
{
52+
"fl": "v15",
53+
"smallx": 0.5717487931251526,
54+
"largex": 0.0,
55+
"trainable": false
56+
}
57+
],
58+
"stop_epoch": 15700,
59+
"best_epoch": 11809,
60+
"erf_tr": 1.5522006750106812,
61+
"erf_vl": 0.8228918313980103,
62+
"chi2": 1.3685028535082824,
63+
"pos_state": "POS_PASS",
64+
"arc_lengths": [
65+
2.523857734518874,
66+
1.101830505438013,
67+
5.354887791586663,
68+
1.002221739520188,
69+
1.0815427015576187
70+
],
71+
"integrability": [
72+
0.02235139708500272,
73+
0.036644561681897336,
74+
0.0004369386006155551,
75+
0.02273471909575253,
76+
0.04385659284889787
77+
],
78+
"hyperparameters": {
79+
"optimizer": "Adam",
80+
"learning_rate": 0.007521481879943997,
81+
"clipnorm": 2.7161295780819e-05,
82+
"epochs": 15756,
83+
"stopping_patience": 0.4200000000000001,
84+
"initial": 15.789743720813016,
85+
"nodes_per_layer": [
86+
30,
87+
40,
88+
15,
89+
52,
90+
9
91+
],
92+
"number_of_layers": 4,
93+
"activation": "sigmoid",
94+
"layer_type": "dense",
95+
"initializer": "glorot_normal",
96+
"dropout": 0.0
97+
}
98+
}

‎extra_tests/regression_fits/no_csr_613.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,6 @@
7474
1.8668532221099987e-05,
7575
0.0024789599992791622,
7676
0.018115404061971763
77-
]
77+
],
78+
"hyperparameters": "from runcard"
7879
}

0 commit comments

Comments
 (0)