Skip to content

Commit 0af8cf8

Browse files
committed
add more equal coherence trials
1 parent 16b5134 commit 0af8cf8

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
TIME_JITTER_HAPPY = 10
7070

7171
INST_FONT = 25
72-
INST_TEXT = "You will perform 4 tasks in this experiment, completing each task twice. Instructions will be displayed prior to each task. Please read the instructions for each task very carefully.\n\nFor each task, you will make responses by pressing the %s button with one hand, and the %s button with your other hand.\n\nSet aside 30-40 minutes. You are able to take short breaks between each task.\n\nOnce the experiment fully begins, you may end the experiment by pressing the escape key. The window will close, and your data up till that point will be sent to us and your payment will be forfeit. Press any key to proceed."
72+
INST_TEXT = "You will perform 4 tasks in this experiment, completing each task two to three times. Instructions will be displayed prior to each task. Please read the instructions for each task very carefully.\n\nFor each task, you will make responses by pressing the %s button with one hand, and the %s button with your other hand.\n\nSet aside 30-40 minutes. You are able to take short breaks between each task.\n\nOnce the experiment fully begins, you may end the experiment by pressing the escape key. The window will close, and your data up till that point will be sent to us and your payment will be forfeit. Press any key to proceed."
7373
HAPPY_TEXT = "Periodically during this experiment, you will be asked about your mood. You will use the same keys as mentioned before. Please rate how you feel about your life these days.\n\nMove the slider with these keys and press SPACE BAR button to lock in your response.\n\nPlease respond as quickly and as accurately as possible.\n\nPress any key to continue."
7474

7575
CONSENT_FONT = 25

tasks/RDM/list_gen.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,8 @@ def gen_moving_dot_trials(config):
4343
temp_real.append(trial)
4444
# make sure that exactly half of the equal coherence trials have the left response
4545
# as the correct response and half have the right response as the correct response
46-
random.shuffle(temp_eq_coh_right)
47-
eq_coh_trials = []
48-
for i in range(len(config.COHERENCES)):
49-
eq_coh_trials.append(temp_eq_coh_right.pop())
50-
for trial in eq_coh_trials:
51-
temp_eq_coh_left = [i for i in temp_eq_coh_left if i['left_coherence'] != trial['left_coherence']]
52-
eq_coh_trials.extend(temp_eq_coh_left)
5346
# combine all trials together
54-
trials = temp_extra + temp_real + eq_coh_trials
47+
trials = temp_extra + temp_real + temp_eq_coh_left + temp_eq_coh_right
5548
blocks = []
5649
# randomize each block and create list of blocks
5750
# based on NUM_BLOCKS attribute

0 commit comments

Comments
 (0)