diff --git a/docs/pyerrors/correlators.html b/docs/pyerrors/correlators.html index 36acf835..3ec302c5 100644 --- a/docs/pyerrors/correlators.html +++ b/docs/pyerrors/correlators.html @@ -278,10 +278,10 @@ if isinstance(data_input, list): - if all([(isinstance(item, Obs) or isinstance(item, CObs)) for item in data_input]): + if all([isinstance(item, (Obs, CObs)) for item in data_input]): _assert_equal_properties(data_input) self.content = [np.asarray([item]) for item in data_input] - if all([(isinstance(item, Obs) or isinstance(item, CObs)) or item is None for item in data_input]): + if all([isinstance(item, (Obs, CObs)) or item is None for item in data_input]): _assert_equal_properties([o for o in data_input if o is not None]) self.content = [np.asarray([item]) if item is not None else None for item in data_input] self.N = 1 @@ -944,7 +944,7 @@ else: ax1.set_ylim(y_range) if comp: - if isinstance(comp, Corr) or isinstance(comp, list): + if isinstance(comp, (Corr, list)): for corr in comp if isinstance(comp, list) else [comp]: x, y, y_err = corr.plottable() plt.errorbar(x, y, y_err, label=corr.tag, mfc=plt.rcParams['axes.facecolor']) @@ -1055,7 +1055,7 @@ newcontent.append(self.content[t] + y.content[t]) return Corr(newcontent) - elif isinstance(y, Obs) or isinstance(y, int) or isinstance(y, float) or isinstance(y, CObs): + elif isinstance(y, (Obs, int, float, CObs)): newcontent = [] for t in range(self.T): if (self.content[t] is None): @@ -1078,7 +1078,7 @@ newcontent.append(self.content[t] * y.content[t]) return Corr(newcontent) - elif isinstance(y, Obs) or isinstance(y, int) or isinstance(y, float) or isinstance(y, CObs): + elif isinstance(y, (Obs, int, float, CObs)): newcontent = [] for t in range(self.T): if (self.content[t] is None): @@ -1109,7 +1109,7 @@ raise Exception("Division returns completely undefined correlator") return Corr(newcontent) - elif isinstance(y, Obs) or isinstance(y, CObs): + elif isinstance(y, (Obs, CObs)): if isinstance(y, Obs): if y.value == 0: raise Exception('Division by zero will return undefined correlator') @@ -1125,7 +1125,7 @@ newcontent.append(self.content[t] / y) return Corr(newcontent, prange=self.prange) - elif isinstance(y, int) or isinstance(y, float): + elif isinstance(y, (int, float)): if y == 0: raise Exception('Division by zero will return undefined correlator') newcontent = [] @@ -1146,7 +1146,7 @@ return self + (-y) def __pow__(self, y): - if isinstance(y, Obs) or isinstance(y, int) or isinstance(y, float) or isinstance(y, CObs): + if isinstance(y, (Obs, int, float, CObs)): newcontent = [None if (item is None) else item**y for item in self.content] return Corr(newcontent, prange=self.prange) else: @@ -1369,10 +1369,10 @@ if isinstance(data_input, list): - if all([(isinstance(item, Obs) or isinstance(item, CObs)) for item in data_input]): + if all([isinstance(item, (Obs, CObs)) for item in data_input]): _assert_equal_properties(data_input) self.content = [np.asarray([item]) for item in data_input] - if all([(isinstance(item, Obs) or isinstance(item, CObs)) or item is None for item in data_input]): + if all([isinstance(item, (Obs, CObs)) or item is None for item in data_input]): _assert_equal_properties([o for o in data_input if o is not None]) self.content = [np.asarray([item]) if item is not None else None for item in data_input] self.N = 1 @@ -2035,7 +2035,7 @@ else: ax1.set_ylim(y_range) if comp: - if isinstance(comp, Corr) or isinstance(comp, list): + if isinstance(comp, (Corr, list)): for corr in comp if isinstance(comp, list) else [comp]: x, y, y_err = corr.plottable() plt.errorbar(x, y, y_err, label=corr.tag, mfc=plt.rcParams['axes.facecolor']) @@ -2146,7 +2146,7 @@ newcontent.append(self.content[t] + y.content[t]) return Corr(newcontent) - elif isinstance(y, Obs) or isinstance(y, int) or isinstance(y, float) or isinstance(y, CObs): + elif isinstance(y, (Obs, int, float, CObs)): newcontent = [] for t in range(self.T): if (self.content[t] is None): @@ -2169,7 +2169,7 @@ newcontent.append(self.content[t] * y.content[t]) return Corr(newcontent) - elif isinstance(y, Obs) or isinstance(y, int) or isinstance(y, float) or isinstance(y, CObs): + elif isinstance(y, (Obs, int, float, CObs)): newcontent = [] for t in range(self.T): if (self.content[t] is None): @@ -2200,7 +2200,7 @@ raise Exception("Division returns completely undefined correlator") return Corr(newcontent) - elif isinstance(y, Obs) or isinstance(y, CObs): + elif isinstance(y, (Obs, CObs)): if isinstance(y, Obs): if y.value == 0: raise Exception('Division by zero will return undefined correlator') @@ -2216,7 +2216,7 @@ newcontent.append(self.content[t] / y) return Corr(newcontent, prange=self.prange) - elif isinstance(y, int) or isinstance(y, float): + elif isinstance(y, (int, float)): if y == 0: raise Exception('Division by zero will return undefined correlator') newcontent = [] @@ -2237,7 +2237,7 @@ return self + (-y) def __pow__(self, y): - if isinstance(y, Obs) or isinstance(y, int) or isinstance(y, float) or isinstance(y, CObs): + if isinstance(y, (Obs, int, float, CObs)): newcontent = [None if (item is None) else item**y for item in self.content] return Corr(newcontent, prange=self.prange) else: @@ -2409,10 +2409,10 @@ matrix at every timeslice. Other dependency (eg. spatial) are not supported.

if isinstance(data_input, list): - if all([(isinstance(item, Obs) or isinstance(item, CObs)) for item in data_input]): + if all([isinstance(item, (Obs, CObs)) for item in data_input]): _assert_equal_properties(data_input) self.content = [np.asarray([item]) for item in data_input] - if all([(isinstance(item, Obs) or isinstance(item, CObs)) or item is None for item in data_input]): + if all([isinstance(item, (Obs, CObs)) or item is None for item in data_input]): _assert_equal_properties([o for o in data_input if o is not None]) self.content = [np.asarray([item]) if item is not None else None for item in data_input] self.N = 1 @@ -3647,7 +3647,7 @@ method to extract the plateau. else: ax1.set_ylim(y_range) if comp: - if isinstance(comp, Corr) or isinstance(comp, list): + if isinstance(comp, (Corr, list)): for corr in comp if isinstance(comp, list) else [comp]: x, y, y_err = corr.plottable() plt.errorbar(x, y, y_err, label=corr.tag, mfc=plt.rcParams['axes.facecolor']) diff --git a/docs/pyerrors/input/hadrons.html b/docs/pyerrors/input/hadrons.html index c33214b7..13d9258c 100644 --- a/docs/pyerrors/input/hadrons.html +++ b/docs/pyerrors/input/hadrons.html @@ -91,9 +91,9 @@
View Source 
import os
+from collections import Counter
 import h5py
 import numpy as np
-from collections import Counter
 from ..obs import Obs, CObs
 from ..correlators import Corr
 
diff --git a/docs/pyerrors/input/json.html b/docs/pyerrors/input/json.html
index 3ae89f0f..6af72b23 100644
--- a/docs/pyerrors/input/json.html
+++ b/docs/pyerrors/input/json.html
@@ -86,13 +86,13 @@
             View Source
             
import json
 import gzip
-import numpy as np
 import getpass
 import socket
 import datetime
 import platform
 import warnings
 import re
+import numpy as np
 from ..obs import Obs
 from ..covobs import Covobs
 from ..correlators import Corr
diff --git a/docs/pyerrors/input/openQCD.html b/docs/pyerrors/input/openQCD.html
index 26ddf2af..59f9c2a5 100644
--- a/docs/pyerrors/input/openQCD.html
+++ b/docs/pyerrors/input/openQCD.html
@@ -85,8 +85,8 @@
 import fnmatch
 import re
 import struct
-import numpy as np  # Thinly-wrapped numpy
 import warnings
+import numpy as np  # Thinly-wrapped numpy
 import matplotlib.pyplot as plt
 from matplotlib import gridspec
 from ..obs import Obs