r3358 - /1.2/sample_scripts/full_analysis.py -- October 21, 2007 - 18:00

Author: bugman
Date: Sun Oct 21 17:59:42 2007
New Revision: 3358

URL: http://svn.gna.org/viewcvs/relax?rev=3358&view=rev
Log:
Doug's patch for fixing bug #10022 (https://gna.org/bugs/?10022).

The patch by Douglas Kojetin (https://gna.org/users/dkojetin) labelled as 
'patch2' and attached to
the bug report has been applied without modification.

This change fixes the convergence test in the 'full_analysis.py' script which 
fails when one residue
has the model None associated with it.  These situations are now caught and 
skipped.


Modified:
    1.2/sample_scripts/full_analysis.py

Modified: 1.2/sample_scripts/full_analysis.py
URL: 
http://svn.gna.org/viewcvs/relax/1.2/sample_scripts/full_analysis.py?rev=3358&r1=3357&r2=3358&view=diff
==============================================================================
--- 1.2/sample_scripts/full_analysis.py (original)
+++ 1.2/sample_scripts/full_analysis.py Sun Oct 21 17:59:42 2007
@@ -362,13 +362,15 @@
         prev_models = ''
         for i in xrange(len(self.relax.data.res['previous'])):
             if hasattr(self.relax.data.res['previous'][i], 'model'):
-                prev_models = prev_models + 
self.relax.data.res['previous'][i].model
+                if not self.relax.data.res['previous'][i].model == 'None':
+                    prev_models = prev_models + 
self.relax.data.res['previous'][i].model
 
         # Create a string representation of the model-free models of the 
current run.
         curr_models = ''
         for i in xrange(len(self.relax.data.res[run])):
             if hasattr(self.relax.data.res[run][i], 'model'):
-                curr_models = curr_models + self.relax.data.res[run][i].model
+                if not self.relax.data.res[run][i].model == 'None':
+                    curr_models = curr_models + 
self.relax.data.res[run][i].model
 
         # The test.
         if prev_models == curr_models: