r21322 - /branches/relax_disp/specific_analyses/relax_disp/disp_data.py -- October 29, 2013 - 16:13

Author: bugman
Date: Tue Oct 29 16:13:56 2013
New Revision: 21322

URL: http://svn.gna.org/viewcvs/relax?rev=21322&view=rev
Log:
Fix for return_index_from_disp_point() for when R2eff/R1rho data is loaded 
rather than intensities.

This specific_analyses.relax_disp.disp_data.return_index_from_disp_point() 
function was always
subtracting 1 from the dispersion point index to take the reference spectrum 
into account.  This
however fails if R2eff/R1rho data is loaded instead.


Modified:
    branches/relax_disp/specific_analyses/relax_disp/disp_data.py

Modified: branches/relax_disp/specific_analyses/relax_disp/disp_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/disp_data.py?rev=21322&r1=21321&r2=21322&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/disp_data.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/disp_data.py Tue Oct 29 
16:13:56 2013
@@ -1286,18 +1286,23 @@
 
     # Initialise.
     index = 0
+    ref_correction = False
 
     # CPMG-type experiments.
     if exp_type in EXP_TYPE_LIST_CPMG:
         index = cdp.cpmg_frqs_list.index(value)
+        if None in cdp.cpmg_frqs_list:
+            ref_correction = True
 
     # R1rho-type experiments.
     elif exp_type in EXP_TYPE_LIST_R1RHO:
         index = cdp.spin_lock_nu1_list.index(value)
+        if None in cdp.spin_lock_nu1_list:
+            ref_correction = True
 
     # Remove the reference point (always at index 0).
     for id in loop_spectrum_ids(exp_type=exp_type):
-        if get_curve_type(id) == 'fixed time':
+        if ref_correction and get_curve_type(id) == 'fixed time':
             index -= 1
             break