some fixs in contrasts sepcification

Author: Bertrand THIRION

ibc_public/utils_contrasts.py

@@ -32,8 +32,8 @@ def make_contrasts(paradigm_id, design_matrix_columns=None):
         return hcp_social(design_matrix_columns)
     elif paradigm_id == 'RSVPLanguage':
         return rsvp_language(design_matrix_columns)
-    elif paradigm_id in ['ContRing', 'ExpRing', 'WedgeClock', ###
-                         'WedgeAnti', 'Wedge', 'Ring']:###
+    #elif paradigm_id in ['ContRing', 'ExpRing', 'WedgeClock', ###
+    #                     'WedgeAnti', 'Wedge', 'Ring']:###
         return retino(design_matrix_columns)###
     elif paradigm_id in ['Wedge', 'WedgeAnti', 'WedgeClock']:
         return wedge(design_matrix_columns)

scripts/glm_only.py

@@ -129,7 +129,7 @@ def run_subject_glm(jobfile, protocol, subject, session=None, smooth=None,
         subject['onset'] = [onset for onset in subject['onset']]
         clean_subject(subject)
         if len(subject['session_id']) > 0:
-            if protocol == 'clips4':
+            if protocol == 'clips4_':
                 first_level(subject, compcorr=compcorr,
                             additional_regressors=RETINO_REG,
                             smooth=smooth, mask_img=mask_img)
@@ -148,8 +148,8 @@ def run_subject_glm(jobfile, protocol, subject, session=None, smooth=None,
     # protocols = ['self', 'search', 'scene', 'tom', 'stanford1', 'stanford2', 'stanford3']
     # protocols = ['audio1', 'audio2', clips4]
     # protocols = ['optimism']
-    # protocols = ['mdtb', 'mario1', 'mario2', 'leuven', 'abstraction', 'aomic'] 
-    protocols = ['scene']
+    # protocols = ['mdtb', 'mario1', 'mario2', 'leuven', 'abstraction', 'aomic', 'scene'] 
+    protocols = ['clips4']
 
     for protocol in protocols:
         jobfile = f'ini_files/IBC_preproc_{protocol}.ini'

scripts/surface_glm_only.py

@@ -84,7 +84,7 @@ def run_subject_surface_glm(jobfile, subject, session, protocol, mesh=None, comp
         if len(subject['session_id']) > 0:
             print(len(subject['session_id']))
         if len(subject['session_id']) > 0:
-            if protocol == 'retino':
+            if protocol == 'retino_':
                 subject['onset'] = [''] * len(subject['onset'])
                 first_level(subject, compcorr=compcorr,
                             additional_regressors=RETINO_REG,
@@ -107,7 +107,7 @@ def run_subject_surface_glm(jobfile, subject, session, protocol, mesh=None, comp
                  'navigation', 'search']
     protocols = ['color', 'aomic'] 'abstraction' 'lyon1', 'aomic' 'optimism'
     """
-    protocols = ['scene'] # 'mario1', 'mdtb', 'color', 'mario2', 'leuven' 
+    protocols = ['retino'] # 'mario1', 'mdtb', 'color', 'mario2', 'leuven' 'scene'
     for protocol in protocols:
         jobfile = 'ini_files/IBC_preproc_%s.ini' % protocol
         acquisition = protocol