From 6524d194f6b6d79ca5713f915702c8ba59e28e4b Mon Sep 17 00:00:00 2001 From: Andrew Davison Date: Thu, 27 Jul 2023 18:25:33 +0200 Subject: [PATCH] do not allow Groups to contain Segments, as proposed in #1026 --- neo/core/group.py | 2 +- neo/test/coretest/test_group.py | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/neo/core/group.py b/neo/core/group.py index 930e810b7..93a9717f4 100644 --- a/neo/core/group.py +++ b/neo/core/group.py @@ -51,7 +51,7 @@ class Group(Container): 'AnalogSignal', 'IrregularlySampledSignal', 'SpikeTrain', 'Event', 'Epoch', 'ChannelView', 'ImageSequence' ) - _container_child_objects = ('Segment', 'Group') + _container_child_objects = ('Group',) _parent_objects = ('Block',) def __init__(self, objects=None, name=None, description=None, file_origin=None, diff --git a/neo/test/coretest/test_group.py b/neo/test/coretest/test_group.py index 48c3ab00a..ff760319f 100644 --- a/neo/test/coretest/test_group.py +++ b/neo/test/coretest/test_group.py @@ -41,7 +41,7 @@ def setUp(self): self.test_segment.spiketrains.extend(self.test_spiketrains) def test_create_group(self): - objects = [self.test_view, self.test_signal, self.test_segment] + objects = [self.test_view, self.test_signal] objects.extend(self.test_spiketrains) group = Group(objects) @@ -50,21 +50,19 @@ def test_create_group(self): assert group.spiketrains[1] is self.test_spiketrains[1] assert group.channelviews[0] is self.test_view assert len(group.irregularlysampledsignals) == 0 - assert group.segments[0].analogsignals[0] is self.test_signal def test_create_empty_group(self): group = Group() def test_children(self): group = Group(self.test_spiketrains + [self.test_view] - + [self.test_signal] + [self.test_segment]) + + [self.test_signal]) # note: ordering is by class name for data children (AnalogSignal, SpikeTrain), # then container children (Segment) assert group.children == (self.test_signal, *self.test_spiketrains, - self.test_view, - self.test_segment) + self.test_view) def test_with_allowed_types(self): objects = [self.test_signal] + self.test_spiketrains