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

adjust

parent bb390ed7
......@@ -25,16 +25,13 @@ class LogNormalWienerFilterCurvature(InvertibleOperatorMixin,
"""
def __init__(self, R, N, S, d, position, inverter=None,
preconditioner=None, fft4exp=None, **kwargs):
def __init__(self, R, N, S, d, position, inverter, fft4exp=None, **kwargs):
self._cache = {}
self.R = R
self.N = N
self.S = S
self.d = d
self.position = position
if preconditioner is None:
preconditioner = self.S.times
self._domain = self.S.domain
if fft4exp is None:
......@@ -45,7 +42,6 @@ class LogNormalWienerFilterCurvature(InvertibleOperatorMixin,
super(LogNormalWienerFilterCurvature, self).__init__(
inverter=inverter,
preconditioner=preconditioner,
**kwargs)
@property
......
......@@ -24,12 +24,13 @@ class LogNormalWienerFilterEnergy(Energy):
The prior signal covariance in harmonic space.
"""
def __init__(self, position, d, R, N, S, fft4exp=None):
def __init__(self, position, d, R, N, S, inverter, fft4exp=None):
super(LogNormalWienerFilterEnergy, self).__init__(position=position)
self.d = d
self.R = R
self.N = N
self.S = S
self._inverter = inverter
if fft4exp is None:
self._fft = create_composed_fft_operator(self.S.domain,
......@@ -39,7 +40,8 @@ class LogNormalWienerFilterEnergy(Energy):
def at(self, position):
return self.__class__(position=position, d=self.d, R=self.R, N=self.N,
S=self.S, fft4exp=self._fft)
S=self.S, fft4exp=self._fft,
inverter=self._inverter)
@property
@memo
......@@ -57,7 +59,8 @@ class LogNormalWienerFilterEnergy(Energy):
def curvature(self):
return LogNormalWienerFilterCurvature(R=self.R, N=self.N, S=self.S,
d=self.d, position=self.position,
fft4exp=self._fft)
fft4exp=self._fft,
inverter=self._inverter)
@property
def _expp(self):
......
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