r27656 - /trunk/lib/structure/internal/object.py -- February 17, 2015 - 09:44

Author: bugman
Date: Tue Feb 17 09:44:53 2015
New Revision: 27656

URL: http://svn.gna.org/viewcvs/relax?rev=27656&view=rev
Log:
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:
    trunk/lib/structure/internal/object.py

Modified: trunk/lib/structure/internal/object.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/lib/structure/internal/object.py?rev=27656&r1=27655&r2=27656&view=diff
==============================================================================
--- trunk/lib/structure/internal/object.py      (original)
+++ trunk/lib/structure/internal/object.py      Tue Feb 17 09:44:53 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)