r7261 - /1.3/specific_fns/model_free/mf_minimise.py -- September 24, 2008 - 18:49

Author: bugman
Date: Wed Sep 24 18:49:04 2008
New Revision: 7261

URL: http://svn.gna.org/viewcvs/relax?rev=7261&view=rev
Log:
Removed the call to count_selected_spins().


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=7261&r1=7260&r2=7261&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/mf_minimise.py (original)
+++ 1.3/specific_fns/model_free/mf_minimise.py Wed Sep 24 18:49:04 2008
@@ -31,7 +31,7 @@
 from float import isNaN, isInf
 from generic_fns import diffusion_tensor
 from generic_fns.diffusion_tensor import diff_data_exists
-from generic_fns.mol_res_spin import count_selected_spins, count_spins, 
exists_mol_res_spin_data, return_spin_from_index, spin_loop
+from generic_fns.mol_res_spin 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 physical_constants import h_bar, mu0, return_gyromagnetic_ratio
@@ -852,8 +852,8 @@
             num_spins = 1
         elif model_type == 'diff' or model_type == 'all':
             num_instances = 1
-            num_data_sets = count_spins()
-            num_spins = count_selected_spins()
+            num_data_sets = count_spins(skip_desel=False)
+            num_spins = count_spins()
 
         # Number of spins, minimisation instances, and data sets for the 
back-calculate function.
         if min_algor == 'back_calc':