r19339 - /branches/relax_disp/specific_analyses/relax_disp.py -- April 03, 2013 - 19:50

Author: bugman
Date: Wed Apr  3 19:50:12 2013
New Revision: 19339

URL: http://svn.gna.org/viewcvs/relax?rev=19339&view=rev
Log:
Better setup checking for the relaxation dispersion specific analysis 
minimise() method.


Modified:
    branches/relax_disp/specific_analyses/relax_disp.py

Modified: branches/relax_disp/specific_analyses/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp.py?rev=19339&r1=19338&r2=19339&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp.py Wed Apr  3 19:50:12 
2013
@@ -923,6 +923,21 @@
         if not exists_mol_res_spin_data():
             raise RelaxNoSequenceError
 
+        # Test if the model has been set.
+        if not hasattr(cdp, 'exp_type'):
+            raise RelaxError("The relaxation dispersion experiment type has 
not been specified.")
+
+        # Test if the model has been set.
+        if not hasattr(cdp, 'curve_type'):
+            raise RelaxError("The relaxation dispersion model has not been 
specified.")
+
+        # Test if the curve count exists.
+        if not hasattr(cdp, 'curve_count'):
+            if cdp.exp_type == 'cpmg':
+                raise RelaxError("The CPMG frequencies have not been set 
up.")
+            elif cdp.exp_type == 'r1rho':
+                raise RelaxError("The spin-lock field strengths have not 
been set up.")
+
         # The unique curves for the R2eff fitting (CPMG).
         cpmg_frqs = []
         if cdp.exp_type == 'cpmg':