call_mr_transform dtype fix (#93)

* fixed dtype for call_mr_transform, removed cap on scipy version * replaced float with data.dtype * ensure that fake data has dtype float
CEA-COSMIC · Apr 30, 2020 · 4815dac · 4815dac
1 parent b3e835a
commit 4815dac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/modopt/signal/wavelet.py b/modopt/signal/wavelet.py
@@ -153,7 +153,7 @@ def call_mr_transform(data, opt='', path='./',
                            ''.format(executable, stdout.rstrip('\n')))
 
     # Retrieve wavelet transformed data.
-    result = fits.getdata(file_mr)
+    result = fits.getdata(file_mr).astype(data.dtype)
 
     # Remove the temporary files.
     if remove_files:
@@ -226,7 +226,7 @@ def get_mr_filters(data_shape, opt='', coarse=False,
     fake_data[tuple(zip(data_shape // 2))] = 1
 
     # Call mr_transform.
-    mr_filters = call_mr_transform(fake_data, opt=opt)
+    mr_filters = call_mr_transform(fake_data.astype(float), opt=opt)
 
     if trim:
         mr_filters = np.array([trim_filter(f) for f in mr_filters])

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
 numpy>=1.16.4
-scipy>=1.3.0,<=1.3.3
+scipy>=1.3.0
 progressbar2>=3.34.3