Skip to content
Snippets Groups Projects
Commit 3613c683 authored by Julian Lenz's avatar Julian Lenz
Browse files

Bug fixes concerning obs and dim

parent 47d35b51
No related branches found
No related tags found
No related merge requests found
......@@ -122,6 +122,8 @@ class OnConfig:
# read a file if given
self.read(dic=kwargs)
self.setObs(kwargs.pop('obs',None))
# evaluate the obervables if needed
if kwargs.pop('initObservables',True):
self.evaluate(dic=kwargs)
......@@ -195,10 +197,6 @@ class OnConfig:
dic.update(kwargs)
else:
dic=kwargs
self.obs=dic.pop('obs',self.obs)
self._normalizeObs()
self.setDim(dic.pop('dim',None))
self.binSize=dic.pop('binSize',self.binSize)
......@@ -223,7 +221,7 @@ class OnConfig:
tested. It might incidentally already work with other dimensions but
it is not supported by now.
'''
if not dim is None:
if dim is None:
return self
self.dim=dim
......@@ -305,7 +303,7 @@ class OnConfig:
elif len(obs[o])>=3:
if not iterTest(obs[o][1]):
raise Exception('obs[...][1] must be iterable.')
if not iterTest(obs[o][2]):
if not iterTest(obs[o][2]) and not obs[o][2] is None:
raise Exception('obs[...][2] must be iterable.')
obs[o]=obs[o][:3]
......@@ -403,6 +401,9 @@ class OnConfig:
Method for (re-)setting or adding observables. See documentation of
self._normalizeObservables() for details.
'''
if obs is None:
return self
if not append:
self.obs=obs
else:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment