r21855 - /trunk/specific_analyses/relax_disp/disp_data.py -- December 07, 2013 - 17:41

Author: bugman
Date: Sat Dec  7 17:41:19 2013
New Revision: 21855

URL: http://svn.gna.org/viewcvs/relax?rev=21855&view=rev
Log:
Changed some warnings in the dispersion analysis so they only show if R1rho 
data is loaded.

This is for missing chemical shifts and R1 data.


Modified:
    trunk/specific_analyses/relax_disp/disp_data.py

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=21855&r1=21854&r2=21855&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/disp_data.py (original)
+++ trunk/specific_analyses/relax_disp/disp_data.py Sat Dec  7 17:41:19 2013
@@ -2651,7 +2651,7 @@
         shift = 0.0
         if hasattr(spin, 'chemical_shift'):
             shift = spin.chemical_shift
-        else:
+        elif has_r1rho_exp_type():
             warn(RelaxWarning("The chemical shift for the spin '%s' cannot 
be found.  Be careful, it is being set to 0.0 ppm so offset calculations will 
probably be wrong!" % spin_id))
 
         # Loop over the experiments and spectrometer frequencies.
@@ -2800,7 +2800,8 @@
 
     # Check for the presence of data.
     if not hasattr(cdp, 'ri_ids'):
-        warn(RelaxWarning("No R1 relaxation data has been loaded.  This is 
essential for the proper handling of offsets in off-resonance R1rho 
experiments."))
+        if has_r1rho_exp_type():
+            warn(RelaxWarning("No R1 relaxation data has been loaded.  This 
is essential for the proper handling of offsets in off-resonance R1rho 
experiments."))
         return 0.0 * r1
 
     # Loop over the Rx IDs.