r3356 - /1.2/sample_scripts/full_analysis.py -- August 30, 2007 - 10:43

Author: bugman
Date: Thu Aug 30 10:42:37 2007
New Revision: 3356

URL: http://svn.gna.org/viewcvs/relax?rev=3356&view=rev
Log:
Hand ported r3355 from the 1.3 line.

.....
  Fix for bug #9892 (https://gna.org/bugs/?9892).

  This bug was reported by Douglas Kojetin <douglas dot kojetin at gmail dot 
com>, and was first
  discussed in the post 
https://mail.gna.org/public/relax-users/2007-08/msg00008.html (Message-id:
  <1E05882B-96B3-4875-B11B-0A6FEF423937@xxxxxxxxx>).

  The fix was to simply test for the presence of the data structures.  If 
these spin system specific
  structures - 'model' and 'params' - were missing, then the bug will arise.
.....


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=3356&r1=3355&r2=3356&view=diff
==============================================================================
--- 1.2/sample_scripts/full_analysis.py (original)
+++ 1.2/sample_scripts/full_analysis.py Thu Aug 30 10:42:37 2007
@@ -361,12 +361,14 @@
         # Create a string representation of the model-free models of the 
previous run.
         prev_models = ''
         for i in xrange(len(self.relax.data.res['previous'])):
-            prev_models = prev_models + 
self.relax.data.res['previous'][i].model
+            if hasattr(self.relax.data.res['previous'][i], 'model'):
+                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])):
-            curr_models = curr_models + self.relax.data.res[run][i].model
+            if hasattr(self.relax.data.res[run][i], 'model'):
+                curr_models = curr_models + self.relax.data.res[run][i].model
 
         # The test.
         if prev_models == curr_models:
@@ -413,6 +415,10 @@
                     if not params_converged:
                         break
 
+                    # Skip spin systems with no 'params' object.
+                    if not hasattr(self.relax.data.res['previous'][i], 
'params') or not hasattr(self.relax.data.res[run][i], 'params'):
+                        continue
+
                     # Loop over the parameters.
                     for j in xrange(len(self.relax.data.res[run][i].params)):
                         # Get the parameter values.