r3528 - /1.3/specific_fns/jw_mapping.py -- November 13, 2007 - 22:49

Author: bugman
Date: Tue Nov 13 22:49:05 2007
New Revision: 3528

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

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

.....
  r3525 | bugman | 2007-11-13 22:19:54 +0100 (Tue, 13 Nov 2007) | 8 lines
  Changed paths:
     M /1.2/specific_fns/jw_mapping.py

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

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

  The fix was to simply use the same fix which went into the equivalent 
model-free code years and
  years ago!
.....


Modified:
    1.3/specific_fns/jw_mapping.py

Modified: 1.3/specific_fns/jw_mapping.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/jw_mapping.py?rev=3528&r1=3527&r2=3528&view=diff
==============================================================================
--- 1.3/specific_fns/jw_mapping.py (original)
+++ 1.3/specific_fns/jw_mapping.py Tue Nov 13 22:49:05 2007
@@ -665,16 +665,18 @@
             ri_error = []
             if hasattr(relax_data_store, 'num_ri'):
                 for i in xrange(relax_data_store.num_ri[self.run]):
-                    # Find the residue specific data corresponding to i.
-                    index = None
-                    for j in xrange(data.num_ri):
-                        if data.ri_labels[j] == 
relax_data_store.ri_labels[self.run][i] and 
data.frq_labels[data.remap_table[j]] == 
relax_data_store.frq_labels[self.run][relax_data_store.remap_table[self.run][i]]:
-                            index = j
-
-                    # Data exists for this data type.
                     try:
+                        # Find the residue specific data corresponding to i.
+                        index = None
+                        for j in xrange(data.num_ri):
+                            if data.ri_labels[j] == 
relax_data_store.ri_labels[self.run][i] and 
data.frq_labels[data.remap_table[j]] == 
relax_data_store.frq_labels[self.run][relax_data_store.remap_table[self.run][i]]:
+                                index = j
+
+                        # Data exists for this data type.
                         ri.append(`data.relax_data[index]`)
                         ri_error.append(`data.relax_error[index]`)
+
+                    # No data exists for this data type.
                     except:
                         ri.append(None)
                         ri_error.append(None)
@@ -771,20 +773,23 @@
                 # Relaxation data and errors.
                 ri = []
                 ri_error = []
-                for k in xrange(relax_data_store.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] == 
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(self.relax.data, '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)
 
                 # Write the line.
                 self.write_columnar_line(file=file, num=data.num, 
name=data.name, select=data.select, data_set='sim_'+`i`, nucleus=nucleus, 
wH=`wH`, j0=`j0`, jwx=`jwx`, jwh=`jwh`, r=`r`, csa=`csa`, 
ri_labels=ri_labels, remap_table=remap_table, frq_labels=frq_labels, frq=frq, 
ri=ri, ri_error=ri_error)