Author: bugman Date: Fri Feb 20 09:35:31 2015 New Revision: 27688 URL: http://svn.gna.org/viewcvs/relax?rev=27688&view=rev Log: Merged revisions 27687 via svnmerge from svn+ssh://bug...@svn.gna.org/svn/relax/trunk
........ r27687 | bugman | 2015-02-20 09:35:07 +0100 (Fri, 20 Feb 2015) | 8 lines Fix for bug #23294 (https://gna.org/bugs/?23294). This is the automatic merging of PDB molecules resulting in an IndexError. Now if only a single molecule name is supplied, this will be used for all molecules in the PDB file. The result is that the structural data will all be automatically merged into a single molecule. This merging is communicated to the user via the current printouts. ........ Modified: branches/frame_order_cleanup/ (props changed) branches/frame_order_cleanup/lib/structure/internal/object.py Propchange: branches/frame_order_cleanup/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Fri Feb 20 09:35:31 2015 @@ -1 +1 @@ -/trunk:1-27684 +/trunk:1-27687 Modified: branches/frame_order_cleanup/lib/structure/internal/object.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/structure/internal/object.py?rev=27688&r1=27687&r2=27688&view=diff ============================================================================== --- branches/frame_order_cleanup/lib/structure/internal/object.py (original) +++ branches/frame_order_cleanup/lib/structure/internal/object.py Fri Feb 20 09:35:31 2015 @@ -2085,7 +2085,15 @@ # Set the target molecule name. if set_mol_name: - new_mol_name.append(set_mol_name[mol_index]) + # Single name. + if len(set_mol_name) == 1: + new_mol_name.append(set_mol_name[0]) + + # Multiple names. + else: + new_mol_name.append(set_mol_name[mol_index]) + + # Auto-generated molecule name. else: # Number of structures already present for the model. num_struct = 0 _______________________________________________ relax (http://www.nmr-relax.com) This is the relax-commits mailing list relax-commits@gna.org To unsubscribe from this list, get a password reminder, or change your subscription options, visit the list information page at https://mail.gna.org/listinfo/relax-commits
