r22223 - /trunk/specific_analyses/relax_disp/disp_data.py -- February 20, 2014 - 18:17

Author: tlinnet
Date: Thu Feb 20 18:17:00 2014
New Revision: 22223

URL: http://svn.gna.org/viewcvs/relax?rev=22223&view=rev
Log:
Added the time point to be sent into the return function of cpmg frequencies.

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=22223&r1=22222&r2=22223&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/disp_data.py (original)
+++ trunk/specific_analyses/relax_disp/disp_data.py Thu Feb 20 18:17:00 2014
@@ -1143,7 +1143,7 @@
                 yield offset, point
 
 
-def loop_point(exp_type=None, frq=None, offset=None, skip_ref=True, 
return_indices=False):
+def loop_point(exp_type=None, frq=None, offset=None, time=None, 
skip_ref=True, return_indices=False):
     """Generator method for looping over the dispersion points.
 
     @keyword exp_type:          The experiment type.
@@ -1152,6 +1152,8 @@
     @type frq:                  float
     @keyword offset:            The spin-lock or hard pulse offset value in 
ppm.
     @type offset:               None or float
+    @keyword time:              The relaxation time period.
+    @type time:                 float
     @keyword skip_ref:          A flag which if True will cause the 
reference point to be skipped.
     @type skip_ref:             bool
     @keyword return_indices:    A flag which if True will cause the 
experiment type index to be returned as well.
@@ -1171,7 +1173,7 @@
     # Assemble the dispersion data.
     ref_flag = not skip_ref
     if exp_type in EXP_TYPE_LIST_CPMG:
-        fields = return_cpmg_frqs_single(exp_type=exp_type, frq=frq, 
offset=offset, ref_flag=ref_flag)
+        fields = return_cpmg_frqs_single(exp_type=exp_type, frq=frq, 
offset=offset, time=time, ref_flag=ref_flag)
     elif exp_type in EXP_TYPE_LIST_R1RHO:
         fields = return_spin_lock_nu1_single(exp_type=exp_type, frq=frq, 
offset=offset, ref_flag=ref_flag)
     else: