Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
c7bd39a
add dataset_names.yml
scarlehoff Oct 9, 2023
730a872
atlas jets
t7phy Oct 18, 2023
01a655f
cms jets
t7phy Oct 18, 2023
d41ab11
address comments atlas jet
t7phy Oct 23, 2023
c95aa17
address comments atlas dijet
t7phy Oct 23, 2023
f15340f
address comments cms jet
t7phy Oct 23, 2023
b2e9195
Merge pull request #1821 from NNPDF/ncd_new_jets
scarlehoff Oct 23, 2023
3fdc65b
h1 jet 290pb-1
t7phy Oct 25, 2023
5ea5a05
h1 jet 351pb-1
t7phy Oct 25, 2023
21a0f77
h1 jet 351pb-1 kin coverage
t7phy Oct 25, 2023
32224b0
h1 dijet 290pb-1
t7phy Oct 25, 2023
9a713bf
h1 dijet 351pb-1
t7phy Oct 25, 2023
03a2f53
zeus jet 39pb-1
t7phy Oct 25, 2023
2f6b78b
zeus jet 82pb-1
t7phy Oct 25, 2023
677a773
zeus dijet 374pb-1
t7phy Oct 25, 2023
792cc1d
update cuts
t7phy Oct 25, 2023
87cd3ce
address comments dataset 1
t7phy Oct 26, 2023
0289ade
address comments dataset 2
t7phy Oct 26, 2023
9d2a72d
address comments dataset 3
t7phy Oct 26, 2023
4d205f7
address comments dataset 4
t7phy Oct 26, 2023
e7e8821
address comments dataset 5
t7phy Oct 26, 2023
c9bf9bd
address comments dataset 6
t7phy Oct 26, 2023
6d9b211
address comments dataset 7
t7phy Oct 26, 2023
f203124
address comments cuts
t7phy Oct 26, 2023
74dc00d
hera jets get their own names
t7phy Nov 1, 2023
f398b27
latex fixes
t7phy Nov 1, 2023
770211a
move it up
t7phy Nov 1, 2023
49c6f4b
cuts have healed
t7phy Nov 2, 2023
1ca873d
remove shifts block
t7phy Nov 2, 2023
cadd20f
anti-anti-kt commit
t7phy Nov 20, 2023
50768fb
syst breakdown and custom corr name for art uncs.
t7phy Feb 9, 2024
99fe416
Merge branch 'master' into ncd_dis_jets
t7phy Feb 15, 2024
6629d84
Merge remote-tracking branch 'origin/master' into ncd_dis_jets
t7phy Feb 15, 2024
e82c85c
Merge remote-tracking branch 'origin/master' into ncd_dis_jets
t7phy Feb 16, 2024
ec84f07
it's ready
t7phy Feb 16, 2024
ec6ab9c
Delete buildmaster/dataset_names.yml
t7phy Feb 17, 2024
0d470d0
Merge remote-tracking branch 'origin/master' into ncd_dis_jets
t7phy Feb 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
import yaml
import numpy
from validphys.commondata_utils import covmat_to_artunc as cta
from validphys.commondata_utils import percentage_to_absolute as pta

def artunc():

with open('rawdata/data49.yaml', 'r') as file:
corMatFile = yaml.safe_load(file)

corMatHalfArr = []
for i in range(4656):
corMatHalfArr.append(float(corMatFile['dependent_variables'][0]['values'][i]['value']))

errPercArr = []
dataArr = []
for i in [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]:
hepdata_tables="rawdata/data"+str(i)+".yaml"
with open(hepdata_tables, 'r') as file:
input = yaml.safe_load(file)
values = input['dependent_variables'][0]['values']
for j in range(len(values)):
errPerc = values[j]['errors'][0]['symerror']
errPercArr.append(errPerc)
dataArr.append(float(values[j]['value']))


errArr = []
for i in range(96):
errArr.append(pta(errPercArr[i], dataArr[i]))

covMat = numpy.zeros((96, 96))
artUnc = numpy.zeros((96, 96))

for i in range(96):
for j in range(i+1):
cmhap = (i * (i+1)) // 2 + j
if i == j:
covMat[i][j] = corMatHalfArr[cmhap] * errArr[i] * errArr[j]
else:
covMat[i][j] = corMatHalfArr[cmhap] * errArr[i] * errArr[j]
covMat[j][i] = corMatHalfArr[cmhap] * errArr[i] * errArr[j]

covMatList = []
for i in range(96):
for j in range(96):
covMatList.append(covMat[i][j])
artUnc = cta(96, covMatList, 0)

return artUnc

def artunc_norm():

with open('rawdata/data50.yaml', 'r') as file:
corMatFile = yaml.safe_load(file)

corMatHalfArr = []
for i in range(4656):
corMatHalfArr.append(float(corMatFile['dependent_variables'][0]['values'][i]['value']))

errPercArr = []
dataArr = []
for i in [25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40]:
hepdata_tables="rawdata/data"+str(i)+".yaml"
with open(hepdata_tables, 'r') as file:
input = yaml.safe_load(file)
values = input['dependent_variables'][0]['values']
for j in range(len(values)):
errPerc = values[j]['errors'][0]['symerror']
errPercArr.append(errPerc)
dataArr.append(float(values[j]['value']))

errArr = []
for i in range(96):
errArr.append(pta(errPercArr[i], dataArr[i]))

covMat = numpy.zeros((96, 96))
artUnc = numpy.zeros((96, 96))

for i in range(96):
for j in range(i+1):
cmhap = (i * (i+1)) // 2 + j
if i == j:
covMat[i][j] = corMatHalfArr[cmhap] * errArr[i] * errArr[j]
else:
covMat[i][j] = corMatHalfArr[cmhap] * errArr[i] * errArr[j]
covMat[j][i] = corMatHalfArr[cmhap] * errArr[i] * errArr[j]

covMatList = []
for i in range(96):
for j in range(96):
covMatList.append(covMat[i][j])
artUnc = cta(96, covMatList, 1)

return artUnc
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
data_central:
- 1520.2961417766862
- 442.3175691947408
- 105.70160196949213
- 18.14506808583527
- 2.1399496052095146
- 0.3245909002911952
- 1077.3804779284385
- 362.815922459706
- 84.82128198457113
- 12.611769178156917
- 1.6488761432230024
- 0.2431083191352701
- 1058.6251203486613
- 355.4571461463955
- 90.39042777449247
- 14.97510056874838
- 2.334208671252201
- 0.4670943983756343
- 736.7197279128237
- 277.7321181166529
- 71.32789033718993
- 13.381449353442337
- 1.79262563160108
- 0.25529521769389
- 559.5770182732919
- 230.421157213187
- 63.39114094103584
- 10.714928105884749
- 1.8752280055125135
- 0.3996182365650588
- 536.6156110816592
- 241.92835772695966
- 65.55739999405293
- 12.932536154774963
- 1.5666573836687063
- 0.250260931747206
- 387.36874135827804
- 196.74688939366885
- 60.414108908399854
- 12.64536449988521
- 2.1989983062271126
- 0.3756551576485761
- 278.28860056198323
- 122.49103459556666
- 38.40238587011927
- 9.3206628937902
- 1.0386065045993735
- 0.19147927798236986
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
data_central:
- 89.51177497371741
- 72.72199571311053
- 66.65340079963816
- 47.33504032508446
- 40.8618724173806
- 0.9234378593333785
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
data_central:
- 0.20732491816561055
- 0.22957442157850536
- 0.2417105143491752
- 0.21642698774361296
- 0.22755173945006035
- 0.10821349387180648
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
data_central:
- 0.11146638373029033
- 0.03260425294916205
- 0.00780303062141272
- 0.0013327131328265693
- 0.00015735053216561418
- 2.397326321286638e-05
- 0.12273962071503276
- 0.041128728675556885
- 0.009635904141767026
- 0.0014304576986950708
- 0.0001874038818428799
- 2.7510605846330985e-05
- 0.13572558369439658
- 0.04552902550314116
- 0.011588911705576466
- 0.0019179871004487625
- 0.00029966775610919006
- 5.9847166170650175e-05
- 0.1521054003899483
- 0.05745153363991823
- 0.014806835816639396
- 0.002777235433313776
- 0.00037183810327547816
- 5.276891665673727e-05
- 0.16103405510139532
- 0.0661681569208333
- 0.018271234090758356
- 0.003089812363910013
- 0.0005383450766005511
- 0.00011506147038943812
- 0.1931927159305228
- 0.08700582158574599
- 0.023585163160108006
- 0.004631325800005102
- 0.0005619636495854181
- 9.014506555236299e-05
- 0.18759623880322573
- 0.09532876271631908
- 0.029290177940496525
- 0.0061403249350086165
- 0.001064888329393524
- 0.00018171526427897267
- 0.23801794388104405
- 0.10441732513677887
- 0.0327
- 0.007957448109729214
- 0.0008875035976320316
- 0.0001637305941636206
Loading