Author: bugman Date: Fri Jan 18 22:02:54 2013 New Revision: 18238 URL: http://svn.gna.org/viewcvs/relax?rev=18238&view=rev Log: Reverted r18237 as the fix was no correct! The command used was: svn merge -r18237:18236 . 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=18238&r1=18237&r2=18238&view=diff ============================================================================== --- branches/frame_order_testing/specific_fns/n_state_model.py (original) +++ branches/frame_order_testing/specific_fns/n_state_model.py Fri Jan 18 22:02:54 2013 @@ -104,7 +104,7 @@ # Loop over the alignments, adding the alignment tensor parameters to the parameter vector. for i in range(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. @@ -557,7 +557,7 @@ tensor_num = 0 for i in range(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. @@ -1368,7 +1368,7 @@ # Loop over the alignments. for i in range(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. @@ -1626,7 +1626,7 @@ # 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.