From 9d9270f84e05b16e7deafecb3317a22d5eda5e17 Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Mon, 10 Aug 2020 15:55:35 +0200 Subject: [PATCH 1/5] fix typo in the file name --- visualLocTanslational.m => visualLocTranslational.m | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename visualLocTanslational.m => visualLocTranslational.m (100%) diff --git a/visualLocTanslational.m b/visualLocTranslational.m similarity index 100% rename from visualLocTanslational.m rename to visualLocTranslational.m From a5505119e4ce569e0b744b4bd61a4b92e9b0ac25 Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Tue, 11 Aug 2020 12:17:25 +0200 Subject: [PATCH 2/5] add comment fix name --- visualLocTranslational.m | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/visualLocTranslational.m b/visualLocTranslational.m index 02b3524..1912a73 100644 --- a/visualLocTranslational.m +++ b/visualLocTranslational.m @@ -63,6 +63,7 @@ disp(cfg); + % Show experiment instruction standByScreen(cfg); % prepare the KbQueue to collect responses @@ -76,7 +77,7 @@ getResponse('start', cfg.keyboard.responseBox); - WaitSecs(cfg.onsetDelay); + WaitSecs(cfg.timing.onsetDelay); %% For Each Block @@ -125,13 +126,13 @@ saveResponsesAndTriggers(responseEvents, cfg, logFile, triggerString); % wait for the inter-stimulus interval - WaitSecs(cfg.ISI); + WaitSecs(cfg.timing.ISI); end eyeTracker('StopRecordings', cfg); - WaitSecs(cfg.IBI); + WaitSecs(cfg.timing.IBI); % trigger monitoring triggerEvents = getResponse('check', cfg.keyboard.responseBox, cfg, ... @@ -143,7 +144,7 @@ end % End of the run for the BOLD to go down - WaitSecs(cfg.endDelay); + WaitSecs(cfg.timing.endDelay); cfg = getExperimentEnd(cfg); From f72bc6fd6901abc525455d87acf8b8a8f03a297a Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Tue, 11 Aug 2020 12:17:38 +0200 Subject: [PATCH 3/5] update to new tidy naming for timing --- setParameters.m | 10 +++++----- subfun/doDotMo.m | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/setParameters.m b/setParameters.m index 5fb65fc..114e1e6 100644 --- a/setParameters.m +++ b/setParameters.m @@ -50,15 +50,15 @@ % block length = (cfg.eventDuration + cfg.ISI) * cfg.design.nbEventsPerBlock % Time between blocs in secs - cfg.IBI = 1.8 * 3; % 8; + cfg.timing.IBI = 1.8 * 3; % 8; % Time between events in secs - cfg.ISI = 0.1; + cfg.timing.ISI = 0.1; % Number of seconds before the motion stimuli are presented - cfg.onsetDelay = .1; + cfg.timing.onsetDelay = .1; % Number of seconds after the end all the stimuli before ending the run - cfg.endDelay = .1; + cfg.timing.endDelay = .1; - cfg.eventDuration = 0.8; % second + cfg.timing.eventDuration = 0.8; % second %% Visual Stimulation diff --git a/subfun/doDotMo.m b/subfun/doDotMo.m index 23217c8..5978421 100644 --- a/subfun/doDotMo.m +++ b/subfun/doDotMo.m @@ -19,7 +19,7 @@ dots = initDots(cfg, thisEvent); % Set for how many frames this event will last - framesLeft = floor(cfg.eventDuration / cfg.screen.ifi); + framesLeft = floor(cfg.timing.eventDuration / cfg.screen.ifi); %% Start the dots presentation vbl = Screen('Flip', cfg.screen.win); From d0dd1f8afc736921f8716985e936d909553003b8 Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Tue, 11 Aug 2020 14:21:11 +0200 Subject: [PATCH 4/5] update submodules --- lib/CPP_BIDS | 2 +- lib/CPP_PTB | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/CPP_BIDS b/lib/CPP_BIDS index a17e12a..c23210f 160000 --- a/lib/CPP_BIDS +++ b/lib/CPP_BIDS @@ -1 +1 @@ -Subproject commit a17e12a53c0063e36fb017b7a545d605e2c2ef8e +Subproject commit c23210f5b35faa1505ca2cc35c92c3168564f98a diff --git a/lib/CPP_PTB b/lib/CPP_PTB index a8bc6b5..536fdd8 160000 --- a/lib/CPP_PTB +++ b/lib/CPP_PTB @@ -1 +1 @@ -Subproject commit a8bc6b5a1457ad78b496fa89037c07f0e548e0c8 +Subproject commit 536fdd8b1b5a9e0fa87d30a4c4070a8eda5487bc From 05882c2c7b838bbc8a0dee54b9d25c411b9fa12a Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Tue, 11 Aug 2020 16:46:32 +0200 Subject: [PATCH 5/5] update submodules --- lib/CPP_PTB | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/CPP_PTB b/lib/CPP_PTB index 536fdd8..56b44dd 160000 --- a/lib/CPP_PTB +++ b/lib/CPP_PTB @@ -1 +1 @@ -Subproject commit 536fdd8b1b5a9e0fa87d30a4c4070a8eda5487bc +Subproject commit 56b44dde23db03cd9d77165231bbf74e9388930e