r26833 - /trunk/specific_analyses/relax_fit/parameters.py -- November 29, 2014 - 11:16

Author: bugman
Date: Sat Nov 29 11:16:08 2014
New Revision: 26833

URL: http://svn.gna.org/viewcvs/relax?rev=26833&view=rev
Log:
Added support for the saturation recovery experiment to parameter disassembly 
function.

This is in the disassemble_param_vector() function of the 
specific_analyses.relax_fit.parameters
module.  This function requires each experiment to be handled separately.


Modified:
    trunk/specific_analyses/relax_fit/parameters.py

Modified: trunk/specific_analyses/relax_fit/parameters.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_fit/parameters.py?rev=26833&r1=26832&r2=26833&view=diff
==============================================================================
--- trunk/specific_analyses/relax_fit/parameters.py     (original)
+++ trunk/specific_analyses/relax_fit/parameters.py     Sat Nov 29 11:16:08 
2014
@@ -87,27 +87,27 @@
 
     # Monte Carlo simulations.
     if sim_index != None:
-        # The relaxation rate.
-        spin.rx_sim[sim_index] = param_vector[0]
+        # Two parameter exponential.
+        if spin.model == 'exp':
+            spin.rx_sim[sim_index] = param_vector[0]
+            spin.i0_sim[sim_index] = param_vector[1]
 
-        # Initial intensity.
-        spin.i0_sim[sim_index] = param_vector[1]
-
-        # Intensity at infinity.
-        if cdp.curve_type == 'inv':
-            spin.iinf_sim[sim_index] = param_vector[2]
+        # Saturation recovery.
+        elif spin.model == 'sat':
+            spin.rx_sim[sim_index] = param_vector[0]
+            spin.iinf_sim[sim_index] = param_vector[1]
 
     # Parameter values.
     else:
-        # The relaxation rate.
-        spin.rx = param_vector[0]
+        # Two parameter exponential.
+        if spin.model == 'exp':
+            spin.rx = param_vector[0]
+            spin.i0 = param_vector[1]
 
-        # Initial intensity.
-        spin.i0 = param_vector[1]
-
-        # Intensity at infinity.
-        if cdp.curve_type == 'inv':
-            spin.iinf = param_vector[2]
+        # Saturation recovery.
+        elif spin.model == 'sat':
+            spin.rx = param_vector[0]
+            spin.iinf = param_vector[1]
 
 
 def linear_constraints(spin=None, scaling_matrix=None):