Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
f19afbc
begin sia implementation
t7phy Apr 3, 2025
346e31c
belle metadata
t7phy Apr 3, 2025
2fe74ed
separate sia process by hadron
t7phy Apr 4, 2025
a02b17a
separate sia process by hadron
t7phy Apr 4, 2025
4a591aa
add babar data and improve naming
t7phy Apr 4, 2025
d479658
add TPC data
t7phy Apr 4, 2025
c7be674
add topaz data
t7phy Apr 4, 2025
e993680
add aleph data
t7phy Apr 4, 2025
7f12cf3
add opal data
t7phy Apr 4, 2025
5762883
improve naming
t7phy Apr 4, 2025
40099b5
add sld data
t7phy Apr 4, 2025
3205f83
add delphi data
t7phy Apr 4, 2025
5bf511a
add tasso 12 and 30 data
t7phy Apr 4, 2025
4122188
add tasso 14 and 22 data
t7phy Apr 4, 2025
b9b183c
add tasso 34 and 44 data
t7phy Apr 4, 2025
a4aafd4
aleph pi impl
t7phy Apr 25, 2025
6c50d04
aleph ka impl
t7phy Apr 26, 2025
d8f6bfb
aleph pro impl
t7phy Apr 26, 2025
1d9a170
aleph metadata fixes
t7phy Apr 27, 2025
8df1044
add babar pi impl
t7phy Apr 27, 2025
5e3e0d3
babar ka impl
t7phy Apr 27, 2025
30e1111
babr pro impl
t7phy Apr 27, 2025
accb325
belle pi impl
t7phy Apr 28, 2025
7955a6d
belle ka impl
t7phy Apr 28, 2025
ad7b383
tpc all impl
t7phy Apr 29, 2025
232177e
topaz all impl
t7phy Apr 29, 2025
dc641c1
delphi pi impl
t7phy May 1, 2025
ee1fc0c
delphi ka impl
t7phy May 1, 2025
1b9f9f8
delphi pro impl
t7phy May 1, 2025
a224e65
opal pi impl
t7phy May 1, 2025
67ac0a4
opal ka impl
t7phy May 1, 2025
a2872a0
opal pro impl
t7phy May 1, 2025
de9327a
sld pi impl
t7phy May 3, 2025
8ab0afb
sld ka impl
t7phy May 3, 2025
a87d6fb
sld pro impl
t7phy May 3, 2025
c4da87c
tasso all 34 and 44 gev impl
t7phy May 3, 2025
b9f17d7
metadata fixes 1
t7phy May 5, 2025
501e6f8
metadata fixes 2
t7phy May 5, 2025
18c5ef8
metadata fixes 3
t7phy May 5, 2025
edf8170
tasso partial metadata
t7phy May 5, 2025
9be64c6
add sia vars to process_options
t7phy May 5, 2025
4dfb1d9
tasso pi 12 gev impl
t7phy May 7, 2025
bd8c151
tasso ka 12 gev impl
t7phy May 7, 2025
80f318b
tasso pro 12 gev impl
t7phy May 7, 2025
c45e308
tasso pi 30 gev impl
t7phy May 7, 2025
652c872
tasso ka 30 gev impl
t7phy May 7, 2025
9e56f9b
tasso pro 30 gev impl
t7phy May 7, 2025
f093685
tasso pi 14 gev impl
t7phy May 7, 2025
3e1080d
tasso ka 14 gev impl
t7phy May 7, 2025
2517802
tasso pro 14 gev impl
t7phy May 7, 2025
44b9b88
tasso pi 22 gev impl
t7phy May 7, 2025
bee05cf
tasso ka 22 gev impl
t7phy May 7, 2025
51f5105
tasso pro 22 gev impl
t7phy May 7, 2025
1d3d991
unc treatment and type fixes
t7phy May 7, 2025
b5f1f14
tasso metadata 1
t7phy May 8, 2025
1efa90d
tasso metadata 2
t7phy May 8, 2025
b64ce5e
tasso metadata 3
t7phy May 8, 2025
b7acf5d
attempt test fix
t7phy May 8, 2025
f61c372
attempt 2nd test fix
t7phy May 8, 2025
9744a28
rename old belle datatsets
t7phy May 8, 2025
ccf631c
belle new pi impl
t7phy May 8, 2025
1804979
belle new ka impl
t7phy May 8, 2025
4b0a2ca
belle new pro impl
t7phy May 8, 2025
48ed2a5
fix failing test
t7phy May 8, 2025
0954325
fix ndata
t7phy May 8, 2025
75149d9
black and isort
t7phy Jul 29, 2025
4453d92
bes3 kam
t7phy Jul 29, 2025
5c10457
rm hepdata
t7phy Jul 29, 2025
042e70b
bes3 kap
t7phy Jul 29, 2025
f4a4f51
bes3 pim
t7phy Jul 29, 2025
5eaa80a
bes3 pip
t7phy Jul 29, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
data_central:
- 12.4
- 13.27
- 15.33
- 17.43
- 18.33
- 19.62
- 20.02
- 21.66
- 25.84
- 27.46
- 27.63
- 10.6
- 9.53
- 9.15
- 8.41
- 7.96
- 7.26
- 6.34
- 5.63
- 4.94
- 4.39
- 4.22
- 3.63
- 3.1
- 2.245
- 1.538
- 0.841
- 0.2936
- 0.0596
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
from filter_core import magic
import yaml

table = "rawdata/Table2.yaml"
ndat = 29
var_name = 'xp'

data, kin, err = magic(table, ndat, var_name)

with open('data.yaml', 'w') as f:
yaml.dump(data, f, sort_keys=False)
with open('kinematics.yaml', 'w') as f:
yaml.dump(kin, f, sort_keys=False)
with open('uncertainties.yaml', 'w') as f:
yaml.dump(err, f, sort_keys=False)
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import yaml

from nnpdf_data.filter_utils.utils import percentage_to_absolute as pta
from nnpdf_data.filter_utils.utils import prettify_float

yaml.add_representer(float, prettify_float)


def magic(table, ndat, var_name):
with open(table, 'r') as f:
input = yaml.safe_load(f)

data_central = []
kin = []
error = []

values = input['dependent_variables'][0]['values']

for i in range(ndat):
kin_min = input['independent_variables'][0]['values'][i]['low']
kin_max = input['independent_variables'][0]['values'][i]['high']
if 'value' in input['independent_variables'][0]['values'][i]:
kin_mid = input['independent_variables'][0]['values'][i]['value']
else:
kin_mid = (kin_min + kin_max) / 2

kin_value = {var_name: {'min': kin_min, 'mid': kin_mid, 'max': kin_max}}

data_central_value = values[i]['value']
error_value = {}
error_value['stat'] = values[i]['errors'][0]['symerror']
error_value['sys'] = values[i]['errors'][1]['symerror']
if i < 8:
error_value['sys_norm'] = pta(5, data_central_value)
else:
error_value['sys_norm'] = pta(3, data_central_value)

kin.append(kin_value)
data_central.append(data_central_value)
error.append(error_value)

error_definition = {}
error_definition['stat'] = {
'definition': 'statistical uncertainty',
'treatment': 'ADD',
'type': 'UNCORR',
}
error_definition['sys'] = {
'definition': 'systematic uncertainty',
'treatment': 'ADD',
'type': 'UNCORR',
}
error_definition['sys_norm'] = {
'definition': 'systematic uncertainty (normalization)',
'treatment': 'MULT',
'type': 'CORR',
}

data_central_yaml = {'data_central': data_central}
kin_yaml = {'bins': kin}
uncertainties_yaml = {'definitions': error_definition, 'bins': error}

return data_central_yaml, kin_yaml, uncertainties_yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
bins:
- xp:
min: 0.0055
mid: 0.00574
max: 0.006
- xp:
min: 0.006
mid: 0.00622
max: 0.0065
- xp:
min: 0.0065
mid: 0.00673
max: 0.007
- xp:
min: 0.007
mid: 0.00722
max: 0.0075
- xp:
min: 0.0075
mid: 0.00773
max: 0.008
- xp:
min: 0.008
mid: 0.00822
max: 0.0085
- xp:
min: 0.0085
mid: 0.00871
max: 0.009
- xp:
min: 0.009
mid: 0.00922
max: 0.0095
- xp:
min: 0.013
mid: 0.0135
max: 0.014
- xp:
min: 0.014
mid: 0.0147
max: 0.016
- xp:
min: 0.016
mid: 0.0167
max: 0.018
- xp:
min: 0.07
mid: 0.0719
max: 0.075
- xp:
min: 0.075
mid: 0.0769
max: 0.08
- xp:
min: 0.08
mid: 0.0819
max: 0.085
- xp:
min: 0.085
mid: 0.087
max: 0.09
- xp:
min: 0.09
mid: 0.0942
max: 0.1
- xp:
min: 0.1
mid: 0.104
max: 0.11
- xp:
min: 0.11
mid: 0.114
max: 0.12
- xp:
min: 0.12
mid: 0.124
max: 0.13
- xp:
min: 0.13
mid: 0.134
max: 0.14
- xp:
min: 0.14
mid: 0.144
max: 0.15
- xp:
min: 0.15
mid: 0.154
max: 0.16
- xp:
min: 0.16
mid: 0.169
max: 0.18
- xp:
min: 0.18
mid: 0.189
max: 0.2
- xp:
min: 0.2
mid: 0.222
max: 0.25
- xp:
min: 0.25
mid: 0.272
max: 0.3
- xp:
min: 0.3
mid: 0.342
max: 0.4
- xp:
min: 0.4
mid: 0.476
max: 0.6
- xp:
min: 0.6
mid: 0.674
max: 0.8
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
setname: 'ALEPH_SIA-KA_91P2GEV_EE-KASUM'

nnpdf_metadata:
nnpdf31_process: "SIA-KA"
experiment: "ALEPH"

arXiv:
url: "N/A"
iNSPIRE:
url: "https://inspirehep.net/literature/382179"
hepdata:
url: "https://www.hepdata.net/record/ins382179"
version: 1

version: 1
version_comment: "Initial implementation"

implemented_observables:

- observable: {description: "normalized x-sec differential wrt $x_p$", label: '$\frac{1}{\sigma_{tot}}\frac{d\sigma^h}{dx_p}$', units: ''}
observable_name: XP
process_type: SIA_XP
ndata: 29
tables: [2]
kinematics:
variables:
xp: {description: "hadron 3-momentum scaled to beam 3-momentum", label: '$x_p$', units: ''}
file: kinematics.yaml
data_central: data.yaml
data_uncertainties:
- uncertainties.yaml
kinematic_coverage: [xp]
plotting:
dataset_label: 'ALEPH SIA KA- + KA+ : $\frac{1}{\sigma_{tot}}\frac{d\sigma^h}{dx_p}$'
x_scale: log
plot_x: xp
y_label: '$\frac{1}{\sigma_{tot}}\frac{d\sigma^h}{dx_p}$'
# theory:
# FK_tables:
# - -
# operation: 'null'
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
definitions:
stat:
definition: statistical uncertainty
treatment: ADD
type: UNCORR
sys:
definition: systematic uncertainty
treatment: ADD
type: UNCORR
sys_norm:
definition: systematic uncertainty (normalization)
treatment: MULT
type: CORR
bins:
- stat: 1.12
sys: 0.01
sys_norm: 0.62
- stat: 0.91
sys: 0.01
sys_norm: 0.6635
- stat: 0.9
sys: 0.01
sys_norm: 7.66500000e-01
- stat: 0.92
sys: 0.02
sys_norm: 0.8715
- stat: 0.88
sys: 0.02
sys_norm: 0.9165
- stat: 0.9
sys: 0.02
sys_norm: 9.81000000e-01
- stat: 0.86
sys: 0.05
sys_norm: 1.001
- stat: 0.88
sys: 0.12
sys_norm: 1.083
- stat: 0.66
sys: 0.5
sys_norm: 0.7752
- stat: 0.47
sys: 0.68
sys_norm: 0.8238
- stat: 0.53
sys: 2.2
sys_norm: 0.8289
- stat: 0.3
sys: 1.28
sys_norm: 0.318
- stat: 0.26
sys: 0.98
sys_norm: 0.2859
- stat: 0.23
sys: 0.83
sys_norm: 0.2745
- stat: 0.21
sys: 0.71
sys_norm: 0.2523
- stat: 0.14
sys: 0.56
sys_norm: 2.38800000e-01
- stat: 0.13
sys: 0.47
sys_norm: 2.17800000e-01
- stat: 0.11
sys: 0.37
sys_norm: 0.1902
- stat: 0.11
sys: 0.32
sys_norm: 1.68900000e-01
- stat: 0.1
sys: 0.28
sys_norm: 0.1482
- stat: 0.09
sys: 0.24
sys_norm: 1.31700000e-01
- stat: 0.09
sys: 0.22
sys_norm: 0.1266
- stat: 0.06
sys: 0.18
sys_norm: 1.08900000e-01
- stat: 0.05
sys: 0.15
sys_norm: 9.30000000e-02
- stat: 0.029
sys: 0.109
sys_norm: 6.73500000e-02
- stat: 0.025
sys: 0.076
sys_norm: 0.04614
- stat: 0.013
sys: 0.043
sys_norm: 0.02523
- stat: 0.0053
sys: 0.0146
sys_norm: 0.008808
- stat: 0.0022
sys: 0.0031
sys_norm: 0.001788
Loading
Loading