r3529 - /1.3/specific_fns/model_free/model_free.py -- November 13, 2007 - 22:57

Author: bugman
Date: Tue Nov 13 22:57:03 2007
New Revision: 3529

URL: http://svn.gna.org/viewcvs/relax?rev=3529&view=rev
Log:
Manually ported r3526 from the 1.2 line.

The command used was:
svn merge -r3525:3526 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2/specific_fns/model_free.py 
specific_fns/model_free/model_free.py

.....
  r3526 | bugman | 2007-11-13 22:22:07 +0100 (Tue, 13 Nov 2007) | 8 lines
  Changed paths:
     M /1.2/specific_fns/model_free.py

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

  This bug was reported by Douglas Kojetin <douglas dot kojetin at gmail dot 
com>.

  This change adds another test for the 'num_ri' structure to the model-free 
code, just in case.  The
  additional test is in the writing of simulation model-free results file.
.....


Modified:
    1.3/specific_fns/model_free/model_free.py

Modified: 1.3/specific_fns/model_free/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/model_free.py?rev=3529&r1=3528&r2=3529&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/model_free.py (original)
+++ 1.3/specific_fns/model_free/model_free.py Tue Nov 13 22:57:03 2007
@@ -5149,24 +5149,23 @@
                     # Relaxation data and errors.
                     ri = []
                     ri_error = []
-                    for k in xrange(relax_data_store.num_ri[self.run]):
-                        # No relaxation data.
-                        if not hasattr(data, 'num_ri'):
-                            break
-
-                        # Find the residue specific data corresponding to k.
-                        index = None
-                        for l in xrange(data.num_ri):
-                            if data.ri_labels[l] == 
relax_data_store.ri_labels[self.run][k] and 
data.frq_labels[data.remap_table[l]] == 
relax_data_store.frq_labels[self.run][relax_data_store.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(relax_data_store, 'num_ri'):
+                        for k in xrange(relax_data_store.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] == 
relax_data_store.ri_labels[self.run][k] and 
data.frq_labels[data.remap_table[l]] == 
relax_data_store.frq_labels[self.run][relax_data_store.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