r9612 - in /1.3/generic_fns: pcs.py rdc.py -- October 07, 2009 - 09:43

Author: bugman
Date: Wed Oct  7 09:43:42 2009
New Revision: 9612

URL: http://svn.gna.org/viewcvs/relax?rev=9612&view=rev
Log:
Bug fixes for the RDC and PCS read() functions.

The alignment tensor ID had the same variable name as the spin ID!


Modified:
    1.3/generic_fns/pcs.py
    1.3/generic_fns/rdc.py

Modified: 1.3/generic_fns/pcs.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/pcs.py?rev=9612&r1=9611&r2=9612&view=diff
==============================================================================
--- 1.3/generic_fns/pcs.py (original)
+++ 1.3/generic_fns/pcs.py Wed Oct  7 09:43:42 2009
@@ -437,11 +437,11 @@
     return index
 
 
-def read(id=None, file=None, dir=None, file_data=None, spin_id_col=None, 
mol_name_col=None, res_num_col=None, res_name_col=None, spin_num_col=None, 
spin_name_col=None, data_col=None, error_col=None, sep=None, spin_id=None):
+def read(align_id=None, file=None, dir=None, file_data=None, 
spin_id_col=None, mol_name_col=None, res_num_col=None, res_name_col=None, 
spin_num_col=None, spin_name_col=None, data_col=None, error_col=None, 
sep=None, spin_id=None):
     """Read the PCS data from file.
 
-    @param id:              The alignment tensor ID string.
-    @type id:               str
+    @param align_id:        The alignment tensor ID string.
+    @type align_id:         str
     @param file:            The name of the file to open.
     @type file:             str
     @param dir:             The directory containing the file (defaults to 
the current directory
@@ -550,8 +550,8 @@
         cdp.pcs_ids = []
 
     # Add the PCS id string.
-    if id not in cdp.pcs_ids:
-        cdp.pcs_ids.append(id)
+    if align_id not in cdp.pcs_ids:
+        cdp.pcs_ids.append(align_id)
 
 
 def return_data_desc(name):

Modified: 1.3/generic_fns/rdc.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/rdc.py?rev=9612&r1=9611&r2=9612&view=diff
==============================================================================
--- 1.3/generic_fns/rdc.py (original)
+++ 1.3/generic_fns/rdc.py Wed Oct  7 09:43:42 2009
@@ -362,11 +362,11 @@
     return index
 
 
-def read(id=None, file=None, dir=None, file_data=None, spin_id_col=None, 
mol_name_col=None, res_num_col=None, res_name_col=None, spin_num_col=None, 
spin_name_col=None, data_col=None, error_col=None, sep=None, spin_id=None):
+def read(align_id=None, file=None, dir=None, file_data=None, 
spin_id_col=None, mol_name_col=None, res_num_col=None, res_name_col=None, 
spin_num_col=None, spin_name_col=None, data_col=None, error_col=None, 
sep=None, spin_id=None):
     """Read the RDC data from file.
 
-    @keyword id:            The alignment tensor ID string.
-    @type id:               str
+    @keyword align_id:      The alignment tensor ID string.
+    @type align_id:         str
     @keyword file:          The name of the file to open.
     @type file:             str
     @keyword dir:           The directory containing the file (defaults to 
the current directory
@@ -473,8 +473,8 @@
         cdp.rdc_ids = []
 
     # Add the RDC id string.
-    if id not in cdp.rdc_ids:
-        cdp.rdc_ids.append(id)
+    if align_id not in cdp.rdc_ids:
+        cdp.rdc_ids.append(align_id)
 
 
 def return_data_desc(name):