Author: bugman
Date: Tue Oct 2 16:58:40 2012
New Revision: 17679
URL: http://svn.gna.org/viewcvs/relax?rev=17679&view=rev
Log:
Python 3 fix for the frame order system tests matching r17678.
As float to string conversions behave differently, the %.1f formatting is
used to force only a
single decimal place float.
Modified:
trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/iso_cone_to_iso_cone_free_rotor.py
trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone.py
trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone_free_rotor.py
trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone.py
trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone_free_rotor.py
Modified:
trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/iso_cone_to_iso_cone_free_rotor.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/iso_cone_to_iso_cone_free_rotor.py?rev=17679&r1=17678&r2=17679&view=diff
==============================================================================
---
trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/iso_cone_to_iso_cone_free_rotor.py
(original)
+++
trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/iso_cone_to_iso_cone_free_rotor.py
Tue Oct 2 16:58:40 2012
@@ -58,7 +58,7 @@
for i in range(INC):
# Switch data pipes.
ds.angles.append(get_angle(i, incs=INC, deg=True))
- self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%s_deg' %
ds.angles[-1])
+ self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%.1f_deg' %
ds.angles[-1])
# Data init.
cdp.ave_pos_alpha = cdp.ave_pos_alpha2 = 0.0
Modified:
trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone.py?rev=17679&r1=17678&r2=17679&view=diff
==============================================================================
---
trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone.py
(original)
+++
trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone.py
Tue Oct 2 16:58:40 2012
@@ -47,7 +47,7 @@
for i in range(INC):
# Switch data pipes.
ds.angles.append(get_angle(i, incs=INC, deg=True))
- self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%s_deg' %
ds.angles[-1])
+ self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%.1f_deg' %
ds.angles[-1])
# Data init.
cdp.ave_pos_alpha = cdp.ave_pos_alpha2 = 0.0
Modified:
trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone_free_rotor.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone_free_rotor.py?rev=17679&r1=17678&r2=17679&view=diff
==============================================================================
---
trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone_free_rotor.py
(original)
+++
trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone_free_rotor.py
Tue Oct 2 16:58:40 2012
@@ -58,7 +58,7 @@
for i in range(INC):
# Switch data pipes.
ds.angles.append(get_angle(i, incs=INC, deg=True))
- self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%s_deg' %
ds.angles[-1])
+ self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%.1f_deg' %
ds.angles[-1])
# Data init.
cdp.ave_pos_alpha = cdp.ave_pos_alpha2 = 0.0
Modified:
trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone.py?rev=17679&r1=17678&r2=17679&view=diff
==============================================================================
---
trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone.py
(original)
+++
trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone.py
Tue Oct 2 16:58:40 2012
@@ -46,7 +46,7 @@
for i in range(INC):
# Switch data pipes.
ds.angles.append(get_angle(i, incs=INC, deg=True))
- self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%s_deg' %
ds.angles[-1])
+ self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%.1f_deg' %
ds.angles[-1])
# Data init.
cdp.ave_pos_alpha = cdp.ave_pos_alpha2 = 0.0
Modified:
trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone_free_rotor.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone_free_rotor.py?rev=17679&r1=17678&r2=17679&view=diff
==============================================================================
---
trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone_free_rotor.py
(original)
+++
trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone_free_rotor.py
Tue Oct 2 16:58:40 2012
@@ -58,7 +58,7 @@
for i in range(INC):
# Switch data pipes.
ds.angles.append(get_angle(i, incs=INC, deg=True))
- self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%s_deg' %
ds.angles[-1])
+ self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%.1f_deg' %
ds.angles[-1])
# Data init.
cdp.ave_pos_alpha = cdp.ave_pos_alpha2 = 0.0
r17679 - /trunk/test_suite/system_tests/scripts/frame_order/parametric_restriction/