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

Merge branch 'NIFTy_5' into operator_documentation

parents d3fb76f1 84625c98
......@@ -27,7 +27,7 @@ class QHTOperator(LinearOperator):
if target.harmonic:
raise TypeError("Target is not a codomain of domain")
from import LogRGSpace
from import LogRGSpace
if not isinstance(domain, LogRGSpace):
raise ValueError("Domain has to be a LogRGSpace!")
if not isinstance(target, LogRGSpace):
......@@ -16,7 +16,7 @@
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
# and financially supported by the Studienstiftung des deutschen Volkes.
from ..operators import LinearOperator
from .linear_operator import LinearOperator
class SelectionOperator(LinearOperator):
......@@ -31,7 +31,7 @@ class SelectionOperator(LinearOperator):
String identifier of the wanted subdomain
def __init__(self, domain, key):
from ..multi import MultiDomain
from ..multi.multi_domain import MultiDomain
if not isinstance(domain, MultiDomain):
raise TypeError("Domain must be a MultiDomain")
self._target = domain[key]
......@@ -56,5 +56,5 @@ class SelectionOperator(LinearOperator):
if mode == self.TIMES:
return x[self._key].copy()
from ..multi import MultiField
from ..multi.multi_field import MultiField
return MultiField({self._key: x.copy()})
Supports Markdown
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