Skip to content

Commit

Permalink
FIX merge_events when replace_events=False
Browse files Browse the repository at this point in the history
  • Loading branch information
teonbrooks authored and agramfort committed Mar 26, 2016
1 parent fe32cd8 commit 33e3f46
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions mne/event.py
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,7 @@ def merge_events(events, ids, new_id, replace_events=True):
where = (events[:, col] == i)
events_out[where, col] = new_id
if not replace_events:
events_out = events_out[where]
events_out = np.concatenate((events_out, events), axis=0)
events_out = events_out[np.argsort(events_out[:, 0])]
return events_out
Expand Down

0 comments on commit 33e3f46

Please sign in to comment.