r19340 - /branches/relax_disp/specific_analyses/relax_disp.py -- April 03, 2013 - 19:51

Author: bugman
Date: Wed Apr  3 19:51:16 2013
New Revision: 19340

URL: http://svn.gna.org/viewcvs/relax?rev=19340&view=rev
Log:
Renamed cdp.curve_type to cdp.model to better explain the variable.


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=19340&r1=19339&r2=19340&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp.py Wed Apr  3 19:51:16 
2013
@@ -698,7 +698,7 @@
         """
 
         # Set the model.
-        cdp.curve_type = model
+        cdp.model = model
 
         # Loop over the sequence.
         for spin in spin_loop():
@@ -928,7 +928,7 @@
             raise RelaxError("The relaxation dispersion experiment type has 
not been specified.")
 
         # Test if the model has been set.
-        if not hasattr(cdp, 'curve_type'):
+        if not hasattr(cdp, 'model'):
             raise RelaxError("The relaxation dispersion model has not been 
specified.")
 
         # Test if the curve count exists.
@@ -1028,7 +1028,7 @@
                     print("Unconstrained grid search size: %s (constraints 
may decrease this size).\n" % grid_size)
 
             # Initialise the function to minimise.
-            model = Dispersion(model=cdp.curve_type, 
num_params=self._param_num(spins=spins), num_times=num_time_pts, 
curve_num=cdp.curve_count, values=values, errors=errors, cpmg_frqs=cpmg_frqs, 
spin_lock_nu1=spin_lock_nu1, scaling_matrix=scaling_matrix)
+            model = Dispersion(model=cdp.model, 
num_params=self._param_num(spins=spins), num_times=num_time_pts, 
curve_num=cdp.curve_count, values=values, errors=errors, cpmg_frqs=cpmg_frqs, 
spin_lock_nu1=spin_lock_nu1, scaling_matrix=scaling_matrix)
 
             # Setup the minimisation algorithm when constraints are present.
             if constraints and not match('^[Gg]rid', min_algor):