Skip to content

Commit

Permalink
all fixes combined
Browse files Browse the repository at this point in the history
  • Loading branch information
@t7phy
t7phy committed Mar 8, 2024
1 parent 2ec03d5 commit d093c07
Show file tree
Hide file tree
Showing 29 changed files with 20,928 additions and 19,123 deletions.
10 changes: 5 additions & 5 deletions validphys2/src/validphys/datafiles/new_commondata/ATLAS_TTBAR_8TEV_LJ_DIF/artunc.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

import numpy as np
from numpy.linalg import eig
from validphys.commondata_utils import cormat_to_covmat as ctc
from validphys.commondata_utils import covmat_to_artunc as cta
from validphys.commondata_utils import percentage_to_absolute as pta
from validphys.commondata_utils import concat_matrices as cm
from validphys.commondata_utils import matlist_to_matrix as mtm
from utils import cormat_to_covmat as ctc
from utils import covmat_to_artunc as cta
from utils import percentage_to_absolute as pta
from utils import concat_matrices as cm
from utils import matlist_to_matrix as mtm

def artunc():
statArr = []
Expand Down
20 changes: 10 additions & 10 deletions validphys2/src/validphys/datafiles/new_commondata/ATLAS_TTBAR_8TEV_LJ_DIF/filter.py
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import artunc
import yaml

from validphys.commondata_utils import percentage_to_absolute as pta
from validphys.commondata_utils import symmetrize_errors as se
from utils import percentage_to_absolute as pta
from utils import symmetrize_errors as se

def processData():
with open('metadata.yaml', 'r') as file:
Expand Down Expand Up @@ -69,7 +69,7 @@ def processData():

error_definition_dSig_dmttBar = {}
for i in range(25):
error_definition_dSig_dmttBar['ArtUnc_'+str(i+1)] = {'definition': 'artificial uncertainty '+str(i+1), 'treatment': 'ADD', 'type': 'ATLAS8TEVTTB151104716'}
error_definition_dSig_dmttBar['ArtUnc_'+str(i+1)] = {'definition': 'artificial uncertainty '+str(i+1), 'treatment': 'ADD', 'type': 'ATLAS8TEVTTB151104716unc'+str(i+1)}
for i in range(1, len(input['dependent_variables'][1]['values'][0]['errors'])-1):
error_definition_dSig_dmttBar[input['dependent_variables'][1]['values'][0]['errors'][i]['label'].replace(" ", "")] = {'definition': '', 'treatment': 'MULT', 'type': 'CORR'}
error_definition_dSig_dmttBar['lumi'] = {'definition': 'luminosity uncertainty', 'treatment': 'MULT', 'type': 'ATLASLUMI8'}
Expand Down Expand Up @@ -120,7 +120,7 @@ def processData():

error_definition_dSig_dmttBar_norm = {}
for i in range(25):
error_definition_dSig_dmttBar_norm['ArtUnc_'+str(i+1)] = {'definition': 'artificial uncertainty '+str(i+1), 'treatment': 'ADD', 'type': 'ATLAS8TEVTTB151104716'}
error_definition_dSig_dmttBar_norm['ArtUnc_'+str(i+1)] = {'definition': 'artificial uncertainty '+str(i+1), 'treatment': 'ADD', 'type': 'ATLAS8TEVTTB151104716unc'+str(i+1)}
for i in range(1, len(input['dependent_variables'][1]['values'][0]['errors'])):
error_definition_dSig_dmttBar_norm[input['dependent_variables'][1]['values'][0]['errors'][i]['label'].replace(" ", "")] = {'definition': '', 'treatment': 'MULT', 'type': 'CORR'}

Expand Down Expand Up @@ -171,7 +171,7 @@ def processData():

error_definition_dSig_dpTt = {}
for i in range(25):
error_definition_dSig_dpTt['ArtUnc_'+str(i+1)] = {'definition': 'artificial uncertainty '+str(i+1), 'treatment': 'ADD', 'type': 'ATLAS8TEVTTB151104716'}
error_definition_dSig_dpTt['ArtUnc_'+str(i+1)] = {'definition': 'artificial uncertainty '+str(i+1), 'treatment': 'ADD', 'type': 'ATLAS8TEVTTB151104716unc'+str(i+1)}
for i in range(1, len(input['dependent_variables'][1]['values'][0]['errors'])-1):
error_definition_dSig_dpTt[input['dependent_variables'][1]['values'][0]['errors'][i]['label'].replace(" ", "")] = {'definition': '', 'treatment': 'MULT', 'type': 'CORR'}
error_definition_dSig_dpTt['lumi'] = {'definition': 'luminosity uncertainty', 'treatment': 'MULT', 'type': 'ATLASLUMI8'}
Expand Down Expand Up @@ -222,7 +222,7 @@ def processData():

error_definition_dSig_dpTt_norm = {}
for i in range(25):
error_definition_dSig_dpTt_norm['ArtUnc_'+str(i+1)] = {'definition': 'artificial uncertainty '+str(i+1), 'treatment': 'ADD', 'type': 'ATLAS8TEVTTB151104716'}
error_definition_dSig_dpTt_norm['ArtUnc_'+str(i+1)] = {'definition': 'artificial uncertainty '+str(i+1), 'treatment': 'ADD', 'type': 'ATLAS8TEVTTB151104716unc'+str(i+1)}
for i in range(1, len(input['dependent_variables'][1]['values'][0]['errors'])):
error_definition_dSig_dpTt_norm[input['dependent_variables'][1]['values'][0]['errors'][i]['label'].replace(" ", "")] = {'definition': '', 'treatment': 'MULT', 'type': 'CORR'}

Expand Down Expand Up @@ -273,7 +273,7 @@ def processData():

error_definition_dSig_dyt = {}
for i in range(25):
error_definition_dSig_dyt['ArtUnc_'+str(i+1)] = {'definition': 'artificial uncertainty '+str(i+1), 'treatment': 'ADD', 'type': 'ATLAS8TEVTTB151104716'}
error_definition_dSig_dyt['ArtUnc_'+str(i+1)] = {'definition': 'artificial uncertainty '+str(i+1), 'treatment': 'ADD', 'type': 'ATLAS8TEVTTB151104716unc'+str(i+1)}
for i in range(1, len(input['dependent_variables'][1]['values'][0]['errors'])-1):
error_definition_dSig_dyt[input['dependent_variables'][1]['values'][0]['errors'][i]['label'].replace(" ", "")] = {'definition': '', 'treatment': 'MULT', 'type': 'CORR'}
error_definition_dSig_dyt['lumi'] = {'definition': 'luminosity uncertainty', 'treatment': 'MULT', 'type': 'ATLASLUMI8'}
Expand Down Expand Up @@ -324,7 +324,7 @@ def processData():

error_definition_dSig_dyt_norm = {}
for i in range(25):
error_definition_dSig_dyt_norm['ArtUnc_'+str(i+1)] = {'definition': 'artificial uncertainty '+str(i+1), 'treatment': 'ADD', 'type': 'ATLAS8TEVTTB151104716'}
error_definition_dSig_dyt_norm['ArtUnc_'+str(i+1)] = {'definition': 'artificial uncertainty '+str(i+1), 'treatment': 'ADD', 'type': 'ATLAS8TEVTTB151104716unc'+str(i+1)}
for i in range(1, len(input['dependent_variables'][1]['values'][0]['errors'])):
error_definition_dSig_dyt_norm[input['dependent_variables'][1]['values'][0]['errors'][i]['label'].replace(" ", "")] = {'definition': '', 'treatment': 'MULT', 'type': 'CORR'}

Expand Down Expand Up @@ -375,7 +375,7 @@ def processData():

error_definition_dSig_dyttBar = {}
for i in range(25):
error_definition_dSig_dyttBar['ArtUnc_'+str(i+1)] = {'definition': 'artificial uncertainty '+str(i+1), 'treatment': 'ADD', 'type': 'ATLAS8TEVTTB151104716'}
error_definition_dSig_dyttBar['ArtUnc_'+str(i+1)] = {'definition': 'artificial uncertainty '+str(i+1), 'treatment': 'ADD', 'type': 'ATLAS8TEVTTB151104716unc'+str(i+1)}
for i in range(1, len(input['dependent_variables'][1]['values'][0]['errors'])-1):
error_definition_dSig_dyttBar[input['dependent_variables'][1]['values'][0]['errors'][i]['label'].replace(" ", "")] = {'definition': '', 'treatment': 'MULT', 'type': 'CORR'}
error_definition_dSig_dyttBar['lumi'] = {'definition': 'luminosity uncertainty', 'treatment': 'MULT', 'type': 'ATLASLUMI8'}
Expand Down Expand Up @@ -426,7 +426,7 @@ def processData():

error_definition_dSig_dyttBar_norm = {}
for i in range(25):
error_definition_dSig_dyttBar_norm['ArtUnc_'+str(i+1)] = {'definition': 'artificial uncertainty '+str(i+1), 'treatment': 'ADD', 'type': 'ATLAS8TEVTTB151104716'}
error_definition_dSig_dyttBar_norm['ArtUnc_'+str(i+1)] = {'definition': 'artificial uncertainty '+str(i+1), 'treatment': 'ADD', 'type': 'ATLAS8TEVTTB151104716unc'+str(i+1)}
for i in range(1, len(input['dependent_variables'][1]['values'][0]['errors'])):
error_definition_dSig_dyttBar_norm[input['dependent_variables'][1]['values'][0]['errors'][i]['label'].replace(" ", "")] = {'definition': '', 'treatment': 'MULT', 'type': 'CORR'}

Expand Down
50 changes: 25 additions & 25 deletions ...alidphys/datafiles/new_commondata/ATLAS_TTBAR_8TEV_LJ_DIF/uncertainties_dSig_dmttBar.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,103 +2,103 @@ definitions:
ArtUnc_1:
definition: artificial uncertainty 1
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc1
ArtUnc_2:
definition: artificial uncertainty 2
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc2
ArtUnc_3:
definition: artificial uncertainty 3
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc3
ArtUnc_4:
definition: artificial uncertainty 4
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc4
ArtUnc_5:
definition: artificial uncertainty 5
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc5
ArtUnc_6:
definition: artificial uncertainty 6
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc6
ArtUnc_7:
definition: artificial uncertainty 7
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc7
ArtUnc_8:
definition: artificial uncertainty 8
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc8
ArtUnc_9:
definition: artificial uncertainty 9
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc9
ArtUnc_10:
definition: artificial uncertainty 10
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc10
ArtUnc_11:
definition: artificial uncertainty 11
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc11
ArtUnc_12:
definition: artificial uncertainty 12
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc12
ArtUnc_13:
definition: artificial uncertainty 13
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc13
ArtUnc_14:
definition: artificial uncertainty 14
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc14
ArtUnc_15:
definition: artificial uncertainty 15
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc15
ArtUnc_16:
definition: artificial uncertainty 16
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc16
ArtUnc_17:
definition: artificial uncertainty 17
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc17
ArtUnc_18:
definition: artificial uncertainty 18
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc18
ArtUnc_19:
definition: artificial uncertainty 19
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc19
ArtUnc_20:
definition: artificial uncertainty 20
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc20
ArtUnc_21:
definition: artificial uncertainty 21
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc21
ArtUnc_22:
definition: artificial uncertainty 22
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc22
ArtUnc_23:
definition: artificial uncertainty 23
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc23
ArtUnc_24:
definition: artificial uncertainty 24
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc24
ArtUnc_25:
definition: artificial uncertainty 25
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc25
sys,singletop-xsec:
definition: ''
treatment: MULT
Expand Down
50 changes: 25 additions & 25 deletions ...hys/datafiles/new_commondata/ATLAS_TTBAR_8TEV_LJ_DIF/uncertainties_dSig_dmttBar_norm.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,103 +2,103 @@ definitions:
ArtUnc_1:
definition: artificial uncertainty 1
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc1
ArtUnc_2:
definition: artificial uncertainty 2
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc2
ArtUnc_3:
definition: artificial uncertainty 3
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc3
ArtUnc_4:
definition: artificial uncertainty 4
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc4
ArtUnc_5:
definition: artificial uncertainty 5
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc5
ArtUnc_6:
definition: artificial uncertainty 6
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc6
ArtUnc_7:
definition: artificial uncertainty 7
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc7
ArtUnc_8:
definition: artificial uncertainty 8
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc8
ArtUnc_9:
definition: artificial uncertainty 9
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc9
ArtUnc_10:
definition: artificial uncertainty 10
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc10
ArtUnc_11:
definition: artificial uncertainty 11
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc11
ArtUnc_12:
definition: artificial uncertainty 12
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc12
ArtUnc_13:
definition: artificial uncertainty 13
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc13
ArtUnc_14:
definition: artificial uncertainty 14
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc14
ArtUnc_15:
definition: artificial uncertainty 15
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc15
ArtUnc_16:
definition: artificial uncertainty 16
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc16
ArtUnc_17:
definition: artificial uncertainty 17
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc17
ArtUnc_18:
definition: artificial uncertainty 18
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc18
ArtUnc_19:
definition: artificial uncertainty 19
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc19
ArtUnc_20:
definition: artificial uncertainty 20
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc20
ArtUnc_21:
definition: artificial uncertainty 21
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc21
ArtUnc_22:
definition: artificial uncertainty 22
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc22
ArtUnc_23:
definition: artificial uncertainty 23
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc23
ArtUnc_24:
definition: artificial uncertainty 24
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc24
ArtUnc_25:
definition: artificial uncertainty 25
treatment: ADD
type: ATLAS8TEVTTB151104716
type: ATLAS8TEVTTB151104716unc25
sys,singletop-xsec:
definition: ''
treatment: MULT
Expand Down
Loading

0 comments on commit d093c07

Please sign in to comment.