Merge pull request #1328 from poldracklab/hotfix/reports-3

[HOTFIX] Reportlets - bbregister vs flirtbbr (continues #1326)

Author: oesteban

fmriprep/viz/config.json

@@ -100,7 +100,7 @@
             },
             {
                 "name": "epi_mean_t1_registration/flirt",
-                "file_pattern": "func/.*_flirt",
+                "file_pattern": "func/.*_flirtnobbr",
                 "title": "EPI to T1 registration",
                 "description": "FSL <code>flirt</code> was used to generate transformations from EPI space to T1 Space - BBR refinement rejected"
             },
@@ -111,14 +111,14 @@
                 "description": "<code>mri_coreg</code> (FreeSurfer) was used to generate transformations from EPI space to T1 Space - <code>bbregister</code> refinement rejected"
             },
             {
-                "name": "epi_mean_t1_registration/flt_bbr",
-                "file_pattern": "func/.*_flt_bbr",
+                "name": "epi_mean_t1_registration/flirtbbr",
+                "file_pattern": "func/.*_flirtbbr",
                 "title": "EPI to T1 registration",
                 "description": "FSL <code>flirt</code> was used to generate transformations from EPI-space to T1w-space - The white matter mask calculated with FSL <code>fast</code> (brain tissue segmentation) was used for BBR"
             },
             {
-                "name": "epi_mean_t1_registration/bbr",
-                "file_pattern": "func/.*_bbr",
+                "name": "epi_mean_t1_registration/bbregister",
+                "file_pattern": "func/.*_bbregister",
                 "title": "EPI to T1 registration",
                 "description": "<code>bbregister</code> was used to generate transformations from EPI-space to T1w-space"
             },

fmriprep/workflows/bold/registration.py

@@ -157,8 +157,8 @@ def init_bold_reg_wf(freesurfer, use_bbr, bold2t1w_dof, mem_gb, omp_nthreads,
 
         def _bold_reg_suffix(fallback, freesurfer):
             if fallback:
-                return 'coreg' if freesurfer else 'flirt'
-            return 'bbr' if freesurfer else 'flt_bbr'
+                return 'coreg' if freesurfer else 'flirtnobbr'
+            return 'bbregister' if freesurfer else 'flirtbbr'
 
         workflow.connect([
             (bbr_wf, ds_report_reg, [