merge conflict

Author: bthirion

ibc_data/all_contrasts.tsv

@@ -406,22 +406,23 @@ audio2	speech-others				[' ']
 audio2	tool-others				[' ']
 audio2	voice-others				[' ']
 audio2	mean-silence	listening to sounds vs silence	silence	sound	['auditory_perception', 'sounds_perception', 'listening']
+<<<<<<< HEAD
 audio2	animal	listen to animals vs silence	silence	animal sound	['auditory_perception', 'sounds_perception', 'listening']
 audio2	music	listen to music vs silence	silence	music	['auditory_perception', 'sounds_perception', 'listening', 'music_perception']
 audio2	nature	listen to nature vs silence	silence	nature sound	['auditory_perception', 'sounds_perception', 'listening']
 audio2	speech	listen to speech vs silence	silence	speech	['auditory_perception', 'sounds_perception', 'voice_perception', 'listening', 'speech_perception', 'language_processing']
 audio2	tool	listen to tool vs silence	silence	tool sound	['auditory_perception', 'sounds_perception', 'listening']
 audio2	voice	listen to voice vs sounds 	silence	voice	['auditory_perception', 'auditory_attention', 'sounds_perception', 'voice_perception', 'listening']
-attention	spatial_cue-double_cue				[' ']
-attention	spatial_cue				[' ']
-attention	incongruent-congruent				[' ']
-attention	double_incongruent-double_congruent				[' ']
-attention	double_congruent				[' ']
-attention	double_incongruent				[' ']
-attention	double_cue				[' ']
-attention	spatial_incongruent-spatial_congruent				[' ']
-attention	spatial_incongruent				[' ']
-attention	spatial_congruent				[' ']
+attention	spatial_cue-double_cue	a cue indicates where the probe will apear vs it does not	visual cue	no cue	[‘attentional_focusing’]
+attention	spatial_cue	the cue indicates where the probe will appear	fixation	spatial cue	[‘spatial_attention’, 'attentional_focusing', ‘saccadic_eye_movement’]
+attention	incongruent-congruent	ignore distractors vs no distractors, with and without spatial cues	no distractors	ignore distractors	[‘selective_attention’]
+attention	double_incongruent-double_congruent	ignore distractors vs no distractors without spatial cue	no distractors	ignore distractors	[‘selective_attention’]
+attention	double_congruent	no spatial cue + no distractors in the probe	fixation	no spatial cue, no distractors	['spatial_attention', ‘saccadic_eye_movement’, ‘response_selction’, ‘response_execution’]
+attention	double_incongruent	no spatial cue + distractors in the probe	fixation	no spatial cue, distractors	[‘spatial_attention’, ‘saccadic_eye_movement’, ‘selective_attention’, ‘response_selection’, ‘response_execution’]
+attention	double_cue	cues appear in both possible location of the probe at the same time	fixation	no spatial cue	['spatial_attention', ‘saccadic_eye_movement’]
+attention	spatial_incongruent-spatial_congruent	ignore distractors vs no distractors with spatial cue	no distractors	ignore distractors	['selective_attention']
+attention	spatial_incongruent	cue indicates the position of the probe + distractors in the probe	fixation	spatial cue, distractors	['spatial_attention', ‘attentional_focusing’, ‘saccadic_eye_movement’, ‘selective_attention’, ‘response_selection’, ‘response_execution’]
+attention	spatial_congruent	cue indicates the position of the probe + no distractors	fixation	spatial cue, no distractors	['spatial_attention', ‘attentional_focusing’, ‘saccadic_eye_mocement’, ‘response_selection’, ‘response_execution’]
 stop-signal	go				[' ']
 stop-signal	stop				[' ']
 stop-signal	stop-go				[' ']