Lots of refactoring.

Author: tsalo

.DS_Store

@@ -2,14 +2,22 @@
 A PsychoPy implementation of the Stanford VPN lab's functional localizer task.
 
 This implementation is not associated with the VPN lab, so any bugs are our own.
-The Python code for this task is released under our selected license, but the stimuli for the task must be taken from the VPN lab's [fLoc repository](https://github.com/VPNL/fLoc), and any use of the stimuli should include an acknowledgement in any resulting research products (see [here](https://github.com/VPNL/fLoc#citation)).
+The Python code for this task is released under our selected license,
+but the stimuli for the task must be taken from the VPN lab's [fLoc repository](https://github.com/VPNL/fLoc),
+and any use of the stimuli should include an acknowledgement in any resulting research products
+(see [here](https://github.com/VPNL/fLoc#citation)).
+
+Please download the stimuli from that repository and place them in a folder named "stimuli" in the same folder as `fLoc.py` and `config.json`.
 
 ## Implementation information
 
 This functional localizer task uses a mini-block design with different categories of images.
-To keep participants focused on the task, there is also a behavioral task that participants will perform throughout the localizer.
+To keep participants focused on the task,
+there is also a behavioral task that participants will perform throughout the localizer.
 There are three options for this task: oddball, one-back, and two-back.
 
 ### Differences from the original task
 
-While we have attempted to maximize similarity between this task and the VPN lab's task, there are differences.
+While we have attempted to maximize similarity between this task and the VPN lab's task,
+there are differences.
+I'm not sure what those differences are, unfortunately.

README.md

@@ -0,0 +1,3 @@
+# bids
+
+BIDS JSON files for the different fLoc tasks.

bids/README.md

@@ -0,0 +1,72 @@
+# Constants that control the timing of the task
+constants:
+  # Countdown presented at the beginning of each run, in seconds
+  COUNTDOWN_DURATION: 12
+  # Final screen presented at the end of each run, in seconds
+  END_SCREEN_DURATION: 2
+  # How long each stimulus is presented, in seconds
+  IMAGE_DURATION: 0.4
+  # Number of single-category blocks
+  N_BLOCKS: 36
+  # Number of stimuli per block
+  N_STIMULI_PER_BLOCK: 12
+  # How long to wait after start of presentation of stimulus to accept response
+  RESPONSE_WINDOW: 1
+  # Interstimulus interval
+  TARGET_ISI: 0.1
+  # Proportion of trials in which to do the task
+  TASK_RATE: 0.5
+  # Total run duration, in seconds
+  TOTAL_DURATION: 240
+# The different sets of categories that determine which stimuli are used
+category_sets:
+  # The default categories
+  default:
+    baseline: null
+    bodies:
+    - body
+    characters:
+    - word
+    faces:
+    - adult
+    objects:
+    - car
+    places:
+    - house
+    scrambled:
+    - scrambled
+  # The alternate categories
+  alternate:
+    baseline: null
+    bodies:
+    - limb
+    characters:
+    - number
+    faces:
+    - child
+    objects:
+    - instrument
+    places:
+    - corridor
+    scrambled:
+    - scrambled
+  # Both sets of categories combined
+  both:
+    baseline: null
+    bodies:
+    - body
+    - limb
+    characters:
+    - word
+    - number
+    faces:
+    - adult
+    - child
+    objects:
+    - car
+    - instrument
+    places:
+    - house
+    - corridor
+    scrambled:
+    - scrambled

config.json

@@ -0,0 +1,12 @@
+name: fLoc
+channels:
+  - conda-forge
+dependencies:
+  - python=3.10
+  - numpy
+  - pandas
+  - pip
+  - pip:
+    - psychopy=23.2.3
+    - pygame
+    - yaml