Skip to content

Commit dac6de3

Browse files
committed
update test makeRawDataset to adapt the new behavior of saveEventFile
1 parent 72b5768 commit dac6de3

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

manualTests/test_makeRawDataset.m

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,17 @@ function test_makeRawDataset()
2323

2424
cfg.task.name = 'testtask';
2525
cfg.task.instructions = 'do this';
26+
27+
cfg.verbosity = 0;
28+
29+
cfg = createFilename(cfg);
2630

2731
logFile.extraColumns.Speed.length = 1;
2832
logFile.extraColumns.LHL24.length = 3;
2933
logFile.extraColumns.is_Fixation.length = 1;
3034

31-
cfg = createFilename(cfg);
32-
35+
logFile = saveEventsFile('init', cfg, logFile);
36+
3337
extraInfo = struct('extraInfo', struct('nestedExtraInfo', 'something extra'));
3438
createJson(cfg, extraInfo);
3539

@@ -72,20 +76,21 @@ function test_makeRawDataset()
7276

7377
% add dummy stim data
7478
stimLogFile.extraColumns.Speed.length = 1;
75-
stimLogFile.extraColumns.LHL24.length = 3;
79+
stimLogFile.extraColumns.LHL24.length = 1;
7680
stimLogFile.extraColumns.is_Fixation.length = 1;
7781

7882
stimLogFile.SamplingFrequency = cfg.mri.repetitionTime;
7983
stimLogFile.StartTime = 0;
8084

81-
stimLogFile = saveEventsFile('open_stim', cfg, stimLogFile);
85+
stimLogFile = saveEventsFile('init_stim', cfg, stimLogFile);
86+
stimLogFile = saveEventsFile('open', cfg, stimLogFile);
8287
for i = 1:100
8388
stimLogFile(i, 1).onset = cfg.mri.repetitionTime * i;
8489
stimLogFile(i, 1).trial_type = 'test';
8590
stimLogFile(i, 1).duration = 1;
8691
stimLogFile(i, 1).Speed = rand(1);
8792
stimLogFile(i, 1).is_Fixation = rand > 0.5;
88-
stimLogFile(i, 1).LHL24 = randn(1, 3);
93+
stimLogFile(i, 1).LHL24 = randn();
8994
end
9095
saveEventsFile('save', cfg, stimLogFile);
9196
saveEventsFile('close', cfg, stimLogFile);

src/saveEventsFile.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ function printHeaderExtraColumns(logFile)
382382
isValid = ones(1, numel(namesExtraColumns));
383383
for iExtraColumn = 1:numel(namesExtraColumns)
384384
data = logFile(iEvent).(namesExtraColumns{iExtraColumn});
385-
if isempty(data) || isnan(data) || (ischar(data) && strcmp(data, 'n/a'))
385+
if isempty(data) || all(isnan(data)) || (ischar(data) && strcmp(data, 'n/a'))
386386
isValid(iExtraColumn) = 0;
387387
end
388388
end

0 commit comments

Comments
 (0)