r3359 - /1.3/sample_scripts/full_analysis.py -- October 21, 2007 - 18:05

Author: bugman
Date: Sun Oct 21 18:04:59 2007
New Revision: 3359

URL: http://svn.gna.org/viewcvs/relax?rev=3359&view=rev
Log:
Manually ported r3358 from the 1.2 line - the fix to bug #10022 
(https://gna.org/bugs/?10022).

The command used was:
svn merge -r3357:3358 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2

.....
  r3358 | bugman | 2007-10-21 17:59:42 +0200 (Sun, 21 Oct 2007) | 9 lines
  Changed paths:
     M /1.2/sample_scripts/full_analysis.py

  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.3/sample_scripts/full_analysis.py

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