lattice/pyerrors
1
0
Fork 0
mirror of https://github.com/fjosw/pyerrors.git synced 2025-05-15 03:53:41 +02:00
Code Issues Projects Releases Packages Wiki Activity

S and tau_exp kwargs in gamma method now parsed in the same way

Browse source
This commit is contained in:
Fabian Joswig 2021-11-12 14:00:57 +00:00
parent cf79bcc089
commit 3d4aee703e
1 changed files with 3 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

51
pyerrors/obs.py
View file

@ -189,7 +189,7 @@ class Obs:
else: else:
fft = True fft = True
def _parse_kwarg(kwarg_name, **kwargs): def _parse_kwarg(kwarg_name):
if kwarg_name in kwargs: if kwarg_name in kwargs:
tmp = kwargs.get(kwarg_name) tmp = kwargs.get(kwarg_name)
if isinstance(tmp, (int, float)): if isinstance(tmp, (int, float)):
@ -206,53 +206,8 @@ class Obs:
else: else:
getattr(self, kwarg_name)[e_name] = getattr(Obs, kwarg_name + '_global') getattr(self, kwarg_name)[e_name] = getattr(Obs, kwarg_name + '_global')
if 'S' in kwargs: _parse_kwarg('S')
tmp = kwargs.get('S') _parse_kwarg('tau_exp')
if isinstance(tmp, list):
if len(tmp) != len(self.e_names):
raise Exception('Length of S array does not match ensembles.')
for e, e_name in enumerate(self.e_names):
if tmp[e] <= 0:
raise Exception('S has to be larger than 0.')
self.S[e_name] = tmp[e]
else:
if isinstance(tmp, (int, float)):
if tmp <= 0:
raise Exception('S has to be larger than 0.')
for e, e_name in enumerate(self.e_names):
self.S[e_name] = tmp
else:
raise TypeError('S is not in proper format.')
else:
for e, e_name in enumerate(self.e_names):
if e_name in Obs.S_dict:
self.S[e_name] = Obs.S_dict[e_name]
else:
self.S[e_name] = Obs.S_global
if 'tau_exp' in kwargs:
tmp = kwargs.get('tau_exp')
if isinstance(tmp, list):
if len(tmp) != len(self.e_names):
raise Exception('Length of tau_exp array does not match ensembles.')
for e, e_name in enumerate(self.e_names):
if tmp[e] < 0:
raise Exception('tau_exp smaller than 0.')
self.tau_exp[e_name] = tmp[e]
else:
if isinstance(tmp, (int, float)):
if tmp < 0:
raise Exception('tau_exp smaller than 0.')
for e, e_name in enumerate(self.e_names):
self.tau_exp[e_name] = tmp
else:
raise TypeError('tau_exp is not in proper format.')
else:
for e, e_name in enumerate(self.e_names):
if e_name in Obs.tau_exp_dict:
self.tau_exp[e_name] = Obs.tau_exp_dict[e_name]
else:
self.tau_exp[e_name] = Obs.tau_exp_global
if 'N_sigma' in kwargs: if 'N_sigma' in kwargs:
self.N_sigma = kwargs.get('N_sigma') self.N_sigma = kwargs.get('N_sigma')