r25135 - /trunk/target_functions/relax_disp.py -- August 21, 2014 - 09:57

Author: bugman
Date: Thu Aug 21 09:57:07 2014
New Revision: 25135

URL: http://svn.gna.org/viewcvs/relax?rev=25135&view=rev
Log:
The r1_fit flag is now used to switch between dispersion target functions.

This is as described in 
http://thread.gmane.org/gmane.science.nmr.relax.scm/22850/focus=6736.

The change makes the '* R1 fit' models now redundant.

Modified:
    trunk/target_functions/relax_disp.py

Modified: trunk/target_functions/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/target_functions/relax_disp.py?rev=25135&r1=25134&r2=25135&view=diff
==============================================================================
--- trunk/target_functions/relax_disp.py        (original)
+++ trunk/target_functions/relax_disp.py        Thu Aug 21 09:57:07 2014
@@ -485,9 +485,10 @@
         if model == MODEL_NOREX:
             self.func = self.func_NOREX
         if model == MODEL_NOREX_R1RHO:
-            self.func = self.func_NOREX_R1RHO
-        if model == MODEL_NOREX_R1RHO_FIT_R1:
-            self.func = self.func_NOREX_R1RHO_FIT_R1
+            if r1_fit:
+                self.func = self.func_NOREX_R1RHO_FIT_R1
+            else:
+                self.func = self.func_NOREX_R1RHO
         if model == MODEL_LM63:
             self.func = self.func_LM63
         if model == MODEL_LM63_3SITE:
@@ -519,25 +520,30 @@
         if model == MODEL_M61B:
             self.func = self.func_M61b
         if model == MODEL_DPL94:
-            self.func = self.func_DPL94
-        if model == MODEL_DPL94_FIT_R1:
-            self.func = self.func_DPL94_fit_r1
+            if r1_fit:
+                self.func = self.func_DPL94_fit_r1
+            else:
+                self.func = self.func_DPL94
         if model == MODEL_TP02:
-            self.func = self.func_TP02
-        if model == MODEL_TP02_FIT_R1:
-            self.func = self.func_TP02_fit_r1
+            if r1_fit:
+                self.func = self.func_TP02_fit_r1
+            else:
+                self.func = self.func_TP02
         if model == MODEL_TAP03:
-            self.func = self.func_TAP03
-        if model == MODEL_TAP03_FIT_R1:
-            self.func = self.func_TAP03_fit_r1
+            if r1_fit:
+                self.func = self.func_TAP03_fit_r1
+            else:
+                self.func = self.func_TAP03
         if model == MODEL_MP05:
-            self.func = self.func_MP05
-        if model == MODEL_MP05_FIT_R1:
-            self.func = self.func_MP05_fit_r1
+            if r1_fit:
+                self.func = self.func_MP05_fit_r1
+            else:
+                self.func = self.func_MP05
         if model == MODEL_NS_R1RHO_2SITE:
-            self.func = self.func_ns_r1rho_2site
-        if model == MODEL_NS_R1RHO_2SITE_FIT_R1:
-            self.func = self.func_ns_r1rho_2site_fit_r1
+            if r1_fit:
+                self.func = self.func_ns_r1rho_2site_fit_r1
+            else:
+                self.func = self.func_ns_r1rho_2site
         if model == MODEL_NS_R1RHO_3SITE:
             self.func = self.func_ns_r1rho_3site
         if model == MODEL_NS_R1RHO_3SITE_LINEAR: