Fixups

nifty4/library/log_normal_wiener_filter_curvature.py

@@ -19,9 +19,8 @@
 from ..operators.inversion_enabler import InversionEnabler
 
 
-def LogNormalWienerFilterCurvature(R, N, S, fft, expp_sspace, inverter):
+def LogNormalWienerFilterCurvature(R, N, S, ht, expp_sspace, inverter):
     part1 = S.inverse
-    part3 = (fft.adjoint * expp_sspace * fft *
-             R. adjoint * N.inverse * R *
-             fft.adjoint * expp_sspace * fft)
+    LinResp = R * ht.adjoint * expp_sspace * ht
+    part3 = (LinResp.adjoint * N.inverse * LinResp)
     return InversionEnabler(part1 + part3, inverter)

nifty4/library/log_normal_wiener_filter_energy.py

@@ -70,7 +70,7 @@ class LogNormalWienerFilterEnergy(Energy):
 
     def at(self, position):
         return self.__class__(position, self.d, self.R, self.N, self.S,
-                              self._inverter, self._fft)
+                              self._inverter, self._ht)
 
     @property
     def value(self):
@@ -84,5 +84,5 @@ class LogNormalWienerFilterEnergy(Energy):
     @memo
     def curvature(self):
         return LogNormalWienerFilterCurvature(
-            R=self.R, N=self.N, S=self.S, fft=self._fft,
+            R=self.R, N=self.N, S=self.S, ht=self._ht,
             expp_sspace=self._expp_sspace, inverter=self._inverter)