Skip to content

Support segmented AcqKnowledge imports #910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
4gwe wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Support segmented AcqKnowledge imports #910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/pspm_get_acqmat.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,21 @@
pspm_init;
end
sts = -1;
sourceinfo = [];
sourceinfo = struct();

% load data
% -------------------------------------------------------------------------
inputdata = load(datafile);

% store original recording offset
sourceinfo.start_sample = inputdata.start_sample;
sourceinfo.start_sample_unit = inputdata.isi_units;

if inputdata.start_sample ~= 0
warning('ID:acqmat_nonzero_start', ...
'AcqKnowledge data starts at %g %s relative to the original recording.', ...
inputdata.start_sample, strtrim(inputdata.isi_units));
end

% extract individual channels
% -------------------------------------------------------------------------
Expand All @@ -60,10 +69,6 @@
warning('\nUnsupported modality - please notify the developers.\n'); return;
end

if inputdata.start_sample ~= 0
warning('\nUnsupported sampling scheme - please notify the developers.\n'); return;
end

% get data & data units
import{k}.data = double(inputdata.data(:, channel));
import{k}.units = inputdata.units(channel,:);
Expand Down
32 changes: 31 additions & 1 deletion test/pspm_get_acqmat_test.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,35 @@ function invalid_datafile(this)
import = this.assign_chantype_number(import);
this.verifyWarning(@()pspm_get_acqmat(fn, import), 'ID:channel_not_contained_in_file');
end
function nonzero_start_sample(this)

inputdata = load('ImportTestData/acq/Acq_exported_SCR_Marker.mat');

% Simulate AcqKnowledge export starting later in original recording
first_sample = 1001;
last_sample = min(2000, size(inputdata.data, 1));

inputdata.data = inputdata.data(first_sample:last_sample, :);
inputdata.start_sample = inputdata.start_sample + ...
(first_sample - 1) * inputdata.isi;

fn = [tempname '.mat'];
save(fn, '-struct', 'inputdata');
cleaner = onCleanup(@() delete(fn));

import{1} = struct('type', 'scr', 'channel', 1);
import{2} = struct('type', 'marker', 'channel', 2);
import = this.assign_chantype_number(import);

[sts, output, sourceinfo] = this.verifyWarning( ...
@() pspm_get_acqmat(fn, import), ...
'ID:acqmat_nonzero_start');

this.verifyEqual(sts, 1);
this.verifyEqual(sourceinfo.start_sample, inputdata.start_sample);
this.verifyEqual(sourceinfo.start_sample_unit, inputdata.isi_units);
this.verifyEqual(output{1}.data, double(inputdata.data(:, 1)));

end
end
end
end
Loading