r19634 - /branches/relax_disp/specific_analyses/relax_disp/disp_data.py -- May 03, 2013 - 14:56

Author: bugman
Date: Fri May  3 14:56:02 2013
New Revision: 19634

URL: http://svn.gna.org/viewcvs/relax?rev=19634&view=rev
Log:
Fixes for some latent bugs in the specific_analyses.relax_disp.disp_data 
module.

The checks for the CPMG-data type in a number of functions now uses the 
CPMG_EXP list instead of 
fixed strings.


Modified:
    branches/relax_disp/specific_analyses/relax_disp/disp_data.py

Modified: branches/relax_disp/specific_analyses/relax_disp/disp_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/disp_data.py?rev=19634&r1=19633&r2=19634&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/disp_data.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/disp_data.py Fri May  3 
14:56:02 2013
@@ -77,7 +77,7 @@
     """
 
     # CPMG data.
-    if cdp.exp_type == 'cpmg':
+    if cdp.exp_type in CPMG_EXP:
         return cdp.cpmg_frqs_list.index(key)
 
     # R1rho data.
@@ -95,7 +95,7 @@
     """
 
     # CPMG data.
-    if cdp.exp_type == 'cpmg':
+    if cdp.exp_type in CPMG_EXP:
         return cdp.cpmg_frqs_list[index]
 
     # R1rho data.
@@ -120,7 +120,7 @@
 
     # Find all keys corresponding to the given exponential key.
     exp_keys = []
-    if cdp.exp_type == 'cpmg':
+    if cdp.exp_type in CPMG_EXP:
         data = cdp.cpmg_frqs
     else:
         data = cdp.spin_lock_nu1