Author: bugman Date: Thu Feb 7 13:38:09 2008 New Revision: 4929 URL: http://svn.gna.org/viewcvs/relax?rev=4929&view=rev Log: Replaced all calls to count_spins() with exists_mol_res_spin_data(). Modified: 1.3/generic_fns/structure.py Modified: 1.3/generic_fns/structure.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure.py?rev=4929&r1=4928&r2=4929&view=diff ============================================================================== --- 1.3/generic_fns/structure.py (original) +++ 1.3/generic_fns/structure.py Thu Feb 7 13:38:09 2008 @@ -37,7 +37,6 @@ from relax_errors import RelaxError, RelaxFileError, RelaxNoPdbChainError, RelaxNoPdbError, RelaxNoResError, RelaxNoPipeError, RelaxNoSequenceError, RelaxNoTensorError, RelaxNoVectorsError, RelaxPdbError, RelaxPdbLoadError, RelaxRegExpError from relax_io import get_file_path from relax_warnings import RelaxNoAtomWarning, RelaxNoPDBFileWarning, RelaxWarning, RelaxZeroVectorWarning -from selection import count_spins @@ -916,7 +915,7 @@ raise RelaxPdbError # Test if sequence data is loaded. - if not load_seq and not count_spins(): + if not load_seq and not exists_mol_res_spin_data(): raise RelaxNoSequenceError # The file path. @@ -951,7 +950,7 @@ ######### # Sequence loading. - if load_seq and not count_spins(): + if load_seq and not exists_mol_res_spin_data(): load_PDB_sequence() # Load into Molmol (if running).