From 0e98316b1a5d38a7ea8e3457ef00b346f819726d Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Tue, 14 Apr 2020 16:29:23 +0100
Subject: [PATCH] RF: isMelodicDir no longer requires dir to end in .ica, and
no longer accepts a file or sub-dir
---
fsl/data/melodicanalysis.py | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/fsl/data/melodicanalysis.py b/fsl/data/melodicanalysis.py
index f3779d5cc..ba0048234 100644
--- a/fsl/data/melodicanalysis.py
+++ b/fsl/data/melodicanalysis.py
@@ -33,7 +33,6 @@ import logging
import os.path as op
import numpy as np
-import fsl.utils.path as fslpath
import fsl.data.image as fslimage
import fsl.data.featanalysis as featanalysis
@@ -63,10 +62,9 @@ def isMelodicImage(path):
def isMelodicDir(path):
- """Returns ``True`` if the given path looks like it is contained within
- a MELODIC directory, ``False`` otherwise. A melodic directory:
+ """Returns ``True`` if the given path looks like it is a MELODIC directory,
+ ``False`` otherwise. A MELODIC directory:
- - Must be named ``*.ica``.
- Must contain a file called ``melodic_IC.nii.gz`` or
``melodic_oIC.nii.gz``.
- Must contain a file called ``melodic_mix``.
@@ -75,12 +73,7 @@ def isMelodicDir(path):
path = op.abspath(path)
- if op.isdir(path): dirname = path
- else: dirname = op.dirname(path)
-
- sufs = ['.ica']
-
- if not any([dirname.endswith(suf) for suf in sufs]):
+ if not op.isdir(path):
return False
# Must contain an image file called
@@ -88,7 +81,7 @@ def isMelodicDir(path):
prefixes = ['melodic_IC', 'melodic_oIC']
for p in prefixes:
try:
- fslimage.addExt(op.join(dirname, p))
+ fslimage.addExt(op.join(path, p))
break
except fslimage.PathError:
pass
@@ -97,8 +90,8 @@ def isMelodicDir(path):
# Must contain files called
# melodic_mix and melodic_FTmix
- if not op.exists(op.join(dirname, 'melodic_mix')): return False
- if not op.exists(op.join(dirname, 'melodic_FTmix')): return False
+ if not op.exists(op.join(path, 'melodic_mix')): return False
+ if not op.exists(op.join(path, 'melodic_FTmix')): return False
return True
@@ -108,10 +101,13 @@ def getAnalysisDir(path):
to that MELODIC directory is returned. Otherwise, ``None`` is returned.
"""
- meldir = fslpath.deepest(path, ['.ica'])
+ if not op.isdir(path):
+ path = op.dirname(path)
- if meldir is not None and isMelodicDir(meldir):
- return meldir
+ while path not in (op.sep, ''):
+ if isMelodicDir(path):
+ return path
+ path = op.dirname(path)
return None
--
GitLab