Skip to content

Commit 14ef816

Browse files
enoceraenocera
committed
Fixed cnflicts - returned to square of the mass
2 parents adf38e8 + d775d15 commit 14ef816

File tree

84 files changed

+2316
-1652
lines changed

Some content is hidden

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

84 files changed

+2316
-1652
lines changed

‎.github/workflows/all_tests_nnpdf.yml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
matrix:
2323
os: [ubuntu-latest, macos-14]
24-
python-version: ["3.9", "3.12"]
24+
python-version: ["3.10", "3.13"]
2525
include:
2626
- os: ubuntu-latest
2727
CONDA_OS: linux-64
@@ -37,7 +37,7 @@ jobs:
3737
run: |
3838
pytest --cov=${PWD} --cov-config=pyproject.toml --mpl --pyargs validphys n3fit --mpl-default-tolerance 18
3939
- name: Keep coverage file
40-
if: startsWith(matrix.python-version, '3.12')
40+
if: startsWith(matrix.python-version, '3.13')
4141
uses: actions/upload-artifact@v4
4242
with:
4343
include-hidden-files: true
@@ -74,7 +74,7 @@ jobs:
7474
fetch-depth: 0
7575
- uses: ./.github/actions/prepare_environment
7676
with:
77-
python-version: "3.12"
77+
python-version: "3.13"
7878
- name: Build recipe
7979
shell: bash -l {0}
8080
run: |
@@ -96,7 +96,7 @@ jobs:
9696
- uses: actions/checkout@v4
9797
- uses: actions/setup-python@v5
9898
with:
99-
python-version: "3.12"
99+
python-version: "3.13"
100100
- name: Install nnpdf without LHAPDF
101101
shell: bash -l {0}
102102
run: |
@@ -109,6 +109,13 @@ jobs:
109109
cd n3fit/runcards/examples
110110
n3fit Basic_runcard.yml 4
111111
cat Basic_runcard/nnfit/*/Basic_runcard.json
112+
- name: Test we can still run postfit
113+
shell: bash -l {0}
114+
run: |
115+
output=$(vp-get fit NNPDF40_nnlo_like_CI_testing_250616)
116+
fit_path=$(echo $output | grep -o "PosixPath('.*')" | cut -d"'" -f2)
117+
mv ${fit_path} .
118+
postfit 50 NNPDF40_nnlo_like_CI_testing_250616
112119
113120
run_jax:
114121
runs-on: ubuntu-latest
@@ -118,7 +125,7 @@ jobs:
118125
- uses: actions/checkout@v4
119126
- uses: actions/setup-python@v5
120127
with:
121-
python-version: "3.12"
128+
python-version: "3.13"
122129
- name: Install nnpdf without LHAPDF
123130
shell: bash -l {0}
124131
run: |
@@ -132,7 +139,6 @@ jobs:
132139
n3fit Basic_runcard.yml 42
133140
cat Basic_runcard/nnfit/*/Basic_runcard.json
134141
135-
136142
full_coverage:
137143
needs: [run_package_tests, regression_tests]
138144
runs-on: ubuntu-latest

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# See https://pre-commit.com/hooks.html for more hooks
33
repos:
44
- repo: https://github.com/pre-commit/pre-commit-hooks
5-
rev: 'v5.0.0'
5+
rev: 'v6.0.0'
66
hooks:
77
- id: check-merge-conflict
88
- id: check-toml

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
[![Docs](https://github.com/NNPDF/nnpdf/actions/workflows/upload_docs.yml/badge.svg)](https://github.com/NNPDF/nnpdf/actions/workflows/upload_docs.yml)
77
[![Commondata](https://github.com/NNPDF/nnpdf/actions/workflows/check_newcd.yml/badge.svg)](https://github.com/NNPDF/nnpdf/actions/workflows/check_newcd.yml)
88

9+
[![EPJC](https://img.shields.io/badge/Eur.Phys.J.C-81%20(2021)%2010-958?color=%231A43BF)](https://link.springer.com/article/10.1140/epjc/s10052-021-09747-9)
910
[![DOI](https://zenodo.org/badge/118135201.svg)](https://zenodo.org/badge/latestdoi/118135201)
11+
[![HSF](https://hepsoftwarefoundation.org/images/HSF-logo/HSF-Affiliated.svg)](https://hepsoftwarefoundation.org/projects/projects)
1012

1113
# NNPDF: An open-source machine learning framework for global analyses of parton distributions
1214

‎n3fit/runcards/example-nnpdf41.yml‎

Lines changed: 190 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
1+
#
2+
# Configuration file for n3fit
3+
#
4+
######################################################################################
5+
description: Starting runcard for the NNPDF4.1 series of fits. Work In Progress
6+
7+
######################################################################################
8+
dataset_inputs:
9+
- {dataset: NMC_NC_NOTFIXED_EM-F2, frac: 0.75, variant: legacy_dw}
10+
- {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}
12+
- {dataset: SLAC_NC_NOTFIXED_D_EM-F2, frac: 0.75, variant: legacy_dw}
13+
- {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}
15+
- {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}
18+
- {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}
20+
- {dataset: HERA_NC_225GEV_EP-SIGMARED, frac: 0.75}
21+
- {dataset: HERA_NC_251GEV_EP-SIGMARED, frac: 0.75}
22+
- {dataset: HERA_NC_300GEV_EP-SIGMARED, frac: 0.75}
23+
- {dataset: HERA_NC_318GEV_EP-SIGMARED, frac: 0.75}
24+
- {dataset: HERA_CC_318GEV_EM-SIGMARED, frac: 0.75}
25+
- {dataset: HERA_CC_318GEV_EP-SIGMARED, frac: 0.75}
26+
- {dataset: HERA_NC_318GEV_EAVG_CHARM-SIGMARED, frac: 0.75}
27+
- {dataset: HERA_NC_318GEV_EAVG_BOTTOM-SIGMARED, frac: 0.75}
28+
- {dataset: DYE866_Z0_800GEV_DW_RATIO_PDXSECRATIO, frac: 0.75}
29+
- {dataset: DYE866_Z0_800GEV_PXSEC, frac: 0.75}
30+
- {dataset: DYE605_Z0_38P8GEV_DW_PXSEC, frac: 0.75}
31+
# - {dataset: DYE906_Z0_120GEV_DW_PDXSECRATIO, frac: 0.75}
32+
- {dataset: CDF_Z0_1P96TEV_ZRAP, frac: 0.75}
33+
- {dataset: D0_Z0_1P96TEV_ZRAP, frac: 0.75}
34+
- {dataset: D0_WPWM_1P96TEV_ASY, frac: 0.75}
35+
- {dataset: ATLAS_WPWM_7TEV_36PB_ETA, frac: 0.75}
36+
- {dataset: ATLAS_Z0_7TEV_36PB_ETA, frac: 0.75}
37+
- {dataset: ATLAS_Z0_7TEV_49FB_HIMASS, frac: 0.75}
38+
- {dataset: ATLAS_Z0_7TEV_LOMASS_M, frac: 0.75}
39+
- {dataset: ATLAS_WPWM_7TEV_46FB_CC-ETA, frac: 0.75}
40+
- {dataset: ATLAS_Z0_7TEV_46FB_CC-Y, frac: 0.75}
41+
- {dataset: ATLAS_Z0_7TEV_46FB_CF-Y, frac: 0.75}
42+
- {dataset: ATLAS_Z0_8TEV_HIMASS_M-Y, frac: 0.75}
43+
# - {dataset: ATLAS_Z0_8TEV_LOWMASS_M-Y, frac: 0.75, variant: legacy}
44+
- {dataset: ATLAS_Z0_13TEV_TOT, frac: 0.75, cfac: [NRM]}
45+
- {dataset: ATLAS_WPWM_13TEV_TOT, frac: 0.75, cfac: [NRM]}
46+
- {dataset: ATLAS_WJ_8TEV_WP-PT, frac: 0.75}
47+
- {dataset: ATLAS_WJ_8TEV_WM-PT, frac: 0.75}
48+
- {dataset: ATLAS_Z0J_8TEV_PT-M, frac: 0.75}
49+
- {dataset: ATLAS_Z0J_8TEV_PT-Y, frac: 0.75}
50+
- {dataset: ATLAS_TTBAR_7TEV_TOT_X-SEC, frac: 0.75}
51+
- {dataset: ATLAS_TTBAR_8TEV_TOT_X-SEC, frac: 0.75}
52+
- {dataset: ATLAS_TTBAR_13TEV_TOT_X-SEC, frac: 0.75}
53+
- {dataset: ATLAS_TTBAR_8TEV_LJ_DIF_YT-NORM, frac: 0.75}
54+
- {dataset: ATLAS_TTBAR_8TEV_LJ_DIF_YTTBAR-NORM, frac: 0.75}
55+
- {dataset: ATLAS_TTBAR_8TEV_2L_DIF_YTTBAR-NORM, frac: 0.75}
56+
- {dataset: ATLAS_1JET_8TEV_R06_PTY, frac: 0.75, variant: legacy_data}
57+
- {dataset: ATLAS_2JET_7TEV_R06_M12Y, frac: 0.75}
58+
- {dataset: ATLAS_PH_13TEV_XSEC, frac: 0.75, cfac: [EWK]}
59+
- {dataset: ATLAS_SINGLETOP_7TEV_TCHANNEL-XSEC, frac: 0.75}
60+
- {dataset: ATLAS_SINGLETOP_13TEV_TCHANNEL-XSEC, frac: 0.75}
61+
- {dataset: ATLAS_SINGLETOP_7TEV_T-Y-NORM, frac: 0.75}
62+
- {dataset: ATLAS_SINGLETOP_7TEV_TBAR-Y-NORM, frac: 0.75}
63+
- {dataset: ATLAS_SINGLETOP_8TEV_T-RAP-NORM, frac: 0.75}
64+
- {dataset: ATLAS_SINGLETOP_8TEV_TBAR-RAP-NORM, frac: 0.75}
65+
- {dataset: CMS_WPWM_7TEV_ELECTRON_ASY, frac: 0.75}
66+
- {dataset: CMS_WPWM_7TEV_MUON_ASY, frac: 0.75}
67+
- {dataset: CMS_Z0_7TEV_DIMUON_2D, frac: 0.75}
68+
- {dataset: CMS_WPWM_8TEV_MUON_Y, frac: 0.75}
69+
- {dataset: CMS_Z0J_8TEV_PT-Y, frac: 0.75, cfac: [NRM]}
70+
- {dataset: CMS_2JET_7TEV_M12-Y, frac: 0.75}
71+
- {dataset: CMS_1JET_8TEV_PTY, frac: 0.75, variant: legacy_data}
72+
- {dataset: CMS_TTBAR_7TEV_TOT_X-SEC, frac: 0.75}
73+
- {dataset: CMS_TTBAR_8TEV_TOT_X-SEC, frac: 0.75}
74+
- {dataset: CMS_TTBAR_13TEV_TOT_X-SEC, frac: 0.75}
75+
- {dataset: CMS_TTBAR_8TEV_LJ_DIF_YTTBAR-NORM, frac: 0.75}
76+
- {dataset: CMS_TTBAR_5TEV_TOT_X-SEC, frac: 0.75}
77+
- {dataset: CMS_TTBAR_8TEV_2L_DIF_MTTBAR-YT-NORM, frac: 0.75}
78+
- {dataset: CMS_TTBAR_13TEV_2L_DIF_YT, frac: 0.75}
79+
- {dataset: CMS_TTBAR_13TEV_LJ_DIF_YT, frac: 0.75}
80+
- {dataset: CMS_SINGLETOP_7TEV_TCHANNEL-XSEC, frac: 0.75}
81+
- {dataset: CMS_SINGLETOP_8TEV_TCHANNEL-XSEC, frac: 0.75}
82+
- {dataset: CMS_SINGLETOP_13TEV_TCHANNEL-XSEC, frac: 0.75}
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}
90+
- {dataset: LHCB_Z0_13TEV_DIELECTRON-Y, frac: 0.75}
91+
92+
93+
################################################################################
94+
datacuts:
95+
t0pdfset: 250917-jcm-001
96+
q2min: 3.49
97+
w2min: 12.5
98+
theory:
99+
theoryid: 41_000_000
100+
101+
trvlseed: 1953065998
102+
nnseed: 1589400026
103+
mcseed: 2135943670
104+
genrep: true
105+
parameters: # This defines the parameter dictionary that is passed to the Model Trainer
106+
nodes_per_layer: [70, 50, 25, 20, 9]
107+
activation_per_layer: [tanh, tanh, tanh, tanh, linear]
108+
initializer: glorot_normal
109+
optimizer:
110+
clipnorm: 6.073e-6
111+
learning_rate: 2.621e-3
112+
optimizer_name: Nadam
113+
epochs: 27000
114+
positivity:
115+
initial: 184.8
116+
multiplier:
117+
integrability:
118+
initial: 10
119+
multiplier:
120+
stopping_patience: 0.1
121+
layer_type: dense
122+
dropout: 0.0
123+
threshold_chi2: 3.5
124+
interpolation_points: 5
125+
fitting:
126+
fitbasis: CCBAR_ASYMM # EVOL (7), EVOLQED (8), etc.
127+
savepseudodata: true
128+
basis:
129+
- {fl: sng, trainable: false, smallx: [1.103, 1.12], largex: [1.461, 3.778]}
130+
- {fl: g, trainable: false, smallx: [0.8737, 1.088], largex: [2.204, 4.431]}
131+
- {fl: v, trainable: false, smallx: [0.5051, 0.6847], largex: [1.526, 2.557]}
132+
- {fl: v3, trainable: false, smallx: [0.1932, 0.4309], largex: [1.73, 2.559]}
133+
- {fl: v8, trainable: false, smallx: [0.5645, 0.7228], largex: [1.566, 2.662]}
134+
- {fl: t3, trainable: false, smallx: [-0.4244, 1.0], largex: [1.75, 2.939]}
135+
- {fl: t8, trainable: false, smallx: [0.6677, 0.9282], largex: [1.55, 3.504]}
136+
- {fl: t15, trainable: false, smallx: [1.087, 1.136], largex: [1.503, 3.379]}
137+
- {fl: v15, trainable: false, smallx: [0.4713, 0.7641], largex: [1.464, 3.851]}
138+
139+
################################################################################
140+
positivity:
141+
posdatasets:
142+
# Positivity Lagrange Multiplier
143+
- {dataset: NNPDF_POS_2P24GEV_F2U, maxlambda: 1e6}
144+
- {dataset: NNPDF_POS_2P24GEV_F2D, maxlambda: 1e6}
145+
- {dataset: NNPDF_POS_2P24GEV_F2S, maxlambda: 1e6}
146+
- {dataset: NNPDF_POS_2P24GEV_FLL, maxlambda: 1e6}
147+
- {dataset: NNPDF_POS_2P24GEV_DYU, maxlambda: 1e10}
148+
- {dataset: NNPDF_POS_2P24GEV_DYD, maxlambda: 1e10}
149+
- {dataset: NNPDF_POS_2P24GEV_DYS, maxlambda: 1e10}
150+
- {dataset: NNPDF_POS_2P24GEV_F2C-CCE, maxlambda: 1e6}
151+
- {dataset: NNPDF_POS_2P24GEV_F2C-CCP, maxlambda: 1e6}
152+
# Positivity of MSbar PDFs
153+
- {dataset: NNPDF_POS_2P24GEV_XUQ, maxlambda: 1e6}
154+
- {dataset: NNPDF_POS_2P24GEV_XUB, maxlambda: 1e6}
155+
- {dataset: NNPDF_POS_2P24GEV_XDQ, maxlambda: 1e6}
156+
- {dataset: NNPDF_POS_2P24GEV_XDB, maxlambda: 1e6}
157+
- {dataset: NNPDF_POS_2P24GEV_XSQ, maxlambda: 1e6}
158+
- {dataset: NNPDF_POS_2P24GEV_XSB, maxlambda: 1e6}
159+
- {dataset: NNPDF_POS_2P24GEV_XGL, maxlambda: 1e6}
160+
161+
added_filter_rules:
162+
- dataset: NNPDF_POS_2P24GEV_FLL
163+
rule: x > 5.0e-7
164+
- dataset: NNPDF_POS_2P24GEV_F2C-CCE
165+
rule: x < 0.74
166+
- dataset: NNPDF_POS_2P24GEV_F2C-CCP
167+
rule: x < 0.74
168+
- dataset: NNPDF_POS_2P24GEV_XGL
169+
rule: x > 0.1
170+
- dataset: NNPDF_POS_2P24GEV_XUQ
171+
rule: x > 0.1
172+
- dataset: NNPDF_POS_2P24GEV_XUB
173+
rule: x > 0.1
174+
- dataset: NNPDF_POS_2P24GEV_XDQ
175+
rule: x > 0.1
176+
- dataset: NNPDF_POS_2P24GEV_XDB
177+
rule: x > 0.1
178+
- dataset: NNPDF_POS_2P24GEV_XSQ
179+
rule: x > 0.1
180+
- dataset: NNPDF_POS_2P24GEV_XSB
181+
rule: x > 0.1
182+
183+
integrability:
184+
integdatasets:
185+
- {dataset: NNPDF_INTEG_3GEV_XT8, maxlambda: 1e2}
186+
- {dataset: NNPDF_INTEG_3GEV_XT3, maxlambda: 1e2}
187+
188+
################################################################################
189+
debug: false
190+
maxcores: 16

‎n3fit/runcards/examples/Basic_feature_scaling.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ description: Basic feature scaling
1111
dataset_inputs:
1212
- {dataset: SLAC_NC_NOTFIXED_D_EM-F2, frac: 0.75, variant: legacy_dw}
1313
- {dataset: NMC_NC_NOTFIXED_EM-F2, frac: 0.75, variant: legacy_dw}
14-
- {dataset: CMS_1JET_8TEV_PTY, frac: 0.75, cfac: [], variant: legacy}
14+
- {dataset: CMS_1JET_8TEV_PTY, frac: 0.75, cfac: [], variant: legacy_data}
1515

1616
############################################################
1717
datacuts:
@@ -21,7 +21,7 @@ datacuts:
2121

2222
############################################################
2323
theory:
24-
theoryid: 708 # database id
24+
theoryid: 41_000_000 # database id
2525

2626
############################################################
2727
trvlseed: 1
@@ -75,7 +75,7 @@ fitting:
7575
positivity:
7676
posdatasets:
7777
- {dataset: NNPDF_POS_2P24GEV_F2U, maxlambda: 1e6} # Positivity Lagrange Multiplier
78-
- {dataset: NNPDF_POS_2P24GEV_FLL-19PTS, maxlambda: 1e6}
78+
- {dataset: NNPDF_POS_2P24GEV_FLL, maxlambda: 1e6}
7979

8080
############################################################
8181
integrability:

‎n3fit/runcards/examples/Basic_hyperopt.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ datacuts:
3838

3939
############################################################
4040
theory:
41-
theoryid: 708 # database id
41+
theoryid: 40_000_000 # database id
4242

4343
############################################################
4444
hyperscan_config:

‎n3fit/runcards/examples/Basic_runcard.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Configuration file for n3fit
33
#
44
############################################################
5-
description: Basic runcard
5+
description: Basic runcard with extra options such as debugging and tensorboard
66

77
############################################################
88
# frac: training fraction
@@ -11,7 +11,7 @@ description: Basic runcard
1111
dataset_inputs:
1212
- {dataset: NMC_NC_NOTFIXED_EM-F2, frac: 0.75, variant: legacy_dw}
1313
- {dataset: SLAC_NC_NOTFIXED_D_EM-F2, frac: 0.75, variant: legacy_dw}
14-
- {dataset: ATLAS_Z0J_8TEV_PT-M, frac: 0.75, cfac: [], variant: legacy_10}
14+
- {dataset: ATLAS_Z0J_8TEV_PT-M, frac: 0.75 }
1515

1616
############################################################
1717
datacuts:
@@ -21,7 +21,7 @@ datacuts:
2121

2222
############################################################
2323
theory:
24-
theoryid: 708 # database id
24+
theoryid: 41_000_000 # database id
2525

2626
parameters: # This defines the parameter dictionary that is passed to the Model Trainer
2727
nodes_per_layer: [15, 10, 8]
@@ -68,7 +68,7 @@ fitting:
6868
positivity:
6969
posdatasets:
7070
- {dataset: NNPDF_POS_2P24GEV_F2U, maxlambda: 1e6} # Positivity Lagrange Multiplier
71-
- {dataset: NNPDF_POS_2P24GEV_FLL-19PTS, maxlambda: 1e6}
71+
- {dataset: NNPDF_POS_2P24GEV_FLL, maxlambda: 1e6}
7272
- {dataset: NNPDF_POS_2P24GEV_XGL, maxlambda: 1e6}
7373

7474
############################################################

0 commit comments

Comments
 (0)