r4019 - in /1.3/generic_fns: angles.py dasha.py diffusion_tensor.py fix.py structure.py -- November 26, 2007 - 15:23

Author: bugman
Date: Mon Nov 26 15:22:47 2007
New Revision: 4019

URL: http://svn.gna.org/viewcvs/relax?rev=4019&view=rev
Log:
Changed all parts of relax to use the modified RelaxTensorError and 
RelaxNoTensorError classes.


Modified:
    1.3/generic_fns/angles.py
    1.3/generic_fns/dasha.py
    1.3/generic_fns/diffusion_tensor.py
    1.3/generic_fns/fix.py
    1.3/generic_fns/structure.py

Modified: 1.3/generic_fns/angles.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/angles.py?rev=4019&r1=4018&r2=4019&view=diff
==============================================================================
--- 1.3/generic_fns/angles.py (original)
+++ 1.3/generic_fns/angles.py Mon Nov 26 15:22:47 2007
@@ -49,7 +49,7 @@
 
     # Test if the diffusion tensor data is loaded.
     if not diff_data_exists():
-        raise RelaxNoTensorError
+        raise RelaxNoTensorError, 'diffusion'
 
     # Sphere.
     if cdp.diff_tensor.type == 'sphere':

Modified: 1.3/generic_fns/dasha.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/dasha.py?rev=4019&r1=4018&r2=4019&view=diff
==============================================================================
--- 1.3/generic_fns/dasha.py (original)
+++ 1.3/generic_fns/dasha.py Mon Nov 26 15:22:47 2007
@@ -63,7 +63,7 @@
 
         # Test if diffusion tensor data for the run exists.
         if self.param_set != 'local_tm' and not 
relax_data_store.diff.has_key(self.run):
-            raise RelaxNoTensorError, self.run
+            raise RelaxNoTensorError, 'diffusion'
 
         # Test if the PDB file has been loaded (for the spheroid and 
ellipsoid).
         if self.param_set != 'local_tm' and 
relax_data_store.diff[self.run].type != 'sphere' and not 
relax_data_store.pdb.has_key(self.run):

Modified: 1.3/generic_fns/diffusion_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/diffusion_tensor.py?rev=4019&r1=4018&r2=4019&view=diff
==============================================================================
--- 1.3/generic_fns/diffusion_tensor.py (original)
+++ 1.3/generic_fns/diffusion_tensor.py Mon Nov 26 15:22:47 2007
@@ -58,11 +58,11 @@
 
     # Test if pipe_from contains diffusion tensor data.
     if not diff_data_exists(pipe_from):
-        raise RelaxNoTensorError
+        raise RelaxNoTensorError, 'diffusion'
 
     # Test if pipe_to contains diffusion tensor data.
     if diff_data_exists(pipe_to):
-        raise RelaxTensorError
+        raise RelaxTensorError, 'diffusion'
 
     # Copy the data.
     relax_data_store[pipe_to].diff_tensor = 
deepcopy(relax_data_store[pipe_from].diff_tensor)
@@ -141,7 +141,7 @@
 
     # Test if diffusion tensor data exists.
     if not diff_data_exists():
-        raise RelaxNoTensorError
+        raise RelaxNoTensorError, 'diffusion'
 
     # Delete the diffusion data.
     del(relax_data_store[relax_data_store.current_pipe].diff_tensor)
@@ -178,7 +178,7 @@
 
     # Test if diffusion tensor data exists.
     if not diff_data_exists():
-        raise RelaxNoTensorError
+        raise RelaxNoTensorError, 'diffusion'
 
     # Alias the current data pipe.
     cdp = relax_data_store[relax_data_store.current_pipe]
@@ -533,7 +533,7 @@
 
     # Test if diffusion tensor data already exists.
     if diff_data_exists():
-        raise RelaxTensorError
+        raise RelaxTensorError, 'diffusion'
 
     # Check the validity of the angle_units argument.
     valid_types = ['deg', 'rad']

Modified: 1.3/generic_fns/fix.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/fix.py?rev=4019&r1=4018&r2=4019&view=diff
==============================================================================
--- 1.3/generic_fns/fix.py (original)
+++ 1.3/generic_fns/fix.py Mon Nov 26 15:22:47 2007
@@ -49,7 +49,7 @@
         if element == 'diff':
             # Test if the diffusion tensor data is loaded.
             if not relax_data_store.diff.has_key(run):
-                raise RelaxNoTensorError, run
+                raise RelaxNoTensorError, 'diffusion'
 
             # Set the fixed flag.
             relax_data_store.diff[run].fixed = fixed
@@ -74,7 +74,7 @@
 
             # Test if the diffusion tensor data is loaded.
             if not relax_data_store.diff.has_key(run):
-                raise RelaxNoTensorError, run
+                raise RelaxNoTensorError, 'diffusion'
 
             # Set the fixed flag for the diffusion tensor.
             relax_data_store.diff[run].fixed = fixed

Modified: 1.3/generic_fns/structure.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure.py?rev=4019&r1=4018&r2=4019&view=diff
==============================================================================
--- 1.3/generic_fns/structure.py (original)
+++ 1.3/generic_fns/structure.py Mon Nov 26 15:22:47 2007
@@ -295,7 +295,7 @@
 
             # Test if the diffusion tensor data is loaded.
             if not relax_data_store.diff.has_key(self.run):
-                raise RelaxNoTensorError, self.run
+                raise RelaxNoTensorError, 'diffusion'
 
             # Test if the PDB file of the macromolecule has been loaded.
             if not relax_data_store.pdb.has_key(self.run):