r22309 - /trunk/specific_analyses/relax_disp/disp_data.py -- February 25, 2014 - 15:05

Author: tlinnet
Date: Tue Feb 25 15:05:04 2014
New Revision: 22309

URL: http://svn.gna.org/viewcvs/relax?rev=22309&view=rev
Log:
Added the extraction of exp_type and frq from cdp, to be sent into 
count_relax_times.

Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG analysis 
with two fields at two delay times.

Modified:
    trunk/specific_analyses/relax_disp/disp_data.py

Modified: trunk/specific_analyses/relax_disp/disp_data.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/disp_data.py?rev=22309&r1=22308&r2=22309&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/disp_data.py (original)
+++ trunk/specific_analyses/relax_disp/disp_data.py Tue Feb 25 15:05:04 2014
@@ -410,7 +410,9 @@
     else:
         # Determine the curve type.
         curve_type = 'exponential'
-        if count_relax_times(ei = cdp.exp_type_list.index(cdp.exp_type[id])) 
== 1:
+        exp_type = cdp.exp_type[id]
+        frq = cdp.spectrometer_frq[id]
+        if count_relax_times(exp_type = exp_type, frq = frq, ei = 
cdp.exp_type_list.index(cdp.exp_type[id])) == 1:
             curve_type = 'fixed time'
 
     # Return the type.