Skip to content

Commit 3a67904

Browse files
committed
fix verbose crash when saving
1 parent 7b2b45e commit 3a67904

File tree

2 files changed

+7
-26
lines changed

2 files changed

+7
-26
lines changed

src/saveEventsFile.m

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@
9090
% flag to indicate that this will be an _events file
9191
logFile(1).isStim = false;
9292

93-
if isfield(cfg, 'fileName') && ...
94-
isfield(cfg.fileName, 'events') && ...
93+
if isfield(cfg, 'fileName') && isfield(cfg.fileName, 'events') && ...
9594
~isempty(cfg.fileName.events)
9695
logFile(1).filename = cfg.fileName.events;
9796
else
@@ -182,8 +181,7 @@
182181
% before calling openFile.
183182

184183
% initialize holy trinity (onset, trial_type, duration) columns
185-
logFile(1).columns = struct( ...
186-
'onset', struct( ...
184+
logFile(1).columns = struct('onset', struct( ...
187185
'Description', ...
188186
'time elapsed since experiment start', ...
189187
'Units', 's'), ...
@@ -210,8 +208,7 @@
210208

211209
% Initialize txt logfiles and empty fields for the standard BIDS
212210
% event file
213-
logFile(1).fileID = fopen( ...
214-
fullfile( ...
211+
logFile(1).fileID = fopen(fullfile( ...
215212
cfg.dir.outputSubject, ...
216213
cfg.fileName.modality, ...
217214
logFile.filename), ...
@@ -280,22 +277,16 @@ function printHeaderExtraColumns(cfg, logFile)
280277

281278
warningMessage = [];
282279
if any(isnan(data))
283-
warningMessage = sprintf( ...
284-
'Missing some %s data for this event.', ...
280+
warningMessage = sprintf('Missing some %s data for this event.', ...
285281
namesExtraColumns{iExtraColumn});
286282

287283
elseif all(isnan(data))
288-
warningMessage = sprintf( ...
289-
'Missing %s data for this event.', ...
284+
warningMessage = sprintf('Missing %s data for this event.', ...
290285
namesExtraColumns{iExtraColumn});
291286

292287
end
293288
throwWarning(cfg, 'saveEventsFile:missingData', warningMessage);
294289

295-
if cfg.verbose > 1
296-
talkToMe(cfg, sprintf('%s', logFile(iEvent)));
297-
end
298-
299290
end
300291

301292
end

tests/test_saveEventsFileSave.m

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,7 @@ function test_saveEventsFile_save_basic()
4848

4949
function test_saveEventsFile_save_no_extra_tab()
5050

51-
cfg.verbose = 0;
52-
53-
cfg.subject.subjectNb = 1;
54-
cfg.subject.runNb = 1;
51+
cfg = globalTestSetUp();
5552

5653
cfg.task.name = 'testtask';
5754

@@ -95,10 +92,7 @@ function test_saveEventsFile_save_stim()
9592

9693
%% set up
9794

98-
cfg.verbose = 0;
99-
100-
cfg.subject.subjectNb = 1;
101-
cfg.subject.runNb = 1;
95+
cfg = globalTestSetUp();
10296

10397
cfg.task.name = 'testtask';
10498

@@ -172,8 +166,6 @@ function test_saveEventsFile_save_skip_empty_events()
172166

173167
[cfg, logFile] = setUp();
174168

175-
cfg.verbose = 0;
176-
177169
% create the events file and header
178170
logFile = saveEventsFile('open', cfg, logFile);
179171

@@ -294,8 +286,6 @@ function test_saveEventsFile_save_array_size()
294286

295287
[cfg, logFile] = setUp();
296288

297-
cfg.verbose = 0;
298-
299289
% create the events file and header
300290
logFile = saveEventsFile('open', cfg, logFile);
301291

0 commit comments

Comments
 (0)