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.

Sign up for GitHub

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

Jump to bottom

[ENH] add band, order, and frequency args to eda_process #99

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[ENH] add band, order, and frequency args to eda_process #99

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions neurokit/bio/bio_eda.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
# ==============================================================================
# ==============================================================================
# ==============================================================================
def eda_process(eda, sampling_rate=1000, alpha=8e-4, gamma=1e-2, filter_type = "butter", scr_method="makowski", scr_treshold=0.1):
def eda_process(eda, sampling_rate=1000, alpha=8e-4, gamma=1e-2,
filter_type="butter", scr_method="makowski", scr_treshold=0.1,
band='lowpass', order=4, frequency=5):
"""
Automated processing of EDA signal using convex optimization (CVXEDA; Greco et al., 2015).

Expand Down Expand Up @@ -100,9 +102,9 @@ def eda_process(eda, sampling_rate=1000, alpha=8e-4, gamma=1e-2, filter_type = "
if filter_type is not None:
filtered, _, _ = biosppy.tools.filter_signal(signal=eda,
ftype=filter_type,
band='lowpass',
order=4,
frequency=5,
band=band,
order=order,
frequency=frequency,
sampling_rate=sampling_rate)

# Smoothing
Expand Down