Skip to content

Commit 44dc062

Browse files
Remi-GauRemi-Gau
authored
Merge pull request #15 from cpp-lln-lab/remi-track_changes_testing_liege
getting ready for v0.0.1
2 parents ad7bf77 + 6530533 commit 44dc062

32 files changed

Lines changed: 213 additions & 233 deletions

‎initEnv.m‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1-
%
2-
% 1 - Check if version requirements
3-
% are satisfied and the packages are
4-
% are installed/loaded:
5-
% Octave > 4
6-
% - image
7-
% - optim
8-
% - struct
9-
% - statistics
10-
%
11-
% MATLAB >= R2015b
12-
%
13-
% 2 - Add project to the O/M path
14-
15-
function initEnv
1+
% (C) Copyright 2020 Agah Karakuzu
2+
% (C) Copyright 2020 Remi Gau
3+
4+
function initEnv()
5+
% initEnv()
6+
%
7+
% 1 - Check if version requirements
8+
% are satisfied and the packages are
9+
% are installed/loaded:
10+
% Octave > 4
11+
% - image
12+
% - optim
13+
% - struct
14+
% - statistics
15+
%
16+
% MATLAB > R2017a
17+
%
18+
% 2 - Add project to the O/M path
1619

1720
octaveVersion = '4.0.3';
1821
matlabVersion = '8.6.0';
@@ -56,8 +59,8 @@
5659

5760
if numel(dir(libDirectory)) <= 2 % Means that the external is empty
5861
error(['Git submodules are not cloned!', ...
59-
'Try this in your terminal:', ...
60-
' git submodule update --recursive ']);
62+
'Try this in your terminal:', ...
63+
' git submodule update --recursive ']);
6164
else
6265
addDependencies();
6366
end

‎lib/CPP_BIDS‎

Submodule CPP_BIDS updated 57 files

‎lib/CPP_PTB‎

Submodule CPP_PTB updated 86 files

‎miss_hit.cfg‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# style guide (https://florianschanda.github.io/miss_hit/style_checker.html)
22
line_length: 100
33
regex_function_name: "[a-z]+(([A-Z]){1}[A-Za-z]+)*"
4-
suppress_rule: "copyright_notice"
4+
exclude_dir: "lib"
5+
copyright_entity: "Sam Schwarzkopf"
6+
copyright_entity: "Remi Gau"
7+
copyright_entity: "Agah Karakuzu"
58

69
# metrics limit for the code quality (https://florianschanda.github.io/miss_hit/metrics.html)
710
metric "cnest": limit 4

‎src/driftingBars.m‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
% (C) Copyright 2010-2020 Sam Schwarzkopf
2+
% (C) Copyright 2020 Remi Gau
3+
14
function driftingBars(debug, stim, emul)
25
% driftingBars(stim, emul, debug)
36
%
@@ -7,7 +10,7 @@ function driftingBars(debug, stim, emul)
710
% Emul : 0 = Triggered by scanner, 1 = Trigger by keypress
811

912
if nargin < 1 || isempty(debug)
10-
debug = 1;
13+
debug = 0;
1114
end
1215
if nargin < 2 || isempty(stim)
1316
stim = 'dot'; % ripples dot
@@ -20,46 +23,46 @@ function driftingBars(debug, stim, emul)
2023

2124
%% Experimental Parameters
2225

23-
cfg.task.name = 'retinotopy drifting bar';
26+
cfg.task.name = 'retinotopy drifting bar dot';
2427

2528
% Stimulus type
2629
cfg.aperture.type = 'bar';
2730

2831
% Stimulus conditions in each block defined by number
29-
cfg.conditions = [45 90 135 270 225 315 90 45 135 270 225 315];
32+
cfg.conditions = repmat([90 45 135 270 225 315], 1, 2);
3033

3134
%% Set defaults
3235

3336
cfg.stim = stim;
3437

3538
cfg.debug.do = debug;
3639

37-
if ~emul
38-
cfg.testingDevice = 'mri';
39-
else
40+
cfg.testingDevice = 'mri';
41+
if emul
4042
cfg.testingDevice = 'pc';
4143
end
4244

4345
cfg.extraColumns.bar_angle = struct( ...
44-
'length', 1, ...
45-
'bids', struct( ...
46-
'LongName', 'bar angle', ...
47-
'Description', '', ...
48-
'Units', 'degrees'));
46+
'length', 1, ...
47+
'bids', struct( ...
48+
'LongName', 'bar angle', ...
49+
'Description', '', ...
50+
'Units', 'degrees'));
4951

5052
cfg.extraColumns.bar_width = struct( ...
51-
'length', 1, ...
52-
'bids', struct( ...
53-
'LongName', 'width of the bar', ...
54-
'Description', '', ...
55-
'Units', 'degrees'));
53+
'length', 1, ...
54+
'bids', struct( ...
55+
'LongName', 'width of the bar', ...
56+
'Description', '', ...
57+
'Units', 'degrees'));
5658

5759
cfg.extraColumns.bar_position = struct( ...
58-
'length', 1, ...
59-
'bids', struct( ...
60-
'LongName', '', ...
61-
'Description', 'bar position with respoect to the fixation cross', ...
62-
'Units', 'degrees'));
60+
'length', 1, ...
61+
'bids', struct( ...
62+
'LongName', '', ...
63+
'Description', ...
64+
'bar position wrt fixation cross', ...
65+
'Units', 'degrees'));
6366

6467
[cfg] = setParameters(cfg);
6568

‎src/eccen.m‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
% (C) Copyright 2010-2020 Sam Schwarzkopf
2+
% (C) Copyright 2020 Remi Gau
3+
14
function eccen(debug, direc, stim, emul)
25
% eccen(debug, direc, stim, emul)
36
%
@@ -45,21 +48,25 @@ function eccen(debug, direc, stim, emul)
4548
cfg.testingDevice = 'pc';
4649
end
4750

51+
defaultStruct = struct('LongName', '', ...
52+
'Units', '');
53+
4854
cfg.extraColumns.ring_inner_rim = struct( ...
49-
'length', 1, ...
50-
'bids', struct( ...
51-
'LongName', 'position of the inner rim of the ring', ...
52-
'Units', 'degrees of visual angles'));
55+
'length', 1, ...
56+
'bids', defaultStruct);
57+
cfg.extraColumns.ring_inner_rim.bids.LongName = 'position of ring inner rim';
58+
cfg.extraColumns.ring_inner_rim.bids.Units = 'degrees of visual angles';
59+
5360
cfg.extraColumns.ring_outer_rim = struct( ...
54-
'length', 1, ...
55-
'bids', struct( ...
56-
'LongName', 'position of the outer rim of the ring', ...
57-
'Units', 'degrees of visual angles'));
61+
'length', 1, ...
62+
'bids', defaultStruct);
63+
cfg.extraColumns.ring_outer_rim.bids.LongName = 'position of ring outer rim';
64+
cfg.extraColumns.ring_outer_rim.bids.Units = 'degrees of visual angles';
5865

5966
[cfg] = setParameters(cfg);
6067

6168
%% Run the experiment
62-
[data, cfg] = retinotopicMapping(cfg);
69+
[~, ~] = retinotopicMapping(cfg);
6370

6471
% plotResults(data, expParameters);
6572

‎src/miss_hit.cfg‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎src/optimRetMapping.m‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎src/polar.m‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
% (C) Copyright 2010-2020 Sam Schwarzkopf
2+
% (C) Copyright 2020 Remi Gau
3+
14
function polar(debug, direc, stim, emul)
25
% polar(debug, direc, stim, emul)
36
%
@@ -45,16 +48,16 @@ function polar(debug, direc, stim, emul)
4548
end
4649

4750
cfg.extraColumns.angle = struct( ...
48-
'length', 1, ...
49-
'bids', struct( ...
50-
'LongName', 'position of the center of the wedge', ...
51-
'Units', 'degrees'));
51+
'length', 1, ...
52+
'bids', struct( ...
53+
'LongName', 'position of wedge center', ...
54+
'Units', 'degrees'));
5255

5356
cfg.extraColumns.wedge_angle = struct( ...
54-
'length', 1, ...
55-
'bids', struct( ...
56-
'LongName', 'angular width of the wedge', ...
57-
'Units', 'degrees'));
57+
'length', 1, ...
58+
'bids', struct( ...
59+
'LongName', 'wedge angular width', ...
60+
'Units', 'degrees'));
5861

5962
[cfg] = setParameters(cfg);
6063

0 commit comments

Comments
 (0)