r22301 - in /trunk/specific_analyses/relax_disp: api.py disp_data.py -- February 25, 2014 - 15:04

Author: tlinnet
Date: Tue Feb 25 15:04:49 2014
New Revision: 22301

URL: http://svn.gna.org/viewcvs/relax?rev=22301&view=rev
Log:
Added exp_type, frq, offset, point to the loop_time() function.

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

Implemented as suggested in: 
http://www.mail-archive.com/relax-devel@xxxxxxx/msg04993.html
In all these cases, that information is available, so it should be used.
If one are analysing a combination of data types simultaneously (SQ CPMG, DQ 
CPMG, R1rho), one will not
have the same relaxation time for each.  For different spin-lock or 180 
degree pulse offsets and even different dispersion points,
the time may also be different.

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=22301&r1=22300&r2=22301&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/api.py (original)
+++ trunk/specific_analyses/relax_disp/api.py Tue Feb 25 15:04:49 2014
@@ -149,7 +149,7 @@
         values = []
         errors = []
         times = []
-        for time in loop_time(frq=frq):
+        for time in loop_time(exp_type=exp_type, frq=frq, offset=offset, 
point=point):
             # 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 loop_time(frq=frq):
+                for time in loop_time(exp_type=exp_type, frq=frq, 
offset=offset, point=point):
                     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 loop_time(frq=frq):
+            for time in loop_time(exp_type=exp_type, frq=frq, offset=offset, 
point=point):
                 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(frq=frq):
+            for time in loop_time(exp_type=exp_type, frq=frq, offset=offset, 
point=point):
                 # 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=22301&r1=22300&r2=22301&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/disp_data.py (original)
+++ trunk/specific_analyses/relax_disp/disp_data.py Tue Feb 25 15:04:49 2014
@@ -1943,7 +1943,7 @@
                     set_labels.append("Spin %s" % id)
 
                 # Loop over the relaxation time periods.
-                for time in loop_time(frq=frq):
+                for time in loop_time(exp_type=exp_type, frq=frq, 
offset=offset, point=point):
                     # The key.
                     keys = find_intensity_keys(exp_type=exp_type, frq=frq, 
point=point, time=time)