diff options
| author | andreas128 <Andreas> | 2017-08-19 14:42:48 +0200 |
|---|---|---|
| committer | andreas128 <Andreas> | 2017-08-19 14:42:48 +0200 |
| commit | c70b33b4cc3a4c61c2f29944e6dd4cbb17031cb6 (patch) | |
| tree | 0749a5185a4ae9fcf31a65acc363e675a4ffe1fb /dpd | |
| parent | a7cec585afe6d4805f61461091e516b25574945d (diff) | |
| parent | a07f668d588b42cb92651a8ffcdebc5ca0a45af9 (diff) | |
| download | dabmod-c70b33b4cc3a4c61c2f29944e6dd4cbb17031cb6.tar.gz dabmod-c70b33b4cc3a4c61c2f29944e6dd4cbb17031cb6.tar.bz2 dabmod-c70b33b4cc3a4c61c2f29944e6dd4cbb17031cb6.zip | |
Merge
Diffstat (limited to 'dpd')
| -rwxr-xr-x | dpd/src/subsample_align.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dpd/src/subsample_align.py b/dpd/src/subsample_align.py index 4dc854b..992aa03 100755 --- a/dpd/src/subsample_align.py +++ b/dpd/src/subsample_align.py @@ -52,7 +52,7 @@ def subsample_align(sig, ref_sig): corr_sig = np.fft.ifft(rotate_vec * fft_sig) - return -np.abs(np.sum(corr_sig.conjugate() * ref_sig)) + return -np.abs(np.sum(np.conj(corr_sig) * ref_sig)) optim_result = optimize.minimize_scalar(correlate_for_delay, bounds=(-1,1), method='bounded', options={'disp': True}) |