Commit f1635286 authored by Martin Reinecke's avatar Martin Reinecke
Browse files

merge NIFTy_4

parents c772ce4b 9b1b7166
This diff is collapsed.
...@@ -161,6 +161,4 @@ class LinearOperator(with_metaclass( ...@@ -161,6 +161,4 @@ class LinearOperator(with_metaclass(
self._check_mode(mode) self._check_mode(mode)
if x.domain != self._dom(mode): if x.domain != self._dom(mode):
raise ValueError("The operator's and and field's domains " raise ValueError("The operator's and field's domains don't match.")
"don't match.")
...@@ -76,7 +76,7 @@ class ScalingOperator(EndomorphicOperator): ...@@ -76,7 +76,7 @@ class ScalingOperator(EndomorphicOperator):
@property @property
def adjoint(self): def adjoint(self):
return ScalingOperator(np.conj(self.factor), self._domain) return ScalingOperator(np.conj(self._factor), self._domain)
@property @property
def domain(self): def domain(self):
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment