r10032 - /1.3/specific_fns/api_common.py -- December 01, 2009 - 00:12

Author: bugman
Date: Tue Dec  1 00:12:25 2009
New Revision: 10032

URL: http://svn.gna.org/viewcvs/relax?rev=10032&view=rev
Log:
Added checks for spin specific, analysis API common methods to see if 
model_info is a SpinContainer.


Modified:
    1.3/specific_fns/api_common.py

Modified: 1.3/specific_fns/api_common.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/api_common.py?rev=10032&r1=10031&r2=10032&view=diff
==============================================================================
--- 1.3/specific_fns/api_common.py (original)
+++ 1.3/specific_fns/api_common.py Tue Dec  1 00:12:25 2009
@@ -28,6 +28,7 @@
 
 # relax module imports.
 import arg_check
+from data.mol_res_spin import SpinContainer
 from generic_fns.mol_res_spin import count_spins, exists_mol_res_spin_data, 
return_spin, spin_loop
 from relax_errors import RelaxError, RelaxLenError, RelaxNoSequenceError
 
@@ -314,7 +315,9 @@
         @type error:        float
         """
 
-        # Assume the default of a spin container.
+        # The spin container.
+        if not isinstance(model_info, SpinContainer):
+            raise RelaxError("The model information argument is not a spin 
container.")
         spin = model_info
 
         # Parameter increment counter.
@@ -410,7 +413,9 @@
         @type select_sim:   bool
         """
 
-        # Assume the default of a spin container.
+        # The spin container.
+        if not isinstance(model_info, SpinContainer):
+            raise RelaxError("The model information argument is not a spin 
container.")
         spin = model_info
 
         # Set the array.
@@ -509,7 +514,9 @@
         @rtype:             list of float or float
         """
 
-        # Assume the default of a spin container.
+        # The spin container.
+        if not isinstance(model_info, SpinContainer):
+            raise RelaxError("The model information argument is not a spin 
container.")
         spin = model_info
 
         # Index.
@@ -532,7 +539,9 @@
         @rtype:             list of float
         """
 
-        # Assume the default of a spin container.
+        # The spin container.
+        if not isinstance(model_info, SpinContainer):
+            raise RelaxError("The model information argument is not a spin 
container.")
         spin = model_info
 
         # Parameter increment counter.
@@ -557,7 +566,9 @@
         @rtype:             list of int
         """
 
-        # Assume the default of a spin container.
+        # The spin container.
+        if not isinstance(model_info, SpinContainer):
+            raise RelaxError("The model information argument is not a spin 
container.")
         spin = model_info
 
         # Return the array.