r4015 - /1.3/generic_fns/diffusion_tensor.py -- November 26, 2007 - 15:23

Author: bugman
Date: Mon Nov 26 15:09:19 2007
New Revision: 4015

URL: http://svn.gna.org/viewcvs/relax?rev=4015&view=rev
Log:
Bug fix for generic_fns.align_tensor.return_data_name().

The function now checks that a string is passed into it and that it raises a 
RelaxError when no
parameter matches.


Modified:
    1.3/generic_fns/diffusion_tensor.py

Modified: 1.3/generic_fns/diffusion_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/diffusion_tensor.py?rev=4015&r1=4014&r2=4015&view=diff
==============================================================================
--- 1.3/generic_fns/diffusion_tensor.py (original)
+++ 1.3/generic_fns/diffusion_tensor.py Mon Nov 26 15:09:19 2007
@@ -30,7 +30,7 @@
 from data import Data as relax_data_store
 from data.diff_tensor import DiffTensorData
 import pipes
-from relax_errors import RelaxError, RelaxNoPipeError, RelaxNoTensorError, 
RelaxTensorError, RelaxUnknownParamCombError, RelaxUnknownParamError
+from relax_errors import RelaxError, RelaxNoPipeError, RelaxNoTensorError, 
RelaxStrError, RelaxTensorError, RelaxUnknownParamCombError, 
RelaxUnknownParamError
 
 
 def copy(pipe_from=None, pipe_to=None):
@@ -747,6 +747,10 @@
     
|________________________________________________________|______________|__________________|
     """
 
+    # Enforce that the name must be a string.
+    if type(name) != str:
+        raise RelaxStrError, ('name', name)
+
     # Local tm.
     if search('^tm$', name):
         return 'tm'
@@ -806,6 +810,9 @@
     # phi.
     if search('phi', name):
         return 'phi'
+
+    # No parameter?
+    raise RelaxUnknownParamError, name
 
 
 def return_eigenvalues(run=None):