From b7f4955097d404f44344f8d5c0f3c5c390418399 Mon Sep 17 00:00:00 2001 From: fjosw Date: Tue, 18 Jan 2022 18:10:20 +0000 Subject: [PATCH] Documentation updated --- docs/pyerrors/obs.html | 48 +++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/docs/pyerrors/obs.html b/docs/pyerrors/obs.html index 15413b98..a507ded3 100644 --- a/docs/pyerrors/obs.html +++ b/docs/pyerrors/obs.html @@ -868,18 +868,24 @@ plt.figure() r_length = [] tmp = [] + tmp_expanded = [] for r, r_name in enumerate(self.e_content[e_name]): + tmp.append(self.deltas[r_name] + self.r_values[r_name]) if expand: - tmp.append(_expand_deltas(self.deltas[r_name], list(self.idl[r_name]), self.shape[r_name]) + self.r_values[r_name]) + tmp_expanded.append(_expand_deltas(self.deltas[r_name], list(self.idl[r_name]), self.shape[r_name]) + self.r_values[r_name]) + r_length.append(len(tmp_expanded[-1])) else: - tmp.append(self.deltas[r_name] + self.r_values[r_name]) - r_length.append(len(tmp[-1])) + r_length.append(len(tmp[-1])) e_N = np.sum(r_length) x = np.arange(e_N) - y = np.concatenate(tmp, axis=0) + y_test = np.concatenate(tmp, axis=0) + if expand: + y = np.concatenate(tmp_expanded, axis=0) + else: + y = y_test plt.errorbar(x, y, fmt='.', markersize=3) plt.xlim(-0.5, e_N - 0.5) - plt.title(e_name + f', skew: {skew(y):.3f} (p={skewtest(y).pvalue:.3f}), kurtosis: {kurtosis(y):.3f} (p={kurtosistest(y).pvalue:.3f})') + plt.title(e_name + f', skew: {skew(y_test):.3f} (p={skewtest(y_test).pvalue:.3f}), kurtosis: {kurtosis(y_test):.3f} (p={kurtosistest(y_test).pvalue:.3f})') plt.draw() def plot_piechart(self): @@ -2442,18 +2448,24 @@ plt.figure() r_length = [] tmp = [] + tmp_expanded = [] for r, r_name in enumerate(self.e_content[e_name]): + tmp.append(self.deltas[r_name] + self.r_values[r_name]) if expand: - tmp.append(_expand_deltas(self.deltas[r_name], list(self.idl[r_name]), self.shape[r_name]) + self.r_values[r_name]) + tmp_expanded.append(_expand_deltas(self.deltas[r_name], list(self.idl[r_name]), self.shape[r_name]) + self.r_values[r_name]) + r_length.append(len(tmp_expanded[-1])) else: - tmp.append(self.deltas[r_name] + self.r_values[r_name]) - r_length.append(len(tmp[-1])) + r_length.append(len(tmp[-1])) e_N = np.sum(r_length) x = np.arange(e_N) - y = np.concatenate(tmp, axis=0) + y_test = np.concatenate(tmp, axis=0) + if expand: + y = np.concatenate(tmp_expanded, axis=0) + else: + y = y_test plt.errorbar(x, y, fmt='.', markersize=3) plt.xlim(-0.5, e_N - 0.5) - plt.title(e_name + f', skew: {skew(y):.3f} (p={skewtest(y).pvalue:.3f}), kurtosis: {kurtosis(y):.3f} (p={kurtosistest(y).pvalue:.3f})') + plt.title(e_name + f', skew: {skew(y_test):.3f} (p={skewtest(y_test).pvalue:.3f}), kurtosis: {kurtosis(y_test):.3f} (p={kurtosistest(y_test).pvalue:.3f})') plt.draw() def plot_piechart(self): @@ -3569,18 +3581,24 @@ saves the figure to a file named 'save' if. plt.figure() r_length = [] tmp = [] + tmp_expanded = [] for r, r_name in enumerate(self.e_content[e_name]): + tmp.append(self.deltas[r_name] + self.r_values[r_name]) if expand: - tmp.append(_expand_deltas(self.deltas[r_name], list(self.idl[r_name]), self.shape[r_name]) + self.r_values[r_name]) + tmp_expanded.append(_expand_deltas(self.deltas[r_name], list(self.idl[r_name]), self.shape[r_name]) + self.r_values[r_name]) + r_length.append(len(tmp_expanded[-1])) else: - tmp.append(self.deltas[r_name] + self.r_values[r_name]) - r_length.append(len(tmp[-1])) + r_length.append(len(tmp[-1])) e_N = np.sum(r_length) x = np.arange(e_N) - y = np.concatenate(tmp, axis=0) + y_test = np.concatenate(tmp, axis=0) + if expand: + y = np.concatenate(tmp_expanded, axis=0) + else: + y = y_test plt.errorbar(x, y, fmt='.', markersize=3) plt.xlim(-0.5, e_N - 0.5) - plt.title(e_name + f', skew: {skew(y):.3f} (p={skewtest(y).pvalue:.3f}), kurtosis: {kurtosis(y):.3f} (p={kurtosistest(y).pvalue:.3f})') + plt.title(e_name + f', skew: {skew(y_test):.3f} (p={skewtest(y_test).pvalue:.3f}), kurtosis: {kurtosis(y_test):.3f} (p={kurtosistest(y_test).pvalue:.3f})') plt.draw()