r22310 - /trunk/specific_analyses/relax_disp/checks.py -- February 25, 2014 - 15:05

Author: tlinnet
Date: Tue Feb 25 15:05:06 2014
New Revision: 22310

URL: http://svn.gna.org/viewcvs/relax?rev=22310&view=rev
Log:
Modified check_exp_type_fixed_time to loop over id's and use 
count_relax_times for each id.

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/checks.py

Modified: trunk/specific_analyses/relax_disp/checks.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/checks.py?rev=22310&r1=22309&r2=22310&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/checks.py (original)
+++ trunk/specific_analyses/relax_disp/checks.py Tue Feb 25 15:05:06 2014
@@ -103,12 +103,13 @@
     @raises RelaxError: If exponential curves are present.
     """
 
-    # Get the times.
-    times = get_times()
-
-    # Loop over all experiment types.
-    for exp_type in times:
-        if len(times[exp_type]) > 1:
+    # Loop over the id's.
+    for id in cdp.exp_type.keys():
+        # Get the exp_type and frq.
+        exp_type = cdp.exp_type[id]
+        frq = cdp.spectrometer_frq[id]
+
+        if specific_analyses.relax_disp.disp_data.count_relax_times(exp_type 
= exp_type, frq = frq, ei = cdp.exp_type_list.index(cdp.exp_type[id])) > 1:
             raise RelaxError("The experiment '%s' is not of the fixed 
relaxation time period data type." % exp_type)