r18859 - /trunk/generic_fns/structure/api_base.py -- March 18, 2013 - 15:31

Author: bugman
Date: Mon Mar 18 15:31:04 2013
New Revision: 18859

URL: http://svn.gna.org/viewcvs/relax?rev=18859&view=rev
Log:
The printouts from the structure.read_pdb user function are now different 
with the merge flag set.

The text now says that the molecules are being merged rather than added.


Modified:
    trunk/generic_fns/structure/api_base.py

Modified: trunk/generic_fns/structure/api_base.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/structure/api_base.py?rev=18859&r1=18858&r2=18859&view=diff
==============================================================================
--- trunk/generic_fns/structure/api_base.py (original)
+++ trunk/generic_fns/structure/api_base.py Mon Mar 18 15:31:04 2013
@@ -551,7 +551,10 @@
             # Loop over the molecules.
             for j in range(len(set_mol_name)):
                 # Print out.
-                print("Adding molecule '%s' to model %s (from the original 
molecule number %s of model %s)" % (set_mol_name[j], set_model_num[i], 
orig_mol_num[j], orig_model_num[i]))
+                if merge:
+                    print("Merging with model %s of molecule '%s' (from the 
original molecule number %s of model %s)" % (set_model_num[i], 
set_mol_name[j], orig_mol_num[j], orig_model_num[i]))
+                else:
+                    print("Adding molecule '%s' to model %s (from the 
original molecule number %s of model %s)" % (set_mol_name[j], 
set_model_num[i], orig_mol_num[j], orig_model_num[i]))
 
                 # Consistency check.
                 index = len(model.mol) - 1