r15139 - /branches/frame_order_testing/specific_fns/n_state_model.py -- January 04, 2012 - 10:49

Author: bugman
Date: Wed Jan  4 10:49:16 2012
New Revision: 15139

URL: http://svn.gna.org/viewcvs/relax?rev=15139&view=rev
Log:
A number of fixes for alignment tensors in the N-state model.


Modified:
    branches/frame_order_testing/specific_fns/n_state_model.py

Modified: branches/frame_order_testing/specific_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/n_state_model.py?rev=15139&r1=15138&r2=15139&view=diff
==============================================================================
--- branches/frame_order_testing/specific_fns/n_state_model.py (original)
+++ branches/frame_order_testing/specific_fns/n_state_model.py Wed Jan  4 
10:49:16 2012
@@ -94,7 +94,7 @@
             # 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.
-                if cdp.align_tensors[i].name not in cdp.align_ids:
+                if cdp.align_tensors[i].align_id not in cdp.align_ids:
                     continue
 
                 # Fixed tensor.
@@ -497,7 +497,7 @@
             tensor_num = 0
             for i in xrange(len(cdp.align_tensors)):
                 # No alignment ID, so skip the tensor as it will not be 
optimised.
-                if cdp.align_tensors[i].name not in cdp.align_ids:
+                if cdp.align_tensors[i].align_id not in cdp.align_ids:
                     continue
 
                 # Fixed tensor.
@@ -1374,7 +1374,7 @@
             # Loop over the alignments.
             for i in xrange(len(cdp.align_tensors)):
                 # No alignment ID, so skip the tensor as it is not part of 
the parameter set.
-                if cdp.align_tensors[i].name not in cdp.align_ids:
+                if cdp.align_tensors[i].align_id not in cdp.align_ids:
                     continue
 
                 # Fixed tensor.
@@ -1627,17 +1627,17 @@
             for id in cdp.align_ids:
                 # No tensors initialised.
                 if not hasattr(cdp, 'align_tensors'):
-                    generic_fns.align_tensor.init(align_id=id, params=[0.0, 
0.0, 0.0, 0.0, 0.0])
+                    generic_fns.align_tensor.init(tensor=id, align_id=id, 
params=[0.0, 0.0, 0.0, 0.0, 0.0])
 
                 # Find if the tensor corresponding to the id exists.
                 exists = False
                 for tensor in cdp.align_tensors:
-                    if id == tensor.name:
+                    if id == tensor.align_id:
                         exists = True
 
                 # Initialise the tensor.
                 if not exists:
-                    generic_fns.align_tensor.init(align_id=id, params=[0.0, 
0.0, 0.0, 0.0, 0.0])
+                    generic_fns.align_tensor.init(tensor=id, align_id=id, 
params=[0.0, 0.0, 0.0, 0.0, 0.0])
 
 
     def base_data_loop(self):