Author: bugman Date: Tue Nov 13 22:22:07 2007 New Revision: 3526 URL: http://svn.gna.org/viewcvs/relax?rev=3526&view=rev Log: 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.2/specific_fns/model_free.py Modified: 1.2/specific_fns/model_free.py URL: http://svn.gna.org/viewcvs/relax/1.2/specific_fns/model_free.py?rev=3526&r1=3525&r2=3526&view=diff ============================================================================== --- 1.2/specific_fns/model_free.py (original) +++ 1.2/specific_fns/model_free.py Tue Nov 13 22:22:07 2007 @@ -5145,24 +5145,23 @@ # Relaxation data and errors. ri = [] ri_error = [] - for k in xrange(self.relax.data.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] == 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