Skip to content

minor naming update for timing related vars #31

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 9 commits into from
Aug 11, 2020
Merged

minor naming update for timing related vars #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
82b0a1f
Merge remote-tracking branch 'cpp-lln-lab/master'
marcobarilari Aug 5, 2020
1d1c63d
Merge branch 'master' into cpp-lln-lab/master
marcobarilari Aug 5, 2020
e74400a
Merge remote-tracking branch 'cpp-lln-lab/master'
marcobarilari Aug 5, 2020
06cc39e
Merge remote-tracking branch 'cpp-lln-lab/master'
marcobarilari Aug 7, 2020
9d9270f
fix typo in the file name
marcobarilari Aug 10, 2020
a550511
add comment fix name
marcobarilari Aug 11, 2020
f72bc6f
update to new tidy naming for timing
marcobarilari Aug 11, 2020
d0dd1f8
update submodules
marcobarilari Aug 11, 2020
05882c2
update submodules
marcobarilari Aug 11, 2020
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 lib/CPP_BIDS
Open in desktop
Submodule CPP_BIDS updated 27 files
+3 −0 .gitignore
+28 −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
+0 −41 manualTests/test_userInput.m
+11 −0 notebooks/README.md
+457 −0 notebooks/basic_usage.ipynb
+344 −0 notebooks/creating_BIDS_dataset.ipynb
+207 −0 notebooks/more_on_saving.ipynb
+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
+1 −0 src/subfun/returnHeaderName.m
+25 −0 src/subfun/setDefaultResponses.m
+14 −57 src/userInputs.m
+52 −0 tests/test_askForGroupAndOrSession.m
+24 −0 tests/test_createQuestionList.m
+29 −0 tests/test_getIsQuestionToAsk.m
+17 −0 tests/test_isPositiveInteger.m
+32 −0 tests/test_setDefaultResponses.m
2 changes: 1 addition & 1 deletion lib/CPP_PTB
Open in desktop
Submodule CPP_PTB updated 11 files
+2 −2 collectAndSaveResponses.m
+5 −1 getExperimentStart.m
+93 −38 src/aperture/apertureTexture.m
+1 −1 src/dot/initDots.m
+0 −0 src/errors/errorAbort.m
+0 −0 src/errors/errorAbortGetReponse.m
+0 −0 src/errors/errorRestrictedKeysGetReponse.m
+0 −53 tests/runTests.m
+1 −0 tests/test_computeRadialMotionDirection.m
+3 −0 tests/test_initDots.m
+10 −2 tests/test_reseedDots.m
10 changes: 5 additions & 5 deletions setParameters.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion subfun/doDotMo.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 5 additions & 4 deletions visualLocTanslational.m → visualLocTranslational.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@

disp(cfg);

% Show experiment instruction
standByScreen(cfg);

% prepare the KbQueue to collect responses
Expand All @@ -76,7 +77,7 @@

getResponse('start', cfg.keyboard.responseBox);

WaitSecs(cfg.onsetDelay);
WaitSecs(cfg.timing.onsetDelay);

%% For Each Block

Expand Down Expand Up @@ -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, ...
Expand All @@ -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);

Expand Down