Merge pull request #45 from embodied-computation-group/LegrandNico-patch-3

MAJOR FIX: Fix randomization of exteroception trials

Author: micahgallen

cardioception/HRD/parameters.py

@@ -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
@@ -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

cardioception/HRD/task.py

@@ -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(

setup.py

@@ -13,7 +13,7 @@ def read(fname):
 DISTNAME = "cardioception"
 MAINTAINER = "Nicolas Legrand"
 MAINTAINER_EMAIL = "[email protected]"
-VERSION = "0.4.0"
+VERSION = "0.4.1"
 
 INSTALL_REQUIRES = [
     "systole>=0.1.3",