Skip to content

Commit e31a52d

Browse files
authored
Merge pull request #44 from Remi-Gau/master
update README
2 parents 7abbfe6 + 6442f96 commit e31a52d

File tree

1 file changed

+39
-30
lines changed

1 file changed

+39
-30
lines changed

README.md

+39-30
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
[![](https://img.shields.io/badge/Octave-CI-blue?logo=Octave&logoColor=white)](https://github.com/cpp-lln-lab/localizer_visual_motion/actions)
2-
![](https://github.com/cpp-lln-lab/localizer_visual_motion/workflows/CI/badge.svg)
2+
![](https://github.com/cpp-lln-lab/localizer_visual_motion/workflows/CI/badge.svg)
3+
4+
[![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)
35

46
[![Build Status](https://travis-ci.com/cpp-lln-lab/localizer_visual_motion.svg?branch=master)](https://travis-ci.com/cpp-lln-lab/localizer_visual_motion)
57

68
<!-- vscode-markdown-toc -->
7-
* 1. [Requirements](#Requirements)
8-
* 2. [Installation](#Installation)
9-
* 3. [Structure and function details](#Structureandfunctiondetails)
10-
* 3.1. [visualLocTranslational](#visualLocTranslational)
11-
* 3.2. [setParameters](#setParameters)
12-
* 3.3. [subfun/doDotMo](#subfundoDotMo)
13-
* 3.3.1. [Input:](#Input:)
14-
* 3.3.2. [Output:](#Output:)
15-
* 3.4. [subfun/expDesign](#subfunexpDesign)
16-
* 3.4.1. [EVENTS](#EVENTS)
17-
* 3.4.2. [TARGETS:](#TARGETS:)
18-
* 3.4.3. [Input:](#Input:-1)
19-
* 3.4.4. [Output:](#Output:-1)
9+
10+
- 1. [Requirements](#Requirements)
11+
- 2. [Installation](#Installation)
12+
- 3. [Structure and function details](#Structureandfunctiondetails)
13+
_ 3.1. [visualLocTranslational](#visualLocTranslational)
14+
_ 3.2. [setParameters](#setParameters)
15+
_ 3.3. [subfun/doDotMo](#subfundoDotMo)
16+
_ 3.3.1. [Input:](#Input:)
17+
_ 3.3.2. [Output:](#Output:)
18+
_ 3.4. [subfun/expDesign](#subfunexpDesign)
19+
_ 3.4.1. [EVENTS](#EVENTS)
20+
_ 3.4.2. [TARGETS:](#TARGETS:)
21+
_ 3.4.3. [Input:](#Input:-1)
22+
_ 3.4.4. [Output:](#Output:-1)
2023

2124
<!-- vscode-markdown-toc-config
2225
numbering=true
@@ -28,40 +31,40 @@
2831

2932
# Translational Motion
3033

31-
## 1. <a name='Requirements'></a>Requirements
34+
## 1. <a name='Requirements'></a>Requirements
3235

3336
Make sure that the following toolboxes are installed and added to the matlab / octave path.
3437

3538
For instructions see the following links:
3639

3740
| Requirements | Used version |
38-
|----------------------------------------------------------|--------------|
41+
| -------------------------------------------------------- | ------------ |
3942
| [CPP_BIDS](https://github.com/cpp-lln-lab/CPP_BIDS) | ? |
4043
| [CPP_PTB](https://github.com/cpp-lln-lab/CPP_PTB) | ? |
4144
| [PsychToolBox](http://psychtoolbox.org/) | >=3.0.14 |
4245
| [Matlab](https://www.mathworks.com/products/matlab.html) | >=2017 |
4346
| or [octave](https://www.gnu.org/software/octave/) | >=4.? |
4447

45-
## 2. <a name='Installation'></a>Installation
48+
## 2. <a name='Installation'></a>Installation
4649

4750
The CPP_BIDS and CPP_PTB dependencies are already set up as submodule to this repository.
48-
You can install it all with git by doing.
51+
You can install it all with git by doing.
4952

5053
```bash
5154
git clone --recurse-submodules https://github.com/cpp-lln-lab/localizer_visual_motion.git
5255
```
5356

54-
## 3. <a name='Structureandfunctiondetails'></a>Structure and function details
57+
## 3. <a name='Structureandfunctiondetails'></a>Structure and function details
5558

56-
### 3.1. <a name='visualLocTranslational'></a>visualLocTranslational
59+
### 3.1. <a name='visualLocTranslational'></a>visualLocTranslational
5760

5861
Running this script will show blocks of motion dots (soon also moving gratings) and static dots. Motion blocks will show dots(/gratings) moving in one of four directions (up-, down-, left-, and right-ward)
5962

6063
By default it is run in `Debug mode` meaning that it does not run care about subjID, run n., fMRI triggers, Eye Tracker, etc..
6164

6265
Any details of the experiment can be changed in `setParameters.m` (e.g., experiment mode, motion stimuli details, exp. design, etc.)
6366

64-
### 3.2. <a name='setParameters'></a>setParameters
67+
### 3.2. <a name='setParameters'></a>setParameters
6568

6669
`setParameters.m` is the core engine of the experiment. It contains the following tweakable sections:
6770

@@ -77,38 +80,44 @@ Any details of the experiment can be changed in `setParameters.m` (e.g., experim
7780
- Instructions
7881
- Task #1 parameters
7982

80-
### 3.3. <a name='subfundoDotMo'></a>subfun/doDotMo
83+
### 3.3. <a name='subfundoDotMo'></a>subfun/doDotMo
84+
85+
#### 3.3.1. <a name='Input:'></a>Input:
8186

82-
#### 3.3.1. <a name='Input:'></a>Input:
8387
- `cfg`: PTB/machine configurations returned by `setParameters` and `initPTB`
8488
- `expParameters`: parameters returned by `setParameters`
8589
- `logFile`: structure that stores the experiment logfile to be saved
8690

87-
#### 3.3.2. <a name='Output:'></a>Output:
91+
#### 3.3.2. <a name='Output:'></a>Output:
92+
8893
- Event `onset`
8994
- Event `duration`
9095

9196
The dots are drawn on a square that contains the round aperture, then any dots outside of the aperture is turned into a NaN so effectively the actual number of dots on the screen at any given time is not the one that you input but a smaller number (nDots / Area of aperture) on average.
9297

93-
### 3.4. <a name='subfunexpDesign'></a>subfun/expDesign
98+
### 3.4. <a name='subfunexpDesign'></a>subfun/expDesign
99+
94100
Creates the sequence of blocks and the events in them. The conditions are consecutive static and motion blocks (Gives better results than randomised). It can be run as a stand alone without inputs to display a visual example of possible design.
95101

96-
#### 3.4.1. <a name='EVENTS'></a>EVENTS
102+
#### 3.4.1. <a name='EVENTS'></a>EVENTS
103+
97104
The `numEventsPerBlock` should be a multiple of the number of "base" listed in the `motionDirections` and `staticDirections` (4 at the moment).
98105

99-
#### 3.4.2. <a name='TARGETS:'></a>TARGETS:
106+
#### 3.4.2. <a name='TARGETS:'></a>TARGETS:
107+
100108
- If there are 2 targets per block we make sure that they are at least 2 events apart.
101109
- Targets cannot be on the first or last event of a block
102110

103-
#### 3.4.3. <a name='Input:-1'></a>Input:
111+
#### 3.4.3. <a name='Input:-1'></a>Input:
112+
104113
- `expParameters`: parameters returned by `setParameters`
105114
- `displayFigs`: a boolean to decide whether to show the basic design matrix of the design
106115

107-
#### 3.4.4. <a name='Output:-1'></a>Output:
116+
#### 3.4.4. <a name='Output:-1'></a>Output:
117+
108118
- `expParameters.designBlockNames` is a cell array `(nr_blocks, 1)` with the name for each block
109119
- `expParameters.designDirections` is an array `(nr_blocks, numEventsPerBlock)` with the direction to present in a given block
110120
- `0 90 180 270` indicate the angle
111121
- `-1` indicates static
112122
- `expParameters.designSpeeds` is an array `(nr_blocks, numEventsPerBlock) * speedEvent`
113123
- `expParameters.designFixationTargets` is an array `(nr_blocks, numEventsPerBlock)` showing for each event if it should be accompanied by a target
114-

0 commit comments

Comments
 (0)