r7037 - in /1.3/specific_fns: model_free/main.py noe.py -- July 30, 2008 - 21:13

Author: semor
Date: Wed Jul 30 21:13:07 2008
New Revision: 7037

URL: http://svn.gna.org/viewcvs/relax?rev=7037&view=rev
Log:
Still the same conversions to the desing concerning the check for the loading 
of the sequence.


Modified:
    1.3/specific_fns/model_free/main.py
    1.3/specific_fns/noe.py

Modified: 1.3/specific_fns/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/main.py?rev=7037&r1=7036&r2=7037&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/main.py (original)
+++ 1.3/specific_fns/model_free/main.py Wed Jul 30 21:13:07 2008
@@ -851,8 +851,8 @@
             raise RelaxFuncSetupError, 
self.relax.specific_setup.get_string(function_type)
 
         # Test if the sequence data is loaded.
-        if not ds.res.has_key(self.run):
-            raise RelaxNoSequenceError, self.run
+        if not exists_mol_res_spin_data():
+            raise RelaxNoSequenceError
 
         # Get all data structure names.
         names = self.data_names()

Modified: 1.3/specific_fns/noe.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/noe.py?rev=7037&r1=7036&r2=7037&view=diff
==============================================================================
--- 1.3/specific_fns/noe.py (original)
+++ 1.3/specific_fns/noe.py Wed Jul 30 21:13:07 2008
@@ -388,8 +388,8 @@
             raise RelaxNoPipeError
 
         # Test if the sequence data is loaded.
-        if not ds.res.has_key(self.run):
-            raise RelaxNoSequenceError, self.run
+        if not exists_mol_res_spin_data():
+            raise RelaxNoSequenceError
 
         # Open the file for writing.
         noe_file = self.relax.IO.open_write_file(file, dir, force)
@@ -435,8 +435,8 @@
             raise RelaxNoPipeError
 
         # Test if sequence data is loaded.
-        if not ds.res.has_key(self.run):
-            raise RelaxNoSequenceError, self.run
+        if not exists_mol_res_spin_data():
+            raise RelaxNoSequenceError
 
 
         # Header.