r12785 - /1.3/generic_fns/relax_data.py -- March 03, 2011 - 15:30

Author: bugman
Date: Thu Mar  3 15:30:40 2011
New Revision: 12785

URL: http://svn.gna.org/viewcvs/relax?rev=12785&view=rev
Log:
Fixes for the relax_data.back_calc() back end.

The user function was completely non-functional!


Modified:
    1.3/generic_fns/relax_data.py

Modified: 1.3/generic_fns/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/relax_data.py?rev=12785&r1=12784&r2=12785&view=diff
==============================================================================
--- 1.3/generic_fns/relax_data.py (original)
+++ 1.3/generic_fns/relax_data.py Thu Mar  3 15:30:40 2011
@@ -101,6 +101,18 @@
     else:
         ri_ids = [ri_id]
 
+    # The data types.
+    if ri_type == None:
+        ri_types = cdp.ri_type
+    else:
+        ri_types = {ri_id: ri_type}
+
+    # The frequencies.
+    if frq == None:
+        frqs = cdp.frq
+    else:
+        frqs = {ri_id: frq}
+
     # Loop over the spins.
     for spin, spin_id in spin_loop(return_id=True):
         # Skip deselected spins.
@@ -116,7 +128,7 @@
 
         # Back-calculate the relaxation value.
         for ri_id in ri_ids:
-            spin.ri_data_bc[ri_id] = back_calculate(spin_index=spin_index, 
ri_id=ri_id, ri_type=ri_type, frq=frq)
+            spin.ri_data_bc[ri_id] = back_calculate(spin_index=spin_index, 
ri_id=ri_id, ri_type=ri_types[ri_id], frq=frqs[ri_id])
 
 
 def bmrb_read(star, sample_conditions=None):