From 9c1c88b3e4c82baf06a10a0660d493a9db52ad5b Mon Sep 17 00:00:00 2001
From: Martin Reinecke <martin@mpa-garching.mpg.de>
Date: Fri, 30 Jun 2017 14:50:04 +0200
Subject: [PATCH] fixes
---
demos/wiener_filter_hamiltonian.py | 6 +++---
demos/wiener_filter_unit.py | 2 +-
nifty/field.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/demos/wiener_filter_hamiltonian.py b/demos/wiener_filter_hamiltonian.py
index 325402e14..85c14d937 100644
--- a/demos/wiener_filter_hamiltonian.py
+++ b/demos/wiener_filter_hamiltonian.py
@@ -27,7 +27,7 @@ class WienerFilterEnergy(Energy):
@property
def value(self):
D_inv_x = self.D_inverse_x()
- H = 0.5 * D_inv_x.vdot(self.position) - self.j.dot(self.position)
+ H = 0.5 * D_inv_x.vdot(self.position) - self.j.vdot(self.position)
return H.real
@property
@@ -75,7 +75,7 @@ if __name__ == "__main__":
ss = fft.inverse_times(sh)
# model the measurement process
- R = SmoothingOperator(s_space, sigma=0.01)
+ R = SmoothingOperator.make(s_space, sigma=0.01)
# R = DiagonalOperator(s_space, diagonal=1.)
# R._diagonal.val[200:400, 200:400] = 0
@@ -95,7 +95,7 @@ if __name__ == "__main__":
def distance_measure(energy, iteration):
x = energy.position
- print((iteration, (x-ss).norm()/ss.norm()).real))
+ print(iteration, (x-ss).norm()/ss.norm().real)
# minimizer = SteepestDescent(convergence_tolerance=0,
# iteration_limit=50,
diff --git a/demos/wiener_filter_unit.py b/demos/wiener_filter_unit.py
index 732155a5a..1441d2646 100644
--- a/demos/wiener_filter_unit.py
+++ b/demos/wiener_filter_unit.py
@@ -88,7 +88,7 @@ if __name__ == "__main__":
x1 = RGSpace(npix, distances=total_volume / npix,
zerocenter=False)
k1 = RGRGTransformation.get_codomain(x1)
- p1 = PowerSpace(harmonic_domain=k1, log=False)
+ p1 = PowerSpace(harmonic_partner=k1, logarithmic=False)
# creating Power Operator with given spectrum
spec = (lambda k: a_s / (1 + (k / k_0) ** 2) ** 2)
diff --git a/nifty/field.py b/nifty/field.py
index ed1235d8a..c139d79af 100644
--- a/nifty/field.py
+++ b/nifty/field.py
@@ -1104,7 +1104,7 @@ class Field(Loggable, Versionable, object):
The Lq-norm of the field values.
"""
- return np.sqrt(np.abs(self.dot(x=self)))
+ return np.sqrt(np.abs(self.vdot(x=self)))
def conjugate(self, inplace=False):
""" Retruns the complex conjugate of the field.
--
GitLab