r3262 - /branches/multi_processor/specific_fns/model_free.py -- April 10, 2007 - 12:42

Author: bugman
Date: Tue Apr 10 12:41:42 2007
New Revision: 3262

URL: http://svn.gna.org/viewcvs/relax?rev=3262&view=rev
Log:
Bug fix for the model-free results.write() problem.

This bug was reported by Gary Thompson at
https://mail.gna.org/public/relax-devel/2007-03/msg00176.html (Message-id:
<460CE499.9070905@xxxxxxxxxxxxxxx>).  The thread continues into the next month
(https://mail.gna.org/public/relax-devel/) starting at
https://mail.gna.org/public/relax-devel/2007-04/msg00028.html (Message-id:
<460CE499.9070905@xxxxxxxxxxxxxxx>).

The fix was to synchronise the relaxation data assembly in the value and 
simulation sections of the
write_columnar_results() function.  The 'num_ri' test was missing from the 
simulation section!


Modified:
    branches/multi_processor/specific_fns/model_free.py

Modified: branches/multi_processor/specific_fns/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor/specific_fns/model_free.py?rev=3262&r1=3261&r2=3262&view=diff
==============================================================================
--- branches/multi_processor/specific_fns/model_free.py (original)
+++ branches/multi_processor/specific_fns/model_free.py Tue Apr 10 12:41:42 
2007
@@ -5195,20 +5195,23 @@
                     # Relaxation data and errors.
                     ri = []
                     ri_error = []
-                    for k in xrange(self.relax.data.num_ri[self.run]):
-                        # Find the residue specific data corresponding to k.
-                        index = None
-                        for l in xrange(data.num_ri):
-                            if data.ri_labels[l] == 
self.relax.data.ri_labels[self.run][k] and 
data.frq_labels[data.remap_table[l]] == 
self.relax.data.frq_labels[self.run][self.relax.data.remap_table[self.run][k]]:
-                                index = l
-
-                        # Data exists for this data type.
-                        try:
-                            ri.append(`data.relax_sim_data[i][index]`)
-                            ri_error.append(`data.relax_error[index]`)
-                        except:
-                            ri.append(None)
-                            ri_error.append(None)
+                    if hasattr(self.relax.data, 'num_ri'):
+                        for k in xrange(self.relax.data.num_ri[self.run]):
+                            try:
+                                # Find the residue specific data 
corresponding to k.
+                                index = None
+                                for l in xrange(data.num_ri):
+                                    if data.ri_labels[l] == 
self.relax.data.ri_labels[self.run][k] and 
data.frq_labels[data.remap_table[l]] == 
self.relax.data.frq_labels[self.run][self.relax.data.remap_table[self.run][k]]:
+                                        index = l
+
+                                # Data exists for this data type.
+                                 ri.append(`data.relax_sim_data[i][index]`)
+                                 ri_error.append(`data.relax_error[index]`)
+                    
+                            # No data exists for this data type.
+                            except:
+                                ri.append(None)
+                                ri_error.append(None)
 
                     # XH vector.
                     xh_vect = None