r25014 - /branches/R1_fitting/specific_analyses/relax_disp/parameters.py -- August 13, 2014 - 21:30

Author: tlinnet
Date: Wed Aug 13 21:30:07 2014
New Revision: 25014

URL: http://svn.gna.org/viewcvs/relax?rev=25014&view=rev
Log:
Fix for the numbers of parameters not getting counted correct.

sr #3135(https://gna.org/support/?3135): Optimisation of the R1 relaxation 
rate for the off-resonance R1rho relaxation dispersion models.

Modified:
    branches/R1_fitting/specific_analyses/relax_disp/parameters.py

Modified: branches/R1_fitting/specific_analyses/relax_disp/parameters.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/R1_fitting/specific_analyses/relax_disp/parameters.py?rev=25014&r1=25013&r2=25014&view=diff
==============================================================================
--- branches/R1_fitting/specific_analyses/relax_disp/parameters.py      
(original)
+++ branches/R1_fitting/specific_analyses/relax_disp/parameters.py      Wed 
Aug 13 21:30:07 2014
@@ -886,6 +886,17 @@
         if len(spin.params) != len(spins[0].params):
             raise RelaxError("The number of parameters for each spin in the 
cluster are not the same.")
 
+    # Count the number of R10 parameters.
+    for spin in spins:
+        # Skip deselected spins.
+        if not spin.select:
+            continue
+
+        for i in range(len(spin.params)):
+            if spin.params[i] in ['r1_fit']:
+                for exp_type, frq in loop_exp_frq():
+                    num += 1
+
     # Count the number of R20 parameters.
     for spin in spins:
         # Skip deselected spins.
@@ -909,7 +920,7 @@
                 num += 1
 
     # Count all other parameters, but only for a single spin.
-    all_params = PARAMS_R20 + spin_params
+    all_params = ['r1_fit'] + PARAMS_R20 + spin_params
     for spin in spins:
         # Skip deselected spins.
         if not spin.select: