proc_interp() update, will now carry over all rejmanualE/rejglobalE p…

…ost-interpolation
sjburwell · Dec 30, 2018 · 4bfeacd · 4bfeacd
1 parent f15ddbb
commit 4bfeacd
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/functions/procfunc/proc_interp.m b/functions/procfunc/proc_interp.m
@@ -113,9 +113,14 @@
 %if isempty(find(EEG.reject.rejglobalE))&&intfull==0, %does this case even make sense???
 %   disp('Rejected channels empty, abort operation');
 %   return
-if intfull==0,
-   interpE = zeros([EEG.nbchan  EEG.trials]);
-elseif isempty(find(EEG.reject.rejglobalE))&&intfull==1,
+%if intfull==0,
+%   interpE = zeros([EEG.nbchan  EEG.trials]);
+%elseif isempty(find(EEG.reject.rejglobalE))&&intfull==1,
+%   interpE = zeros([EEG.nbchan  EEG.trials]);
+%else,
+%   interpE = EEG.reject.rejglobalE;
+%end
+if isempty(find(EEG.reject.rejglobalE)),
    interpE = zeros([EEG.nbchan  EEG.trials]);
 else,
    interpE = EEG.reject.rejglobalE;
@@ -143,7 +148,7 @@
 % interpolate
 XSTCHANS = find( ismember({chanlocs.labels},{EEG.chanlocs.labels}));
 ADDCHANS = find(~ismember({chanlocs.labels},{EEG.chanlocs.labels}));
-if ~isempty(find(interpE)),
+if ~isempty(find(interpE)) && intfull==1,
    EEG = eeg_interp3d_spl(EEG, interpE); %chan-epoch
    %EEG = eeg_hist(EEG, 'EEG = eeg_interp3d_spl(EEG, EEG.reject.rejglobalE)');
 end