r24721 - in /branches/frame_order_cleanup: ./ user_functions/minimisation.py -- July 24, 2014 - 17:28

Author: bugman
Date: Thu Jul 24 17:28:34 2014
New Revision: 24721

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

........
  r24720 | bugman | 2014-07-24 17:19:05 +0200 (Thu, 24 Jul 2014) | 6 lines
  
  Reverted r24718 as this was rubbish.
  
  The command used was:
  svn merge -r24718:24717 .
........

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

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul 24 17:28:34 2014
@@ -1 +1 @@
-/trunk:1-24718
+/trunk:1-24720

Modified: branches/frame_order_cleanup/user_functions/minimisation.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/user_functions/minimisation.py?rev=24721&r1=24720&r2=24721&view=diff
==============================================================================
--- branches/frame_order_cleanup/user_functions/minimisation.py (original)
+++ branches/frame_order_cleanup/user_functions/minimisation.py Thu Jul 24 
17:28:34 2014
@@ -345,7 +345,7 @@
     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.",
-    none_elements = False
+    none_elements = True
 )
 uf.add_keyarg(
     name = "verbosity",