r23549 - /branches/disp_speed/specific_analyses/relax_disp/parameter_object.py -- May 28, 2014 - 18:08

Author: tlinnet
Date: Wed May 28 18:08:27 2014
New Revision: 23549

URL: http://svn.gna.org/viewcvs/relax?rev=23549&view=rev
Log:
FIx for incorrectly svnmerge command.

To complete the full reverse, I should have gone one reversion number down.

The command used was:
svn merge -r23526:23504 .

.....
    ------------------------------------------------------------------------
    r23526 | tlinnet | 2014-05-28 16:49:00 +0200 (Wed, 28 May 2014) | 13 lines

    Added the default value lower grid value to be set for the pA parameter.

    This is added in the collected table of 
specific_analysis/relax_disp/parameter_object.py

    This is related to: task #7793: (https://gna.org/task/?7793) Speed-up of 
dispersion models.
    Discussed in post 
http://thread.gmane.org/gmane.science.nmr.relax.devel/5986.

    In any function, these default values can get accessed by:

    from specific_analyses.relax_disp.parameter_object import 
Relax_disp_params
    PARAMS = Relax_disp_params()
    PARAMS.default_value('pA')
    PARAMS.grid_lower('pA')
    ------------------------------------------------------------------------
.....



Modified:
    branches/disp_speed/specific_analyses/relax_disp/parameter_object.py

Modified: branches/disp_speed/specific_analyses/relax_disp/parameter_object.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_speed/specific_analyses/relax_disp/parameter_object.py?rev=23549&r1=23548&r2=23549&view=diff
==============================================================================
--- branches/disp_speed/specific_analyses/relax_disp/parameter_object.py      
  (original)
+++ branches/disp_speed/specific_analyses/relax_disp/parameter_object.py      
  Wed May 28 18:08:27 2014
@@ -61,7 +61,7 @@
         self._add('r2', scope='spin', default=10.0, desc='The transversal 
relaxation rate', set='params', py_type=dict, grace_string='\\qR\\s2\\N\\Q 
(rad.s\\S-1\\N)', err=True, sim=True)
         self._add('r2a', scope='spin', default=10.0, desc='The transversal 
relaxation rate for state A in the absence of exchange', set='params', 
py_type=dict, grace_string='\\qR\\s2,A\\N\\Q (rad.s\\S-1\\N)', err=True, 
sim=True)
         self._add('r2b', scope='spin', default=10.0, desc='The transversal 
relaxation rate for state B in the absence of exchange', set='params', 
py_type=dict, grace_string='\\qR\\s2,B\\N\\Q (rad.s\\S-1\\N)', err=True, 
sim=True)
-        self._add('pA', scope='spin', default=0.90, grid_lower=0.5, 
desc='The population for state A', set='params', py_type=float, 
grace_string='\\qp\\sA\\N\\Q', err=True, sim=True)
+        self._add('pA', scope='spin', default=0.90, desc='The population for 
state A', set='params', py_type=float, grace_string='\\qp\\sA\\N\\Q', 
err=True, sim=True)
         self._add('pB', scope='spin', default=0.5, desc='The population for 
state B', set='params', py_type=float, grace_string='\\qp\\sB\\N\\Q', 
err=True, sim=True)
         self._add('pC', scope='spin', default=0.5, desc='The population for 
state C', set='params', py_type=float, grace_string='\\qp\\sC\\N\\Q', 
err=True, sim=True)
         self._add('phi_ex', scope='spin', default=5.0, desc='The phi_ex = 
pA.pB.dw**2 value (ppm^2)', set='params', py_type=float, 
grace_string='\\xF\\B\\sex\\N = \\q p\\sA\\N.p\\sB\\N.\\xDw\\B\\S2\\N\\Q  
(ppm\\S2\\N)', err=True, sim=True)