r8929 - /1.3/generic_fns/relax_data.py -- March 08, 2009 - 22:36

Author: bugman
Date: Sun Mar  8 22:36:03 2009
New Revision: 8929

URL: http://svn.gna.org/viewcvs/relax?rev=8929&view=rev
Log:
None args are now allowed in pack_data(), and the arg lengths are checked.


Modified:
    1.3/generic_fns/relax_data.py

Modified: 1.3/generic_fns/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/relax_data.py?rev=8929&r1=8928&r2=8929&view=diff
==============================================================================
--- 1.3/generic_fns/relax_data.py (original)
+++ 1.3/generic_fns/relax_data.py Sun Mar  8 22:36:03 2009
@@ -547,6 +547,35 @@
                             data to be generated.
     @type gen_seq:          bool
     """
+
+    # The number of spins.
+    N = len(values)
+
+    # Convert None args.
+    if not mol_names:
+        mol_names = [None]*N
+    if not res_nums:
+        res_nums = [None]*N
+    if not res_names:
+        res_names = [None]*N
+    if not spin_nums:
+        spin_nums = [None]*N
+    if not spin_names:
+        spin_names = [None]*N
+
+    # Test the data.
+    if len(errors) != N:
+        raise RelaxError, "The length of the errors arg (%s) does not match 
that of the value arg (%s)." % (len(errors), N)
+    if len(mol_names) != N:
+        raise RelaxError, "The length of the mol_names arg (%s) does not 
match that of the value arg (%s)." % (len(mol_names), N)
+    if len(res_nums) != N:
+        raise RelaxError, "The length of the res_nums arg (%s) does not 
match that of the value arg (%s)." % (len(res_nums), N)
+    if len(res_names) != N:
+        raise RelaxError, "The length of the res_names arg (%s) does not 
match that of the value arg (%s)." % (len(res_names), N)
+    if len(spin_nums) != N:
+        raise RelaxError, "The length of the spin_nums arg (%s) does not 
match that of the value arg (%s)." % (len(spin_nums), N)
+    if len(spin_names) != N:
+        raise RelaxError, "The length of the spin_names arg (%s) does not 
match that of the value arg (%s)." % (len(spin_names), N)
 
     # Get the current data pipe.
     cdp = pipes.get_pipe()