Merge branch 'NIFTy_4' into notebook_demo

28deed25 · Martin Reinecke · c92db8ac · 73427615 · 28deed25
Commit 28deed25 authored Feb 04, 2018 by Martin Reinecke
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

nifty4/operators/scaling_operator.py nifty4/operators/scaling_operator.py +1 -1

No files found.
--- a/nifty4/operators/scaling_operator.py
+++ b/nifty4/operators/scaling_operator.py
@@ -76,7 +76,7 @@ class ScalingOperator(EndomorphicOperator):

    @property
    def adjoint(self):
-        return ScalingOperator(np.conj(self.factor), self._domain)
+        return ScalingOperator(np.conj(self._factor), self._domain)

    @property
    def domain(self):