Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/multitaper psd estimate #458

Merged
Changes from 1 commit
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
e0796e2
Initial commit multitaper psd estimate
ackurth Jan 11, 2021
9d87185
Fix wrong variable
ackurth Jan 11, 2021
eb2d501
Fix minor bug
ackurth Jan 11, 2021
a38b17a
Fix variable name
ackurth Jan 11, 2021
e63e6bb
Fix typos
ackurth Jan 11, 2021
96a9d93
Add functionality to generate test data
ackurth Jan 17, 2021
ef624e0
Use rfftfreq to generate frequencies instead of fftfreq
ackurth Jan 17, 2021
fecd726
Add example for comparison for multitaper and welch
ackurth Jan 17, 2021
6be6c53
Refactor NW -> nw
rjurkus Jan 25, 2021
43d3de1
Refactor NW -> nw in the test section
rjurkus Jan 25, 2021
4d64623
Add functionality to multitaper to handle frequency resolution
ackurth Feb 12, 2021
efd6f11
Remove subsampling
ackurth Feb 12, 2021
3526e5f
Initial commit for multitaper_psd tests
rjurkus Feb 12, 2021
99bcdd1
Merge branch 'master' into feature/multitaper_psd_estimate
rjurkus Feb 15, 2021
841ab51
Run all tests in test_spectral.py
rjurkus Feb 15, 2021
54998dc
Tests for multitaper_psd (copied/adapted from welch_psd)
rjurkus Feb 15, 2021
37458ef
Added quantities and their handling to multitaper psd
ackurth Feb 22, 2021
3d570a2
Remove code doubling for one/multi dim case, minor edits
ackurth Feb 22, 2021
5731f4e
Clean up examples
ackurth Feb 22, 2021
a25b2c9
Correct test, remove wrong test
ackurth Feb 22, 2021
e08aba0
Fixed PEP8 issues
rjurkus Feb 22, 2021
855e607
Removed if __name__ == '__main__'
rjurkus Feb 22, 2021
72e03b4
multitaper_psd -> psd refactor
rjurkus Feb 22, 2021
4b7559b
Refactor frequency_resolution -> peak_resolution
rjurkus Apr 16, 2021
63be87b
Refactor frequency_resolution -> peak_resolution in test_spectral.py
rjurkus Apr 16, 2021
8350d20
Added a test comparing multitaper_psd against nitime multitaper imple…
rjurkus Apr 16, 2021
4ac9e68
Removed the line regarding None for peak_resolution
rjurkus Jun 18, 2021
01d71c9
Added a note regarding parameter hierarchy and a line of code to ensu…
rjurkus Jun 18, 2021
760d318
Refactor slepain_fcts -> slepian_fcts
rjurkus Jun 18, 2021
3afd1ca
Added a comment that sym=False in dpss is used for spectral analysis
rjurkus Jun 18, 2021
3bd81bc
Changed elif to if for the second num_tapers check
rjurkus Jun 18, 2021
6cd853f
Added a comment regarding broadcasting if data has more than 1 dim
rjurkus Jun 18, 2021
7fea31a
Adjusted comparison to nitime to use both rtol and atol
rjurkus Jun 18, 2021
cfc914c
Changed num_tapers to be of type int (not int64)
rjurkus Jun 18, 2021
787485f
Added tests for peak_resolution, num_tapers and nw parameter hierarchy
rjurkus Jun 18, 2021
e0bb3a7
Initial commit multitaper psd estimate
ackurth Jan 11, 2021
9b6ec18
Fix wrong variable
ackurth Jan 11, 2021
cb7f6fd
Fix minor bug
ackurth Jan 11, 2021
3ae4664
Fix variable name
ackurth Jan 11, 2021
5f45d54
Fix typos
ackurth Jan 11, 2021
975a36f
Improve memory efficiency of _create_sparse_matrix in BinnedSpikeTrai…
morales-gregorio Jan 12, 2021
b774956
Add functionality to generate test data
ackurth Jan 17, 2021
b3fff9f
Use rfftfreq to generate frequencies instead of fftfreq
ackurth Jan 17, 2021
abbb548
Add example for comparison for multitaper and welch
ackurth Jan 17, 2021
25c746a
Joint-ISI dithering: fixed a bug regarding first ISI bin (#396)
pbouss Jan 21, 2021
358e30a
Refactor NW -> nw
rjurkus Jan 25, 2021
178b8b9
Refactor NW -> nw in the test section
rjurkus Jan 25, 2021
305fc52
CUDA accelerated ASSET (#351)
dizcza Jan 29, 2021
ba331ee
Bin-Shuffling: reimplemented the continuos time version (#397)
pbouss Feb 1, 2021
ebc0a97
Account for unidirectional spiketrain->segment links in synchrofact d…
Kleinjohann Feb 1, 2021
b46f80e
Speed up bin shuffling (#400)
pbouss Feb 3, 2021
6c3ea44
Memory efficient and faster implementation of ASSET pmat analytical (…
dizcza Feb 3, 2021
73bdb3c
missing comma in BibTeX entry (#401)
apdavison Feb 8, 2021
019187a
Add functionality to multitaper to handle frequency resolution
ackurth Feb 12, 2021
aa72902
Remove subsampling
ackurth Feb 12, 2021
3943be4
Initial commit for multitaper_psd tests
rjurkus Feb 12, 2021
6dc83e9
Run all tests in test_spectral.py
rjurkus Feb 15, 2021
172a4f0
Tests for multitaper_psd (copied/adapted from welch_psd)
rjurkus Feb 15, 2021
196e016
Added quantities and their handling to multitaper psd
ackurth Feb 22, 2021
b6dad55
Remove code doubling for one/multi dim case, minor edits
ackurth Feb 22, 2021
7fd2992
Clean up examples
ackurth Feb 22, 2021
2e0ddaf
Correct test, remove wrong test
ackurth Feb 22, 2021
2c1bc51
Fixed PEP8 issues
rjurkus Feb 22, 2021
94e9468
Removed if __name__ == '__main__'
rjurkus Feb 22, 2021
45f5df7
multitaper_psd -> psd refactor
rjurkus Feb 22, 2021
36f6e2e
Refactor frequency_resolution -> peak_resolution
rjurkus Apr 16, 2021
a755af8
Refactor frequency_resolution -> peak_resolution in test_spectral.py
rjurkus Apr 16, 2021
f987a75
Added a test comparing multitaper_psd against nitime multitaper imple…
rjurkus Apr 16, 2021
a2dcc13
Removed the line regarding None for peak_resolution
rjurkus Jun 18, 2021
a81dc26
Added a note regarding parameter hierarchy and a line of code to ensu…
rjurkus Jun 18, 2021
35f5e08
Refactor slepain_fcts -> slepian_fcts
rjurkus Jun 18, 2021
4b36d5e
Added a comment that sym=False in dpss is used for spectral analysis
rjurkus Jun 18, 2021
d3084b1
Changed elif to if for the second num_tapers check
rjurkus Jun 18, 2021
0b534e3
Added a comment regarding broadcasting if data has more than 1 dim
rjurkus Jun 18, 2021
281b151
Adjusted comparison to nitime to use both rtol and atol
rjurkus Jun 18, 2021
a7d7078
Changed num_tapers to be of type int (not int64)
rjurkus Jun 18, 2021
85e4868
Added tests for peak_resolution, num_tapers and nw parameter hierarchy
rjurkus Jun 18, 2021
8ae206e
Merge branch 'feature/multitaper_psd_estimate' of github.com:INM-6/el…
ackurth Oct 1, 2021
ed2a0c4
Add segmentation of signal to multitaper_psd
ackurth Oct 7, 2021
5c33635
Correct adding new axis
ackurth Oct 7, 2021
1816bc0
Remove printing number of tapers
ackurth Oct 7, 2021
075d4c1
Add frequency resolution to multiatper_psd
ackurth Oct 8, 2021
6e4b24b
Code factor issue fix (else is not necessary)
rjurkus Nov 3, 2021
fd6da43
Fixed a typo in multitaper_psd docstring
rjurkus Nov 3, 2021
026c5e0
Consistent language and formatting in Raises section of multitaper_ps…
rjurkus Nov 3, 2021
b3b906a
Fixed a typo in a comment of multitaper_psd, also:
rjurkus Nov 3, 2021
f3e7dc5
Update docstring peak_resolution
ackurth Nov 5, 2021
b2df694
Removed basic Raises section entries
rjurkus Nov 5, 2021
a36e7d4
Updated test_spectral.py test_multitaper_psd_against_nitime to downlo…
rjurkus Dec 10, 2021
44f0817
Merge remote-tracking branch 'upstream/master' into feature/multitape…
rjurkus Jan 26, 2022
d0a8601
fixed typos in inline comments
Moritz-Alexander-Kern Feb 8, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added a comment regarding broadcasting if data has more than 1 dim
rjurkus committed Jun 18, 2021
commit 6cd853f9c99c3127b7e8743875e2a9403c404516
1 change: 1 addition & 0 deletions elephant/spectral.py
Original file line number Diff line number Diff line change
@@ -347,6 +347,7 @@ def multitaper_psd(signal, fs=1, nw=4, num_tapers=None,
if data.ndim == 1:
tapered_signal = data * slepian_fcts
else:
# Use broadcasting to match dimensions for point-wise multiplication
tapered_signal = data[:, np.newaxis] * slepian_fcts

# Determine Fourier transform of tapered signal