improvements

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')
 

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:

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

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;