mirror of
https://github.com/fjosw/pyerrors.git
synced 2025-03-15 06:40:24 +01:00
repr and str exchanged
This commit is contained in:
parent
62fe1f9e3a
commit
be4d9f722e
2 changed files with 5 additions and 5 deletions
|
@ -402,7 +402,7 @@ class Corr:
|
|||
|
||||
if plateau:
|
||||
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='-')
|
||||
else:
|
||||
raise Exception('plateau must be an Obs')
|
||||
|
@ -451,7 +451,7 @@ class Corr:
|
|||
else:
|
||||
content_string += str(i + range[0])
|
||||
for element in sub_corr:
|
||||
content_string += '\t' + element.__repr__()
|
||||
content_string += '\t' + str(element)
|
||||
content_string += '\n'
|
||||
return content_string
|
||||
|
||||
|
|
|
@ -473,6 +473,9 @@ class Obs:
|
|||
pickle.dump(self, fb)
|
||||
|
||||
def __repr__(self):
|
||||
return 'Obs[' + str(self) + ']'
|
||||
|
||||
def __str__(self):
|
||||
if self.dvalue == 0.0:
|
||||
return str(self.value)
|
||||
fexp = np.floor(np.log10(self.dvalue))
|
||||
|
@ -483,9 +486,6 @@ class Obs:
|
|||
else:
|
||||
return '{:.0f}({:2.0f})'.format(self.value, self.dvalue)
|
||||
|
||||
def __str__(self):
|
||||
return 'Obs[' + self.__repr__() + ']'
|
||||
|
||||
# Overload comparisons
|
||||
def __lt__(self, other):
|
||||
return self.value < other
|
||||
|
|
Loading…
Add table
Reference in a new issue