r27074 - /trunk/lib/structure/internal/coordinates.py -- December 11, 2014 - 10:33

Author: bugman
Date: Thu Dec 11 10:33:05 2014
New Revision: 27074

URL: http://svn.gna.org/viewcvs/relax?rev=27074&view=rev
Log:
Changed the structure ID strings returned by the assemble_coord_array() 
function.

This is from the lib.structure.internal.coordinates module.  The structural 
object name is only
included if more than one structural object has been supplied.


Modified:
    trunk/lib/structure/internal/coordinates.py

Modified: trunk/lib/structure/internal/coordinates.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/lib/structure/internal/coordinates.py?rev=27074&r1=27073&r2=27074&view=diff
==============================================================================
--- trunk/lib/structure/internal/coordinates.py (original)
+++ trunk/lib/structure/internal/coordinates.py Thu Dec 11 10:33:05 2014
@@ -96,10 +96,12 @@
                         atom_elem.append({})
 
                     # Create a new structure ID.
+                    ids.append('')
+                    if len(object_names) > 1:
+                        ids[-1] += object_names[struct_index]
                     if model.num != None:
-                        ids.append("%s, %i, %s" % 
(object_names[struct_index], model.num, mol_name))
-                    else:
-                        ids.append("%s, %s" % (object_names[struct_index], 
mol_name))
+                        ids[-1] += ", %i" % model.num
+                    ids[-1] += ", %s" % mol_name
 
                 # A unique identifier.
                 if molecules != None: