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

repr and str exchanged

Browse source
This commit is contained in:
Fabian Joswig 2021-10-16 11:21:19 +01:00
parent 62fe1f9e3a
commit be4d9f722e
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pyerrors/correlators.py
View file

@ -402,7 +402,7 @@ class Corr:
if plateau: if plateau:
if isinstance(plateau, Obs): if isinstance(plateau, Obs):
ax1.axhline(y=plateau.value, linewidth=2, color=plt.rcParams['text.color'], alpha=0.6, marker=',', ls='--', label=plateau.__repr__()) ax1.axhline(y=plateau.value, linewidth=2, color=plt.rcParams['text.color'], alpha=0.6, marker=',', ls='--', label=str(plateau))
ax1.axhspan(plateau.value - plateau.dvalue, plateau.value + plateau.dvalue, alpha=0.25, color=plt.rcParams['text.color'], ls='-') ax1.axhspan(plateau.value - plateau.dvalue, plateau.value + plateau.dvalue, alpha=0.25, color=plt.rcParams['text.color'], ls='-')
else: else:
raise Exception('plateau must be an Obs') raise Exception('plateau must be an Obs')
@ -451,7 +451,7 @@ class Corr:
else: else:
content_string += str(i + range[0]) content_string += str(i + range[0])
for element in sub_corr: for element in sub_corr:
content_string += '\t' + element.__repr__() content_string += '\t' + str(element)
content_string += '\n' content_string += '\n'
return content_string return content_string

6
pyerrors/pyerrors.py
View file

@ -473,6 +473,9 @@ class Obs:
pickle.dump(self, fb) pickle.dump(self, fb)
def __repr__(self): def __repr__(self):
return 'Obs[' + str(self) + ']'
def __str__(self):
if self.dvalue == 0.0: if self.dvalue == 0.0:
return str(self.value) return str(self.value)
fexp = np.floor(np.log10(self.dvalue)) fexp = np.floor(np.log10(self.dvalue))
@ -483,9 +486,6 @@ class Obs:
else: else:
return '{:.0f}({:2.0f})'.format(self.value, self.dvalue) return '{:.0f}({:2.0f})'.format(self.value, self.dvalue)
def __str__(self):
return 'Obs[' + self.__repr__() + ']'
# Overload comparisons # Overload comparisons
def __lt__(self, other): def __lt__(self, other):
return self.value < other return self.value < other