Merge pull request #196 from stephaniebrandl/append_epo

bug in proc_appendEpochs
bbci · Jan 19, 2017 · 2845d43 · 2845d43
2 parents 25d07e4 + 319d8a6
commit 2845d43
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/processing/proc_appendEpochs.m b/processing/proc_appendEpochs.m
@@ -29,6 +29,7 @@
   for ii= 2:length(Cepo),
     epo1= proc_appendEpochs(epo1, Cepo{ii});
   end
+  epo=epo1;
   return
 end
 

diff --git a/processing/utils/score_medianvar.m b/processing/utils/score_medianvar.m
@@ -1,9 +1,12 @@
-
 function score = score_medianvar(dat,W,~)
 %SCORE_MEDIANVAR - Median variance of projected components as score
 
 nChans = size(dat.x,2);
 
+if size(W,2)<nChans
+    nChans=size(W,2);
+end
+
 fv = proc_linearDerivation(dat,W);
 fv = proc_variance(fv);
 score = zeros(nChans,1);
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,6 +29,7 @@ @@
       for ii= 2:length(Cepo),
         epo1= proc_appendEpochs(epo1, Cepo{ii});
       end
+      epo=epo1;
       return
     end
@@ Expand Down @@