r4123 - /branches/N_state_model/generic_fns/align_tensor.py -- November 28, 2007 - 18:44

Author: bugman
Date: Wed Nov 28 18:44:39 2007
New Revision: 4123

URL: http://svn.gna.org/viewcvs/relax?rev=4123&view=rev
Log:
Updated the generic_fns.align_tensor.init() function to use the new 'tensor' 
arg.

The structure align_tensor in the PipeContainer is now a dictionary.


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=4123&r1=4122&r2=4123&view=diff
==============================================================================
--- branches/N_state_model/generic_fns/align_tensor.py (original)
+++ branches/N_state_model/generic_fns/align_tensor.py Wed Nov 28 18:44:39 
2007
@@ -251,9 +251,11 @@
             cdp.align_tensor.beta_sim[sim_index] = 
cdp.align_tensor.beta_sim[sim_index] + pi
 
 
-def init(params=None, scale=1.0, angle_units='deg', param_types=0, errors=0):
+def init(tensor=None, params=None, scale=1.0, angle_units='deg', 
param_types=0, errors=0):
     """Function for initialising the alignment tensor.
 
+    @param tensor:          The alignment tensor identification string.
+    @type tensor:           str
     @param params:          The alignment tensor parameters.
     @type params:           float
     @param scale:           The alignment tensor eigenvalue scaling value.
@@ -284,7 +286,9 @@
         raise RelaxError, "The alignment tensor 'angle_units' argument " + 
`angle_units` + " should be either 'deg' or 'rad'."
 
     # Add the align_tensor object to the data pipe.
-    cdp.align_tensor = AlignTensorData()
+    if not hasattr(cdp, 'align_tensor'):
+        cdp.align_tensor = {}
+    cdp.align_tensor[tensor] = AlignTensorData()
 
     # (Axx, Ayy, Axy, Axz, Ayz).
     if param_types == 0: