Merge develop into master #433
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 01ad623.
This reverts commit df211b9.
…epochs-in-time-order Fix issue 224 - pspm_data_editor
Process gaze signals with valid samples provided by pupil
allow combining channels without valid samples
Let pupil use load_data instead of load_single_chan
Can select preprocessed data if necessary
for all functions, source and test
put all subfunctions used by pupil_pp inside it
make pspm_sf to use pspm_options
make pspm_sf_dcm to use pspm_options
make pspm_split_sessions to use pspm_options
make pspm_write_channel to use pspm_options
a bug for options.msg that is used in pspm_write_channel leads to the error
Fix Issue 419
…reamline-options-input-between-functions
fix default values according to comments
parameters of ecg2hb_amri were fixed for itself and pspm_options
update parameters for glm and convert_hb2hp in pspm_options
make ecg_editor to use pspm_options
…ween-functions Fix issue 385 - structure field names
teddychao
approved these changes
Dec 11, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Prepares keeping master up-to-date.
Changes proposed in this pull request: