Skip to content

Commit d1c6967

Browse files
marcobarilarimarcobarilari
committed
Merge remote-tracking branch 'cpp-lln-lab/master'
2 parents 4e986ed + 3d9ebfe commit d1c6967

File tree

5 files changed

+150
-15
lines changed

5 files changed

+150
-15
lines changed

‎.all-contributorsrc‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
{
2+
"files": [
3+
"README.md"
4+
],
5+
"imageSize": 100,
6+
"commit": false,
7+
"contributors": [
8+
{
9+
"login": "mohmdrezk",
10+
"name": "Mohamed Rezk",
11+
"avatar_url": "https://avatars2.githubusercontent.com/u/9597815?v=4",
12+
"profile": "https://github.com/mohmdrezk",
13+
"contributions": [
14+
"code",
15+
"design",
16+
"ideas"
17+
]
18+
},
19+
{
20+
"login": "marcobarilari",
21+
"name": "marcobarilari",
22+
"avatar_url": "https://avatars3.githubusercontent.com/u/38101692?v=4",
23+
"profile": "https://github.com/marcobarilari",
24+
"contributions": [
25+
"code",
26+
"design",
27+
"ideas",
28+
"bug",
29+
"userTesting",
30+
"review",
31+
"question",
32+
"infra",
33+
"maintenance"
34+
]
35+
},
36+
{
37+
"login": "Remi-Gau",
38+
"name": "Remi Gau",
39+
"avatar_url": "https://avatars3.githubusercontent.com/u/6961185?v=4",
40+
"profile": "https://remi-gau.github.io/",
41+
"contributions": [
42+
"code",
43+
"design",
44+
"ideas",
45+
"bug",
46+
"userTesting",
47+
"review",
48+
"question",
49+
"infra",
50+
"maintenance"
51+
]
52+
},
53+
{
54+
"login": "CerenB",
55+
"name": "CerenB",
56+
"avatar_url": "https://avatars1.githubusercontent.com/u/10451654?v=4",
57+
"profile": "https://github.com/CerenB",
58+
"contributions": [
59+
"bug",
60+
"userTesting"
61+
]
62+
}
63+
],
64+
"contributorsPerLine": 7,
65+
"projectName": "localizer_visual_motion",
66+
"projectOwner": "cpp-lln-lab",
67+
"repoType": "github",
68+
"repoHost": "https://github.com",
69+
"skipCi": false
70+
"contributorsSortAlphabetically": true
71+
}

‎README.md‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
[![](https://img.shields.io/badge/Octave-CI-blue?logo=Octave&logoColor=white)](https://github.com/cpp-lln-lab/localizer_visual_motion/actions)
2+
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
3+
[![All Contributors](https://img.shields.io/badge/all_contributors-4-orange.svg?style=flat-square)](#contributors-)
4+
<!-- ALL-CONTRIBUTORS-BADGE:END -->
25
![](https://github.com/cpp-lln-lab/localizer_visual_motion/workflows/CI/badge.svg)
36

47
[![codecov](https://codecov.io/gh/cpp-lln-lab/localizer_visual_motion/branch/master/graph/badge.svg)](https://codecov.io/gh/cpp-lln-lab/localizer_visual_motion)
@@ -80,6 +83,31 @@ Any details of the experiment can be changed in `setParameters.m` (e.g., experim
8083
- Instructions
8184
- Task #1 parameters
8285

86+
#### Let the scanner pace the experiment
87+
88+
Set `cfg.pacedByTriggers.do` to `true` and you can then set all the details in this `if` block
89+
90+
```matlab
91+
% Time is here in in terms of number repetition time (i.e MRI volumes)
92+
if cfg.pacedByTriggers.do
93+
94+
cfg.pacedByTriggers.quietMode = true;
95+
cfg.pacedByTriggers.nbTriggers = 1;
96+
97+
cfg.timing.eventDuration = cfg.mri.repetitionTime / 2 - 0.04; % second
98+
99+
% Time between blocs in secs
100+
cfg.timing.IBI = 0;
101+
% Time between events in secs
102+
cfg.timing.ISI = 0;
103+
% Number of seconds before the motion stimuli are presented
104+
cfg.timing.onsetDelay = 0;
105+
% Number of seconds after the end all the stimuli before ending the run
106+
cfg.timing.endDelay = 2;
107+
108+
end
109+
```
110+
83111
### 3.3. <a name='subfundoDotMo'></a>subfun/doDotMo
84112

85113
#### 3.3.1. <a name='Input:'></a>Input:
@@ -121,3 +149,25 @@ The `numEventsPerBlock` should be a multiple of the number of "base" listed in t
121149
- `-1` indicates static
122150
- `expParameters.designSpeeds` is an array `(nr_blocks, numEventsPerBlock) * speedEvent`
123151
- `expParameters.designFixationTargets` is an array `(nr_blocks, numEventsPerBlock)` showing for each event if it should be accompanied by a target
152+
153+
## Contributors ✨
154+
155+
Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
156+
157+
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
158+
<!-- prettier-ignore-start -->
159+
<!-- markdownlint-disable -->
160+
<table>
161+
<tr>
162+
<td align="center"><a href="https://github.com/mohmdrezk"><img src="https://avatars2.githubusercontent.com/u/9597815?v=4" width="100px;" alt=""/><br /><sub><b>Mohamed Rezk</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/localizer_visual_motion/commits?author=mohmdrezk" title="Code">💻</a> <a href="#design-mohmdrezk" title="Design">🎨</a> <a href="#ideas-mohmdrezk" title="Ideas, Planning, & Feedback">🤔</a></td>
163+
<td align="center"><a href="https://github.com/marcobarilari"><img src="https://avatars3.githubusercontent.com/u/38101692?v=4" width="100px;" alt=""/><br /><sub><b>marcobarilari</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/localizer_visual_motion/commits?author=marcobarilari" title="Code">💻</a> <a href="#design-marcobarilari" title="Design">🎨</a> <a href="#ideas-marcobarilari" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/cpp-lln-lab/localizer_visual_motion/issues?q=author%3Amarcobarilari" title="Bug reports">🐛</a> <a href="#userTesting-marcobarilari" title="User Testing">📓</a> <a href="https://github.com/cpp-lln-lab/localizer_visual_motion/pulls?q=is%3Apr+reviewed-by%3Amarcobarilari" title="Reviewed Pull Requests">👀</a> <a href="#question-marcobarilari" title="Answering Questions">💬</a> <a href="#infra-marcobarilari" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#maintenance-marcobarilari" title="Maintenance">🚧</a></td>
164+
<td align="center"><a href="https://remi-gau.github.io/"><img src="https://avatars3.githubusercontent.com/u/6961185?v=4" width="100px;" alt=""/><br /><sub><b>Remi Gau</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/localizer_visual_motion/commits?author=Remi-Gau" title="Code">💻</a> <a href="#design-Remi-Gau" title="Design">🎨</a> <a href="#ideas-Remi-Gau" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/cpp-lln-lab/localizer_visual_motion/issues?q=author%3ARemi-Gau" title="Bug reports">🐛</a> <a href="#userTesting-Remi-Gau" title="User Testing">📓</a> <a href="https://github.com/cpp-lln-lab/localizer_visual_motion/pulls?q=is%3Apr+reviewed-by%3ARemi-Gau" title="Reviewed Pull Requests">👀</a> <a href="#question-Remi-Gau" title="Answering Questions">💬</a> <a href="#infra-Remi-Gau" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#maintenance-Remi-Gau" title="Maintenance">🚧</a></td>
165+
<td align="center"><a href="https://github.com/CerenB"><img src="https://avatars1.githubusercontent.com/u/10451654?v=4" width="100px;" alt=""/><br /><sub><b>CerenB</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/localizer_visual_motion/issues?q=author%3ACerenB" title="Bug reports">🐛</a> <a href="#userTesting-CerenB" title="User Testing">📓</a></td>
166+
</tr>
167+
</table>
168+
169+
<!-- markdownlint-enable -->
170+
<!-- prettier-ignore-end -->
171+
<!-- ALL-CONTRIBUTORS-LIST:END -->
172+
173+
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

‎subfun/postInitializationSetup.m‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
function varargout = postInitializationSetup(varargin)
2+
% varargout = postInitializatinSetup(varargin)
3+
4+
% generic function to finalize some set up after psychtoolbox has been
5+
% initialized
6+
7+
cfg = deal(varargin{:});
8+
9+
cfg.dot.matrixWidth = cfg.screen.winWidth;
10+
11+
% Convert some values from degrees to pixels
12+
cfg.dot = degToPix('size', cfg.dot, cfg);
13+
cfg.dot = degToPix('speed', cfg.dot, cfg);
14+
15+
% Get dot speeds in pixels per frame
16+
cfg.dot.speedPixPerFrame = cfg.dot.speedPix / cfg.screen.monitorRefresh;
17+
18+
cfg.aperture = degToPix('xPos', cfg.aperture, cfg);
19+
20+
% dots are displayed on a square with a length in visual angle equal to the
21+
% field of view
22+
cfg.dot.number = round(cfg.dot.density * ...
23+
(cfg.dot.matrixWidth / cfg.screen.ppd)^2);
24+
25+
varargout = cfg;
26+
27+
end

‎version.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v0.0.1

‎visualLocTranslational.m‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,7 @@
3333
%% Init the experiment
3434
[cfg] = initPTB(cfg);
3535

36-
cfg.dot.matrixWidth = cfg.screen.winWidth;
37-
38-
% Convert some values from degrees to pixels
39-
cfg.dot = degToPix('size', cfg.dot, cfg);
40-
cfg.dot = degToPix('speed', cfg.dot, cfg);
41-
42-
% Get dot speeds in pixels per frame
43-
cfg.dot.speedPixPerFrame = cfg.dot.speedPix / cfg.screen.monitorRefresh;
44-
45-
cfg.aperture = degToPix('xPos', cfg.aperture, cfg);
46-
47-
% dots are displayed on a square with a length in visual angle equal to the
48-
% field of view
49-
cfg.dot.number = round(cfg.dot.density * ...
50-
(cfg.dot.matrixWidth / cfg.screen.ppd)^2);
36+
cfg = postInitializationSetup(cfg);
5137

5238
[el] = eyeTracker('Calibration', cfg);
5339

0 commit comments

Comments
 (0)