From 3e77a4609af239eac294e4630b54c90efbedd29e Mon Sep 17 00:00:00 2001 From: Mats van Es Date: Mon, 24 Aug 2020 17:05:38 +0100 Subject: [PATCH 1/3] fixed copying of badtrials and events in case of a mismatch in trialnumbers. --- oat/oat_run_first_level_epoched.m | 1 + osl_change_spm_eeg_data.m | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/oat/oat_run_first_level_epoched.m b/oat/oat_run_first_level_epoched.m index 46b3446..f85e244 100644 --- a/oat/oat_run_first_level_epoched.m +++ b/oat/oat_run_first_level_epoched.m @@ -642,6 +642,7 @@ Sc.frequencies = first_level_results.frequencies(f); Sc.remove_montages=0; Sc.cond_list = D.conditions(triallist); + Sc.events = D.events(triallist); D_tf = osl_change_spm_eeg_data( Sc ); % add back in Class channel: diff --git a/osl_change_spm_eeg_data.m b/osl_change_spm_eeg_data.m index b0ba75b..46bd327 100644 --- a/osl_change_spm_eeg_data.m +++ b/osl_change_spm_eeg_data.m @@ -111,14 +111,18 @@ % copy badtrials badtrials=D.badtrials; - if ~isempty(badtrials) + if ~isempty(badtrials) && Sc.D.ntrials==D2.ntrials tmp_bad = zeros(D.ntrials,1); tmp_bad(badtrials) = 1; D2 = D2.badtrials(1:length(tmp_bad),tmp_bad); end % copy events - ev = D.events; + if isfield(Sc, 'events') % required when number of trials in D and D2 is not equal + ev = Sc.events; + else + ev = D.events; + end D2 = D2.events(1:D2.ntrials,ev); end From 9261f1c79f6fcf6d11146ef0d24e4aac70557033 Mon Sep 17 00:00:00 2001 From: Mats van Es Date: Fri, 18 Sep 2020 11:43:19 +0100 Subject: [PATCH 2/3] improve display of title and include component number in title. --- africa/private/identify_artefactual_components_manual.m | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/africa/private/identify_artefactual_components_manual.m b/africa/private/identify_artefactual_components_manual.m index 8beaa2b..fe13ef6 100644 --- a/africa/private/identify_artefactual_components_manual.m +++ b/africa/private/identify_artefactual_components_manual.m @@ -275,11 +275,15 @@ function createlayout(varargin) % SETUP FIGURE WINDOWS drawnow % Add info about metrics as title above tICWindow - titlestr = 'Component ranking: '; + titlestr = sprintf('Component %d ranking: ', current_comp); for j = 1:length(metric_names) v = metrics.(metric_names{j}).value(current_comp); % Metric value r = sum(v <= metrics.(metric_names{j}).value); - titlestr = [titlestr sprintf('%s: %i (%.2f) ',metric_names{j},r,v)]; + if mod(j,4)==0 + titlestr = [titlestr sprintf('\n %s: %i (%.2f) ',metric_names{j},r,v)]; + else + titlestr = [titlestr sprintf('%s: %i (%.2f) ',metric_names{j},r,v)]; + end end title(tICWindow,titlestr,'fontsize',FONTSIZE,'interpreter','none') From 089767c31bcd4e7a122a1159e4224629d2f9f6cf Mon Sep 17 00:00:00 2001 From: Mats Date: Wed, 22 Sep 2021 15:21:37 +0100 Subject: [PATCH 3/3] Update osl_quick_spectra.m Fix modality selection --- osl_quick_spectra.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osl_quick_spectra.m b/osl_quick_spectra.m index 764abcf..8010f46 100644 --- a/osl_quick_spectra.m +++ b/osl_quick_spectra.m @@ -18,7 +18,7 @@ bands = {[0 3], [3 7], [7 13], [13 30], [30 100], [100 200]}; end -chaninds = D.indchantype('MEGPLANAR'); +chaninds = D.indchantype(modality); [pxx,f] = pwelch( zscore(D(chaninds,:,1)'),D.fsample,[],[],D.fsample ); font_size = 12;