Skip to content

Commit cec3422

Browse files
authored
less warnings in bids model (#1182)
1 parent 4ffdb41 commit cec3422

File tree

2 files changed

+29
-19
lines changed

2 files changed

+29
-19
lines changed

src/bids_model/BidsModel.m

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,12 @@
103103
spm_get_defaults('stats.fmri.hpf'), ...
104104
nodeName, ...
105105
returnBsmDocURL('options'));
106-
obj.bidsModelError('noHighPassFilter', msg);
106+
107+
opt.verbosity = 0;
108+
if obj.verbose
109+
opt.verbosity = 1;
110+
end
111+
logger('INFO', msg, 'filename', mfilename(), 'options', opt);
107112

108113
else
109114

@@ -151,7 +156,12 @@
151156
nodeName, ...
152157
nodeName, ...
153158
returnRtdURL('', 'HRF'));
154-
obj.bidsModelError('noHRFderivatives', msg);
159+
160+
opt.verbosity = 0;
161+
if obj.verbose
162+
opt.verbosity = 1;
163+
end
164+
logger('INFO', msg, 'filename', mfilename(), 'options', opt);
155165
end
156166

157167
HRFderivatives = lower(strrep(HRFderivatives, ' ', ''));
@@ -196,7 +206,12 @@
196206
nodeName, ...
197207
nodeName, ...
198208
returnBsmDocURL('options'));
199-
obj.bidsModelError('noMask', msg);
209+
210+
opt.verbosity = 0;
211+
if obj.verbose
212+
opt.verbosity = 1;
213+
end
214+
logger('INFO', msg, 'filename', mfilename(), 'options', opt);
200215

201216
end
202217

@@ -241,7 +256,12 @@
241256
spm_get_defaults('mask.thresh'), ...
242257
nodeName, ...
243258
returnRtdURL('', 'software'));
244-
obj.bidsModelError('noInclMaskThresh', msg);
259+
260+
opt.verbosity = 0;
261+
if obj.verbose
262+
opt.verbosity = 1;
263+
end
264+
logger('INFO', msg, 'filename', mfilename(), 'options', opt);
245265

246266
end
247267

@@ -280,7 +300,11 @@
280300
nodeName, ...
281301
returnRtdURL('', 'software'));
282302

283-
obj.bidsModelError('noTemporalCorrection', msg);
303+
opt.verbosity = 0;
304+
if obj.verbose
305+
opt.verbosity = 1;
306+
end
307+
logger('INFO', msg, 'filename', mfilename(), 'options', opt);
284308

285309
end
286310

tests/tests_bids_model/test_bidsModel.m

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -198,14 +198,6 @@ function test_getModelMask_method()
198198
mask = bm.getModelMask('Name', 'run_level');
199199
assertEqual(mask, 'mask.nii');
200200

201-
if bids.internal.is_octave()
202-
moxunit_throw_test_skipped_exception('Octave:mixed-string-concat warning thrown');
203-
end
204-
bm.verbose = true;
205-
bm.Nodes{1}.Model.Options = rmfield(bm.Nodes{1}.Model.Options, 'Mask');
206-
assertWarning(@()bm.getModelMask('Name', 'run_level'), ...
207-
'BidsModel:noMask');
208-
209201
end
210202

211203
function test_getInclusiveMaskThreshold()
@@ -241,12 +233,6 @@ function test_getInclusiveMaskThreshold_method()
241233

242234
bm.getInclusiveMaskThreshold('Name', 'subject_level');
243235

244-
if bids.internal.is_octave()
245-
moxunit_throw_test_skipped_exception('Octave:mixed-string-concat warning thrown');
246-
end
247-
assertWarning(@()bm.getInclusiveMaskThreshold('Name', 'subject_level'), ...
248-
'BidsModel:noInclMaskThresh');
249-
250236
end
251237

252238
function test_getGrpLevelContrast_basic()

0 commit comments

Comments
 (0)