Skip to content

MAJOR FIX: Fix randomization of exteroception trials #45

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

Merged
merged 3 commits into from
Jun 8, 2021
Merged

MAJOR FIX: Fix randomization of exteroception trials #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c119e79
Update parameters.py
LegrandNico Jun 8, 2021
6539616
Update task.py
LegrandNico Jun 8, 2021
53a6d66
Update setup.py
LegrandNico Jun 8, 2021
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
6 changes: 0 additions & 6 deletions cardioception/HRD/parameters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,6 @@ def getParameters(
Subject ID. Default is 'Participant'.
path : str
The task working directory.
referenceTone : callable
Function selecting the reference tones for the exteroceptive condition.
The output should be a single float matching the name of the `.wav`
files (ending with `.0` or `.5`). Default is uniform between 40.0 and
100.0 BPM (`np.random.choice(np.arange(40, 100, 0.5))`).
resultPath : str or None
Where to save the results.
serial : PySerial instance
Expand Down Expand Up @@ -198,7 +193,6 @@ def getParameters(
parameters["nBreaking"] = nBreaking
parameters["lambdaIntero"] = [] # Save the history of lambda values
parameters["lambdaExtero"] = [] # Save the history of lambda values
parameters["referenceTone"] = np.random.choice(np.arange(40, 100, 0.5))
parameters["nFinger"] = None
parameters["signal_df"] = pd.DataFrame([]) # Physiological recording
parameters["results_df"] = pd.DataFrame([]) # Behavioral results
Expand Down
2 changes: 1 addition & 1 deletion cardioception/HRD/task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ def trial(
parameters["triggers"]["listeningStart"] # Send triggers

# Random selection of HR frequency
listenBPM = parameters["referenceTone"]
listenBPM = np.random.choice(np.arange(40, 100, 0.5))

# Play the corresponding beat file
listenFile = pkg_resources.resource_filename(
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def read(fname):
DISTNAME = "cardioception"
MAINTAINER = "Nicolas Legrand"
MAINTAINER_EMAIL = "nicolas.legrand@cfin.au.dk"
VERSION = "0.4.0"
VERSION = "0.4.1"

INSTALL_REQUIRES = [
"systole>=0.1.3",
Expand Down