r4130 - /branches/N_state_model/generic_fns/align_tensor.py -- November 29, 2007 - 09:10

Author: bugman
Date: Thu Nov 29 09:10:37 2007
New Revision: 4130

URL: http://svn.gna.org/viewcvs/relax?rev=4130&view=rev
Log:
Updated the generic_fns.align_tensor.delete() function to use the 'tensor' 
key.


Modified:
    branches/N_state_model/generic_fns/align_tensor.py

Modified: branches/N_state_model/generic_fns/align_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/generic_fns/align_tensor.py?rev=4130&r1=4129&r2=4130&view=diff
==============================================================================
--- branches/N_state_model/generic_fns/align_tensor.py (original)
+++ branches/N_state_model/generic_fns/align_tensor.py Thu Nov 29 09:10:37 
2007
@@ -135,8 +135,12 @@
     return 0.0
 
 
-def delete():
-    """Function for deleting alignment tensor data."""
+def delete(tensor):
+    """Function for deleting alignment tensor data.
+
+    @param tensor:          The alignment tensor identification string.
+    @type tensor:           str
+    """
 
     # Test if the current data pipe exists.
     pipes.test(relax_data_store.current_pipe)
@@ -145,11 +149,18 @@
     if not align_data_exists(tensor):
         raise RelaxNoTensorError, 'alignment'
 
+    # Alias the tensor dictionary.
+    align_tensor = 
relax_data_store[relax_data_store.current_pipe].align_tensor
+
     # Delete the alignment data.
-    del(relax_data_store[relax_data_store.current_pipe].align_tensor)
-
-
-def display(tensor=None):
+    align_tensor.pop(tensor)
+
+    # Delete the dictionary if empty.
+    if not len(align_tensor):
+        del(relax_data_store[relax_data_store.current_pipe].align_tensor)
+
+
+def display(tensor):
     """Function for displaying the alignment tensor.
 
     @param tensor:          The alignment tensor identification string.