Merge branch 'explicit_codomains' into 'NIFTy_5'

allow explicit specification of codomains

See merge request ift/nifty-dev!195

nifty5/library/correlated_fields.py

@@ -24,7 +24,7 @@ from ..operators.harmonic_operators import HarmonicTransformOperator
 from ..operators.simple_linear_operators import ducktape
 
 
-def CorrelatedField(target, amplitude_operator, name='xi'):
+def CorrelatedField(target, amplitude_operator, name='xi', codomain=None):
     """Constructs an operator which turns a white Gaussian excitation field
     into a correlated field.
 
@@ -42,16 +42,21 @@ def CorrelatedField(target, amplitude_operator, name='xi'):
     amplitude_operator: Operator
     name : string
         :class:`MultiField` key for the xi-field.
+    codomain : Domain
+        The codomain for target[0]. If not supplied, it is inferred.
 
     Returns
     -------
-    Correlated field : Operator
+    Operator
+        Correlated field
     """
     tgt = DomainTuple.make(target)
     if len(tgt) > 1:
         raise ValueError
-    h_space = tgt[0].get_default_codomain()
-    ht = HarmonicTransformOperator(h_space, tgt[0])
+    if codomain is None:
+        codomain = tgt[0].get_default_codomain()
+    h_space = codomain
+    ht = HarmonicTransformOperator(h_space, target=tgt[0])
     p_space = amplitude_operator.target[0]
     power_distributor = PowerDistributor(h_space, p_space)
     A = power_distributor(amplitude_operator)
@@ -70,7 +75,7 @@ def MfCorrelatedField(target, amplitudes, name='xi'):
     Parameters
     ----------
     target : Domain, DomainTuple or tuple of Domain
-        Target of the operator. Must contain exactly one space.
+        Target of the operator. Must contain exactly two spaces.
     amplitudes: iterable of Operator
         List of two amplitude operators.
     name : string
@@ -78,7 +83,8 @@ def MfCorrelatedField(target, amplitudes, name='xi'):
 
     Returns
     -------
-    Correlated field : Operator
+    Operator
+        Correlated field
     """
     tgt = DomainTuple.make(target)
     if len(tgt) != 2:
@@ -88,7 +94,7 @@ def MfCorrelatedField(target, amplitudes, name='xi'):
 
     hsp = DomainTuple.make([tt.get_default_codomain() for tt in tgt])
     ht1 = HarmonicTransformOperator(hsp, target=tgt[0], space=0)
-    ht2 = HarmonicTransformOperator(ht1.target, space=1)
+    ht2 = HarmonicTransformOperator(ht1.target, target=tgt[1], space=1)
     ht = ht2 @ ht1
 
     psp = [aa.target[0] for aa in amplitudes]

nifty5/library/dynamic_operator.py

@@ -43,7 +43,8 @@ def _make_dynamic_operator(target,
                            causal,
                            minimum_phase,
                            sigc=None,
-                           quant=None):
+                           quant=None,
+                           codomain=None):
     if not isinstance(target, RGSpace):
         raise TypeError("RGSpace required")
     if not target.harmonic:
@@ -64,7 +65,9 @@ def _make_dynamic_operator(target,
     if cone and (sigc is None or quant is None):
         raise RuntimeError
 
-    dom = DomainTuple.make(target.get_default_codomain())
+    if codomain is None:
+        codomain = target.get_default_codomain()
+    dom = DomainTuple.make(codomain)
     ops = {}
     FFT = FFTOperator(dom)
     Real = Realizer(dom)

nifty5/operators/qht_operator.py

@@ -37,9 +37,11 @@ class QHTOperator(LinearOperator):
     space : int
         The index of the domain on which the operator acts.
         target[space] must be a non-harmonic LogRGSpace.
+    codomain : Domain
+        The codomain for target[space]. If not supplied, it is inferred.
     """
 
-    def __init__(self, target, space=0):
+    def __init__(self, target, space=0, codomain=None):
         self._target = DomainTuple.make(target)
         self._space = infer_space(self._target, space)
 
@@ -51,8 +53,9 @@ class QHTOperator(LinearOperator):
             raise TypeError("target[space] must be a nonharmonic space")
 
         self._domain = [dom for dom in self._target]
-        self._domain[self._space] = \
-            self._target[self._space].get_default_codomain()
+        if codomain is None:
+            codomain = self._target[self._space].get_default_codomain()
+        self._domain[self._space] = codomain
         self._domain = DomainTuple.make(self._domain)
         self._capability = self.TIMES | self.ADJOINT_TIMES