r19576 - /branches/relax_disp/auto_analyses/relax_disp.py -- April 22, 2013 - 00:42

Author: bugman
Date: Mon Apr 22 00:42:34 2013
New Revision: 19576

URL: http://svn.gna.org/viewcvs/relax?rev=19576&view=rev
Log:
More fixed for the peak intensity error analysis method of the relaxation 
dispersion auto-analysis.

The fixed relaxation time period type experiments can now be handled.


Modified:
    branches/relax_disp/auto_analyses/relax_disp.py

Modified: branches/relax_disp/auto_analyses/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/auto_analyses/relax_disp.py?rev=19576&r1=19575&r2=19576&view=diff
==============================================================================
--- branches/relax_disp/auto_analyses/relax_disp.py (original)
+++ branches/relax_disp/auto_analyses/relax_disp.py Mon Apr 22 00:42:34 2013
@@ -31,7 +31,7 @@
 from lib.text.sectioning import title, subtitle
 from pipe_control.pipes import has_pipe
 from prompt.interpreter import Interpreter
-from specific_analyses.relax_disp import CPMG_EXP
+from specific_analyses.relax_disp import CPMG_EXP, FIXED_TIME_EXP
 from status import Status; status = Status()
 
 
@@ -114,11 +114,15 @@
 
         # Dispersion points.
         if cdp.exp_type in CPMG_EXP:
-            disp_points = cdp.cpmg_frqs_list
+            disp_points = cdp.cpmg_frqs
         else:
             disp_points = cdp.spin_lock_nu1
         fields = unique_elements(disp_points.values())
         fields.sort()
+
+        # Fixed relaxation time periods.
+        if cdp.exp_type in FIXED_TIME_EXP:
+            fields = [None]
 
         # Loop over the spectrometer frequencies, then the dispersion points.
         for frq in frqs:
@@ -126,10 +130,18 @@
                 # Generate a list of spectrum IDs matching the frequency and 
field.
                 ids = []
                 for id in cdp.spectrum_ids:
+                    # Check that the spectrometer frequency matches.
                     match_frq = True
                     if frq != None and cdp.frq[id] != frq:
                         match_frq = False
-                    if match_frq and disp_points[id] == field:
+
+                    # Check that the dispersion point matches.
+                    match_disp_point = True
+                    if field != None and disp_points[id] != field:
+                        match_disp_point = False
+
+                    # Add the ID.
+                    if match_frq and match_disp_point:
                         ids.append(id)
 
                 # Run the error analysis on the subset.