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

Multitaper psd segmentation #556

Conversation

rjurkus
Copy link
Collaborator

@rjurkus rjurkus commented Apr 5, 2023

This PR separates multitaper_psd() with segmentation into segmented_multitaper_psd() and multitaper_psd() without segmentation to match the approach used in #525.

ackurth and others added 30 commits January 11, 2021 11:07
…re that peak_resolution is the primary parameter.
rjurkus and others added 24 commits January 31, 2023 11:10
…tapered_signals should not use signals, but the underlying and modified numpy array

Co-authored-by: ackurth <anno.kurth@posteo.de>
…elephant into feature/multitaper_cross_spectrum
Co-authored-by: rjurkus <regimantas.jurkus@gmail.com>
…r_cross_spectrum test case (copied from multitaper_cross_spectrum test case)
…ence

Co-authored-by: ackurth <anno.kurth@posteo.de>
…taper_cross_spectrum

Co-authored-by: ackurth <anno.kurth@posteo.de>
…er Coherence test case

Co-authored-by: ackurth <anno.kurth@posteo.de>
Co-authored-by: ackurth <anno.kurth@posteo.de>
Fixed several docstring issues (PEP8, unused parameters, wrong parameter names);
Fixed the coherence equation string in multitaper_coherence
Co-authored-by: ackurth <anno.kurth@posteo.de>
…sd_segmentation

# Conflicts:
#	elephant/spectral.py
#	elephant/test/test_spectral.py
@coveralls
Copy link
Collaborator

coveralls commented Apr 5, 2023

Coverage Status

Coverage: 86.724% (-1.3%) from 87.996% when pulling 6c711dd on INM-6:hotfix/multitaper_psd_segmentation into a8aab43 on NeuralEnsemble:master.

@Moritz-Alexander-Kern Moritz-Alexander-Kern added the enhancement Editing an existing module, improving something label Apr 5, 2023
@Moritz-Alexander-Kern
Copy link
Member

Hey @rjurkus ,

thank you so much for this follow up PR.
If not stated otherwise, I will consider @rjurkus and @ackurth as authors of this PR.

# Average Fourier transform windowed signal
psd_segment = np.mean(spectrum_estimates, axis=-2) / fs
# Number of data points in time series
length_signal = np.shape(data)[1]

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

length_signal not needed at this point? , it is calculated later in _segmented_apply_func ?

@Moritz-Alexander-Kern Moritz-Alexander-Kern merged commit fef6339 into NeuralEnsemble:master Jun 6, 2023
13 checks passed
@Moritz-Alexander-Kern Moritz-Alexander-Kern deleted the hotfix/multitaper_psd_segmentation branch July 21, 2023 12:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Editing an existing module, improving something
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants