r19622 - /branches/relax_disp/specific_analyses/relax_disp.py -- May 03, 2013 - 10:33

Author: bugman
Date: Fri May  3 10:33:44 2013
New Revision: 19622

URL: http://svn.gna.org/viewcvs/relax?rev=19622&view=rev
Log:
The relaxation dispersion class variables for the experiment types are now 
used for all comparisons.

This should avoid random bugs.


Modified:
    branches/relax_disp/specific_analyses/relax_disp.py

Modified: branches/relax_disp/specific_analyses/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp.py?rev=19622&r1=19621&r2=19622&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp.py Fri May  3 10:33:44 
2013
@@ -618,9 +618,9 @@
         """
 
         # CPMG type data.
-        if cdp.exp_type in ['cpmg']:
+        if cdp.exp_type in CPMG_EXP:
             fields = unique_elements(cdp.cpmg_frqs_list.values())
-        elif cdp.exp_type in ['r1rho']:
+        elif cdp.exp_type in R1RHO_EXP:
             fields = unique_elements(cdp.spin_lock_nu1.values())
         else:
             raise RelaxError("The experiment type '%s' is unknown." % 
cdp.exp_type)
@@ -677,7 +677,7 @@
         # Loop over each exponential curve.
         for i in range(cdp.dispersion_points):
             # The experiment specific key.
-            if cdp.exp_type in ['cpmg', 'cpmg fixed']:
+            if cdp.exp_type in CPMG_EXP:
                 key = cdp.cpmg_frqs_list[i]
             else:
                 key = cdp.spin_lock_nu1_list[i]
@@ -1594,7 +1594,7 @@
         # Special exponential curve-fitting for the 'R2eff' model.
         if cdp.model == 'R2eff':
             # Sanity checks.
-            if cdp.exp_type in ['cpmg fixed']:
+            if cdp.exp_type in FIXED_TIME_EXP:
                 raise RelaxError("The R2eff model with the fixed time period 
CPMG experiment cannot be optimised.")
 
             # Optimisation.