r24939 - in /branches/R1_fitting: specific_analyses/relax_disp/variables.py target_functions/relax_disp.py -- August 04, 2014 - 16:28

Author: tlinnet
Date: Mon Aug  4 16:28:03 2014
New Revision: 24939

URL: http://svn.gna.org/viewcvs/relax?rev=24939&view=rev
Log:
Added model  MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR, to list of 
models who has who dw parameters.

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/variables.py
    branches/R1_fitting/target_functions/relax_disp.py

Modified: branches/R1_fitting/specific_analyses/relax_disp/variables.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/R1_fitting/specific_analyses/relax_disp/variables.py?rev=24939&r1=24938&r2=24939&view=diff
==============================================================================
--- branches/R1_fitting/specific_analyses/relax_disp/variables.py       
(original)
+++ branches/R1_fitting/specific_analyses/relax_disp/variables.py       Mon 
Aug  4 16:28:03 2014
@@ -233,7 +233,7 @@
 MODEL_PARAM_R20B = [MODEL_B14_FULL, MODEL_CR72_FULL, 
MODEL_NS_CPMG_2SITE_3D_FULL, MODEL_NS_CPMG_2SITE_STAR_FULL]
 """Models using R20B."""
 
-MODEL_PARAM_DW_MIX_DOUBLE = [MODEL_LM63_3SITE, MODEL_MMQ_CR72, 
MODEL_NS_MMQ_2SITE]
+MODEL_PARAM_DW_MIX_DOUBLE = [MODEL_LM63_3SITE, MODEL_MMQ_CR72, 
MODEL_NS_MMQ_2SITE, MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR]
 """Models using parameters with mixed dw, and has two variables. For example 
with both dw and dwH or dw_AB and dw_BC or phi_ex_B and phi_ex_C."""
 
 

Modified: branches/R1_fitting/target_functions/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/R1_fitting/target_functions/relax_disp.py?rev=24939&r1=24938&r2=24939&view=diff
==============================================================================
--- branches/R1_fitting/target_functions/relax_disp.py  (original)
+++ branches/R1_fitting/target_functions/relax_disp.py  Mon Aug  4 16:28:03 
2014
@@ -413,10 +413,6 @@
 
         # For models with both dw and dwH or dw_AB and dw_BC or phi_ex_B and 
phi_ex_C.
         if model in MODEL_PARAM_DW_MIX_DOUBLE:
-            self.end_index.append(self.end_index[-1] + self.NS)
-
-        elif model in [MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR]:
-            self.end_index.append(self.end_index[-1] + self.NS)
             self.end_index.append(self.end_index[-1] + self.NS)
 
         elif model in [MODEL_NS_MMQ_3SITE, MODEL_NS_MMQ_3SITE_LINEAR]: