r11258 - /1.3/specific_fns/n_state_model.py -- June 29, 2010 - 11:48

Author: bugman
Date: Tue Jun 29 11:48:23 2010
New Revision: 11258

URL: http://svn.gna.org/viewcvs/relax?rev=11258&view=rev
Log:
The fixed alignment tensors are no longer included in the parameter vector 
from _assemble_param_vector().


Modified:
    1.3/specific_fns/n_state_model.py

Modified: 1.3/specific_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/n_state_model.py?rev=11258&r1=11257&r2=11258&view=diff
==============================================================================
--- 1.3/specific_fns/n_state_model.py (original)
+++ 1.3/specific_fns/n_state_model.py Tue Jun 29 11:48:23 2010
@@ -84,8 +84,8 @@
         # Initialise the parameter vector.
         param_vector = []
 
-        # A RDC or PCS data type requires the alignment tensors to be at the 
start of the parameter vector.
-        if 'rdc' in data_types or 'pcs' in data_types:
+        # A RDC or PCS data type requires the alignment tensors to be at the 
start of the parameter vector (unless the tensors are fixed).
+        if ('rdc' in data_types or 'pcs' in data_types) and not 
(hasattr(cdp.align_tensors, 'fixed') and cdp.align_tensors.fixed):
             # Loop over the alignments, adding the alignment tensor 
parameters to the parameter vector.
             for i in xrange(len(cdp.align_tensors)):
                 # No alignment ID, so skip the tensor as it will not be 
optimised.