r16432 - in /branches/uf_redesign/user_functions: n_state_model.py spectrum.py state.py -- May 24, 2012 - 11:34

Author: bugman
Date: Thu May 24 11:34:35 2012
New Revision: 16432

URL: http://svn.gna.org/viewcvs/relax?rev=16432&view=rev
Log:
Fix for a number of user function definitions.

These problems were picked up by the unit tests.


Modified:
    branches/uf_redesign/user_functions/n_state_model.py
    branches/uf_redesign/user_functions/spectrum.py
    branches/uf_redesign/user_functions/state.py

Modified: branches/uf_redesign/user_functions/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/user_functions/n_state_model.py?rev=16432&r1=16431&r2=16432&view=diff
==============================================================================
--- branches/uf_redesign/user_functions/n_state_model.py (original)
+++ branches/uf_redesign/user_functions/n_state_model.py Thu May 24 11:34:35 
2012
@@ -189,8 +189,7 @@
     name = "N",
     py_type = "int",
     desc_short = "number of states N",
-    desc = "The number of states.",
-    can_be_none = True
+    desc = "The number of states."
 )
 uf.desc = """
 Prior to optimisation, the number of states in the N-state model can be 
specified.  If the number of states is not set, then this parameter will be 
equal to the number of loaded structures - the ensemble size.

Modified: branches/uf_redesign/user_functions/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/user_functions/spectrum.py?rev=16432&r1=16431&r2=16432&view=diff
==============================================================================
--- branches/uf_redesign/user_functions/spectrum.py (original)
+++ branches/uf_redesign/user_functions/spectrum.py Thu May 24 11:34:35 2012
@@ -278,7 +278,7 @@
 )
 uf.add_keyarg(
     name = "int_col",
-    py_type = "int",
+    py_type = "int_or_int_list",
     desc_short = "intensity column",
     desc = "The optional column containing the peak intensity data (used by 
the generic intensity file format, or if the intensities are in a 
non-standard column).",
     can_be_none = True
@@ -333,7 +333,7 @@
 )
 uf.add_keyarg(
     name = "sep",
-    py_type = "int",
+    py_type = "str",
     arg_type = "free format",
     desc_short = "column separator",
     desc = "The column separator used by the generic intensity format (the 
default is white space).",

Modified: branches/uf_redesign/user_functions/state.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/user_functions/state.py?rev=16432&r1=16431&r2=16432&view=diff
==============================================================================
--- branches/uf_redesign/user_functions/state.py (original)
+++ branches/uf_redesign/user_functions/state.py Thu May 24 11:34:35 2012
@@ -45,7 +45,7 @@
 uf.title_short = "Saved state loading."
 uf.add_keyarg(
     name = "state",
-    py_type = "str",
+    py_type = "str_or_inst",
     arg_type = "file sel",
     desc_short = "file name",
     desc = "The file name, which can be a string or a file descriptor 
object, of a saved program state.",