From 9f471cba1352aa09e4c84ce0fd00e8152c79318c Mon Sep 17 00:00:00 2001
From: Martin Reinecke <martin@mpa-garching.mpg.de>
Date: Fri, 2 Feb 2018 15:21:30 +0100
Subject: [PATCH] adjustments
---
demos/log_normal_wiener_filter.py | 6 +++---
demos/paper_demos/cartesian_wiener_filter.py | 2 +-
demos/paper_demos/wiener_filter.py | 2 +-
demos/wiener_filter_easy.py | 2 +-
demos/wiener_filter_via_hamiltonian.py | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/demos/log_normal_wiener_filter.py b/demos/log_normal_wiener_filter.py
index f5bcccf64..d69150c7f 100644
--- a/demos/log_normal_wiener_filter.py
+++ b/demos/log_normal_wiener_filter.py
@@ -41,7 +41,7 @@ if __name__ == "__main__":
# Setting up the noise covariance and drawing a random noise realization
noiseless_data = R(mock_signal)
- noise_amplitude = noiseless_data.std()/signal_to_noise
+ noise_amplitude = noiseless_data.val.std()/signal_to_noise
N = ift.DiagonalOperator(
ift.Field.full(data_domain, noise_amplitude**2))
noise = ift.Field.from_random(
@@ -56,9 +56,9 @@ if __name__ == "__main__":
inverter = ift.ConjugateGradient(controller=ctrl)
energy = ift.library.LogNormalWienerFilterEnergy(m0, data, R,
N, S, inverter=inverter)
- # minimizer = ift.VL_BFGS(controller=ctrl2, max_history_length=20)
+ #minimizer = ift.VL_BFGS(controller=ctrl2, max_history_length=20)
minimizer = ift.RelaxedNewton(controller=ctrl2)
- # minimizer = ift.SteepestDescent(controller=ctrl2)
+ #minimizer = ift.SteepestDescent(controller=ctrl2)
me = minimizer(energy)
m = ht(me[0].position)
diff --git a/demos/paper_demos/cartesian_wiener_filter.py b/demos/paper_demos/cartesian_wiener_filter.py
index 849d793aa..d4a2159b8 100644
--- a/demos/paper_demos/cartesian_wiener_filter.py
+++ b/demos/paper_demos/cartesian_wiener_filter.py
@@ -81,7 +81,7 @@ if __name__ == "__main__":
data_domain = R.target
noiseless_data = R(mock_signal)
- noise_amplitude = noiseless_data.std()/signal_to_noise
+ noise_amplitude = noiseless_data.val.std()/signal_to_noise
# Setting up the noise covariance and drawing a random noise realization
ndiag = ift.Field.full(data_domain, noise_amplitude**2)
N = ift.DiagonalOperator(ndiag)
diff --git a/demos/paper_demos/wiener_filter.py b/demos/paper_demos/wiener_filter.py
index 78cffc3fb..aa873d35a 100644
--- a/demos/paper_demos/wiener_filter.py
+++ b/demos/paper_demos/wiener_filter.py
@@ -42,7 +42,7 @@ if __name__ == "__main__":
data_domain = R.target[0]
noiseless_data = R(mock_signal)
- noise_amplitude = noiseless_data.std()/signal_to_noise
+ noise_amplitude = noiseless_data.val.std()/signal_to_noise
# Setting up the noise covariance and drawing a random noise realization
ndiag = ift.Field.full(data_domain, noise_amplitude**2)
N = ift.DiagonalOperator(ndiag)
diff --git a/demos/wiener_filter_easy.py b/demos/wiener_filter_easy.py
index 2867161e2..4de310c8d 100644
--- a/demos/wiener_filter_easy.py
+++ b/demos/wiener_filter_easy.py
@@ -42,7 +42,7 @@ if __name__ == "__main__":
noiseless_data = R(sh)
signal_to_noise = 1.
- noise_amplitude = noiseless_data.std()/signal_to_noise
+ noise_amplitude = noiseless_data.val.std()/signal_to_noise
N = ift.DiagonalOperator(ift.Field.full(s_space, noise_amplitude**2))
n = ift.Field.from_random(domain=s_space,
random_type='normal',
diff --git a/demos/wiener_filter_via_hamiltonian.py b/demos/wiener_filter_via_hamiltonian.py
index e3a22db3a..0e73cafbe 100644
--- a/demos/wiener_filter_via_hamiltonian.py
+++ b/demos/wiener_filter_via_hamiltonian.py
@@ -36,7 +36,7 @@ if __name__ == "__main__":
R = Instrument*ht
noiseless_data = R(sh)
signal_to_noise = 1.
- noise_amplitude = noiseless_data.std()/signal_to_noise
+ noise_amplitude = noiseless_data.val.std()/signal_to_noise
N = ift.DiagonalOperator(ift.Field.full(s_space, noise_amplitude**2))
n = ift.Field.from_random(domain=s_space,
random_type='normal',
--
GitLab