Skip to content

Commit

Permalink
Merge pull request #799 from bachlab/fix_illuminance_gui
Browse files Browse the repository at this point in the history
fix illuminance GUI
  • Loading branch information
dominikbach authored Nov 25, 2024
2 parents 8e329db + b47762c commit 3f487e9
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 22 deletions.
3 changes: 1 addition & 2 deletions src/pspm_bf_lcrf_gm.m
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
% ● Arguments
% * td : time resolution in second.
% * n : duration of the function in s. Default as 20 s.
% * offset: offset in s. tells the function where to start with
% the response function. Default as 0.2 s.
% * offset: offset of the response function (in s).
% * a : shape of the function.
% * b : scale of the function.
% * A : quantifier or amplitude of the function
Expand Down
3 changes: 1 addition & 2 deletions src/pspm_bf_ldrf_gm.m
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
% ● Arguments
% * td : Time resolution in second.
% * n : Duration of the function in second. Default as 20 s.
% * offset : Offset in s. tells the function where to start with
% the response function. Default as 0.2 s.
% * offset : Offset of the response (in s).
% * a : Shape of the function.
% * b : Scale of the function.
% * A : Quantifier or amplitude of the function.
Expand Down
18 changes: 1 addition & 17 deletions src/pspm_cfg/pspm_cfg_process_illuminance.m
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,6 @@
sr.strtype = 'i';
sr.num = [1 1];
sr.help = pspm_cfg_help_format('pspm_process_illuminance', 'sr');
%% Duration
duration = cfg_entry;
duration.name = 'Duration';
duration.tag = 'duration';
duration.strtype= 'r';
duration.val = {20};
duration.num = [1 1];
duration.help = pspm_cfg_help_format('pspm_process_illuminance', 'options.bf.duration');
%% Offset
offset = cfg_entry;
offset.name = 'Offset';
offset.tag = 'offset';
offset.strtype = 'r';
offset.val = {0.2};
offset.num = [1 1];
offset.help = pspm_cfg_help_format('pspm_process_illuminance', 'options.bf.offset');
%% LDRF_GM
ldrf_gm = cfg_const;
ldrf_gm.name = 'pspm_bf_ldrf_gm';
Expand Down Expand Up @@ -78,7 +62,7 @@
bf = cfg_branch;
bf.name = 'Basis function options';
bf.tag = 'bf';
bf.val = {duration, offset, dilation, constrict};
bf.val = {dilation, constrict};
bf.help = {'Specify options for the basis functions.'};

%% Executable branch
Expand Down
1 change: 0 additions & 1 deletion src/pspm_cfg/pspm_cfg_run_proc_illuminance.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
options.overwrite = job.output.overwrite;
%% basis function
options.bf = struct();
options.bf = pspm_update_struct(options.bf, job.bf, {'duration','offset'});
dil_f = fields(job.bf.dilation);
% only check first field
switch dil_f{1}
Expand Down

0 comments on commit 3f487e9

Please sign in to comment.