Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Test implementation of new commondata format #1500

Closed
wants to merge 13 commits into from
Prev Previous commit
Next Next commit
Updated filter
  • Loading branch information
enocera authored and alecandido committed Feb 22, 2023
commit 3c55f9910f678517b1d7b0c19107767b92658944
15 changes: 15 additions & 0 deletions buildmaster/NMCPD/filter.py
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@ def filter_NMCPD():
data_central = []
kin = []
error = []
error_nuc = []

for i in tables:
hepdata_tables="rawdata/HEPData-ins426595-"+version+"-Table_"+str(i)+".yaml"
@@ -35,12 +36,20 @@ def filter_NMCPD():
error_value = {'stat_1': input['dependent_variables'][0]['values'][j]['errors'][0]['symerror'], 'syst_1': input['dependent_variables'][0]['values'][j]['errors'][1]['symerror']}
error.append(error_value)

error_value_nuc = {'nuclear': input['dependent_variables'][0]['values'][j]['errors'][0]['symerror']}
error_nuc.append(error_value_nuc)

error_definition = {'stat_1': {'description': "total statistical uncertainty", 'treatment': "ADD", 'type': "UNCORR"},
'syst_1': {'description': "total systematic uncertainty", 'treatment': "ADD", 'type': "CORR"}}

error_definition_dw = {'nuclear': {'description': "nuclear uncertainty (deweighted)", 'treatment': "ADD", 'type': "NUC_DW"}}
error_definition_sh = {'nuclear': {'description': "nuclear uncertainty (shifted)", 'treatment': "ADD", 'type': "NUC_SH"}}

data_central_yaml = { 'data_central' : data_central }
kinematics_yaml = { 'bins' : kin }
uncertainties_yaml = { 'definition': error_definition, 'bins' : error }
uncertainties_dw_yaml = { 'definition': error_definition_dw, 'bins' : error_nuc }
uncertainties_sh_yaml = { 'definition': error_definition_sh, 'bins' : error_nuc }

with open('data.yaml', 'w') as file:
yaml.dump(data_central_yaml, file, sort_keys=False)
@@ -50,5 +59,11 @@ def filter_NMCPD():

with open('uncertainties.yaml', 'w') as file:
yaml.dump(uncertainties_yaml, file, sort_keys=False)

with open('uncertainties_dw.yaml', 'w') as file:
yaml.dump(uncertainties_dw_yaml, file, sort_keys=False)

with open('uncertainties_sh.yaml', 'w') as file:
yaml.dump(uncertainties_sh_yaml, file, sort_keys=False)

filter_NMCPD()
Radonirinaunimi marked this conversation as resolved.
Show resolved Hide resolved
266 changes: 266 additions & 0 deletions buildmaster/NMCPD/uncertainties_dw.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,266 @@
definition:
nuclear:
description: nuclear uncertainty (deweighted)
treatment: ADD
type: NUC_DW
bins:
- nuclear: 0.0203
- nuclear: 0.0212
- nuclear: 0.0205
- nuclear: 0.0258
- nuclear: 0.0176
- nuclear: 0.0277
- nuclear: 0.0171
- nuclear: 0.0137
- nuclear: 0.0129
- nuclear: 0.0118
- nuclear: 0.0108
- nuclear: 0.0116
- nuclear: 0.0615
- nuclear: 0.025
- nuclear: 0.0208
- nuclear: 0.0172
- nuclear: 0.0092
- nuclear: 0.0157
- nuclear: 0.0137
- nuclear: 0.0128
- nuclear: 0.0098
- nuclear: 0.0547
- nuclear: 0.025
- nuclear: 0.0213
- nuclear: 0.018
- nuclear: 0.0091
- nuclear: 0.0083
- nuclear: 0.0088
- nuclear: 0.01
- nuclear: 0.0083
- nuclear: 0.0086
- nuclear: 0.0097
- nuclear: 0.0122
- nuclear: 0.0543
- nuclear: 0.032
- nuclear: 0.0233
- nuclear: 0.0205
- nuclear: 0.0127
- nuclear: 0.0108
- nuclear: 0.0092
- nuclear: 0.0098
- nuclear: 0.0072
- nuclear: 0.0085
- nuclear: 0.0103
- nuclear: 0.0087
- nuclear: 0.0095
- nuclear: 0.0134
- nuclear: 0.0402
- nuclear: 0.0301
- nuclear: 0.0268
- nuclear: 0.0161
- nuclear: 0.0155
- nuclear: 0.0129
- nuclear: 0.0119
- nuclear: 0.0084
- nuclear: 0.0087
- nuclear: 0.0098
- nuclear: 0.0092
- nuclear: 0.01
- nuclear: 0.0143
- nuclear: 0.0107
- nuclear: 0.0375
- nuclear: 0.0287
- nuclear: 0.0313
- nuclear: 0.0131
- nuclear: 0.0154
- nuclear: 0.0124
- nuclear: 0.0107
- nuclear: 0.0076
- nuclear: 0.0071
- nuclear: 0.0074
- nuclear: 0.0065
- nuclear: 0.0085
- nuclear: 0.0097
- nuclear: 0.0085
- nuclear: 0.01
- nuclear: 0.0375
- nuclear: 0.034
- nuclear: 0.0207
- nuclear: 0.0179
- nuclear: 0.0183
- nuclear: 0.0138
- nuclear: 0.0089
- nuclear: 0.0087
- nuclear: 0.009
- nuclear: 0.0069
- nuclear: 0.0088
- nuclear: 0.0111
- nuclear: 0.0101
- nuclear: 0.0115
- nuclear: 0.0107
- nuclear: 0.0144
- nuclear: 0.0412
- nuclear: 0.0214
- nuclear: 0.0213
- nuclear: 0.0167
- nuclear: 0.0138
- nuclear: 0.0092
- nuclear: 0.0077
- nuclear: 0.0077
- nuclear: 0.0058
- nuclear: 0.0069
- nuclear: 0.0085
- nuclear: 0.0076
- nuclear: 0.0097
- nuclear: 0.0087
- nuclear: 0.009
- nuclear: 0.0119
- nuclear: 0.0438
- nuclear: 0.0344
- nuclear: 0.0542
- nuclear: 0.0197
- nuclear: 0.0117
- nuclear: 0.0111
- nuclear: 0.0096
- nuclear: 0.0069
- nuclear: 0.0079
- nuclear: 0.0095
- nuclear: 0.0082
- nuclear: 0.0105
- nuclear: 0.0105
- nuclear: 0.0103
- nuclear: 0.0103
- nuclear: 0.0157
- nuclear: 0.054
- nuclear: 0.0537
- nuclear: 0.0281
- nuclear: 0.014
- nuclear: 0.0136
- nuclear: 0.0124
- nuclear: 0.0082
- nuclear: 0.0089
- nuclear: 0.0106
- nuclear: 0.0092
- nuclear: 0.0114
- nuclear: 0.0115
- nuclear: 0.0116
- nuclear: 0.0114
- nuclear: 0.0147
- nuclear: 0.0222
- nuclear: 0.068
- nuclear: 0.0306
- nuclear: 0.0169
- nuclear: 0.0151
- nuclear: 0.0153
- nuclear: 0.0097
- nuclear: 0.0098
- nuclear: 0.0117
- nuclear: 0.0102
- nuclear: 0.0127
- nuclear: 0.0126
- nuclear: 0.013
- nuclear: 0.0124
- nuclear: 0.0147
- nuclear: 0.0209
- nuclear: 0.0345
- nuclear: 0.031
- nuclear: 0.0143
- nuclear: 0.0127
- nuclear: 0.0125
- nuclear: 0.009
- nuclear: 0.0087
- nuclear: 0.0095
- nuclear: 0.0081
- nuclear: 0.01
- nuclear: 0.0097
- nuclear: 0.0101
- nuclear: 0.0098
- nuclear: 0.011
- nuclear: 0.0149
- nuclear: 0.0191
- nuclear: 0.0193
- nuclear: 0.0146
- nuclear: 0.015
- nuclear: 0.0106
- nuclear: 0.0117
- nuclear: 0.012
- nuclear: 0.0093
- nuclear: 0.0108
- nuclear: 0.0109
- nuclear: 0.0114
- nuclear: 0.0108
- nuclear: 0.0122
- nuclear: 0.0153
- nuclear: 0.0202
- nuclear: 0.0297
- nuclear: 0.0172
- nuclear: 0.0161
- nuclear: 0.0109
- nuclear: 0.0121
- nuclear: 0.0137
- nuclear: 0.0101
- nuclear: 0.0112
- nuclear: 0.0112
- nuclear: 0.0116
- nuclear: 0.0112
- nuclear: 0.0126
- nuclear: 0.0155
- nuclear: 0.0186
- nuclear: 0.0248
- nuclear: 0.0203
- nuclear: 0.0155
- nuclear: 0.0141
- nuclear: 0.0163
- nuclear: 0.0142
- nuclear: 0.0134
- nuclear: 0.0128
- nuclear: 0.0135
- nuclear: 0.0127
- nuclear: 0.014
- nuclear: 0.0169
- nuclear: 0.0214
- nuclear: 0.0265
- nuclear: 0.0349
- nuclear: 0.0158
- nuclear: 0.0134
- nuclear: 0.0143
- nuclear: 0.012
- nuclear: 0.0165
- nuclear: 0.0118
- nuclear: 0.0113
- nuclear: 0.0109
- nuclear: 0.012
- nuclear: 0.0147
- nuclear: 0.0162
- nuclear: 0.0213
- nuclear: 0.0253
- nuclear: 0.0242
- nuclear: 0.0245
- nuclear: 0.0161
- nuclear: 0.0211
- nuclear: 0.0227
- nuclear: 0.0158
- nuclear: 0.0146
- nuclear: 0.016
- nuclear: 0.0187
- nuclear: 0.0222
- nuclear: 0.0281
- nuclear: 0.0296
- nuclear: 0.0356
- nuclear: 0.0296
- nuclear: 0.028
- nuclear: 0.03
- nuclear: 0.0282
- nuclear: 0.0205
- nuclear: 0.0216
- nuclear: 0.0267
- nuclear: 0.0331
- nuclear: 0.0345
- nuclear: 0.0458
- nuclear: 0.0361
- nuclear: 0.0465
- nuclear: 0.0353
- nuclear: 0.0395
- nuclear: 0.0281
- nuclear: 0.0235
- nuclear: 0.033
- nuclear: 0.0373
- nuclear: 0.0513
- nuclear: 0.0645
Loading