r21815 - /trunk/pipe_control/spectrum.py -- December 06, 2013 - 09:57

Author: tlinnet
Date: Fri Dec  6 09:57:18 2013
New Revision: 21815

URL: http://svn.gna.org/viewcvs/relax?rev=21815&view=rev
Log:
Changed to use return_spin for testing presence of spin.

Work in progress for Support Request #3044, 
(https://gna.org/support/index.php?3044) - Load spins from SPARKY list.

Modified:
    trunk/pipe_control/spectrum.py

Modified: trunk/pipe_control/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/spectrum.py?rev=21815&r1=21814&r2=21815&view=diff
==============================================================================
--- trunk/pipe_control/spectrum.py (original)
+++ trunk/pipe_control/spectrum.py Fri Dec  6 09:57:18 2013
@@ -37,7 +37,7 @@
 from lib.statistics import std
 from lib.warnings import RelaxWarning, RelaxNoSpinWarning
 from pipe_control import pipes
-from pipe_control.mol_res_spin import are_spins_named, 
check_mol_res_spin_data, create_spin, generate_spin_id_unique, return_spin, 
spin_loop
+from pipe_control.mol_res_spin import check_mol_res_spin_data, create_spin, 
generate_spin_id_unique, return_spin, spin_loop
 
 
 def __errors_height_no_repl():
@@ -661,7 +661,7 @@
         spin_id = generate_spin_id_unique(mol_name=mol_name, 
res_num=res_num, res_name=res_name, spin_name=spin_name)
 
         # Check if the spin already exist.
-        if not are_spins_named(spin_id=spin_id):
+        if return_spin(spin_id=spin_id) == None:
             # Create the spin if not exist.
             create_spin(spin_num=spin_num, spin_name=spin_name, 
res_num=res_num, res_name=res_name, mol_name=mol_name)