Author: bugman Date: Thu Jul 26 09:34:13 2012 New Revision: 17319 URL: http://svn.gna.org/viewcvs/relax?rev=17319&view=rev Log: Updated all of the CaM frame order test data optimisation scripts for the align_tensor.init changes. Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rigid/frame_order.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor/frame_order.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py?rev=17319&r1=17318&r2=17319&view=diff ============================================================================== --- branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py (original) +++ branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py Thu Jul 26 09:34:13 2012 @@ -72,9 +72,10 @@ # The tensor domains and reductions. full = ['Dy N-dom', 'Tb N-dom', 'Tm N-dom', 'Er N-dom'] red = ['Dy C-dom', 'Tb C-dom', 'Tm C-dom', 'Er C-dom'] + ids = ['dy', 'tb', 'tm', 'er'] for i in range(len(full)): # Initialise the reduced tensor. - align_tensor.init(tensor=red[i], params=(0,0,0,0,0)) + align_tensor.init(tensor=red[i], align_id=ids[i], params=(0, 0, 0, 0, 0)) # Set the domain info. align_tensor.set_domain(tensor=full[i], domain='N') Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py?rev=17319&r1=17318&r2=17319&view=diff ============================================================================== --- branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py (original) +++ branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py Thu Jul 26 09:34:13 2012 @@ -72,9 +72,10 @@ # The tensor domains and reductions. full = ['Dy N-dom', 'Tb N-dom', 'Tm N-dom', 'Er N-dom'] red = ['Dy C-dom', 'Tb C-dom', 'Tm C-dom', 'Er C-dom'] + ids = ['dy', 'tb', 'tm', 'er'] for i in range(len(full)): # Initialise the reduced tensor. - align_tensor.init(tensor=red[i], params=(0,0,0,0,0)) + align_tensor.init(tensor=red[i], align_id=ids[i], params=(0, 0, 0, 0, 0)) # Set the domain info. align_tensor.set_domain(tensor=full[i], domain='N') Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py?rev=17319&r1=17318&r2=17319&view=diff ============================================================================== --- branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py (original) +++ branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py Thu Jul 26 09:34:13 2012 @@ -72,9 +72,10 @@ # The tensor domains and reductions. full = ['Dy N-dom', 'Tb N-dom', 'Tm N-dom', 'Er N-dom'] red = ['Dy C-dom', 'Tb C-dom', 'Tm C-dom', 'Er C-dom'] + ids = ['dy', 'tb', 'tm', 'er'] for i in range(len(full)): # Initialise the reduced tensor. - align_tensor.init(tensor=red[i], params=(0,0,0,0,0)) + align_tensor.init(tensor=red[i], align_id=ids[i], params=(0, 0, 0, 0, 0)) # Set the domain info. align_tensor.set_domain(tensor=full[i], domain='N') Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py?rev=17319&r1=17318&r2=17319&view=diff ============================================================================== --- branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py (original) +++ branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py Thu Jul 26 09:34:13 2012 @@ -73,9 +73,10 @@ # The tensor domains and reductions. full = ['Dy N-dom', 'Tb N-dom', 'Tm N-dom', 'Er N-dom'] red = ['Dy C-dom', 'Tb C-dom', 'Tm C-dom', 'Er C-dom'] + ids = ['dy', 'tb', 'tm', 'er'] for i in range(len(full)): # Initialise the reduced tensor. - align_tensor.init(tensor=red[i], params=(0,0,0,0,0)) + align_tensor.init(tensor=red[i], align_id=ids[i], params=(0, 0, 0, 0, 0)) # Set the domain info. align_tensor.set_domain(tensor=full[i], domain='N') Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py?rev=17319&r1=17318&r2=17319&view=diff ============================================================================== --- branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py (original) +++ branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py Thu Jul 26 09:34:13 2012 @@ -73,9 +73,10 @@ # The tensor domains and reductions. full = ['Dy N-dom', 'Tb N-dom', 'Tm N-dom', 'Er N-dom'] red = ['Dy C-dom', 'Tb C-dom', 'Tm C-dom', 'Er C-dom'] + ids = ['dy', 'tb', 'tm', 'er'] for i in range(len(full)): # Initialise the reduced tensor. - align_tensor.init(tensor=red[i], params=(0,0,0,0,0)) + align_tensor.init(tensor=red[i], align_id=ids[i], params=(0, 0, 0, 0, 0)) # Set the domain info. align_tensor.set_domain(tensor=full[i], domain='N') Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py?rev=17319&r1=17318&r2=17319&view=diff ============================================================================== --- branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py (original) +++ branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py Thu Jul 26 09:34:13 2012 @@ -72,9 +72,10 @@ # The tensor domains and reductions. full = ['Dy N-dom', 'Tb N-dom', 'Tm N-dom', 'Er N-dom'] red = ['Dy C-dom', 'Tb C-dom', 'Tm C-dom', 'Er C-dom'] + ids = ['dy', 'tb', 'tm', 'er'] for i in range(len(full)): # Initialise the reduced tensor. - align_tensor.init(tensor=red[i], params=(0,0,0,0,0)) + align_tensor.init(tensor=red[i], align_id=ids[i], params=(0, 0, 0, 0, 0)) # Set the domain info. align_tensor.set_domain(tensor=full[i], domain='N') Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py?rev=17319&r1=17318&r2=17319&view=diff ============================================================================== --- branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py (original) +++ branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py Thu Jul 26 09:34:13 2012 @@ -72,9 +72,10 @@ # The tensor domains and reductions. full = ['Dy N-dom', 'Tb N-dom', 'Tm N-dom', 'Er N-dom'] red = ['Dy C-dom', 'Tb C-dom', 'Tm C-dom', 'Er C-dom'] + ids = ['dy', 'tb', 'tm', 'er'] for i in range(len(full)): # Initialise the reduced tensor. - align_tensor.init(tensor=red[i], params=(0,0,0,0,0)) + align_tensor.init(tensor=red[i], align_id=ids[i], params=(0, 0, 0, 0, 0)) # Set the domain info. align_tensor.set_domain(tensor=full[i], domain='N') Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py?rev=17319&r1=17318&r2=17319&view=diff ============================================================================== --- branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py (original) +++ branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py Thu Jul 26 09:34:13 2012 @@ -72,9 +72,10 @@ # The tensor domains and reductions. full = ['Dy N-dom', 'Tb N-dom', 'Tm N-dom', 'Er N-dom'] red = ['Dy C-dom', 'Tb C-dom', 'Tm C-dom', 'Er C-dom'] + ids = ['dy', 'tb', 'tm', 'er'] for i in range(len(full)): # Initialise the reduced tensor. - align_tensor.init(tensor=red[i], params=(0,0,0,0,0)) + align_tensor.init(tensor=red[i], align_id=ids[i], params=(0, 0, 0, 0, 0)) # Set the domain info. align_tensor.set_domain(tensor=full[i], domain='N') Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py?rev=17319&r1=17318&r2=17319&view=diff ============================================================================== --- branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py (original) +++ branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py Thu Jul 26 09:34:13 2012 @@ -72,9 +72,10 @@ # The tensor domains and reductions. full = ['Dy N-dom', 'Tb N-dom', 'Tm N-dom', 'Er N-dom'] red = ['Dy C-dom', 'Tb C-dom', 'Tm C-dom', 'Er C-dom'] + ids = ['dy', 'tb', 'tm', 'er'] for i in range(len(full)): # Initialise the reduced tensor. - align_tensor.init(tensor=red[i], params=(0,0,0,0,0)) + align_tensor.init(tensor=red[i], align_id=ids[i], params=(0, 0, 0, 0, 0)) # Set the domain info. align_tensor.set_domain(tensor=full[i], domain='N') Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py?rev=17319&r1=17318&r2=17319&view=diff ============================================================================== --- branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py (original) +++ branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py Thu Jul 26 09:34:13 2012 @@ -72,9 +72,10 @@ # The tensor domains and reductions. full = ['Dy N-dom', 'Tb N-dom', 'Tm N-dom', 'Er N-dom'] red = ['Dy C-dom', 'Tb C-dom', 'Tm C-dom', 'Er C-dom'] + ids = ['dy', 'tb', 'tm', 'er'] for i in range(len(full)): # Initialise the reduced tensor. - align_tensor.init(tensor=red[i], params=(0,0,0,0,0)) + align_tensor.init(tensor=red[i], align_id=ids[i], params=(0, 0, 0, 0, 0)) # Set the domain info. align_tensor.set_domain(tensor=full[i], domain='N') Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rigid/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rigid/frame_order.py?rev=17319&r1=17318&r2=17319&view=diff ============================================================================== --- branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rigid/frame_order.py (original) +++ branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rigid/frame_order.py Thu Jul 26 09:34:13 2012 @@ -72,9 +72,10 @@ # The tensor domains and reductions. full = ['Dy N-dom', 'Tb N-dom', 'Tm N-dom', 'Er N-dom'] red = ['Dy C-dom', 'Tb C-dom', 'Tm C-dom', 'Er C-dom'] + ids = ['dy', 'tb', 'tm', 'er'] for i in range(len(full)): # Initialise the reduced tensor. - align_tensor.init(tensor=red[i], params=(0,0,0,0,0)) + align_tensor.init(tensor=red[i], align_id=ids[i], params=(0, 0, 0, 0, 0)) # Set the domain info. align_tensor.set_domain(tensor=full[i], domain='N') Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor/frame_order.py?rev=17319&r1=17318&r2=17319&view=diff ============================================================================== --- branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor/frame_order.py (original) +++ branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor/frame_order.py Thu Jul 26 09:34:13 2012 @@ -72,9 +72,10 @@ # The tensor domains and reductions. full = ['Dy N-dom', 'Tb N-dom', 'Tm N-dom', 'Er N-dom'] red = ['Dy C-dom', 'Tb C-dom', 'Tm C-dom', 'Er C-dom'] + ids = ['dy', 'tb', 'tm', 'er'] for i in range(len(full)): # Initialise the reduced tensor. - align_tensor.init(tensor=red[i], params=(0,0,0,0,0)) + align_tensor.init(tensor=red[i], align_id=ids[i], params=(0, 0, 0, 0, 0)) # Set the domain info. align_tensor.set_domain(tensor=full[i], domain='N') Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py?rev=17319&r1=17318&r2=17319&view=diff ============================================================================== --- branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py (original) +++ branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py Thu Jul 26 09:34:13 2012 @@ -72,9 +72,10 @@ # The tensor domains and reductions. full = ['Dy N-dom', 'Tb N-dom', 'Tm N-dom', 'Er N-dom'] red = ['Dy C-dom', 'Tb C-dom', 'Tm C-dom', 'Er C-dom'] + ids = ['dy', 'tb', 'tm', 'er'] for i in range(len(full)): # Initialise the reduced tensor. - align_tensor.init(tensor=red[i], params=(0,0,0,0,0)) + align_tensor.init(tensor=red[i], align_id=ids[i], params=(0, 0, 0, 0, 0)) # Set the domain info. align_tensor.set_domain(tensor=full[i], domain='N') Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py?rev=17319&r1=17318&r2=17319&view=diff ============================================================================== --- branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py (original) +++ branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py Thu Jul 26 09:34:13 2012 @@ -72,9 +72,10 @@ # The tensor domains and reductions. full = ['Dy N-dom', 'Tb N-dom', 'Tm N-dom', 'Er N-dom'] red = ['Dy C-dom', 'Tb C-dom', 'Tm C-dom', 'Er C-dom'] + ids = ['dy', 'tb', 'tm', 'er'] for i in range(len(full)): # Initialise the reduced tensor. - align_tensor.init(tensor=red[i], params=(0,0,0,0,0)) + align_tensor.init(tensor=red[i], align_id=ids[i], params=(0, 0, 0, 0, 0)) # Set the domain info. align_tensor.set_domain(tensor=full[i], domain='N')