aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas128 <Andreas>2017-05-29 22:48:56 +0100
committerandreas128 <Andreas>2017-05-29 22:48:56 +0100
commitf14e0d8bb1edf1b32c4da4dfce1aa079c4ad67d5 (patch)
tree97ec27e4aac1b9512ae6426d7d0f4f4764205bc2
parent59ff35e5b6a81150a87cc0b5a972a91bd64c3ab9 (diff)
downloadODR-StaticPrecorrection-f14e0d8bb1edf1b32c4da4dfce1aa079c4ad67d5.tar.gz
ODR-StaticPrecorrection-f14e0d8bb1edf1b32c4da4dfce1aa079c4ad67d5.tar.bz2
ODR-StaticPrecorrection-f14e0d8bb1edf1b32c4da4dfce1aa079c4ad67d5.zip
Fix complex float type
-rw-r--r--src/dab_util.py3
-rwxr-xr-xsrc/subsample_align.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/dab_util.py b/src/dab_util.py
index 3187036..ff26fa5 100644
--- a/src/dab_util.py
+++ b/src/dab_util.py
@@ -81,6 +81,7 @@ def subsample_align(sig1, sig2):
"""
Returns an aligned version of sig1 and sig2 by cropping and subsample alignment
"""
+ assert(sig2.dtype == 'complex64')
off_meas = lag_upsampling(sig2, sig1, n_up=1)
off = int(abs(off_meas))
@@ -95,7 +96,9 @@ def subsample_align(sig1, sig2):
sig1 = sig1[:-1]
sig2 = sig2[:-1]
+ assert(sig2.dtype == 'complex64')
sig2 = sa.subsample_align(sig2, sig1)
+ assert(sig2.dtype == 'complex64')
return sig1, sig2
def get_amp_ratio(ampl_1, ampl_2, a_out_abs, a_in_abs):
diff --git a/src/subsample_align.py b/src/subsample_align.py
index 1657131..76ec97f 100755
--- a/src/subsample_align.py
+++ b/src/subsample_align.py
@@ -70,7 +70,7 @@ def subsample_align(sig, ref_sig):
# Prepare rotate_vec = fft_sig with rotated phase
rotate_vec = np.exp(1j * best_tau * omega)
rotate_vec[halflen] = np.cos(np.pi * best_tau)
- return np.fft.ifft(rotate_vec * fft_sig)
+ return np.fft.ifft(rotate_vec * fft_sig).astype(np.complex64)
else:
#print("Could not optimize: " + optim_result.message)
return np.zeros(0, dtype=np.complex64)