diff --git a/.codespellrc b/.codespellrc new file mode 100644 index 0000000..aaa7aff --- /dev/null +++ b/.codespellrc @@ -0,0 +1,4 @@ +[codespell] +# reference: https://github.com/codespell-project/codespell#using-a-config-file +skip = .git,*.pdf,.codespellrc,*.svg +ignore-words-list = sie,startet,oder,ist,als,alle,linke,ende,deines,manuell,egal,lief,relativ,zar,vor,wont,deine \ No newline at end of file diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml new file mode 100644 index 0000000..96cfecd --- /dev/null +++ b/.github/workflows/codespell.yml @@ -0,0 +1,21 @@ +# Codespell configuration is within .codespellrc +--- +name: Codespell +on: + push: + branches: [master] + pull_request: + branches: [master] +permissions: + contents: read +jobs: + codespell: + name: Check for spelling errors + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Annotate locations with typos + uses: codespell-project/codespell-problem-matcher@v1 + - name: Codespell + uses: codespell-project/actions-codespell@v2 diff --git a/Task/Classes/al_display.m b/Task/Classes/al_display.m index f418ea0..7e9a3a5 100644 --- a/Task/Classes/al_display.m +++ b/Task/Classes/al_display.m @@ -14,7 +14,7 @@ % General screensize % screen size - screensizePart % witdh and height of screen + screensizePart % width and height of screen distance2screen % participant distance to screen in mm screenWidthInMM % for degrees visual angle window % psychtoolbox window diff --git a/Task/Classes/al_eyeTracker.m b/Task/Classes/al_eyeTracker.m index afc25b7..9992148 100644 --- a/Task/Classes/al_eyeTracker.m +++ b/Task/Classes/al_eyeTracker.m @@ -46,7 +46,7 @@ end function self = initializeEyeLink(self, taskParam, et_file_name_suffix) - % INITIALIZEEYELINK This function initialzes the eye-tracker + % INITIALIZEEYELINK This function initializes the eye-tracker % % Input % taskParam: Task-parameter-object instance diff --git a/Task/Classes/al_gparam.m b/Task/Classes/al_gparam.m index 5ac19c2..001c53f 100644 --- a/Task/Classes/al_gparam.m +++ b/Task/Classes/al_gparam.m @@ -23,7 +23,7 @@ shieldMu % mean shield size shieldMin % minimum angular shield size - shieldMax % maximium angular shield size + shieldMax % maximum angular shield size trials % number of trials practTrials % number of practice trials diff --git a/Task/Classes/al_strings.m b/Task/Classes/al_strings.m index 7f05329..58469bd 100644 --- a/Task/Classes/al_strings.m +++ b/Task/Classes/al_strings.m @@ -26,7 +26,7 @@ function self = al_strings() % AL_STRINGS This function creates a strings object - % of classs al_strings + % of class al_strings % % The initial values correspond to useful defaults that % are often used across tasks. diff --git a/Task/Classes/al_taskDataMain.m b/Task/Classes/al_taskDataMain.m index 423a620..451f53b 100644 --- a/Task/Classes/al_taskDataMain.m +++ b/Task/Classes/al_taskDataMain.m @@ -716,7 +716,7 @@ end function s = saveobj(self) - % SAVEOBJ This function tranlates data that we want to save + % SAVEOBJ This function translates data that we want to save % into a structure % % Background: @@ -849,7 +849,7 @@ elseif isequal(self.taskType, 'infant') - % Todo carefull check what we need + % Todo careful check what we need % when everything is implemented s.group = self.group; diff --git a/Task/Classes/al_trialflow.m b/Task/Classes/al_trialflow.m index ccb56df..c338862 100644 --- a/Task/Classes/al_trialflow.m +++ b/Task/Classes/al_trialflow.m @@ -71,7 +71,7 @@ % Whether or not tickmarks for current trial are used currentTickmarks - % show: standard tick makrs + % show: standard tick marks % workingMemory: 5 last outcomes % hide: no tick marks @@ -141,7 +141,7 @@ function self = al_trialflow() %AL_TRIALFLOW This function creates a trialflow object - % of classs al_trialflow + % of class al_trialflow % % The initial values correspond to useful defaults that % are often used across tasks. diff --git a/Task/Functions/al_baselineArousal.m b/Task/Functions/al_baselineArousal.m index dd35406..fa0e0c8 100644 --- a/Task/Functions/al_baselineArousal.m +++ b/Task/Functions/al_baselineArousal.m @@ -37,7 +37,7 @@ function al_baselineArousal(taskParam, file_name_suffix) Eyelink('message', 'TRIALID %d', i); end - % Only send trigger on first interation + % Only send trigger on first iteration firstIteration = true; % Beginning of current color diff --git a/Task/Functions/al_controlPredSpotKeyboard.m b/Task/Functions/al_controlPredSpotKeyboard.m index 0f6727a..2a2f2ed 100644 --- a/Task/Functions/al_controlPredSpotKeyboard.m +++ b/Task/Functions/al_controlPredSpotKeyboard.m @@ -12,7 +12,7 @@ % disableResponseThreshold: Optionally activate response time % limit (if additionally specified in trialflow) % -% Ouptut +% Output % breakLoop: Index response loop should be terminated % taskParam: Task-parameter-object instance % taskData: Task-data-object instance @@ -98,7 +98,7 @@ % Here, we separated both conditions for initRT and prediction control % to make sure that both would be completed even if button press was % extremely fast (which practically does not happen bc button press is -% longer than one cyle in while loop). +% longer than one cycle in while loop). % Second case: When other keys are pressed before space, update orange spot until space % is pressed diff --git a/Task/Functions/al_drawCircle.m b/Task/Functions/al_drawCircle.m index 98621f9..fa32352 100644 --- a/Task/Functions/al_drawCircle.m +++ b/Task/Functions/al_drawCircle.m @@ -19,7 +19,7 @@ function al_drawCircle(taskParam) % Generate circle Screen(taskParam.display.window.onScreen, 'FrameOval', taskParam.colors.circleCol, [zero(1) - rotRad, zero(2) - rotRad, zero(1) + rotRad, zero(2) + rotRad], [], circleWidth, []); -% Mannually darawing two lines to check circle properties to compute number +% Manually darawing two lines to check circle properties to compute number % of pixels for isoluminant background % rotRad = 140; % Screen(taskParam.display.window.onScreen, 'FrameOval', [0 0 0], [zero(1) - rotRad, zero(2) - rotRad, zero(1) + rotRad, zero(2) + rotRad], [], 1, []); diff --git a/Task/Functions/al_keyboardLoop.m b/Task/Functions/al_keyboardLoop.m index 95116cf..3c247e3 100644 --- a/Task/Functions/al_keyboardLoop.m +++ b/Task/Functions/al_keyboardLoop.m @@ -12,7 +12,7 @@ % disableResponseThreshold: Optionally activate response time % limit (if additionally specified in trialflow) % -% Ouptut +% Output % taskData: Task-parameter-object instance % taskParam: Task-data-object instance diff --git a/Task/Functions/al_lineAndBack.m b/Task/Functions/al_lineAndBack.m index c7463d7..73568cd 100644 --- a/Task/Functions/al_lineAndBack.m +++ b/Task/Functions/al_lineAndBack.m @@ -1,5 +1,5 @@ function al_lineAndBack(taskParam) -%AL_LINEANDBACK This function draws the background for intructions in the cannon task +%AL_LINEANDBACK This function draws the background for instructions in the cannon task % % Input % taskParam: Task-parameter-object instance diff --git a/Task/Functions/al_minMaxNormalization.m b/Task/Functions/al_minMaxNormalization.m index d8323df..842c3c2 100644 --- a/Task/Functions/al_minMaxNormalization.m +++ b/Task/Functions/al_minMaxNormalization.m @@ -1,5 +1,5 @@ function normalizedCoordinate = al_minMaxNormalization(currMouseCoord, minCoord, maxCoord) -%AL_MINMAXNORMALIZATION This function perfoms min-max normalization for the +%AL_MINMAXNORMALIZATION This function performs min-max normalization for the %joystick at the Donner MEG lab at UKE % % Input diff --git a/Task/Functions/al_sendTrigger.m b/Task/Functions/al_sendTrigger.m index 2a058c9..8d3a8a9 100644 --- a/Task/Functions/al_sendTrigger.m +++ b/Task/Functions/al_sendTrigger.m @@ -8,7 +8,7 @@ % trial: Current trial % Tevent: Event type that gets triggered % -% Ouptut +% Output % triggerID: Current trigger diff --git a/Task/Functions/al_stressSlider.m b/Task/Functions/al_stressSlider.m index 6b35078..7238f1b 100644 --- a/Task/Functions/al_stressSlider.m +++ b/Task/Functions/al_stressSlider.m @@ -25,7 +25,7 @@ scaleLengthPix = taskParam.display.screensize(4) / 1.5; scaleHLengthPix = scaleLengthPix / 2; -% Coordiantes of the scale left and right ends +% Coordinates of the scale left and right ends leftEnd = [taskParam.display.zero(1) - scaleHLengthPix taskParam.display.zero(2)]; rightEnd = [taskParam.display.zero(1) + scaleHLengthPix taskParam.display.zero(2)]; scaleLineCoords = [leftEnd' rightEnd']; @@ -54,7 +54,7 @@ [~, ~, numBoundsAll(i, :)] = DrawFormattedText(taskParam.display.window.onScreen, num2str(i), 0, 0, taskParam.colors.white); end -% Width and height of the scale number text bounding boxs +% Width and height of the scale number text bounding boxes numWidths = numBoundsAll(:, 3)'; halfNumWidths = numWidths / 2; numHeights = [range([numBoundsAll(:, 2) numBoundsAll(:, 4)], 2)]'; @@ -64,7 +64,7 @@ dim = 40; hDim = dim / 2; -% The numbers are aligned to be directly under the relevent button (tops of +% The numbers are aligned to be directly under the relevant button (tops of % their bounding boxes "numShiftDownPix" below the button y coordinate, and % aligned laterally such that the centre of the text bounding boxes aligned % with the x coordinate of the button diff --git a/Task/Functions/al_tickMark.m b/Task/Functions/al_tickMark.m index cff9569..fb7e886 100644 --- a/Task/Functions/al_tickMark.m +++ b/Task/Functions/al_tickMark.m @@ -7,7 +7,7 @@ % type: Tick-mark type % % Output -% tickLength: Length of tick mark to compute backgound RGB +% tickLength: Length of tick mark to compute background RGB % col: Color to compute background RGB % % Todo: integrate in circle diff --git a/Task/Functions/catstruct.m b/Task/Functions/catstruct.m index 9972388..554b75e 100644 --- a/Task/Functions/catstruct.m +++ b/Task/Functions/catstruct.m @@ -62,7 +62,7 @@ % (thanks to Tor Inge Birkenes). % Rephrased the help section as well. % 4.0 (dec 2013) fixed problem with unique due to version differences in -% ML. Unique(...,'last') is no longer the deafult. +% ML. Unique(...,'last') is no longer the default. % (thanks to Isabel P) %error(nargchk(1,Inf,nargin)) ; diff --git a/Task/Functions/deg2rad.m b/Task/Functions/deg2rad.m index 5978543..4345174 100644 --- a/Task/Functions/deg2rad.m +++ b/Task/Functions/deg2rad.m @@ -5,7 +5,7 @@ % Keith Brady 18-08-2010 % % Conversion function from Degrees to Radian. -% an alterative form to the functions by Richard Medlock renamed as +% an alternative form to the functions by Richard Medlock renamed as % suggested in the blog article % % http://blogs.mathworks.com/pick/2009/11/27/degrees-and-radians/ diff --git a/Task/TaskVersions/Other/MagdeburgFMRI/al_MagdeburgFMRIInstructions.m b/Task/TaskVersions/Other/MagdeburgFMRI/al_MagdeburgFMRIInstructions.m index 2e5017d..3734ba5 100644 --- a/Task/TaskVersions/Other/MagdeburgFMRI/al_MagdeburgFMRIInstructions.m +++ b/Task/TaskVersions/Other/MagdeburgFMRI/al_MagdeburgFMRIInstructions.m @@ -143,7 +143,7 @@ function al_MagdeburgFMRIInstructions(taskParam) taskData = taskData.taskData; taskData.initialTendency = nan(length(taskData.ID), 1); -% Reset roation angle to starting location +% Reset rotation angle to starting location taskParam.circle.rotAngle = 0; % Run task diff --git a/Task/TaskVersions/Other/dresden/OutputTest.m b/Task/TaskVersions/Other/dresden/OutputTest.m index 8b4c70c..54536b3 100644 --- a/Task/TaskVersions/Other/dresden/OutputTest.m +++ b/Task/TaskVersions/Other/dresden/OutputTest.m @@ -912,7 +912,7 @@ function testTaskOutput(testCase) % % Set number of trials of control task % controlTrials = 4; % this is the new control version that we added to control for differences between groups % -% % Number of practice trials - note that in "reversal" version this is muliplied by 2 +% % Number of practice trials - note that in "reversal" version this is multiplied by 2 % practTrials = 2; % % % Number of trials to introduce the shield in the cover story @@ -1012,7 +1012,7 @@ function testTaskOutput(testCase) % timingParam = al_timing(timing_init); % % % --------------------------------------------- -% % Create object instance with srings to display +% % Create object instance with strings to display % % --------------------------------------------- % % strings_init = al_stringsinit(); diff --git a/Task/TaskVersions/Other/dresden/RunDresdenVersion.m b/Task/TaskVersions/Other/dresden/RunDresdenVersion.m index 6fa5fbd..ec3e6d1 100644 --- a/Task/TaskVersions/Other/dresden/RunDresdenVersion.m +++ b/Task/TaskVersions/Other/dresden/RunDresdenVersion.m @@ -94,7 +94,7 @@ practiceTrialCriterionEstErr = 9; % Rotation radius -rotationRad = 200; % this value should be differen on other computers +rotationRad = 200; % this value should be different on other computers % Tickmark width tickWidth = 1; @@ -205,7 +205,7 @@ timingParam.fixedITI = 0.9; % This is a reference timestamp at the start of the experiment. -% This is not equal to the first trial or so. So be carful when using +% This is not equal to the first trial or so. So be careful when using % EEG or pupillometry and make sure the reference is specified as desired. timingParam.ref = GetSecs(); diff --git a/Task/TaskVersions/Other/dresden/al_dresdenInstructions.m b/Task/TaskVersions/Other/dresden/al_dresdenInstructions.m index 5992344..3fc15f8 100644 --- a/Task/TaskVersions/Other/dresden/al_dresdenInstructions.m +++ b/Task/TaskVersions/Other/dresden/al_dresdenInstructions.m @@ -368,7 +368,7 @@ function al_dresdenInstructions(taskParam, whichPractice) end end -% Confim that cannon ball was missed +% Confirm that cannon ball was missed win = true; if isequal(whichPractice, 'main') || isequal(whichPractice, 'followCannon') txt = 'Weil Sie die Kanonenkugel verpasst haben, hätten Sie nichts verdient.'; @@ -520,7 +520,7 @@ function al_dresdenInstructions(taskParam, whichPractice) practData = load('CP_Noise.mat'); taskData = practData.practData; -% Reset roation angle to starting location +% Reset rotation angle to starting location taskParam.circle.rotAngle = 0; % Practice session diff --git a/Task/TaskVersions/Other/sleep/RunSleepVersion.m b/Task/TaskVersions/Other/sleep/RunSleepVersion.m index 1c863a1..ceab05f 100644 --- a/Task/TaskVersions/Other/sleep/RunSleepVersion.m +++ b/Task/TaskVersions/Other/sleep/RunSleepVersion.m @@ -15,7 +15,7 @@ % This function runs the sleep-study version of the cannon task. % Subjects are sleep deprived and perform the task within % a larger test battery. The version is shorter that usual -% and focuses on the most essential intructions. +% and focuses on the most essential instructions. % % Testing % To run the integration test, run "al_sleepIntegrationTest" @@ -217,7 +217,7 @@ timingParam = al_timing(); % This is a reference timestamp at the start of the experiment. -% This is not equal to the first trial or so. So be carful when using +% This is not equal to the first trial or so. So be careful when using % EEG or pupillometry and make sure the reference is specified as desired. timingParam.ref = GetSecs(); timingParam.jitterFixCrossOutcome = 0; % we did not use jitter here diff --git a/Task/TaskVersions/Other/sleep/al_sleepInstructions.m b/Task/TaskVersions/Other/sleep/al_sleepInstructions.m index 5ec256c..2bf5457 100644 --- a/Task/TaskVersions/Other/sleep/al_sleepInstructions.m +++ b/Task/TaskVersions/Other/sleep/al_sleepInstructions.m @@ -152,7 +152,7 @@ function al_sleepInstructions(taskParam) taskData = load('visCannonPracticeSleep.mat'); taskData = taskData.taskData; - % Reset roation angle to starting location + % Reset rotation angle to starting location taskParam.circle.rotAngle = 0; % Run task diff --git a/Task/TaskVersions/ResearchUnit/AsymmetricReward/RunAsymRewardVersion.m b/Task/TaskVersions/ResearchUnit/AsymmetricReward/RunAsymRewardVersion.m index 435f577..a8b7923 100644 --- a/Task/TaskVersions/ResearchUnit/AsymmetricReward/RunAsymRewardVersion.m +++ b/Task/TaskVersions/ResearchUnit/AsymmetricReward/RunAsymRewardVersion.m @@ -239,7 +239,7 @@ % timingParam.fixCrossOutcome = 0.5; % This is a reference timestamp at the start of the experiment. -% This is not equal to the first trial or so. So be carful when using +% This is not equal to the first trial or so. So be careful when using % EEG or pupillometry and make sure the reference is specified as desired. timingParam.ref = GetSecs(); diff --git a/Task/TaskVersions/ResearchUnit/AsymmetricReward/al_asymRewardInstructions.m b/Task/TaskVersions/ResearchUnit/AsymmetricReward/al_asymRewardInstructions.m index 31c2554..a0d0f25 100644 --- a/Task/TaskVersions/ResearchUnit/AsymmetricReward/al_asymRewardInstructions.m +++ b/Task/TaskVersions/ResearchUnit/AsymmetricReward/al_asymRewardInstructions.m @@ -132,7 +132,7 @@ function al_asymRewardInstructions(taskParam) taskData = taskData.taskData; taskParam.trialflow.exp = 'practVis'; - % Reset roation angle to starting location + % Reset rotation angle to starting location taskParam.circle.rotAngle = 0; % Run task diff --git a/Task/TaskVersions/ResearchUnit/EEG/RunConfettiEEGVersion.m b/Task/TaskVersions/ResearchUnit/EEG/RunConfettiEEGVersion.m index 5135322..b33ba0c 100644 --- a/Task/TaskVersions/ResearchUnit/EEG/RunConfettiEEGVersion.m +++ b/Task/TaskVersions/ResearchUnit/EEG/RunConfettiEEGVersion.m @@ -118,7 +118,7 @@ % customInstructions = config.customInstructions; % instructionText = config.instructionText; -% More general paramters +% More general parameters % ---------------------- % Risk parameter: Precision of confetti average @@ -291,7 +291,7 @@ timingParam.jitterITI = 0.2; % This is a reference timestamp at the start of the experiment. -% This is not equal to the first trial or so. So be carful when using +% This is not equal to the first trial or so. So be careful when using % EEG or pupillometry and make sure the reference is specified as desired. timingParam.ref = GetSecs(); @@ -523,7 +523,7 @@ % ----------- header = 'Ende des Versuchs!'; -txt = sprintf('Vielen Dank für Deine Teilnahme!\n\n\nDu hast insgesamt %.2f Euro gewonnen!', totWin); +txt = sprintf('Vielen Dank f�r Deine Teilnahme!\n\n\nDu hast insgesamt %.2f Euro gewonnen!', totWin); feedback = true; % indicate that this is the instruction mode al_bigScreen(taskParam, header, txt, feedback, true); diff --git a/Task/TaskVersions/ResearchUnit/EEG/al_confettiEEGConfigExample.m b/Task/TaskVersions/ResearchUnit/EEG/al_confettiEEGConfigExample.m index 7587ea9..5191091 100644 --- a/Task/TaskVersions/ResearchUnit/EEG/al_confettiEEGConfigExample.m +++ b/Task/TaskVersions/ResearchUnit/EEG/al_confettiEEGConfigExample.m @@ -4,7 +4,7 @@ % function that runs the task. % % It is recommended that you create your own script with the local -% parameter settings so that you can re-use your settings. +% parameter settings so that you can reuse your settings. % Create config structure config = struct(); diff --git a/Task/TaskVersions/ResearchUnit/EEG/al_confettiEEGLoop.m b/Task/TaskVersions/ResearchUnit/EEG/al_confettiEEGLoop.m index 440aeb5..3e7b921 100644 --- a/Task/TaskVersions/ResearchUnit/EEG/al_confettiEEGLoop.m +++ b/Task/TaskVersions/ResearchUnit/EEG/al_confettiEEGLoop.m @@ -3,7 +3,7 @@ % % Input % taskParam: Task-parameter-object instance -% condtion: Condition type +% condition: Condition type % taskData: Task-data-object instance % trial: Number of trials % diff --git a/Task/TaskVersions/ResearchUnit/Infant/RunInfantVersion.m b/Task/TaskVersions/ResearchUnit/Infant/RunInfantVersion.m index 1c2afe7..c3e1a36 100644 --- a/Task/TaskVersions/ResearchUnit/Infant/RunInfantVersion.m +++ b/Task/TaskVersions/ResearchUnit/Infant/RunInfantVersion.m @@ -215,7 +215,7 @@ timingParam.movingOutcome = 1.0; % This is a reference timestamp at the start of the experiment. -% This is not equal to the first trial or so. So be carful when using +% This is not equal to the first trial or so. So be careful when using % EEG or pupillometry and make sure the reference is specified as desired. timingParam.ref = GetSecs(); diff --git a/Task/TaskVersions/ResearchUnit/Infant/al_infantConfigExample.m b/Task/TaskVersions/ResearchUnit/Infant/al_infantConfigExample.m index 9d3ef76..a1daa42 100644 --- a/Task/TaskVersions/ResearchUnit/Infant/al_infantConfigExample.m +++ b/Task/TaskVersions/ResearchUnit/Infant/al_infantConfigExample.m @@ -4,7 +4,7 @@ % function that runs the task. % % It is recommended that you create your own script with the local -% parameter settings so that you can re-use your settings. +% parameter settings so that you can reuse your settings. % Create config structure config = struct(); diff --git a/Task/TaskVersions/ResearchUnit/Infant/al_infantLoop.m b/Task/TaskVersions/ResearchUnit/Infant/al_infantLoop.m index 3cf7bc8..ee19ab2 100644 --- a/Task/TaskVersions/ResearchUnit/Infant/al_infantLoop.m +++ b/Task/TaskVersions/ResearchUnit/Infant/al_infantLoop.m @@ -6,7 +6,7 @@ % % Input % taskParam: Task-parameter-object instance -% condtion: Condition type +% condition: Condition type % concentration: Noise in outcomes % trial: Number of trials % myTobii: Tobii eye-tracker object @@ -109,10 +109,10 @@ % Todo: if not used anymore, get rid of this in timingParam as well % timestampOutcomeMovementOffset = timestampOutcomeStaticOffset + taskParam.timingParam.movingOutcome; - % Initilalize variable controlling movement frequency + % Initialize variable controlling movement frequency duckLastMovement = GetSecs() - taskParam.gParam.duckMovementFrequency; - % Initilalize variable controlling gaze sampling + % Initialize variable controlling gaze sampling lastGazeSample = GetSecs() - 1/gazeSamplingRate; % Generate change point @@ -351,7 +351,7 @@ lastGazeSample = GetSecs(); % This if statement is just for debugging - % When full screen with eye-tracker, always chech if samples in + % When full screen with eye-tracker, always check if samples in % AOI if isnan(myTobii) && (gazeX > taskParam.display.screensizePart(1)) == false && (gazeY > taskParam.display.screensizePart(2)) == false diff --git a/Task/TaskVersions/ResearchUnit/Leipzig/RunLeipzigVersion.m b/Task/TaskVersions/ResearchUnit/Leipzig/RunLeipzigVersion.m index cf4b314..dd72584 100644 --- a/Task/TaskVersions/ResearchUnit/Leipzig/RunLeipzigVersion.m +++ b/Task/TaskVersions/ResearchUnit/Leipzig/RunLeipzigVersion.m @@ -229,7 +229,7 @@ timingParam.cannonBallAnimation = 1.5; % This is a reference timestamp at the start of the experiment. -% This is not equal to the first trial or so. So be carful when using +% This is not equal to the first trial or so. So be careful when using % EEG or pupillometry and make sure the reference is specified as desired. timingParam.ref = GetSecs(); diff --git a/Task/TaskVersions/ResearchUnit/Leipzig/al_LeipzigInstructions.m b/Task/TaskVersions/ResearchUnit/Leipzig/al_LeipzigInstructions.m index cc8bb58..104abec 100644 --- a/Task/TaskVersions/ResearchUnit/Leipzig/al_LeipzigInstructions.m +++ b/Task/TaskVersions/ResearchUnit/Leipzig/al_LeipzigInstructions.m @@ -164,7 +164,7 @@ function al_LeipzigInstructions(taskParam) taskParam.trialflow.exp = 'practVis'; taskData.initialTendency = nan(length(taskData.ID), 1); -% Reset roation angle to starting location +% Reset rotation angle to starting location taskParam.circle.rotAngle = 0; % Run task diff --git a/Task/TaskVersions/ResearchUnit/Leipzig/al_LeipzigLoop.m b/Task/TaskVersions/ResearchUnit/Leipzig/al_LeipzigLoop.m index 8541234..3e99c35 100644 --- a/Task/TaskVersions/ResearchUnit/Leipzig/al_LeipzigLoop.m +++ b/Task/TaskVersions/ResearchUnit/Leipzig/al_LeipzigLoop.m @@ -4,7 +4,7 @@ % % Input % taskParam: Task-parameter-object instance -% condtion: Condition type +% condition: Condition type % taskData: Task-data-object instance % trial: Number of trials % @@ -78,7 +78,7 @@ %------------------------------ % Send fixation cross 1 trigger - % todo: this should be done in mouse loop, like I did fo keyboardLoop + % todo: this should be done in mouse loop, like I did for keyboardLoop taskData.timestampPrediction(i,:) = GetSecs - taskParam.timingParam.ref; % Deviation from cannon (estimation error) to compute performance diff --git a/Task/TaskVersions/ResearchUnit/Leipzig/al_indicateHelicopterNoise.m b/Task/TaskVersions/ResearchUnit/Leipzig/al_indicateHelicopterNoise.m index 3efbdeb..5f1765e 100644 --- a/Task/TaskVersions/ResearchUnit/Leipzig/al_indicateHelicopterNoise.m +++ b/Task/TaskVersions/ResearchUnit/Leipzig/al_indicateHelicopterNoise.m @@ -1,6 +1,6 @@ function al_indicateHelicopterNoise(taskParam, noiseCondition) % AL_INDICATENOISE This function indicates the noise -% condition in the Leipzig helicopter verion +% condition in the Leipzig helicopter version % % Input: % taskParam: Task-parameter-object instance diff --git a/Task/TaskVersions/ResearchUnit/VWM/RunVarianceWorkingMemoryVersion.m b/Task/TaskVersions/ResearchUnit/VWM/RunVarianceWorkingMemoryVersion.m index 2aadef4..201bf44 100644 --- a/Task/TaskVersions/ResearchUnit/VWM/RunVarianceWorkingMemoryVersion.m +++ b/Task/TaskVersions/ResearchUnit/VWM/RunVarianceWorkingMemoryVersion.m @@ -259,7 +259,7 @@ timingParam.cannonBallAnimation = 1.5; % This is a reference timestamp at the start of the experiment. -% This is not equal to the first trial or so. So be carful when using +% This is not equal to the first trial or so. So be careful when using % EEG or pupillometry and make sure the reference is specified as desired. timingParam.ref = GetSecs(); diff --git a/Task/TaskVersions/ResearchUnit/VWM/al_VWMInstructions.m b/Task/TaskVersions/ResearchUnit/VWM/al_VWMInstructions.m index e4e2c78..ab4f238 100644 --- a/Task/TaskVersions/ResearchUnit/VWM/al_VWMInstructions.m +++ b/Task/TaskVersions/ResearchUnit/VWM/al_VWMInstructions.m @@ -168,7 +168,7 @@ function al_VWMInstructions(taskParam) taskData = taskData.taskData; taskData.initialTendency = nan(length(taskData.ID), 1); - % Reset roation angle to starting location + % Reset rotation angle to starting location taskParam.circle.rotAngle = 0; % Run task diff --git a/Task/TaskVersions/ResearchUnit/commonConfetti/RunCommonConfettiVersion.m b/Task/TaskVersions/ResearchUnit/commonConfetti/RunCommonConfettiVersion.m index 9b9a33a..a193315 100644 --- a/Task/TaskVersions/ResearchUnit/commonConfetti/RunCommonConfettiVersion.m +++ b/Task/TaskVersions/ResearchUnit/commonConfetti/RunCommonConfettiVersion.m @@ -345,7 +345,7 @@ timingParam.jitterITI = 0.5; % This is a reference timestamp at the start of the experiment. -% This is not equal to the first trial or so. So be carful when using +% This is not equal to the first trial or so. So be careful when using % EEG or pupillometry and make sure the reference is specified as desired. timingParam.ref = GetSecs(); diff --git a/Task/TaskVersions/ResearchUnit/commonConfetti/al_MRILoop.m b/Task/TaskVersions/ResearchUnit/commonConfetti/al_MRILoop.m index 4351f5e..c777199 100644 --- a/Task/TaskVersions/ResearchUnit/commonConfetti/al_MRILoop.m +++ b/Task/TaskVersions/ResearchUnit/commonConfetti/al_MRILoop.m @@ -254,7 +254,7 @@ fprintf('Fixation-cross 1 duration: %.5f\n', taskData.timestampOutcome(i) - taskData.timestampFixCross1(i)) end - % ... then re-use dots for rest of the trial + % ... then reuse dots for rest of the trial else regenerateParticles = false; al_confettiOutcome(taskParam, taskData, i, regenerateParticles); diff --git a/Task/TaskVersions/ResearchUnit/commonConfetti/al_commonConfettiConditions.m b/Task/TaskVersions/ResearchUnit/commonConfetti/al_commonConfettiConditions.m index e683a71..2e29ca9 100644 --- a/Task/TaskVersions/ResearchUnit/commonConfetti/al_commonConfettiConditions.m +++ b/Task/TaskVersions/ResearchUnit/commonConfetti/al_commonConfettiConditions.m @@ -151,7 +151,7 @@ feedback = false; % indicate that this is the instruction mode al_bigScreen(taskParam, header, txt, feedback, true); - % Meaure baseline arousal + % Measure baseline arousal al_baselineArousal(taskParam, '_a2') end diff --git a/Task/TaskVersions/ResearchUnit/commonConfetti/al_commonConfettiConditionsFMRI.m b/Task/TaskVersions/ResearchUnit/commonConfetti/al_commonConfettiConditionsFMRI.m index 142a6f0..f4f0d2f 100644 --- a/Task/TaskVersions/ResearchUnit/commonConfetti/al_commonConfettiConditionsFMRI.m +++ b/Task/TaskVersions/ResearchUnit/commonConfetti/al_commonConfettiConditionsFMRI.m @@ -101,7 +101,7 @@ feedback = false; % indicate that this is the instruction mode al_bigScreen(taskParam, header, txt, feedback); - % Meaure baseline arousal + % Measure baseline arousal al_baselineArousal(taskParam) end @@ -206,7 +206,7 @@ feedback = false; % indicate that this is the instruction mode al_bigScreen(taskParam, header, txt, feedback); - % Meaure baseline arousal + % Measure baseline arousal al_baselineArousal(taskParam) end diff --git a/Task/TaskVersions/ResearchUnit/commonConfetti/al_commonConfettiConfigExample.m b/Task/TaskVersions/ResearchUnit/commonConfetti/al_commonConfettiConfigExample.m index 8cc3a5d..8f7a0da 100644 --- a/Task/TaskVersions/ResearchUnit/commonConfetti/al_commonConfettiConfigExample.m +++ b/Task/TaskVersions/ResearchUnit/commonConfetti/al_commonConfettiConfigExample.m @@ -4,7 +4,7 @@ % function that runs the task. % % It is recommended that you create your own script with the local -% parameter settings so that you can re-use your settings. +% parameter settings so that you can reuse your settings. % Create config structure config = struct(); diff --git a/Task/TaskVersions/ResearchUnit/commonConfetti/al_commonConfettiInstructions.m b/Task/TaskVersions/ResearchUnit/commonConfetti/al_commonConfettiInstructions.m index a09b3d9..40fcf9c 100644 --- a/Task/TaskVersions/ResearchUnit/commonConfetti/al_commonConfettiInstructions.m +++ b/Task/TaskVersions/ResearchUnit/commonConfetti/al_commonConfettiInstructions.m @@ -225,7 +225,7 @@ function al_commonConfettiInstructions(taskParam) taskParam.trialflow.saveData = 'true'; taskParam.trialflow.shieldAppearance = 'full'; -% Reset roation angle to starting location +% Reset rotation angle to starting location taskParam.circle.rotAngle = 0; % Update unit test predictions diff --git a/Task/TaskVersions/ResearchUnit/commonConfetti/al_commonConfettiInstructionsDefaultText.m b/Task/TaskVersions/ResearchUnit/commonConfetti/al_commonConfettiInstructionsDefaultText.m index 15141ac..4996728 100644 --- a/Task/TaskVersions/ResearchUnit/commonConfetti/al_commonConfettiInstructionsDefaultText.m +++ b/Task/TaskVersions/ResearchUnit/commonConfetti/al_commonConfettiInstructionsDefaultText.m @@ -1,6 +1,6 @@ classdef al_commonConfettiInstructionsDefaultText %AL_COMMONCONFETTIINSTRUCTIONSDEFAULTTEXT This class-definition file - % specifiec the properties of the instruction text. + % specifies the properties of the instruction text. % % The advantage of this kind of text file is that most text is in one % place and a local file can replace (specified in the config file) the diff --git a/Task/TaskVersions/ResearchUnit/commonConfetti/al_passiveViewingConfigExample.m b/Task/TaskVersions/ResearchUnit/commonConfetti/al_passiveViewingConfigExample.m index ceb4223..0494edb 100644 --- a/Task/TaskVersions/ResearchUnit/commonConfetti/al_passiveViewingConfigExample.m +++ b/Task/TaskVersions/ResearchUnit/commonConfetti/al_passiveViewingConfigExample.m @@ -4,7 +4,7 @@ % function that runs the task. % % It is recommended that you create your own script with the local -% parameter settings so that you can re-use your settings. +% parameter settings so that you can reuse your settings. % todo: optionally no noise conditions and only random outcomes with haz=1