Commit 0669c952 authored by Martin Reinecke's avatar Martin Reinecke
Browse files

Merge branch 'correlated_field_names' into 'NIFTy_5'

choose mutifield key

See merge request ift/nifty-dev!108
parents d77406e9 4f12103c
......@@ -46,7 +46,7 @@ def CorrelatedField(s_space, amplitude_model):
def MfCorrelatedField(s_space_spatial, s_space_energy, amplitude_model_spatial,
amplitude_model_energy, name="xi"):
Method for construction of correlated multi-frequency fields
......@@ -71,4 +71,4 @@ def MfCorrelatedField(s_space_spatial, s_space_energy, amplitude_model_spatial,
a_energy = dom_distr_energy(amplitude_model_energy)
a = a_spatial*a_energy
A = pd(a)
return ht(A*FieldAdapter(MultiDomain.make({"xi": h_space}), "xi"))
return ht(A*FieldAdapter(MultiDomain.make({name: h_space}), name))
......@@ -178,6 +178,14 @@ class Linearization(object):
return Linearization(field, NullOperator(field.domain, field.domain),
def make_const_empty_input(field, want_metric=False):
from .operators.simple_linear_operators import NullOperator
from .multi_domain import MultiDomain
return Linearization(
field, NullOperator(MultiDomain.make({}), field.domain),
def make_partial_var(field, constants, want_metric=False):
from .operators.scaling_operator import ScalingOperator
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