Merge pull request #1314 from apdavison/no-segments-in-group

do not allow Groups to contain Segments

Author: JuliaSprenger

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,

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