Similar structure names

Author: legouee

neo/io/nwbio.py

@@ -518,10 +518,10 @@ def _write_segment(self, nwbfile, segment, electrodes):
                 chain(segment.analogsignals, segment.irregularlysampledsignals)):
             assert signal.segment is segment
             if hasattr(signal, 'name'):
-                signal.name = "%s %s %i" % (signal.name, segment.name, i)
+                signal.name = "%s %s %i" % (segment.name, signal.name, i)
                 logging.warning("Warning signal name exists. New name: %s" % (signal.name))
-            if not signal.name:
-                signal.name = "%s : analogsignal%d %i" % (segment.name, i, i)
+            else:
+                signal.name = "%s : analogsignal%s %i" % (segment.name, signal.name, i)
             self._write_signal(nwbfile, signal, electrodes)
 
         for i, train in enumerate(segment.spiketrains):
@@ -533,10 +533,10 @@ def _write_segment(self, nwbfile, segment, electrodes):
         for i, event in enumerate(segment.events):
             assert event.segment is segment
             if hasattr(event, 'name'):
-                event.name = "%s  %s %i" % (event.name, segment.name, i)
+                event.name = "%s  %s %i" % (segment.name, event.name, i)
                 logging.warning("Warning event name exists. New name: %s" % (event.name))
-            if not event.name:
-                event.name = "%s : event%d" % (segment.name, i)
+            else:
+                event.name = "%s : event%s %d" % (segment.name, event.name, i)
             self._write_event(nwbfile, event)
 
         for i, epoch in enumerate(segment.epochs):