r17969 - in /branches/frame_order_testing: ./ user_functions/minimisation.py -- November 14, 2012 - 12:26

Author: bugman
Date: Wed Nov 14 12:26:26 2012
New Revision: 17969

URL: http://svn.gna.org/viewcvs/relax?rev=17969&view=rev
Log:
Merged revisions 17968 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r17968 | bugman | 2012-11-14 12:23:56 +0100 (Wed, 14 Nov 2012) | 6 lines
  
  Bug fix for the grid_search user function.
  
  The elements of the list of integers can be None to indicate that no grid 
search in that dimension
  is to be performed.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/user_functions/minimisation.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Nov 14 12:26:26 2012
@@ -1,1 +1,1 @@
-/trunk:1-17960
+/trunk:1-17968

Modified: branches/frame_order_testing/user_functions/minimisation.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/user_functions/minimisation.py?rev=17969&r1=17968&r2=17969&view=diff
==============================================================================
--- branches/frame_order_testing/user_functions/minimisation.py (original)
+++ branches/frame_order_testing/user_functions/minimisation.py Wed Nov 14 
12:26:26 2012
@@ -76,7 +76,8 @@
     default = 21,
     py_type = "int_or_int_list",
     desc_short = "incrementation value",
-    desc = "The number of increments to search over.  If a single integer is 
given then the number of increments will be equal in all dimensions.  
Different numbers of increments in each direction can be set if 'inc' is set 
to an array of integers of length equal to the number of parameters."
+    desc = "The number of increments to search over.  If a single integer is 
given then the number of increments will be equal in all dimensions.  
Different numbers of increments in each direction can be set if 'inc' is set 
to an array of integers of length equal to the number of parameters.",
+    none_elements = True
 )
 
 uf.add_keyarg(