From 42df2542885d980720f92647b8dd93cd68b7ce3d Mon Sep 17 00:00:00 2001 From: Fabian Joswig Date: Mon, 28 Feb 2022 13:26:48 +0000 Subject: [PATCH] refactor: else case for empty observables in Obs.__init__ simplified. --- pyerrors/obs.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pyerrors/obs.py b/pyerrors/obs.py index 9ad3a0d4..cdf7bce8 100644 --- a/pyerrors/obs.py +++ b/pyerrors/obs.py @@ -90,6 +90,9 @@ class Obs: self.deltas = {} self._covobs = {} + self._value = 0 + self.N = 0 + self.is_merged = {} self.idl = {} if len(samples): if idl is not None: @@ -110,8 +113,6 @@ class Obs: for name, sample in sorted(zip(names, samples)): self.idl[name] = range(1, len(sample) + 1) - self._value = 0 - self.N = 0 if kwargs.get("means") is not None: for name, sample, mean in sorted(zip(names, samples, kwargs.get("means"))): self.shape[name] = len(self.idl[name]) @@ -129,13 +130,6 @@ class Obs: self._value += self.shape[name] * self.r_values[name] self._value /= self.N - self.is_merged = {} - - else: - self._value = 0 - self.is_merged = {} - self.N = 0 - self._dvalue = 0.0 self.ddvalue = 0.0 self.reweighted = False