r2511 - /1.2/specific_fns/model_free.py -- July 19, 2006 - 07:14

Author: bugman
Date: Wed Jul 19 07:13:44 2006
New Revision: 2511

URL: http://svn.gna.org/viewcvs/relax?rev=2511&view=rev
Log:
Fix to bug #5806.

The bug is located at https://gna.org/bugs/?func=detailitem&item_id=5806.

To remove the bug, tests for the presence of relaxation data have been added 
to the
model_statistics() functions.  This may cause future bugs!


Modified:
    1.2/specific_fns/model_free.py

Modified: 1.2/specific_fns/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.2/specific_fns/model_free.py?rev=2511&r1=2510&r2=2511&view=diff
==============================================================================
--- 1.2/specific_fns/model_free.py (original)
+++ 1.2/specific_fns/model_free.py Wed Jul 19 07:13:44 2006
@@ -2547,6 +2547,10 @@
                 if not self.relax.data.res[self.run][i].select:
                     continue
 
+                # Skip residues with no relaxation data.
+                if not hasattr(self.relax.data.res[self.run][i], 
'relax_data') or not len(self.relax.data.res[self.run][i].relax_data):
+                    continue
+
                 # Count the number of parameters.
                 self.param_vector = self.assemble_param_vector(index=i)
                 k = k + len(self.param_vector)
@@ -2568,6 +2572,10 @@
             for i in xrange(len(self.relax.data.res[self.run])):
                 # Skip unselected residues.
                 if not self.relax.data.res[self.run][i].select:
+                    continue
+
+                # Skip residues with no relaxation data.
+                if not hasattr(self.relax.data.res[self.run][i], 
'relax_data') or not len(self.relax.data.res[self.run][i].relax_data):
                     continue
 
                 n = n + len(self.relax.data.res[self.run][i].relax_data)