r22294 - in /trunk/specific_analyses/relax_disp: api.py disp_data.py -- February 24, 2014 - 18:28

Author: tlinnet
Date: Mon Feb 24 18:28:11 2014
New Revision: 22294

URL: http://svn.gna.org/viewcvs/relax?rev=22294&view=rev
Log:
Replacing looping over time points from cdp.relax_time_list to 
loop_time(frq=frq).

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

loop_time has been modified to accept spectrometer frequency as input to 
restrict the looping.

Modified:
    trunk/specific_analyses/relax_disp/api.py
    trunk/specific_analyses/relax_disp/disp_data.py

Modified: trunk/specific_analyses/relax_disp/api.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/api.py?rev=22294&r1=22293&r2=22294&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/api.py (original)
+++ trunk/specific_analyses/relax_disp/api.py Mon Feb 24 18:28:11 2014
@@ -149,7 +149,7 @@
         values = []
         errors = []
         times = []
-        for time in cdp.relax_time_list:
+        for time in loop_time(frq=frq):
             # The data.
             values.append(average_intensity(spin=spin, exp_type=exp_type, 
frq=frq, offset=offset, point=point, time=time))
             errors.append(average_intensity(spin=spin, exp_type=exp_type, 
frq=frq, offset=offset, point=point, time=time, error=True))
@@ -378,7 +378,7 @@
                 values = []
                 errors = []
                 times = []
-                for time in cdp.relax_time_list:
+                for time in loop_time(frq=frq):
                     values.append(average_intensity(spin=spin, 
exp_type=exp_type, frq=frq, offset=offset, point=point, time=time, 
sim_index=sim_index))
                     errors.append(average_intensity(spin=spin, 
exp_type=exp_type, frq=frq, offset=offset, point=point, time=time, 
error=True))
                     times.append(time)
@@ -1373,7 +1373,7 @@
 
             # Generate the data structure to return.
             errors = []
-            for time in cdp.relax_time_list:
+            for time in loop_time(frq=frq):
                 errors.append(average_intensity(spin=spin, 
exp_type=exp_type, frq=frq, offset=offset, point=point, time=time, 
error=True))
 
         # All other models.
@@ -1597,7 +1597,7 @@
 
             # Loop over each time point.
             ti = 0
-            for time in loop_time():
+            for time in loop_time(frq=frq):
                 # Get the intensity keys.
                 int_keys = find_intensity_keys(exp_type=exp_type, frq=frq, 
point=point, time=time)
 

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=22294&r1=22293&r2=22294&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/disp_data.py (original)
+++ trunk/specific_analyses/relax_disp/disp_data.py Mon Feb 24 18:28:11 2014
@@ -1930,7 +1930,7 @@
                     set_labels.append("Spin %s" % id)
 
                 # Loop over the relaxation time periods.
-                for time in cdp.relax_time_list:
+                for time in loop_time(frq=frq):
                     # The key.
                     keys = find_intensity_keys(exp_type=exp_type, frq=frq, 
point=point, time=time)