mailr22865 - in /trunk: auto_analyses/relax_disp.py user_functions/value.py


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by tlinnet on April 28, 2014 - 16:09:
Author: tlinnet
Date: Mon Apr 28 16:09:21 2014
New Revision: 22865

URL: http://svn.gna.org/viewcvs/relax?rev=22865&view=rev
Log:
Fix for setting index=None, when setting default values for parameters.

Feature request: #3151, (https://gna.org/support/index.php?3151) - User 
function to set the R20 parameters in the default grid search using the 
minimum R2eff value.

Modified:
    trunk/auto_analyses/relax_disp.py
    trunk/user_functions/value.py

Modified: trunk/auto_analyses/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/relax_disp.py?rev=22865&r1=22864&r2=22865&view=diff
==============================================================================
--- trunk/auto_analyses/relax_disp.py   (original)
+++ trunk/auto_analyses/relax_disp.py   Mon Apr 28 16:09:21 2014
@@ -381,7 +381,7 @@
                 # Default values.
                 else:
                     for param in MODEL_PARAMS[model]:
-                        self.interpreter.value.set(param=param)
+                        self.interpreter.value.set(param=param, index=None)
 
         # Minimise.
         self.interpreter.minimise('simplex', func_tol=self.opt_func_tol, 
max_iter=self.opt_max_iterations, constraints=True)

Modified: trunk/user_functions/value.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/user_functions/value.py?rev=22865&r1=22864&r2=22865&view=diff
==============================================================================
--- trunk/user_functions/value.py       (original)
+++ trunk/user_functions/value.py       Mon Apr 28 16:09:21 2014
@@ -318,7 +318,8 @@
     min = 0,
     max = 10000000,
     desc_short = "index for list-type parameters",
-    desc = "The list index for when the parameter is a list of values.  This 
is ignored in all other cases."
+    desc = "The list index for when the parameter is a list of values.  This 
is ignored in all other cases.",
+    can_be_none = True
 )
 uf.add_keyarg(
     name = "spin_id",




Related Messages


Powered by MHonArc, Updated Mon Apr 28 16:20:02 2014