Author: bugman Date: Tue Feb 17 09:48:07 2015 New Revision: 27660 URL: http://svn.gna.org/viewcvs/relax?rev=27660&view=rev Log: Merged revisions 27656 via svnmerge from svn+ssh://bug...@svn.gna.org/svn/relax/trunk
........ r27656 | bugman | 2015-02-17 09:44:53 +0100 (Tue, 17 Feb 2015) | 7 lines Fix for bug #23288 (https://gna.org/bugs/?23288). This is the failure of the structure.read_pdb user function when simultaneously merging multiple molecules from one file. The set_mol_name and set_model_num arguments are now converted to lists equal to the length of the read_mol and read_model arguments simultaneously, if supplied. ........ Modified: branches/nmrglue/ (props changed) branches/nmrglue/lib/structure/internal/object.py Propchange: branches/nmrglue/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Tue Feb 17 09:48:07 2015 @@ -1 +1 @@ -/trunk:1-27633,27635-27655 +/trunk:1-27659 Modified: branches/nmrglue/lib/structure/internal/object.py URL: http://svn.gna.org/viewcvs/relax/branches/nmrglue/lib/structure/internal/object.py?rev=27660&r1=27659&r2=27660&view=diff ============================================================================== --- branches/nmrglue/lib/structure/internal/object.py (original) +++ branches/nmrglue/lib/structure/internal/object.py Tue Feb 17 09:48:07 2015 @@ -2031,10 +2031,14 @@ read_mol = [read_mol] if set_mol_name and not isinstance(set_mol_name, list): set_mol_name = [set_mol_name] + if read_mol: + set_mol_name *= len(read_mol) if read_model and not isinstance(read_model, list): read_model = [read_model] if set_model_num and not isinstance(set_model_num, list): set_model_num = [set_model_num] + if read_model: + set_model_num *= len(read_model) # Open the PDB file. pdb_file = open_read_file(file_path, verbosity=verbosity) _______________________________________________ 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
