-
Notifications
You must be signed in to change notification settings - Fork 11
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.
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
Finalise for release 6.1 #520
Merged
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
some last fixes in pull request 522 |
…lab/PsPM into 448-release-pspm-version-61
teddychao
added
Completed & Waiting for Review
Completed and waiting for review
and removed
In Progress
Currently being worked on
labels
Aug 22, 2023
Hi @uzaygokay I noticed |
…lab/PsPM into 448-release-pspm-version-61
dominikbach
approved these changes
Aug 23, 2023
teddychao
removed
the
Completed & Waiting for Review
Completed and waiting for review
label
Feb 26, 2024
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.
General
pspm
in the Command Window of MATLAB, where the appropriate way of entering PsPM will be recognised automatically.pspm_appdesigner
. To enter PsPM through Guide, which is the classic entrance, please typepspm_guide
.pspm_options
(Streamline options input between functions #385, Option values for pspm_dcm, pspm_dcm_inv and pspm_get_rf #426, The initial values ofchannel
for some functions #430)pspm_options
is introduced to PsPM for controlling the default and acceptable values of the structoptions
used by most PsPM functions. The default values of the fields in the structoptions
for various functions can be directly checked by searching inpspm_options
.pspm_options
have been checked and tested for PsPM. If preferred values are different from defaults, users can specify them when calling the corresponding PsPM functions, and the corresponding functions andpspm_options
will always respect the users' specification with the highest priority. However, the user's specification needs to satisfy the condition set inpspm_options
, and invalid values may be reported as errors.Bug Fixes
pspm_rev_dcm
has been fixed (Wrong x-tick labels in pspm_rev_dcm #495).pspm_convert_...
pspm_convert_...
functions, has been fixed (Unable to convert ECG data to Heart Rate Period #508).pspm_get_eyelink
lr
for eyes observed or signals #479, Eyes observed incorrectly inherit eye marker #509).pspm_glm
pspm_sf
pspm_sf
is analysing data with missing epochs has been fixed (Missing epoch issue ofpspm_sf
#484).pspm_sf
analyses data wheretime unit
is defined asmarker
has been fixed (pspm_sf has issues when processing data whose unit is defined by marker #503).pspm_split_sessions
pspm_split_sessions
now considersmarker_chan_num
when callingpspm_trim
(Fixpspm_split_sessions
#506).Improvements
channel
(Legacy use ofchan
#470, Compatibility ofchantype
#478, Load_data checking logic #497)channel
related variables throughout PsPM, which are given aschan/channel
→channel
chans/channels
→channels
channel_units/channels_units/chan_units/chans_units
→channel_units
chan_combine
→channel_combine
chan_action
→channel_action
channels_header
→channel_header
chantype
→channeltype
import_eyelink
import_eyelink
for adding some support for importing eyelink data converted by higher version of .EDF files. (Fail to import pupil size data (.asc) #459 and Eyelink (.asc) import issue #465)pspm_con2
pspm_con2
is now usingpspm_overwrite
(Missing overwrite behaviour in pspm_con2 #422).pspm_dcm
andpspm_dcm_inv
.flexevents
and.fixevents
are now fields ofmodel
instead ofoptions
(Unsorted fields betweenmodel
andoptions
inpspm_dcm
#458).pspm_dcm
now usespspm_get_timing
to handle missing epochs (Generalising missing epoch sorting into pspm_get_timing #499)..missing
is now allocated fromoptions
tomodel
(Generalise missing epochs allocation #491)..missing_data
is used to load missing epoch data that was loaded from dcm, as an optional field (Generalise missing epochs allocation #491).pspm_extract_segments
marker_chan
as default (marker_chan
/marker_chan_num
unclearly defined #427).pspm_glm
options.exclude_missing
has been set forpspm_glm
, which is not to exclude any missing epochs (Two fields ofoptions
inpspm_glm
#429).marker_chan_num
now refers to the first marker channel as default (marker_chan
/marker_chan_num
unclearly defined #427).pspm_glm
now usespspm_get_timing
to handle missing epochs (Generalising missing epoch sorting into pspm_get_timing #499).pspm_interp1
pspm_interp1
now considers the data where no valid values are detected and interpolation is not possible, and warnings will be reported in this case (pspm_interp1 needs to consider data without valid values #500).pspm_merge
[1,2]
, meaning the first channel will be merged as the default option (marker_chan
/marker_chan_num
unclearly defined #427).pspm_prepdata
pspm_prepdata
now uses interpolation to handle data withNaN
. (Implement a new NaN handling strategy for pspm_prepdata #35, 434)NaN
will be filled with the first/last non-NaN
values in those positions.pspm_sf
pspm_sf
now supports missing epochs (Enable data withNaN
forpspm_sf_dcm
#457).NaN
that indicates missing epochs.NaN
detection.options.missingthresh
.[]
.pspm_sf
now usespspm_get_timing
to handle missing epochs (Generalising missing epoch sorting into pspm_get_timing #499).marker_chan_num
now refers to the first marker channel as default (marker_chan
/marker_chan_num
unclearly defined #427).pspm_sf_dcm
pspm_sf_dcm
now usespspm_interp1
for interpolating data (Generalise missing epochs allocation #491).pspm_text
pspm_text.mat
will be stored inside the source folder of PsPM and will be deleted when PsPM is quit (Path to save pspm_text.mat #450).pspm_trim
marker_chan_num
now refers to the first marker channel as default (marker_chan
/marker_chan_num
unclearly defined #427).Minor Adjustments
pspm_sf
,pspm_glm
andpspm_dcm
(GLM select incorrect default channel #490, Fix issue 490 --- generalising first marker channel and last data channel #493)marker_chan_num_event
is removed.Reference document
options
fields (Manual updates #432).User-interface improvement
Launchpad, AppDesigner
Mac
Windows
Launchpad, Guide
Mac
Windows
Batch Editor
Mac
Windows
Display
Mac
Windows
Contrast Manager
Mac
Windows