r15255 - /1.3/generic_fns/value.py -- January 26, 2012 - 10:32

Author: bugman
Date: Thu Jan 26 10:32:55 2012
New Revision: 15255

URL: http://svn.gna.org/viewcvs/relax?rev=15255&view=rev
Log:
Big bugfix for the value.read user function.

This is for bug #19332 (https://gna.org/bugs/?19332).

The problem was that the wrong spin ID string was being used to set the 
parameter value so that
all spins have the same value set for the parameter.


Modified:
    1.3/generic_fns/value.py

Modified: 1.3/generic_fns/value.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/value.py?rev=15255&r1=15254&r2=15255&view=diff
==============================================================================
--- 1.3/generic_fns/value.py (original)
+++ 1.3/generic_fns/value.py Thu Jan 26 10:32:55 2012
@@ -200,31 +200,21 @@
     @type scaling:          float
     @keyword file:          The name of the file to open.
     @type file:             str
-    @keyword dir:           The directory containing the file (defaults to 
the current directory if
-                            None).
+    @keyword dir:           The directory containing the file (defaults to 
the current directory if None).
     @type dir:              str or None
-    @keyword file_data:     An alternative to opening a file, if the data 
already exists in the
-                            correct format.  The format is a list of lists 
where the first index
-                            corresponds to the row and the second the column.
+    @keyword file_data:     An alternative to opening a file, if the data 
already exists in the correct format.  The format is a list of lists where 
the first index corresponds to the row and the second the column.
     @type file_data:        list of lists
-    @keyword spin_id_col:   The column containing the spin ID strings.  If 
supplied, the
-                            mol_name_col, res_name_col, res_num_col, 
spin_name_col, and spin_num_col
-                            arguments must be none.
+    @keyword spin_id_col:   The column containing the spin ID strings.  If 
supplied, the mol_name_col, res_name_col, res_num_col, spin_name_col, and 
spin_num_col arguments must be none.
     @type spin_id_col:      int or None
-    @keyword mol_name_col:  The column containing the molecule name 
information.  If supplied,
-                            spin_id_col must be None.
+    @keyword mol_name_col:  The column containing the molecule name 
information.  If supplied, spin_id_col must be None.
     @type mol_name_col:     int or None
-    @keyword res_name_col:  The column containing the residue name 
information.  If supplied,
-                            spin_id_col must be None.
+    @keyword res_name_col:  The column containing the residue name 
information.  If supplied, spin_id_col must be None.
     @type res_name_col:     int or None
-    @keyword res_num_col:   The column containing the residue number 
information.  If supplied,
-                            spin_id_col must be None.
+    @keyword res_num_col:   The column containing the residue number 
information.  If supplied, spin_id_col must be None.
     @type res_num_col:      int or None
-    @keyword spin_name_col: The column containing the spin name information. 
 If supplied,
-                            spin_id_col must be None.
+    @keyword spin_name_col: The column containing the spin name information. 
 If supplied, spin_id_col must be None.
     @type spin_name_col:    int or None
-    @keyword spin_num_col:  The column containing the spin number 
information.  If supplied,
-                            spin_id_col must be None.
+    @keyword spin_num_col:  The column containing the spin number 
information.  If supplied, spin_id_col must be None.
     @type spin_num_col:     int or None
     @keyword data_col:      The column containing the RDC data in Hz.
     @type data_col:         int or None
@@ -289,7 +279,7 @@
             id, error = data
 
         # Set the value.
-        set_fn(val=value, error=error, param=param, spin_id=spin_id)
+        set_fn(val=value, error=error, param=param, spin_id=id)
 
     # Reset the minimisation statistics.
     if not min_stat: