Author: bugman Date: Tue Dec 11 16:24:48 2012 New Revision: 18116 URL: http://svn.gna.org/viewcvs/relax?rev=18116&view=rev Log: Merged revisions 18115 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r18115 | bugman | 2012-12-11 16:22:46 +0100 (Tue, 11 Dec 2012) | 6 lines Bug fix for the align_tensor.copy user function for a recently introduced bug. The alignment tensor is now correctly initialised if the target data pipe is not the current data pipe. ........ Modified: branches/frame_order_testing/ (props changed) branches/frame_order_testing/generic_fns/align_tensor.py Propchange: branches/frame_order_testing/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Tue Dec 11 16:24:48 2012 @@ -1,1 +1,1 @@ -/trunk:1-18110 +/trunk:1-18115 Modified: branches/frame_order_testing/generic_fns/align_tensor.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/align_tensor.py?rev=18116&r1=18115&r2=18116&view=diff ============================================================================== --- branches/frame_order_testing/generic_fns/align_tensor.py (original) +++ branches/frame_order_testing/generic_fns/align_tensor.py Tue Dec 11 16:24:48 2012 @@ -157,7 +157,7 @@ # Add the tensor if it doesn't already exist. if tensor_to not in dp_to.align_tensors.names(): - tensor_obj = cdp.align_tensors.add_item(tensor_to) + dp_to.align_tensors.add_item(tensor_to) # Find the tensor index. index_from = get_tensor_index(tensor=tensor_from, pipe=pipe_from)