cSAXS/cdtools
0
0
Fork 0
mirror of https://github.com/cdtools-developers/cdtools.git synced 2026-09-27 12:42:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove dependency on fftpack completely

Browse Source
This commit is contained in:
Abe Levitan
2022-08-19 10:02:11 -07:00
parent b8b508ce2c
commit 036fa8ea2c
5 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/tools/test_analysis.py
+6 -7
View File
@@ -1,5 +1,4 @@
import numpy as np
from scipy import fftpack as ffts
from scipy import linalg as la
import torch as t
from itertools import combinations
@@ -251,18 +250,18 @@ def test_calc_frc():
nbins = 100
snr = 2
cor_fft = ffts.fftshift(ffts.fft2(obj1[10:-10,20:-20])) * \
ffts.fftshift(np.conj(ffts.fft2(obj2[10:-10,20:-20])))
cor_fft = np.fft.fftshift(np.fft.fft2(obj1[10:-10,20:-20])) * \
np.fft.fftshift(np.conj(np.fft.fft2(obj2[10:-10,20:-20])))
F1 = np.abs(ffts.fftshift(ffts.fft2(obj1[10:-10,20:-20])))**2
F2 = np.abs(ffts.fftshift(ffts.fft2(obj2[10:-10,20:-20])))**2
F1 = np.abs(np.fft.fftshift(np.fft.fft2(obj1[10:-10,20:-20])))**2
F2 = np.abs(np.fft.fftshift(np.fft.fft2(obj2[10:-10,20:-20])))**2
di = np.linalg.norm(basis[:,0])
dj = np.linalg.norm(basis[:,1])
i_freqs = ffts.fftshift(ffts.fftfreq(cor_fft.shape[0],d=di))
j_freqs = ffts.fftshift(ffts.fftfreq(cor_fft.shape[1],d=dj))
i_freqs = np.fft.fftshift(np.fft.fftfreq(cor_fft.shape[0],d=di))
j_freqs = np.fft.fftshift(np.fft.fftfreq(cor_fft.shape[1],d=dj))
Js,Is = np.meshgrid(j_freqs,i_freqs)
Rs = np.sqrt(Is**2+Js**2)
tests/tools/test_interactions.py
+1 -1
View File
@@ -2,7 +2,7 @@ from cdtools.tools import interactions
import numpy as np
import torch as t
from numpy import fft
from scipy.fftpack import fftshift, ifftshift
from numpy.fft import fftshift, ifftshift
import pytest