r5145 - /1.3/specific_fns/model_free/mf_minimise.py -- March 22, 2008 - 18:38

Author: bugman
Date: Sat Mar 22 18:38:47 2008
New Revision: 5145

URL: http://svn.gna.org/viewcvs/relax?rev=5145&view=rev
Log:
Modified the model-free minimise() method to use the new 
return_spin_from_index() function.


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=5145&r1=5144&r2=5145&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/mf_minimise.py (original)
+++ 1.3/specific_fns/model_free/mf_minimise.py Sat Mar 22 18:38:47 2008
@@ -30,7 +30,7 @@
 from data import Data as relax_data_store
 from float import isNaN, isInf
 from generic_fns import diffusion_tensor
-from generic_fns.selection import count_spins, exists_mol_res_spin_data, 
return_spin, spin_loop
+from generic_fns.selection import count_spins, exists_mol_res_spin_data, 
return_spin_from_index, spin_loop
 from maths_fns.mf import Mf
 from minfx.generic import generic_minimise
 from relax_errors import RelaxError, RelaxInfError, RelaxLenError, 
RelaxNaNError, RelaxNoModelError, RelaxNoPdbError, RelaxNoResError, 
RelaxNoSequenceError, RelaxNoTensorError, RelaxNoValueError, 
RelaxNoVectorsError, RelaxNucleusError
@@ -740,10 +740,10 @@
                 spin = None
             elif min_algor == 'back_calc':
                 spin_index = min_options[0]
-                spin = return_spin(index=spin_index)
+                spin = return_spin_from_index(global_index=spin_index)
             else:
                 spin_index = i
-                spin = return_spin(index=spin_index)
+                spin = return_spin_from_index(global_index=spin_index)
 
             # Individual spin stuff.
             if spin and (param_set == 'mf' or param_set == 'local_tm') and 
not min_algor == 'back_calc':
@@ -851,7 +851,7 @@
                 # Set the spin index and get the spin, if not already set.
                 if param_set == 'diff' or param_set == 'all':
                     spin_index = j
-                    spin = return_spin(index=spin_index)
+                    spin = return_spin_from_index(global_index=spin_index)
 
                 # Skip unselected spins.
                 if not spin.select: