add try/except to pipeline and remove run from tsv name

Author: Katie Bottenhorn

idconn/connectivity/build_networks.py

@@ -156,7 +156,7 @@ def task_connectivity(layout, subject, session, task, atlas, confounds, connecti
         corrmat_df = pd.DataFrame(index=np.arange(1, avg_corrmat.shape[0]+1), columns=np.arange(1, avg_corrmat.shape[0]+1),data=avg_corrmat)
         avg_corrmats[condition] = corrmat_df
         corrmat_file = join(deriv_dir,  
-                            f'sub-{subject}', f'ses-{session}', 'func', f'sub-{subject}_ses-{session}_task-{task}_condition-{condition}_run-{run}_desc-{atlas_name}_corrmat.tsv')
+                            f'sub-{subject}', f'ses-{session}', 'func', f'sub-{subject}_ses-{session}_task-{task}_condition-{condition}_desc-{atlas_name}_corrmat.tsv')
         try:
             corrmat_df.to_csv(corrmat_file, sep='\t')
             files.append(corrmat_file)

idconn/pipeline.py

@@ -90,11 +90,20 @@ def idconn_workflow(dset_dir, atlas, task, out_dir, space="MNI152NLin2009cAsym",
             print(f"Session {session}")
             print(f"here are the inputs: {layout, subject, session, task, atlas, conn, space, confounds}")
             if 'rest' in task:
-                adj_matrix = build_networks.connectivity(layout, subject, session, task, atlas, conn, space, confounds)
+                try:
+                    adj_matrix = build_networks.connectivity(layout, subject, session, task, atlas, conn, space, confounds)
+                except Exception as e:
+                    print(f'Error building corrmat for sub-{subject}, ses-{session}, task-{task}: {e}')
             if len(conditions) < 1:
-                adj_matrix = build_networks.connectivity(layout, subject, session, task, atlas, conn, space, confounds)
+                try:
+                    adj_matrix = build_networks.connectivity(layout, subject, session, task, atlas, conn, space, confounds)
+                except Exception as e:
+                    print(f'Error building corrmat for sub-{subject}, ses-{session}, task-{task}: {e}')
             else:
-                adj_matrix = build_networks.task_connectivity(layout=layout, subject=subject, session=session, task=task, atlas=atlas, confounds=confounds, connectivity_metric=conn)
+                try:
+                    adj_matrix = build_networks.task_connectivity(layout=layout, subject=subject, session=session, task=task, atlas=atlas, confounds=confounds, connectivity_metric=conn)
+                except Exception as e:
+                    print(f'Error building corrmat for sub-{subject}, ses-{session}, task-{task}: {e}')
 
 
 def _main(argv=None):