mirror of
https://github.com/fjosw/pyerrors.git
synced 2025-03-15 23:00:25 +01:00
refactor: minor simplifications in derived_observable
This commit is contained in:
parent
140268c1c9
commit
52705d8fcd
1 changed files with 3 additions and 7 deletions
|
@ -1057,7 +1057,7 @@ def derived_observable(func, data, array_mode=False, **kwargs):
|
||||||
if not all(isinstance(x, Obs) for x in raveled_data):
|
if not all(isinstance(x, Obs) for x in raveled_data):
|
||||||
for i in range(len(raveled_data)):
|
for i in range(len(raveled_data)):
|
||||||
if isinstance(raveled_data[i], (int, float)):
|
if isinstance(raveled_data[i], (int, float)):
|
||||||
raveled_data[i] = cov_Obs(raveled_data[i], 0.0, "###dummy_entry###")
|
raveled_data[i] = cov_Obs(raveled_data[i], 0.0, "###dummy_covobs###")
|
||||||
|
|
||||||
allcov = {}
|
allcov = {}
|
||||||
for o in raveled_data:
|
for o in raveled_data:
|
||||||
|
@ -1083,9 +1083,7 @@ def derived_observable(func, data, array_mode=False, **kwargs):
|
||||||
|
|
||||||
new_values = func(values, **kwargs)
|
new_values = func(values, **kwargs)
|
||||||
|
|
||||||
multi = 0
|
multi = int(isinstance(new_values, np.ndarray))
|
||||||
if isinstance(new_values, np.ndarray):
|
|
||||||
multi = 1
|
|
||||||
|
|
||||||
new_r_values = {}
|
new_r_values = {}
|
||||||
new_idl_d = {}
|
new_idl_d = {}
|
||||||
|
@ -1137,13 +1135,11 @@ def derived_observable(func, data, array_mode=False, **kwargs):
|
||||||
|
|
||||||
if array_mode is True:
|
if array_mode is True:
|
||||||
|
|
||||||
new_covobs_lengths = dict(set([y for x in [[(n, o.covobs[n].N) for n in o.cov_names] for o in raveled_data] for y in x]))
|
|
||||||
|
|
||||||
class _Zero_grad():
|
class _Zero_grad():
|
||||||
def __init__(self, N):
|
def __init__(self, N):
|
||||||
# self.grad = np.zeros(N)
|
|
||||||
self.grad = np.zeros((N, 1))
|
self.grad = np.zeros((N, 1))
|
||||||
|
|
||||||
|
new_covobs_lengths = dict(set([y for x in [[(n, o.covobs[n].N) for n in o.cov_names] for o in raveled_data] for y in x]))
|
||||||
d_extracted = {}
|
d_extracted = {}
|
||||||
g_extracted = {}
|
g_extracted = {}
|
||||||
for name in new_sample_names:
|
for name in new_sample_names:
|
||||||
|
|
Loading…
Add table
Reference in a new issue