r25134 - /trunk/specific_analyses/relax_disp/parameters.py -- August 21, 2014 - 09:33

Author: bugman
Date: Thu Aug 21 09:33:15 2014
New Revision: 25134

URL: http://svn.gna.org/viewcvs/relax?rev=25134&view=rev
Log:
Fixes for the relaxation dispersion loop_parameters() function.

The R1, R20, R20A, R20B (and R1rho_prime, R1rho_primeA, R1rho_primeB) 
parameters are now checked for
in each spin container rather than just the first of the cluster.  This 
should make no difference as
all spins should have the same model and parameters, but it might be a source 
of bugs in the future.


Modified:
    trunk/specific_analyses/relax_disp/parameters.py

Modified: trunk/specific_analyses/relax_disp/parameters.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/parameters.py?rev=25134&r1=25133&r2=25134&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/parameters.py    (original)
+++ trunk/specific_analyses/relax_disp/parameters.py    Thu Aug 21 09:33:15 
2014
@@ -681,7 +681,7 @@
                 continue
 
             # The R1 parameter.
-            if 'r1' in spins[0].params:
+            if 'r1' in spins[spin_index].params:
                 for exp_type, frq in loop_exp_frq():
                     param_index += 1
                     yield 'r1', param_index, spin_index, 
generate_r20_key(exp_type=exp_type, frq=frq)
@@ -693,19 +693,19 @@
                 continue
 
             # The R2 parameter.
-            if 'r2' in spins[0].params:
+            if 'r2' in spins[spin_index].params:
                 for exp_type, frq in loop_exp_frq():
                     param_index += 1
                     yield 'r2', param_index, spin_index, 
generate_r20_key(exp_type=exp_type, frq=frq)
 
             # The R2A parameter.
-            if 'r2a' in spins[0].params:
+            if 'r2a' in spins[spin_index].params:
                 for exp_type, frq in loop_exp_frq():
                     param_index += 1
                     yield 'r2a', param_index, spin_index, 
generate_r20_key(exp_type=exp_type, frq=frq)
 
             # The R2B parameter.
-            if 'r2b' in spins[0].params:
+            if 'r2b' in spins[spin_index].params:
                 for exp_type, frq in loop_exp_frq():
                     param_index += 1
                     yield 'r2b', param_index, spin_index, 
generate_r20_key(exp_type=exp_type, frq=frq)