Commit c0bc65a3 authored by Philipp Arras's avatar Philipp Arras
Browse files

Merge branch 'conventions_mf_correlated_field' into 'NIFTy_5'

Remove exp from multifrequency correlated field

See merge request ift/nifty-dev!107
parents 6b1c58f7 d304ebc0
...@@ -25,7 +25,6 @@ from ..operators.contraction_operator import ContractionOperator ...@@ -25,7 +25,6 @@ from ..operators.contraction_operator import ContractionOperator
from ..operators.distributors import PowerDistributor from ..operators.distributors import PowerDistributor
from ..operators.harmonic_operators import HarmonicTransformOperator from ..operators.harmonic_operators import HarmonicTransformOperator
from ..operators.simple_linear_operators import FieldAdapter from ..operators.simple_linear_operators import FieldAdapter
from ..sugar import exp
def CorrelatedField(s_space, amplitude_model): def CorrelatedField(s_space, amplitude_model):
...@@ -72,4 +71,4 @@ def MfCorrelatedField(s_space_spatial, s_space_energy, amplitude_model_spatial, ...@@ -72,4 +71,4 @@ def MfCorrelatedField(s_space_spatial, s_space_energy, amplitude_model_spatial,
a_energy = dom_distr_energy(amplitude_model_energy) a_energy = dom_distr_energy(amplitude_model_energy)
a = a_spatial*a_energy a = a_spatial*a_energy
A = pd(a) A = pd(a)
return exp(ht(A*FieldAdapter(MultiDomain.make({"xi": h_space}), "xi"))) return ht(A*FieldAdapter(MultiDomain.make({"xi": h_space}), "xi"))
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