r25102 - /trunk/auto_analyses/relax_disp.py -- August 20, 2014 - 16:46

Author: tlinnet
Date: Wed Aug 20 16:46:32 2014
New Revision: 25102

URL: http://svn.gna.org/viewcvs/relax?rev=25102&view=rev
Log:
Shortening the text in the auto_analysis, and raises a warning if R1 data has 
not been loaded.

Modified:
    trunk/auto_analyses/relax_disp.py

Modified: trunk/auto_analyses/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/relax_disp.py?rev=25102&r1=25101&r2=25102&view=diff
==============================================================================
--- trunk/auto_analyses/relax_disp.py   (original)
+++ trunk/auto_analyses/relax_disp.py   Wed Aug 20 16:46:32 2014
@@ -124,14 +124,15 @@
             # If 'No Rex' model was translated.
             if no_rex_translated:
                 no_rex_index = models.index(MODEL_NOREX)
-                print("\nThe 'No Rex' model for R1rho off-resonance models 
has been translated to the model: '%s'."%(converted_models[no_rex_index]))
+                text = "\nThe 'No Rex' model for R1rho off-resonance models 
has been translated to the model: '%s'."%(converted_models[no_rex_index])
+                print(text)
             if no_rex_inserted:
                 no_rex_index = models.index(MODEL_NOREX) + 1
-                print("\nThe 'No Rex' model for R1rho off-resonance models 
has been inserted as model: '%s'."%(converted_models[no_rex_index]))
+                text = "\nThe 'No Rex' model for R1rho off-resonance models 
has been inserted as model: '%s'."%(converted_models[no_rex_index])
+                print(text)
             if r1ho_translated:
-                print("\nIMPORTANT: R1 data is missing for this data-pipe.")
-                print("Therefore all of the R1rho off-resonance model has 
been translated into the corresponding models where R1 is fitted.")
-                print("If the R1 parameter should not fitted, consult the 
help pages: help(relax_data.read), to read how to load 'R1 data' before 
analysis.")
+                text = "R1 data is missing.  All R1rho off-resonance models 
have been translated to the corresponding model whereby R1 is fitted.  How to 
read 'R1 data' can be reviewed by 'help(relax_data.read)'."
+                warn(RelaxWarning(text))
 
             print("\nPrevious list of models: %s" % (models))
             print("\nNew list of models: %s" % (converted_models))