r22303 - /trunk/specific_analyses/relax_disp/disp_data.py -- February 25, 2014 - 15:04

Author: tlinnet
Date: Tue Feb 25 15:04:53 2014
New Revision: 22303

URL: http://svn.gna.org/viewcvs/relax?rev=22303&view=rev
Log:
Modified to pass exp_typ, frq, offset or point to loop_time() where such 
information is available.

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=22303&r1=22302&r2=22303&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/disp_data.py (original)
+++ trunk/specific_analyses/relax_disp/disp_data.py Tue Feb 25 15:04:53 2014
@@ -894,7 +894,7 @@
                 # Then the dispersion points.
                 for point, di in loop_point(exp_type=exp_type, frq=frq, 
offset=offset, return_indices=True):
                     # Finally the relaxation times.
-                    for time, ti in loop_time(frq=frq, return_indices=True):
+                    for time, ti in loop_time(exp_type=exp_type, frq=frq, 
offset=offset, point=point, return_indices=True):
                         # Yield the data.
                         if return_indices:
                             yield exp_type, frq, offset, point, time, ei, 
mi, oi, di, ti
@@ -946,7 +946,7 @@
             # Then the dispersion points.
             for point, di in loop_point(exp_type=exp_type, frq=frq, 
offset=0.0, return_indices=True):
                 # Finally the relaxation times.
-                for time, ti in loop_time(return_indices=True):
+                for time, ti in loop_time(exp_type=exp_type, frq=frq, 
point=point, return_indices=True):
                     # Yield all data.
                     if return_indices:
                         yield exp_type, frq, point, time, ei, mi, di, ti
@@ -1062,7 +1062,7 @@
         # Then the dispersion points.
         for point, di in loop_point(exp_type=exp_type, frq=frq, offset=0.0, 
return_indices=True):
             # Finally the relaxation times.
-            for time, ti in loop_time(return_indices=True):
+            for time, ti in loop_time(exp_type=exp_type, frq=frq, 
point=point, return_indices=True):
                 # Yield all data.
                 if return_indices:
                     yield frq, point, time, mi, di, ti