r5836 - /1.3/specific_fns/relax_data.py -- April 20, 2008 - 12:54

Author: bugman
Date: Sun Apr 20 12:54:02 2008
New Revision: 5836

URL: http://svn.gna.org/viewcvs/relax?rev=5836&view=rev
Log:
The generate_spin_id_data_array() fn is now called in the read() method.


Modified:
    1.3/specific_fns/relax_data.py

Modified: 1.3/specific_fns/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_data.py?rev=5836&r1=5835&r2=5836&view=diff
==============================================================================
--- 1.3/specific_fns/relax_data.py (original)
+++ 1.3/specific_fns/relax_data.py Sun Apr 20 12:54:02 2008
@@ -27,7 +27,7 @@
 # relax module imports.
 from data import Data as relax_data_store
 from generic_fns import pipes
-from generic_fns.selection import exists_mol_res_spin_data, 
generate_spin_id, return_spin, spin_loop
+from generic_fns.selection import exists_mol_res_spin_data, 
generate_spin_id_data_array, return_spin, spin_loop
 from relax_errors import RelaxError, RelaxNoResError, RelaxNoRiError, 
RelaxNoPipeError, RelaxNoSequenceError, RelaxNoSpinError, RelaxRiError
 from relax_io import extract_data, strip
 
@@ -624,7 +624,7 @@
                 continue
 
             # Generate the spin identification string.
-            id = generate_spin_id(data=file_data[i], 
mol_name_col=mol_name_col, res_num_col=res_num_col, 
res_name_col=res_name_col, spin_num_col=spin_num_col, 
spin_name_col=spin_name_col)
+            id = generate_spin_id_data_array(data=file_data[i], 
mol_name_col=mol_name_col, res_num_col=res_num_col, 
res_name_col=res_name_col, spin_num_col=spin_num_col, 
spin_name_col=spin_name_col)
 
             # Convert the data.
             value = eval(file_data[i][data_col])