Skip to content

Commit 2e00c99

Browse files
Merge pull request #1054 from legouee/Convert_Data2
[NWBIO] Add a warning to avoid signals with the same name
2 parents 504dcbe + 80cc13d commit 2e00c99

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

neo/io/nwbio.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -517,9 +517,11 @@ def _write_segment(self, nwbfile, segment, electrodes):
517517
for i, signal in enumerate(
518518
chain(segment.analogsignals, segment.irregularlysampledsignals)):
519519
assert signal.segment is segment
520-
signal.name = "%s %s %i" % (signal.name, segment.name, i)
521-
if not signal.name:
522-
signal.name = "%s : analogsignal%d %i" % (segment.name, i, i)
520+
if hasattr(signal, 'name'):
521+
signal.name = "%s %s %i" % (segment.name, signal.name, i)
522+
logging.warning("Warning signal name exists. New name: %s" % (signal.name))
523+
else:
524+
signal.name = "%s : analogsignal%s %i" % (segment.name, signal.name, i)
523525
self._write_signal(nwbfile, signal, electrodes)
524526

525527
for i, train in enumerate(segment.spiketrains):
@@ -530,9 +532,11 @@ def _write_segment(self, nwbfile, segment, electrodes):
530532

531533
for i, event in enumerate(segment.events):
532534
assert event.segment is segment
533-
event.name = "%s %s %i" % (event.name, segment.name, i)
534-
if not event.name:
535-
event.name = "%s : event%d" % (segment.name, i)
535+
if hasattr(event, 'name'):
536+
event.name = "%s %s %i" % (segment.name, event.name, i)
537+
logging.warning("Warning event name exists. New name: %s" % (event.name))
538+
else:
539+
event.name = "%s : event%s %d" % (segment.name, event.name, i)
536540
self._write_event(nwbfile, event)
537541

538542
for i, epoch in enumerate(segment.epochs):

0 commit comments

Comments
 (0)