r5191 - /1.3/specific_fns/model_free/mf_minimise.py -- March 23, 2008 - 15:23

Author: bugman
Date: Sun Mar 23 15:18:37 2008
New Revision: 5191

URL: http://svn.gna.org/viewcvs/relax?rev=5191&view=rev
Log:
Modified the model-free minimise() function to print out the spin_id rather 
than res name and num.


Modified:
    1.3/specific_fns/model_free/mf_minimise.py

Modified: 1.3/specific_fns/model_free/mf_minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/mf_minimise.py?rev=5191&r1=5190&r2=5191&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/mf_minimise.py (original)
+++ 1.3/specific_fns/model_free/mf_minimise.py Sun Mar 23 15:18:37 2008
@@ -840,13 +840,13 @@
             # Get the spin container if required.
             if param_set == 'diff' or param_set == 'all':
                 spin_index = None
-                spin = None
+                spin, spin_id = None, None
             elif min_algor == 'back_calc':
                 spin_index = min_options[0]
-                spin = return_spin_from_index(global_index=spin_index)
+                spin, spin_id = 
return_spin_from_index(global_index=spin_index, return_spin_id=True)
             else:
                 spin_index = i
-                spin = return_spin_from_index(global_index=spin_index)
+                spin, spin_id = 
return_spin_from_index(global_index=spin_index, return_spin_id=True)
 
             # Individual spin stuff.
             if spin and (param_set == 'mf' or param_set == 'local_tm') and 
not min_algor == 'back_calc':
@@ -896,7 +896,7 @@
                 if param_set == 'mf' or param_set == 'local_tm':
                     if verbosity >= 2:
                         print "\n\n"
-                    string = "Fitting to spin: " + `spin.num` + " " + 
spin.name
+                    string = "Fitting to spin " + `spin_id`
                     print "\n\n" + string
                     print len(string) * '~'
                 if match('^[Gg]rid', min_algor):