Fixed handling of boundary events outside data range

widmann · Feb 13, 2023 · 4b2701d · 4b2701d
1 parent 5f13998
commit 4b2701d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,6 @@
+Version 2.6.1
+- BUG: fixed handling of boundary events outside data range.
+
 Version 2.6
 - BUG: fixed filter order not converted to numeric by GUI.
 

diff --git a/eegplugin_firfilt.m b/eegplugin_firfilt.m
@@ -31,7 +31,7 @@
 
 function vers = eegplugin_firfilt(fig, trystrs, catchstrs)
 
-    vers = 'firfilt2.6';
+    vers = 'firfilt2.6.1';
     if nargin < 3
         error('eegplugin_firfilt requires 3 arguments');
     end

diff --git a/firfilt.m b/firfilt.m
@@ -66,7 +66,9 @@
     EEG.data = reshape(EEG.data, [EEG.nbchan EEG.pnts * EEG.trials]);
     dcArray = 1 : EEG.pnts : EEG.pnts * (EEG.trials + 1);
 else % Continuous data
-    dcArray = [findboundaries(EEG.event) EEG.pnts + 1];
+    dcArray = findboundaries(EEG.event);
+    dcArray = dcArray( dcArray >= 1 & dcArray <= EEG.pnts ); % Assert DC offset events are within data range
+    dcArray = [ dcArray EEG.pnts + 1 ];
 end
 
 % Initialize progress indicator

diff --git a/firfiltsplit.m b/firfiltsplit.m
@@ -68,7 +68,9 @@
     EEG.data = reshape(EEG.data, [EEG.nbchan EEG.pnts * EEG.trials]);
     dcArray = 1 : EEG.pnts : EEG.pnts * (EEG.trials + 1);
 else % Continuous data
-    dcArray = [findboundaries(EEG.event) EEG.pnts + 1];
+    dcArray = findboundaries(EEG.event);
+    dcArray = dcArray( dcArray >= 1 & dcArray <= EEG.pnts ); % Assert DC offset events are within data range
+    dcArray = [ dcArray EEG.pnts + 1 ];
 end
 
 % Loop over continuous segments