Merge branch 'master' into review_tags_in_contrasts

Author: ferponcem

ibc_data/all_contrasts.tsv

@@ -524,17 +524,9 @@ VisualSearch	memory_array_four	memorizing 4 items	fixation	array of four items w
 VisualSearch	memory_array_two	memorizing 2 items	fixation	array of two items with or without the item to search for	['visual_pattern_recognition','visual_attention','visual_working_memory']
 VisualSearch	sample_item	item to search for	fixation	item to search for in an array of two or four items	['visual_pattern_recognition','visual_attention','visual_working_memory']
 VisualSearch	delay_vis	delay period on visual search	fixation	delay period on visual search	['working_memory_maintenance']
-VisualSearch	probe_item_four_absent	probing an absent item from array of four	fixation	probing an absent item from array of four	['visual_search','visual_pattern_recognition','visual_form_discrimination','task_difficulty']
-VisualSearch	probe_item_two_absent	probing an absent item from array of two	fixation	probing an absent item from array of four	['visual_search','visual_pattern_recognition','visual_form_discrimination']
-VisualSearch	probe_item_four_present	probing a present item from array of four	fixation	probing a present item from array of four	['visual_search','visual_pattern_recognition','visual_form_discrimination','task_difficulty']
-VisualSearch	probe_item_two_present	probing a present item from array of two	fixation	probing a present item from array of four	['visual_search','visual_pattern_recognition','visual_form_discrimination']
 VisualSearch	response_hit	subject's correct response	fixation	subject's correct response	['response_selection','response_execution']
 VisualSearch	response_miss	subject's incorrect response	fixation	subject's incorrect response	['response_selection','response_execution']
 VisualSearch	delay_wm	delay period on working memory	fixation	delay period on working memory	['working_memory_maintenance']
-VisualSearch	search_array_four_absent	array of four items without the sample item	fixation	array of four items without sample item	['visual_pattern_recognition','visual_attention','task_difficulty','visual_working_memory','visual_form_discrimination']
-VisualSearch	search_array_four_present	array of four items with the sample item	fixation	array of four items with sample item	['visual_pattern_recognition','visual_attention','task_difficulty','visual_working_memory','visual_form_discrimination']
-VisualSearch	search_array_two_absent	array of two items without the sample item	fixation	array of two items without the sample item	['visual_pattern_recognition','visual_attention','visual_working_memory','visual_form_discrimination']
-VisualSearch	search_array_two_present	array of two items with the sample item	fixation	array of two items with the sample item	['visual_pattern_recognition','visual_attention','visual_working_memory','visual_form_discrimination']
 VisualSearch	probe_item	probing an item	fixation	probing an item  absent or present	['visual_search','visual_pattern_recognition','visual_form_discrimination']
 VisualSearch	search_array	array of items	fixation	array of items  four or two	['visual_pattern_recognition','visual_attention','visual_working_memory','visual_form_discrimination']
 VisualSearch	probe_item_absent-probe_item_present	probing an absent item	probing a present item	probing an absent vs present item	['visual_form_discrimination']
@@ -739,6 +731,7 @@ MDTB	tom_belief	believes	fixation	statement relates to character's believes	['se
 MDTB	search_easy	easy to find correct shape	fixation	easy to look for the right-oriented shape	['visual_search','visual_localization','salience','response_execution','response_selection']
 MDTB	search_hard	hard to find correct shape	fixation	hard to look for the right-oriented shape	['visual_search','visual_localization','visual_form_discrimination','task_difficulty','response_execution','response_selection']
 MDTB	flexion_extension	toes flexion-extension	fixation	continuous toes flexion-extension	['response_execution','left_toe_response_execution','right_toe_response_execution']
+MDTB	movie	movie watching	fixation	watching an animated movie without sound	['naturalistic_scenes','emotional_expression','visual_scene_perception']
 MDTB	action_action-control	hands making knot	resulting knot from different angles	hands making specific knot vs resulting knot	['action_perception','procedural_memory','action-outcome_learning','shape_recognition','task_difficulty','naturalistic_biological_motion']
 MDTB	finger_complex-simple	hard button sequence	easy button sequence	hard vs easy button sequence	['motor_control','task_difficulty']
 MDTB	semantic_hard-easy	ambiguous sequence	natural sequence	ambiguous vs natural sequence	['combinatorial_semantics','task_difficulty']

ibc_data/contrasts/FingerTapping.csv

@@ -1,4 +1,4 @@
-condition,chosen-specified,specified-null,chosen-null
+condition,chosen-specified,specified-no_tap,chosen-no_tap
 specified,-1,1,
 chosen,1,,1
-null,,-1,-1
+no_tap,,-1,-1

ibc_data/contrasts/MDTB.csv

@@ -1,14 +1,15 @@
-condition,action_action,action_control,finger_simple,finger_complex,semantic_hard,semantic_easy,2back_easy,2back_hard,tom_photo,tom_belief,search_easy,search_hard,flexion_extension,action_action-control,finger_complex-simple,semantic_hard-easy,2back_hard-easy,tom_belief-photo,search_hard-easy
-search_easy,,,,,,,,,,,1,,,,,,,,-1
-search_hard,,,,,,,,,,,,1,,,,,,,1
-action_action,1,,,,,,,,,,,,,1,,,,,
-action_control,,1,,,,,,,,,,,,-1,,,,,
-flexion_extension,,,,,,,,,,,,,1,,,,,,
-finger_complex,,,,1,,,,,,,,,,,1,,,,
-finger_simple,,,1,,,,,,,,,,,,-1,,,,
-tom_belief,,,,,,,,,,1,,,,,,,,1,
-tom_photo,,,,,,,,,1,,,,,,,,,-1,
-2back_easy,,,,,,,1,,,,,,,,,,-1,,
-2back_hard,,,,,,,,1,,,,,,,,,1,,
-semantic easy,,,,,,1,,,,,,,,,,-1,,,
-semantic hard,,,,,1,,,,,,,,,,,1,,,
+condition,action_action,action_control,finger_simple,finger_complex,semantic_hard,semantic_easy,2back_easy,2back_hard,tom_photo,tom_belief,search_easy,search_hard,flexion_extension,action_action-control,finger_complex-simple,semantic_hard-easy,2back_hard-easy,tom_belief-photo,search_hard-easy,movie
+search_easy,,,,,,,,,,,1,,,,,,,,-1,
+search_hard,,,,,,,,,,,,1,,,,,,,1,
+action_action,1,,,,,,,,,,,,,1,,,,,,
+action_control,,1,,,,,,,,,,,,-1,,,,,,
+flexion_extension,,,,,,,,,,,,,1,,,,,,,
+finger_complex,,,,1,,,,,,,,,,,1,,,,,
+finger_simple,,,1,,,,,,,,,,,,-1,,,,,
+tom_belief,,,,,,,,,,1,,,,,,,,1,,
+tom_photo,,,,,,,,,1,,,,,,,,,-1,,
+2back_easy,,,,,,,1,,,,,,,,,,-1,,,
+2back_hard,,,,,,,,1,,,,,,,,,1,,,
+semantic easy,,,,,,1,,,,,,,,,,-1,,,,
+semantic hard,,,,,1,,,,,,,,,,,1,,,,
+movie,,,,,,,,,,,,,,,,,,,,1

ibc_data/contrasts/VisualSearch.csv

@@ -1,16 +1,16 @@
-condition,probe_item,search_array,probe_item_absent–probe_item_present,search_array_absent–search_array_present ,probe_item_four–probe_item_two,search_array_four–search_array_two,delay_vis–delay_wm
-memory_array_two,,,,,,,
-memory_array_four,,,,,,,
-delay_wm,,,,,,,-1
-probe_item_two_present,1,,-1,,-1,,
-probe_item_four_present,1,,-1,,1,,
-probe_item_two_absent,1,,1,,-1,,
-probe_item_four_absent,1,,1,,1,,
-sample_item,,,,,,,
-delay_vis,,,,,,,1
-search_array_two_absent,,1,,1,,-1,
-search_array_two_present,,1,,-1,,-1,
-search_array_four_absent,,1,,1,,1,
-search_array_four_present,,1,,-1,,1,
-response_hit,,,,,,,
-response_miss,,,,,,,
+condition,probe_item,search_array,probe_item_absent-probe_item_present,search_array_absent-search_array_present ,probe_item_four-probe_item_two,search_array_four-search_array_two,delay_vis-delay_wm
+memory_array_two,,,,,,,
+memory_array_four,,,,,,,
+delay_wm,,,,,,,-1
+probe_item_two,1,,,,-1,,
+probe_item_four,1,,,,1,,
+probe_item_present,1,,-1,,,,
+probe_item_absent,1,,1,,,,
+sample_item,,,,,,,
+delay_vis,,,,,,,1
+search_array_two,,1,,,,-1,
+search_array_four,,1,,,,1,
+search_array_present,,1,,-1,,,
+search_array_absent,,1,,1,,,
+response_hit,,,,,,,
+response_miss,,,,,,,