r25111 - /trunk/specific_analyses/relax_disp/parameters.py -- August 20, 2014 - 19:16

Author: tlinnet
Date: Wed Aug 20 19:16:05 2014
New Revision: 25111

URL: http://svn.gna.org/viewcvs/relax?rev=25111&view=rev
Log:
Revert of commit r25002 in branches/R1_fitting.

This was not the correct implementation, since copying of 'R2eff' is
not really a "parameter", which can be "fitted" in the sence of the 
dispersion models.

Rather, R2eff should be copied, with value.copy() function.

Modified:
    trunk/specific_analyses/relax_disp/parameters.py

Modified: trunk/specific_analyses/relax_disp/parameters.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/parameters.py?rev=25111&r1=25110&r2=25111&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/parameters.py    (original)
+++ trunk/specific_analyses/relax_disp/parameters.py    Wed Aug 20 19:16:05 
2014
@@ -269,18 +269,8 @@
                 if param in ['r2', 'r2a', 'r2b', 'pA', 'pB', 'pC', 'kex', 
'kex_AB', 'kex_AC', 'kex_BC', 'k_AB', 'kB', 'kC', 'tex']:
                     continue
 
-                elif param == 'r2eff':
-                    # Copy the value.
-                    setattr(spin_to, param, deepcopy(getattr(spin_from, 
param)))
-
-                    # If error estimation exists.
-                    param_err = '%s_err' % param
-                    if hasattr(spin_from, param_err):
-                        setattr(spin_to, param_err, 
deepcopy(getattr(spin_from, param_err)))
-
-                else:
-                    # Copy the value.
-                    setattr(spin_to, param, deepcopy(getattr(spin_from, 
param)))
+                # Copy the value.
+                setattr(spin_to, param, deepcopy(getattr(spin_from, param)))
 
     # Switch back to the original data pipe.
     pipes.switch(pipe_orig)