Skip to content

Commit 5462816

Browse files
authored
Merge pull request #19 from Remi-Gau/remi-use_aperture
move subfunctions to submodules
2 parents 6225b66 + 6373b96 commit 5462816

File tree

6 files changed

+8
-98
lines changed

6 files changed

+8
-98
lines changed

README.md

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,12 @@ For instructions see the following links:
1616
| [Matlab](https://www.mathworks.com/products/matlab.html) | >=2017 |
1717
| or [octave](https://www.gnu.org/software/octave/) | >=4.? |
1818

19-
## Installing dependencies
19+
## Installation
2020

21-
All the dependencies needed to run this are listed in the [mpm-requirements.txt file](.mpm-requirements.txt). If those functions are not in the matlab path the scripts in this repository will not work.
21+
git clone --recurse-submodules https://github.com/Remi-Gau/repo_with_submod.git
22+
cd repo_with_submod/
23+
git submodule update --remote
2224

23-
If you are using the [matlab package manager](https://github.com/mobeets/mpm), you can simply download the appropriate version of those dependencies and add them to your path by running the `getDependencies` function.
24-
25-
```matlab
26-
getDependencies('update')
27-
```
28-
29-
If you already have the appropriate version but just want to add them to the matlab path, then run.
30-
31-
```matlab
32-
getDependencies()
33-
```
3425
## Structure and function details
3526

3627
### visualLocTranslational
@@ -92,8 +83,3 @@ The `numEventsPerBlock` should be a multiple of the number of "base" listed in t
9283
- `expParameters.designSpeeds` is an array `(nr_blocks, numEventsPerBlock) * speedEvent`
9384
- `expParameters.designFixationTargets` is an array `(nr_blocks, numEventsPerBlock)` showing for each event if it should be accompanied by a target
9485

95-
### subfun/eyeTracker
96-
Eyetracker script, still to be debugged. Will probably moved in the CPP_PTB package. It deals with the calibration (dufault or custom), eye movements recording and saving the files.
97-
98-
### subfun/wait4Trigger
99-
Simple functions that counts the triggers sent by the MRI computer to the stimulation computer to sync brain volume recordings and stimulation.

lib/CPP_BIDS

lib/CPP_PTB

setParameters.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
% Diameter/length of side of aperture in Visual angles
7171
cfg.aperture.type = 'circle';
7272
cfg.aperture.width = []; % if left empty it will take the screen height
73-
cfg.aperture.xPos = 0;
73+
cfg.aperture.xPos = -30;
7474

7575
%% Task(s)
7676

@@ -85,7 +85,7 @@
8585
cfg.fixation.color = cfg.color.white;
8686
cfg.fixation.width = 1;
8787
cfg.fixation.lineWidthPix = 2;
88-
cfg.fixation.xDisplacement = 0;
88+
cfg.fixation.xDisplacement = 30;
8989
cfg.fixation.yDisplacement = 0;
9090

9191
cfg.target.maxNbPerBlock = 2;

subfun/initializeDots.m

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

subfun/updateDots.m

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

0 commit comments

Comments
 (0)