From 888a679a841ac2b0a414b4bfb39a29838c456638 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Wed, 28 Jul 2021 17:31:53 +0100
Subject: [PATCH] RF: Accept filtered_func_data_clean.nii.gz as melodic data
file
---
fsl/data/melodicanalysis.py | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/fsl/data/melodicanalysis.py b/fsl/data/melodicanalysis.py
index ba0048234..bffc68964 100644
--- a/fsl/data/melodicanalysis.py
+++ b/fsl/data/melodicanalysis.py
@@ -133,10 +133,18 @@ def getDataFile(meldir):
if topDir is None:
return None
- dataFile = op.join(topDir, 'filtered_func_data')
+ # People often rename filtered_func_data.nii.gz
+ # to something like filtered_func_data_clean.nii.gz,
+ # because that is the recommended approach when
+ # performing ICA-based denoising). So we try both.
+ candidates = ['filtered_func_data', 'filtered_func_data_clean']
- try: return fslimage.addExt(dataFile)
- except fslimage.PathError: return None
+ for candidate in candidates:
+ dataFile = op.join(topDir, candidate)
+ try: return fslimage.addExt(dataFile)
+ except fslimage.PathError: continue
+
+ return None
def getMeanFile(meldir):
--
GitLab