r17110 - /branches/interatomic/specific_fns/model_free/main.py -- June 28, 2012 - 19:44

Author: bugman
Date: Thu Jun 28 19:44:16 2012
New Revision: 17110

URL: http://svn.gna.org/viewcvs/relax?rev=17110&view=rev
Log:
Fix for the model-free _determine_model_type() method.

This should skip deselected spin rather than spins without relaxation data!


Modified:
    branches/interatomic/specific_fns/model_free/main.py

Modified: branches/interatomic/specific_fns/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/specific_fns/model_free/main.py?rev=17110&r1=17109&r2=17110&view=diff
==============================================================================
--- branches/interatomic/specific_fns/model_free/main.py (original)
+++ branches/interatomic/specific_fns/model_free/main.py Thu Jun 28 19:44:16 
2012
@@ -705,8 +705,8 @@
         # If there is a local tm, fail if not all residues have a local tm 
parameter.
         local_tm = False
         for spin in spin_loop():
-            # No relaxation data.
-            if not hasattr(spin, 'ri_data') or spin.ri_data == None:
+            # Skip deselected spins.
+            if not spin.select:
                 continue
 
             # No params.
@@ -719,7 +719,7 @@
 
             # Inconsistencies.
             elif local_tm and not 'local_tm' in spin.params:
-                raise RelaxError("All residues must either have a local tm 
parameter or not.")
+                raise RelaxError("All spins must either have a local tm 
parameter or not.")
 
         # Check if any model-free parameters are allowed to vary.
         mf_all_fixed = True