Skip to content

Commit c56ccbc

Browse files
committed
better handling of unset $FSLDIR
1 parent fcb38aa commit c56ccbc

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

nipype/interfaces/fsl/model.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,14 @@ def _create_ev_files(
197197
ev_parameters['cond_file'] = evfname
198198
ev_parameters['ev_num'] = num_evs[0]
199199
ev_parameters['ev_name'] = name
200-
ev_parameters['fsldir'] = os.environ['FSLDIR']
201200
ev_parameters['tempfilt_yn'] = do_tempfilter
201+
try:
202+
ev_parameters['fsldir'] = os.environ['FSLDIR']
203+
except KeyError:
204+
if basis_key == 'flobs':
205+
raise Exception('FSL environment variables not set')
206+
else:
207+
ev_parameters['fsldir'] = '/usr/share/fsl'
202208
try:
203209
ev_parameters['temporalderiv'] = int(bool(ev_parameters.pop('derivs')))
204210
except KeyError:

nipype/interfaces/script_templates/feat_ev_custom.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ set fmri(deriv_yn$ev_num) $temporalderiv
3434
set fmri(custom$ev_num) "$cond_file"
3535

3636
# Optimal/custom HRF convolution file
37-
set fmri(default_bfcustom) "${fsldir}etc/default_flobs.flobs/hrfbasisfns.txt"
37+
set fmri(default_bfcustom) "${fsldir}/etc/default_flobs.flobs/hrfbasisfns.txt"
3838
set fmri(bfcustom) "$bfcustompath"

0 commit comments

Comments
 (0)