Skip to content

add changes from testing in Liege #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 29, 2020
Merged

add changes from testing in Liege #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion audioLocTranslational.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@

eyeTracker('Shutdown', cfg);

createBoldJson(cfg, cfg);
createJson(cfg, cfg);

farewellScreen(cfg);

Expand Down
2 changes: 1 addition & 1 deletion lib/CPP_BIDS
Open in desktop
Submodule CPP_BIDS updated 50 files
+3 −0 .gitignore
+22 −17 .travis.yml
+57 −373 README.md
+3 −0 binder/apt.txt
+2 −0 binder/environment.yml
+3 −0 binder/postBuild
+144 −0 docs/functions_description.md
+97 −0 docs/installation.md
+223 −201 lib/utils/file_utils.m
+11 −0 manualTests/dummyData/.bidsignore
+9 −2 manualTests/miss_hit.cfg
+0 −0 manualTests/test_createDatasetDescription.m
+3 −3 manualTests/test_createJson.m
+139 −22 manualTests/test_makeRawDataset.m
+0 −41 manualTests/test_userInput.m
+8 −1 miss_hit.cfg
+11 −0 notebooks/README.md
+795 −0 notebooks/basic_usage.ipynb
+646 −0 notebooks/creating_BIDS_dataset.ipynb
+288 −0 notebooks/more_on_saving.ipynb
+67 −12 src/checkCFG.m
+4 −1 src/convertSourceToRaw.m
+0 −37 src/createBoldJson.m
+26 −22 src/createFilename.m
+127 −0 src/createJson.m
+28 −16 src/saveEventsFile.m
+19 −0 src/subfun/askForGroupAndOrSession.m
+33 −0 src/subfun/askUserCli.m
+42 −0 src/subfun/askUserGui.m
+34 −0 src/subfun/createQuestionList.m
+10 −0 src/subfun/getIsQuestionToAsk.m
+14 −0 src/subfun/isPositiveInteger.m
+0 −45 src/subfun/parseFunc.m
+52 −0 src/subfun/removeAllDateSuffix.m
+1 −0 src/subfun/returnHeaderName.m
+25 −0 src/subfun/setDefaultResponses.m
+11 −0 src/subfun/transferInfoToBids.m
+14 −57 src/userInputs.m
+8 −1 tests/miss_hit.cfg
+52 −0 tests/test_askForGroupAndOrSession.m
+35 −9 tests/test_checkCFG.m
+0 −41 tests/test_createBoldJson.m
+173 −56 tests/test_createFilename.m
+140 −0 tests/test_createJson.m
+24 −0 tests/test_createQuestionList.m
+29 −0 tests/test_getIsQuestionToAsk.m
+17 −0 tests/test_isPositiveInteger.m
+185 −61 tests/test_saveEventsFileSave.m
+32 −0 tests/test_setDefaultResponses.m
+9 −0 tests/test_transferInfoToBids.m
2 changes: 1 addition & 1 deletion lib/CPP_PTB
Open in desktop
Submodule CPP_PTB updated 1 files
+21 −3 src/aperture/apertureTexture.m
12 changes: 7 additions & 5 deletions setParameters.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
function cfg = setParameters

% AUDITORY LOCALIZER

% Initialize the parameters and general configuration variables
cfg = struct();

Expand All @@ -12,7 +14,7 @@

%% Debug mode settings

cfg.debug.do = true; % To test the script out of the scanner, skip PTB sync
cfg.debug.do = false; % To test the script out of the scanner, skip PTB sync
cfg.debug.smallWin = false; % To test on a part of the screen, change to 1
cfg.debug.transpWin = false; % To test with trasparent full size screen

Expand All @@ -21,7 +23,7 @@
%% Engine parameters

cfg.testingDevice = 'mri';
cfg.eyeTracker.do = false;
cfg.eyeTracker.do = true;
cfg.audio.do = true;

cfg = setMonitor(cfg);
Expand Down Expand Up @@ -56,7 +58,7 @@
cfg.timing.eventDuration = 0.850; % second

% Time between blocs in secs
cfg.timing.IBI = 1.8;
cfg.timing.IBI = 0;
% Time between events in secs
cfg.timing.ISI = 0;
% Number of seconds before the motion stimuli are presented
Expand All @@ -73,7 +75,7 @@
cfg.timing.eventDuration = cfg.mri.repetitionTime / 2 - 0.04; % second

% Time between blocs in secs
cfg.timing.IBI = 1;
cfg.timing.IBI = 0;
% Time between events in secs
cfg.timing.ISI = 0;
% Number of seconds before the motion stimuli are presented
Expand Down Expand Up @@ -148,7 +150,7 @@
function cfg = setMRI(cfg)
% letter sent by the trigger to sync stimulation and volume acquisition
cfg.mri.triggerKey = 't';
cfg.mri.triggerNb = 0;
cfg.mri.triggerNb = 5;

cfg.mri.repetitionTime = 1.8;

Expand Down