Commit 00e5367f authored by Philipp Arras's avatar Philipp Arras
Browse files

Revert change in amplitude model

parent 4a893224
...@@ -33,6 +33,8 @@ def make_amplitude_model(s_space, Npixdof, ceps_a, ceps_k, sm, sv, im, iv, ...@@ -33,6 +33,8 @@ def make_amplitude_model(s_space, Npixdof, ceps_a, ceps_k, sm, sv, im, iv,
''' '''
from ..operators import (ExpTransform, QHTOperator, SlopeOperator, from ..operators import (ExpTransform, QHTOperator, SlopeOperator,
SymmetrizingOperator) SymmetrizingOperator)
from ..models import Variable, Constant, PointwiseExponential
h_space = s_space.get_default_codomain() h_space = s_space.get_default_codomain()
p_space = PowerSpace(h_space) p_space = PowerSpace(h_space)
exp_transform = ExpTransform(p_space, Npixdof) exp_transform = ExpTransform(p_space, Npixdof)
...@@ -59,12 +61,10 @@ def make_amplitude_model(s_space, Npixdof, ceps_a, ceps_k, sm, sv, im, iv, ...@@ -59,12 +61,10 @@ def make_amplitude_model(s_space, Npixdof, ceps_a, ceps_k, sm, sv, im, iv,
ceps = makeOp(sqrt(cepstrum)) ceps = makeOp(sqrt(cepstrum))
smooth_op = sym * qht * ceps smooth_op = sym * qht * ceps
from ..models import Variable
smooth_spec = smooth_op(Variable(position)[keys[0]]) smooth_spec = smooth_op(Variable(position)[keys[0]])
phi = Variable(position)[keys[1]] + norm_phi_mean phi = Variable(position)[keys[1]] + Constant(position, norm_phi_mean)
linear_spec = slope(phi) linear_spec = slope(phi)
loglog_spec = smooth_spec + linear_spec loglog_spec = smooth_spec + linear_spec
from ..models import PointwiseExponential
xlog_ampl = PointwiseExponential(0.5*loglog_spec) xlog_ampl = PointwiseExponential(0.5*loglog_spec)
internals = {'loglog_spec': loglog_spec, internals = {'loglog_spec': loglog_spec,
......
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