Skip to content

Commit 4ea05cf

Browse files
committed
Merge branch 'master' into channel_length_discrepancy
2 parents 893df11 + 25cf65a commit 4ea05cf

3 files changed

Lines changed: 16 additions & 2 deletions

File tree

CHANGELOG.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
Changes
22
=======
3+
Version 0.11.3
4+
--------------
5+
**2024-7-2**
6+
7+
* Patch to resolve error introduced by previous patch.
8+
9+
Version 0.11.2
10+
--------------
11+
**2024-7-2**
12+
13+
* Patch to load EEG for pre-RAM sessions without ``n_samples`` metadata. Toggle off
14+
event-epoch EEG boundary checks.
15+
316
Version 0.11.1
417
--------------
518
**2024-6-21**

cmlreaders/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
from .readers import * # noqa
1111
from .cmlreader import CMLReader # noqa
1212

13-
__version__ = "0.11.1"
13+
__version__ = "0.11.3"
1414
version_info = namedtuple("VersionInfo", "major,minor,patch")(
1515
*__version__.split('.'))

cmlreaders/readers/eeg.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,8 @@ def as_timeseries(
707707
else:
708708
# drop events beyond bounds of EEG samples
709709
n_samples = sources["n_samples"]
710-
if not isinstance(n_samples, np.ndarray): # pass if multiple EEG files
710+
# pass if no n_samples or if multiple EEG files
711+
if not isinstance(n_samples, np.ndarray) and n_samples:
711712
rstart = convert.milliseconds_to_samples(rel_start, sample_rate)
712713
rstop = convert.milliseconds_to_samples(rel_stop, sample_rate)
713714
# only events within boundaries

0 commit comments

Comments
 (0)