Draft: Nifty5 to nifty7

helpers/generate_data.py

@@ -11,42 +11,42 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# Copyright(C) 2013-2019 Max-Planck-Society
+# Copyright(C) 2013-2021 Max-Planck-Society
 #
 # NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik.
 
 import numpy as np
 
-import nifty5 as ift
+import nifty7 as ift
 
 
 def generate_gaussian_data(signal_response, noise_covariance):
-    ground_truth = ift.from_random('normal', signal_response.domain)
-    d = signal_response(ground_truth) + noise_covariance.draw_sample()
+    ground_truth = ift.from_random(signal_response.domain)
+    d = signal_response(ground_truth) + noise_covariance.draw_sample_with_dtype(np.float64)
     return d, ground_truth
 
 
 def generate_poisson_data(signal_response):
-    ground_truth = ift.from_random('normal', signal_response.domain)
-    rate = signal_response(ground_truth).to_global_data()
+    ground_truth = ift.from_random(signal_response.domain)
+    rate = signal_response(ground_truth).val
     d = np.random.poisson(rate)
-    return ift.from_global_data(signal_response.target, d), ground_truth
+    return ift.makeField(signal_response.target, d), ground_truth
 
 
 def generate_bernoulli_data(signal_response):
-    ground_truth = ift.from_random('normal', signal_response.domain)
-    rate = signal_response(ground_truth).to_global_data()
+    ground_truth = ift.from_random(signal_response.domain)
+    rate = signal_response(ground_truth).val
     d = np.random.binomial(1, rate)
-    return ift.from_global_data(signal_response.target, d), ground_truth
+    return ift.makeField(signal_response.target, d), ground_truth
 
 
 def generate_wf_data(domain, spectrum):
     harmonic_space = domain.get_default_codomain()
-    HT = ift.HartleyOperator(harmonic_space, target=domain)
-    N = ift.ScalingOperator(0.1, domain)
+    HT = ift.HarmonicTransformOperator(harmonic_space, target=domain)
+    N = ift.ScalingOperator(domain, 0.1)
     S_k = ift.create_power_operator(harmonic_space, spectrum)
-    s = HT(S_k.draw_sample()).to_global_data()
-    d = s + N.draw_sample().to_global_data()
+    s = HT(S_k.draw_sample_with_dtype(np.float64)).val
+    d = s + N.draw_sample_with_dtype(np.float64).val
     return d, s