Skip to content

Commit 5f7b6f1

Browse files
authored
Merge pull request #598 from bachlab/596-channel-action-issue-in-the-gui
Fix issue 596
2 parents e6d0342 + 4aac39c commit 5f7b6f1

File tree

4 files changed

+16
-19
lines changed

4 files changed

+16
-19
lines changed

src/pspm_cfg/pspm_cfg_pp_emg.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
% PsPM 3.1
77
% (C) 2016 Tobias Moser (University of Zurich)
88

9-
% $Id$
10-
% $Rev$
119

1210
%% Data preprocessing
1311
cfg = cfg_repeat;

src/pspm_cfg/pspm_cfg_pp_emg_data.m

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
function [pp_emg] = pspm_cfg_pp_emg_data
2-
% function to process emg data which leads to emg_proc data
3-
%
4-
5-
% $Id$
6-
% $Rev$
2+
% * Description
3+
% function to process emg data which leads to emg_proc data
4+
% * History
5+
% Updated in 2024 by Teddy
76

87
% Initialise
98
global settings
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
function out = pspm_cfg_run_pp_emg_data(job)
2-
% Executes pspm_emg_pp
3-
2+
% * Description
3+
% Executes pspm_emg_pp
4+
% * History
5+
% Updated with PsPM 6.1.2 in 2024 by Teddy
46
options = struct();
57
options.mains_freq = job.options(1).mains_freq;
6-
options.channel_action = job.options(1).channel_action;
8+
options.channel_action = job.options(1).chan_action;
79
if isfield(job.options(1).channel, 'cust_channel')
8-
options.channel = job.options(1).channel(1).cust_channel;
10+
options.channel = job.options(1).channel(1).cust_channel;
911
elseif isfield(job.options(1).channel, 'first_channel')
10-
options.channel = job.options(1).channel(1).first_channel;
11-
end;
12-
12+
options.channel = job.options(1).channel(1).first_channel;
13+
end
1314
[sts, output] = pspm_emg_pp(job.datafile{1}, options);
14-
1515
if sts == 1
16-
out = {output.channel};
16+
out = {output.channel};
1717
else
18-
out = {-1};
19-
end;
18+
out = {-1};
19+
end

src/pspm_pp.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
% ● History
2020
% Introduced In PsPM 3.0
2121
% Written in 2009-2015 by Dominik R Bach (Wellcome Trust Centre for Neuroimaging)
22-
% Maintained in 2022 by Teddy Chao (UCL)
22+
% Maintained in 2024 by Teddy
2323

2424
%% Initialise
2525
global settings

0 commit comments

Comments
 (0)