Merge branch 'add_pet_freesurfer' of https://github.com/mnoergaard/nipype into add_pet_freesurfer

Author: mnoergaard

nipype/interfaces/freesurfer/model.py

@@ -519,9 +519,9 @@ def _list_outputs(self):
         outputs["dof_file"] = os.path.join(glmdir, "dof.dat")
         # Assign the conditional outputs
         if self.inputs.save_residual:
-            outputs["error_file"] = os.path.join(glmdir, "eres.{ext}")
+            outputs["error_file"] = os.path.join(glmdir, f"eres.{ext}")
         if self.inputs.save_estimate:
-            outputs["estimate_file"] = os.path.join(glmdir, "yhat.{ext}")
+            outputs["estimate_file"] = os.path.join(glmdir, f"yhat.{ext}")
         if any((self.inputs.mrtm1, self.inputs.mrtm2, self.inputs.logan)):
             outputs["bp_file"] = os.path.join(glmdir, f"bp.{ext}")
         if self.inputs.mrtm1:

nipype/interfaces/freesurfer/petsurfer.py

@@ -475,7 +475,7 @@ def _list_outputs(self):
         outputs["nopvc_file"] = os.path.join(pvcdir, "nopvc.nii.gz")
         outputs["gtm_file"] = os.path.join(pvcdir, "gtm.nii.gz")
         outputs["gtm_stats"] = os.path.join(pvcdir, "gtm.stats.dat")
-        outputs["reg_pet2anat"] = os.path.join(pvcdir, "aux/bbpet2anat.lta")
+        outputs["reg_pet2anat"] = os.path.join(pvcdir, "aux", "bbpet2anat.lta")
 
         # Assign the conditional outputs
         if self.inputs.save_input: